sixam/minetest
Template
2
0
Fork 0
mirror of https://github.com/luanti-org/minetest_game.git synced 2025-05-21 14:53:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch to math.random for speed

Browse source
This commit is contained in:
ShadowNinja 2014-08-25 13:18:17 -04:00
parent dd5eb88f7e
commit fa18853866
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
mods/default/trees.lua
View file

@ -57,7 +57,6 @@ function default.grow_tree(pos, is_apple_tree, bad)
if bad then if bad then
error("Deprecated use of default.grow_tree") error("Deprecated use of default.grow_tree")
end end
local seed = math.random(1, 100000)
local vm = minetest.get_voxel_manip() local vm = minetest.get_voxel_manip()
local minp, maxp = vm:read_from_map( local minp, maxp = vm:read_from_map(
@ -67,8 +66,8 @@ function default.grow_tree(pos, is_apple_tree, bad)
local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp}) local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
local data = vm:get_data() local data = vm:get_data()
local pr = PseudoRandom(seed) local random = math.random
local th = pr:next(4, 5) local th = random(4, 5)
local x, y, z = pos.x, pos.y, pos.z local x, y, z = pos.x, pos.y, pos.z
for yy = y, y + th - 1 do for yy = y, y + th - 1 do
local vi = a:index(x, yy, z) local vi = a:index(x, yy, z)
@ -96,9 +95,9 @@ function default.grow_tree(pos, is_apple_tree, bad)
-- Add leaves randomly -- Add leaves randomly
for iii = 1, 8 do for iii = 1, 8 do
local d = 1 local d = 1
local xx = pr:next(leaves_a.MinEdge.x, leaves_a.MaxEdge.x - d) local xx = random(leaves_a.MinEdge.x, leaves_a.MaxEdge.x - d)
local yy = pr:next(leaves_a.MinEdge.y, leaves_a.MaxEdge.y - d) local yy = random(leaves_a.MinEdge.y, leaves_a.MaxEdge.y - d)
local zz = pr:next(leaves_a.MinEdge.z, leaves_a.MaxEdge.z - d) local zz = random(leaves_a.MinEdge.z, leaves_a.MaxEdge.z - d)
for xi = 0, d do for xi = 0, d do
for yi = 0, d do for yi = 0, d do
@ -115,7 +114,7 @@ function default.grow_tree(pos, is_apple_tree, bad)
for zi = -2, 2 do for zi = -2, 2 do
local vi = a:index(x + xi, y + yi, z + zi) local vi = a:index(x + xi, y + yi, z + zi)
if data[vi] == c_air and leaves_buffer[leaves_a:index(xi, yi, zi)] then if data[vi] == c_air and leaves_buffer[leaves_a:index(xi, yi, zi)] then
if is_apple_tree and pr:next(1, 100) <= 10 then if is_apple_tree and random(1, 100) <= 10 then
data[vi] = c_apple data[vi] = c_apple
else else
data[vi] = c_leaves data[vi] = c_leaves
@ -141,7 +140,7 @@ function default.grow_jungletree(pos, bad)
if bad then if bad then
error("Deprecated use of default.grow_jungletree") error("Deprecated use of default.grow_jungletree")
end end
local seed = math.random(1, 100000)
local vm = minetest.get_voxel_manip() local vm = minetest.get_voxel_manip()
local minp, maxp = vm:read_from_map( local minp, maxp = vm:read_from_map(
{x = pos.x - 2, y = pos.y - 1, z = pos.z - 2}, {x = pos.x - 2, y = pos.y - 1, z = pos.z - 2},
@ -149,13 +148,13 @@ function default.grow_jungletree(pos, bad)
local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp}) local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
local data = vm:get_data() local data = vm:get_data()
local pr = PseudoRandom(seed) local random = math.random
local x, y, z = pos.x, pos.y, pos.z local x, y, z = pos.x, pos.y, pos.z
-- Add the roots -- Add the roots
for xi = -1, 1 do for xi = -1, 1 do
for zi = -1, 1 do for zi = -1, 1 do
if pr:next(1, 3) >= 2 then if random(1, 3) >= 2 then
local vi1 = a:index(x + xi, y, z + zi) local vi1 = a:index(x + xi, y, z + zi)
local vi2 = a:index(x + xi, y - 1, z + zi) local vi2 = a:index(x + xi, y - 1, z + zi)
if data[vi2] == c_air then if data[vi2] == c_air then
@ -168,7 +167,7 @@ function default.grow_jungletree(pos, bad)
end end
-- Add the trunk -- Add the trunk
local th = pr:next(8, 12) local th = random(8, 12)
for yy = y, y + th - 1 do for yy = y, y + th - 1 do
local vi = a:index(x, yy, z) local vi = a:index(x, yy, z)
if data[vi] == c_air or yy == y then if data[vi] == c_air or yy == y then
@ -195,9 +194,9 @@ function default.grow_jungletree(pos, bad)
-- Add leaves randomly -- Add leaves randomly
for iii = 1, 30 do for iii = 1, 30 do
local d = 1 local d = 1
local xx = pr:next(leaves_a.MinEdge.x, leaves_a.MaxEdge.x - d) local xx = random(leaves_a.MinEdge.x, leaves_a.MaxEdge.x - d)
local yy = pr:next(leaves_a.MinEdge.y, leaves_a.MaxEdge.y - d) local yy = random(leaves_a.MinEdge.y, leaves_a.MaxEdge.y - d)
local zz = pr:next(leaves_a.MinEdge.z, leaves_a.MaxEdge.z - d) local zz = random(leaves_a.MinEdge.z, leaves_a.MaxEdge.z - d)
for xi = 0, d do for xi = 0, d do
for yi = 0, d do for yi = 0, d do