nalc/watershed
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix spawn player function

Browse Source
This commit is contained in:
paramat 2014-05-06 03:23:17 +01:00
parent 37bc4d25b2
commit b804a06c64
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
functions.lua
View File

@ -224,31 +224,31 @@ if SINGLENODE then
-- Spawn player -- Spawn player
function spawnplayer(player) function spawnplayer(player)
local TERCEN = -160 -- Terrain 'centre', average seabed level local TERCEN = -128 -- Terrain 'centre', average seabed level
local TERSCA = 512 -- Vertical terrain scale local TERSCA = 512 -- Vertical terrain scale
local ATANAMP = 1.1 -- Arctan function amplitude, smaller = more and larger floatlands above ridges local XLSAMP = 0.1 -- Extra large scale height variation amplitude
local XLSAMP = 0.2 -- Extra large scale height variation amplitude local BASAMP = 0.3 -- Base terrain amplitude
local BASAMP = 0.4 -- Base terrain amplitude local MIDAMP = 0.1 -- Mid terrain amplitude
local CANAMP = 0.4 -- Canyon terrain maximum amplitude local CANAMP = 0.4 -- Canyon terrain maximum amplitude
local BLENEXP = 2 -- Terrain blend exponent local ATANAMP = 1
local xsp local xsp
local ysp local ysp
local zsp local zsp
local np_rough = { local np_terrain = {
offset = 0, offset = 0,
scale = 1, scale = 1,
spread = {x=512, y=256, z=512}, spread = {x=384, y=192, z=384},
seed = 593, seed = 593,
octaves = 6, octaves = 5,
persist = 0.67 persist = 0.67
} }
local np_roughalt = { local np_mid = {
offset = 0, offset = 0,
scale = 1, scale = 1,
spread = {x=414, y=207, z=414}, spread = {x=768, y=768, z=768},
seed = -9003, seed = 85546,
octaves = 6, octaves = 5,
persist = 0.67 persist = 0.5
} }
local np_base = { local np_base = {
offset = 0, offset = 0,
@ -280,9 +280,8 @@ if SINGLENODE then
local minposxyz = {x=x0, y=y0, z=z0} local minposxyz = {x=x0, y=y0, z=z0}
local minposxz = {x=x0, y=z0} local minposxz = {x=x0, y=z0}
local nvals_rough = minetest.get_perlin_map(np_rough, chulens):get3dMap_flat(minposxyz) local nvals_terrain = minetest.get_perlin_map(np_terrain, chulens):get3dMap_flat(minposxyz)
local nvals_roughalt = minetest.get_perlin_map(np_roughalt, chulens):get3dMap_flat(minposxyz) local nvals_mid = minetest.get_perlin_map(np_mid, chulens):get2dMap_flat(minposxz)
local nvals_base = minetest.get_perlin_map(np_base, chulens):get2dMap_flat(minposxz) local nvals_base = minetest.get_perlin_map(np_base, chulens):get2dMap_flat(minposxz)
local nvals_xlscale = minetest.get_perlin_map(np_xlscale, chulens):get2dMap_flat(minposxz) local nvals_xlscale = minetest.get_perlin_map(np_xlscale, chulens):get2dMap_flat(minposxz)
@ -291,16 +290,17 @@ if SINGLENODE then
for z = z0, z1 do for z = z0, z1 do
for y = y0, y1 do for y = y0, y1 do
for x = x0, x1 do for x = x0, x1 do
local n_rough = nvals_rough[nixyz] local n_absterrain = math.abs(nvals_terrain[nixyz])
local n_roughalt = nvals_roughalt[nixyz] local n_absmid = math.abs(nvals_mid[nixz])
local n_base = nvals_base[nixz] local n_absbase = math.abs(nvals_base[nixz])
local n_xlscale = nvals_xlscale[nixz] local n_xlscale = nvals_xlscale[nixz]
local n_invbase = (1 - n_absbase)
local grad = math.atan((TERCEN - y) / TERSCA) * ATANAMP local grad = math.atan((TERCEN - y) / TERSCA) * ATANAMP
local densitybase = (1 - math.abs(n_base)) * BASAMP + n_xlscale * XLSAMP + grad local densitybase = n_invbase * BASAMP + grad + 0.1
local terblen = (math.max(1 - math.abs(n_base), 0)) ^ BLENEXP local densitymid = n_absmid * MIDAMP + densitybase
local canexp = 0.5 + terblen local canexp = 0.2 + n_invbase * 0.8
local canamp = 0.01 + terblen * CANAMP local canamp = n_invbase * CANAMP
local density = densitybase + math.abs((n_rough + n_roughalt) * 0.5) ^ canexp * canamp local density = n_absterrain ^ canexp * canamp * n_absmid + densitymid
if y >= 1 and density > -0.01 and density < 0 then if y >= 1 and density > -0.01 and density < 0 then
ysp = y + 1 ysp = y + 1
xsp = x xsp = x