mirror of
https://github.com/sbrl/Minetest-WorldEditAdditions.git
synced 2024-09-12 08:08:30 +02:00
perlin: use wea.bit.band
This commit is contained in:
parent
5c7b5432d9
commit
e4d3f26692
@ -58,9 +58,9 @@ end
|
|||||||
function Perlin:noise( x, y, z )
|
function Perlin:noise( x, y, z )
|
||||||
y = y or 0
|
y = y or 0
|
||||||
z = z or 0
|
z = z or 0
|
||||||
local xi = self:BitAND(math.floor(x), 255)
|
local xi = wea.bit.band(math.floor(x), 255)
|
||||||
local yi = self:BitAND(math.floor(y), 255)
|
local yi = wea.bit.band(math.floor(y), 255)
|
||||||
local zi = self:BitAND(math.floor(z), 255)
|
local zi = wea.bit.band(math.floor(z), 255)
|
||||||
|
|
||||||
-- print("x", x, "y", y, "z", z, "xi", xi, "yi", yi, "zi", zi)
|
-- print("x", x, "y", y, "z", z, "xi", xi, "yi", yi, "zi", zi)
|
||||||
-- print("p[xi]", self.p[xi])
|
-- print("p[xi]", self.p[xi])
|
||||||
@ -109,17 +109,6 @@ function Perlin:noise( x, y, z )
|
|||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
function Perlin:BitAND(a, b) --Bitwise and
|
|
||||||
local p, c = 1, 0
|
|
||||||
while a > 0 and b > 0 do
|
|
||||||
local ra, rb = a%2, b%2
|
|
||||||
if ra + rb > 1 then c = c + p end
|
|
||||||
a, b, p = (a - ra) / 2, (b - rb) / 2, p * 2
|
|
||||||
end
|
|
||||||
return c
|
|
||||||
end
|
|
||||||
|
|
||||||
function Perlin:fade(t)
|
function Perlin:fade(t)
|
||||||
return t * t * t * (t * (t * 6 - 15) + 10)
|
return t * t * t * (t * (t * 6 - 15) + 10)
|
||||||
end
|
end
|
||||||
@ -129,7 +118,7 @@ function Perlin:lerp(t, a, b)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function Perlin:grad(hash, x, y, z)
|
function Perlin:grad(hash, x, y, z)
|
||||||
local h = self:BitAND(hash, 15)
|
local h = wea.bit.band(hash, 15)
|
||||||
local u = h < 8 and x or y
|
local u = h < 8 and x or y
|
||||||
local v = h < 4 and y or ((h == 12 or h == 14) and x or z)
|
local v = h < 4 and y or ((h == 12 or h == 14) and x or z)
|
||||||
return ((h and 1) == 0 and u or - u) + ((h and 2) == 0 and v or - v)
|
return ((h and 1) == 0 and u or - u) + ((h and 2) == 0 and v or - v)
|
||||||
|
Loading…
Reference in New Issue
Block a user