nalc/minetest-mod-snow
1
0
Fork 0
forked from mtcontrib/minetest-mod-snow
Code Issues Pull Requests Releases Wiki Activity

add back caching ws values, that was a memory bug of minetest and these numbers hardly use memory space I guess

Browse Source
This commit is contained in:
HybridDog 2015-11-21 21:54:25 +01:00
parent 35c21dd879
commit b647842ad4
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/mapgen_v6.lua
View File

@ -1,5 +1,6 @@
-- https://github.com/paramat/meru/blob/master/init.lua#L52 -- https://github.com/paramat/meru/blob/master/init.lua#L52
-- Parameters must match mgv6 biome noise -- Parameters must match mgv6 biome noise
local np_default = { local np_default = {
offset = 0, offset = 0,
scale = 1, scale = 1,
@ -9,6 +10,7 @@ local np_default = {
persist = 0.5 persist = 0.5
} }
-- 2D noise for coldness -- 2D noise for coldness
local mg = snow.mapgen local mg = snow.mapgen
@ -22,6 +24,7 @@ local np_cold = {
persist = 0.5 persist = 0.5
} }
-- 2D noise for icetype -- 2D noise for icetype
local np_ice = { local np_ice = {
@ -33,6 +36,7 @@ local np_ice = {
persist = 0.5 persist = 0.5
} }
-- Debugging function -- Debugging function
local biome_strings = { local biome_strings = {
@ -55,6 +59,24 @@ local function do_ws_func(a, x)
end end
-- caching functions
local ws_lists = {}
local function get_ws_list(a,x)
ws_lists[a] = ws_lists[a] or {}
local v = ws_lists[a][x]
if v then
return v
end
v = {}
for x=x,x + (80 - 1) do
local y = do_ws_func(a, x)
v[x] = y
end
ws_lists[a][x] = v
return v
end
local plantlike_ids = {} local plantlike_ids = {}
local function is_plantlike(id) local function is_plantlike(id)
if plantlike_ids[id] ~= nil then if plantlike_ids[id] ~= nil then
@ -97,6 +119,7 @@ local function is_snowable(id)
return true return true
end end
local c, replacements local c, replacements
local function define_contents() local function define_contents()
c = { c = {
@ -235,7 +258,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
if not nvals_ice then if not nvals_ice then
nvals_ice = minetest.get_perlin_map(np_ice, chulens):get2dMap_flat({x=x0, y=z0}) nvals_ice = minetest.get_perlin_map(np_ice, chulens):get2dMap_flat({x=x0, y=z0})
end end
local icetype = nvals_ice[ni] local icetype = nvals_ice[ni]
local cool = icetype > 0 -- only spawns ice on edge of water local cool = icetype > 0 -- only spawns ice on edge of water
local icebergs = icetype > -0.2 and icetype <= 0 local icebergs = icetype > -0.2 and icetype <= 0
local icehole = icetype > -0.4 and icetype <= -0.2 -- icesheet with holes local icehole = icetype > -0.4 and icetype <= -0.2 -- icesheet with holes
@ -431,7 +454,11 @@ minetest.register_on_generated(function(minp, maxp, seed)
if test > 0 then if test > 0 then
local maxh = math.floor(test*10)%10+1 local maxh = math.floor(test*10)%10+1
if maxh ~= 1 then if maxh ~= 1 then
local h = math.floor( do_ws_func(2, x) + do_ws_func(5, z)*5)%10+1 if not wsz then
wsz = get_ws_list(5, z0)
wsx = get_ws_list(2, x0)
end
local h = math.floor(wsx[x]+wsz[z]*5)%10+1
if h ~= 1 then if h ~= 1 then
-- search for nearby snow -- search for nearby snow
y = y+1 y = y+1
@ -488,4 +515,3 @@ minetest.register_on_generated(function(minp, maxp, seed)
print("[snow] "..biome_string.." x "..minp.x.." z "..minp.z.." time "..chugent.." ms") print("[snow] "..biome_string.." x "..minp.x.." z "..minp.z.." time "..chugent.." ms")
end end
end) end)