mtcontrib/rocks
1
0
Fork 0
mirror of git://repo.or.cz/rocks.git synced 2025-01-04 07:10:28 +01:00
Code Issues Releases Wiki Activity

Preserving order of registered strata, fixed some noise params, added upper boundary check to mapgen.

Browse Source
This commit is contained in:
Tomáš Brada 2015-04-03 16:06:45 +02:00
parent f02a668c22
commit dbbd865125
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ign.lua
View File

@ -51,9 +51,9 @@ end
rocks.register_igneous=reg rocks.register_igneous=reg
-- rock registration -- rock registration
reg("rocks:granite", { spread=40, height=32, treshold=0.04}) reg("rocks:granite", { spread=40, height=32, treshold=0.06})
reg("rocks:diorite", { spread=40, height=32, treshold=0.24}) reg("rocks:diorite", { spread=40, height=32, treshold=0.23})
reg("rocks:gabbro", { spread=40, height=32, treshold=0.33}) reg("rocks:gabbro", { spread=40, height=32, treshold=0.36})
minetest.register_on_generated(function(minp, maxp, seed) minetest.register_on_generated(function(minp, maxp, seed)
rocksl.layergen(ign,minp,maxp,seed) rocksl.layergen(ign,minp,maxp,seed)

15
mapgen.lua
View File

@ -14,13 +14,14 @@ rocksl.GetNextSeed=function()
end end
rocksl.register_blob=function(layer,name,param) rocksl.register_blob=function(layer,name,param)
layer.localized[name]={ table.insert(layer.localized,{
primary=name,
spread=(param.spread or 20), spread=(param.spread or 20),
height=(param.height or 15), height=(param.height or 15),
treshold=(param.treshold or 0.85), treshold=(param.treshold or 0.85),
secondary=param.secondary, secondary=param.secondary,
seed=(rocksl.GetNextSeed()), seed=(rocksl.GetNextSeed()),
} })
layer.stats.node[name]=0 layer.stats.node[name]=0
end end
@ -45,7 +46,7 @@ rocksl.layergen=function(layer, minp, maxp, seed)
-- noises: -- noises:
local bottom=minetest.get_perlin_map(layer.bot,map_lengths_xyz):get2dMap_flat({x=minp.x, y=minp.z}) local bottom=minetest.get_perlin_map(layer.bot,map_lengths_xyz):get2dMap_flat({x=minp.x, y=minp.z})
local localized={} local localized={}
for name,loc in pairs(layer.localized) do for _,loc in ipairs(layer.localized) do
--defaults and overrides --defaults and overrides
local np={ offset = 0, scale = 1, octaves = 1, persist = 0.7, local np={ offset = 0, scale = 1, octaves = 1, persist = 0.7,
spread = {x=loc.spread, y=loc.height, z=loc.spread}, seed=loc.seed} spread = {x=loc.spread, y=loc.height, z=loc.spread}, seed=loc.seed}
@ -54,8 +55,8 @@ rocksl.layergen=function(layer, minp, maxp, seed)
{ {
noise=minetest.get_perlin_map(np,map_lengths_xyz):get3dMap_flat(minp), noise=minetest.get_perlin_map(np,map_lengths_xyz):get3dMap_flat(minp),
treshold=loc.treshold, treshold=loc.treshold,
ctx= minetest.get_content_id(name), ctx= minetest.get_content_id(loc.primary),
ndn=name ndn=loc.primary
}) })
end end
local noise2d_ix = 1 local noise2d_ix = 1
@ -65,8 +66,8 @@ rocksl.layergen=function(layer, minp, maxp, seed)
for y=minp.y,maxp.y,1 do for y=minp.y,maxp.y,1 do
for x=minp.x,maxp.x,1 do for x=minp.x,maxp.x,1 do
local pos = area:index(x, y, z) local pos = area:index(x, y, z)
if (y>bottom[noise2d_ix]) if (y>bottom[noise2d_ix]) and (y<layer.top.offset)
and (nodes[pos]~=air_ctx) and ( (nodes[pos]==stone_ctx) or (nodes[pos]==dirt_ctx) )
then then
layer.stats.totalnodes=layer.stats.totalnodes+1 layer.stats.totalnodes=layer.stats.totalnodes+1
if nodes[pos]==stone_ctx then nodes[pos] = layer.primary.ctx end if nodes[pos]==stone_ctx then nodes[pos] = layer.primary.ctx end

2
sed.lua
View File

@ -50,8 +50,8 @@ rocks.register_sedimentary=reg
reg("rocks:limestone", { spread=64, height=32, treshold=0.36 }) reg("rocks:limestone", { spread=64, height=32, treshold=0.36 })
--reg("rocks:breccia", { spread=64, height=32, treshold=0.6 }) --reg("rocks:breccia", { spread=64, height=32, treshold=0.6 })
--reg("rocks:conglomerate", { spread=64, height=32, treshold=0.6 }) --reg("rocks:conglomerate", { spread=64, height=32, treshold=0.6 })
reg("default:clay",{ spread=48, height=14, treshold=0.50 })
reg("default:stone_with_coal", { spread=48, height=14, treshold=0.40 }) reg("default:stone_with_coal", { spread=48, height=14, treshold=0.40 })
reg("default:clay",{ spread=48, height=14, treshold=0.50 })
minetest.register_on_generated(function(minp, maxp, seed) minetest.register_on_generated(function(minp, maxp, seed)
rocksl.layergen(sed,minp,maxp,seed) rocksl.layergen(sed,minp,maxp,seed)