add core:obstacle block & move cameras from base to core & add new generator

res/content/base/generators/demo.lua

@@ -0,0 +1,86 @@
+sea_level = 64
+
+-- 1 - temperature
+-- 2 - humidity
+biome_parameters = 2
+
+biomes = json.parse(file.read("base:generators/demo/biomes.json"))
+
+function place_structures(x, z, w, d, seed, hmap)
+    local placements = {}
+    for i=1,10 do
+        local sx = math.random() * w
+        local sz = math.random() * d
+        local sy = math.random() * 128
+        if sy < hmap:at(sx, sz) * 256 - 6 then
+            table.insert(placements, {"coal_ore0", {sx, sy, sz}, math.random()*4})
+        end
+    end
+    return placements
+end
+
+local function _generate_heightmap(x, y, w, h, seed, s)
+    local umap = Heightmap(w, h)
+    local vmap = Heightmap(w, h)
+    umap.noiseSeed = seed
+    vmap.noiseSeed = seed
+    vmap:noise({x+521, y+70}, 0.1*s, 3, 25.8)
+    vmap:noise({x+95, y+246}, 0.15*s, 3, 25.8)
+
+    local map = Heightmap(w, h)
+    map.noiseSeed = seed
+    map:noise({x, y}, 0.8*s, 4, 0.02)
+    map:cellnoise({x, y}, 0.1*s, 3, 0.3, umap, vmap)
+    map:add(0.4)
+
+    local rivermap = Heightmap(w, h)
+    rivermap.noiseSeed = seed
+    rivermap:noise({x+21, y+12}, 0.1*s, 4)
+    rivermap:abs()
+    rivermap:mul(2.0)
+    rivermap:pow(0.15)
+    rivermap:max(0.3)
+    map:add(0.3)
+    map:mul(rivermap)
+    return map
+end
+
+function generate_heightmap(x, y, w, h, seed)
+    -- blocks per dot
+    -- 8 - linear interpolation is visible, but not so much
+    -- 4 - high quality, but slower
+    -- 2 - you really don't need it
+    -- 1 - please have mercy on your CPU
+    local bpd = 4
+    local map = _generate_heightmap(
+        math.floor(x/bpd), math.floor(y/bpd), 
+        math.floor(w/bpd)+1, math.floor(h/bpd)+1, seed, bpd)
+    map:resize(w+bpd, h+bpd, 'linear')
+    map:crop(0, 0, w, h)
+    return map
+end
+
+local function _generate_biome_parameters(x, y, w, h, seed, s)
+    local tempmap = Heightmap(w, h)
+    tempmap.noiseSeed = seed + 5324
+    tempmap:noise({x, y}, 0.04*s, 6)
+    local hummap = Heightmap(w, h)
+    hummap.noiseSeed = seed + 953
+    hummap:noise({x, y}, 0.04*s, 6)
+    tempmap:pow(3)
+    hummap:pow(3)
+    return tempmap, hummap
+end
+
+function generate_biome_parameters(x, y, w, h, seed)
+    local bpd = 8
+    local tmap, hmap = _generate_biome_parameters(
+        math.floor(x/bpd), math.floor(y/bpd), 
+        math.floor(w/bpd)+1, math.floor(h/bpd)+1, seed, bpd) 
+    tmap:resize(w+bpd, h+bpd, 'linear')
+    tmap:crop(0, 0, w, h)
+
+    hmap:resize(w+bpd, h+bpd, 'linear')
+    hmap:crop(0, 0, w, h)
+    return tmap, hmap
+end

res/content/base/preload.json

@@ -7,13 +7,6 @@
     "models": [
         "drop-item"
     ],
-    "shaders": [
-        "ui3d",
-        "entity",
-        "screen",
-        "background",
-        "skybox_gen"
-    ],
     "textures": [
         "misc/moon",
         "misc/sun",

res/generators/default.lua

@@ -1,84 +1,15 @@
-sea_level = 64
+biome_parameters = 0
 
--- 1 - temperature
--- 2 - humidity
-biome_parameters = 2
-
-biomes = json.parse(file.read("core:generators/default/biomes.json"))
-
-function place_structures(x, z, w, d, seed, hmap)
-    local placements = {}
-    for i=1,10 do
-        local sx = math.random() * w
-        local sz = math.random() * d
-        local sy = math.random() * hmap:at(sx, sz)*256 - 6
-        table.insert(placements, {"coal_ore0", {sx, sy, sz}, math.random()*4})
-    end
-    return placements
-end
-
-local function _generate_heightmap(x, y, w, h, seed, s)
-    local umap = Heightmap(w, h)
-    local vmap = Heightmap(w, h)
-    umap.noiseSeed = seed
-    vmap.noiseSeed = seed
-    vmap:noise({x+521, y+70}, 0.1*s, 3, 25.8)
-    vmap:noise({x+95, y+246}, 0.15*s, 3, 25.8)
-
-    local map = Heightmap(w, h)
-    map.noiseSeed = seed
-    map:noise({x, y}, 0.8*s, 4, 0.02)
-    map:cellnoise({x, y}, 0.1*s, 3, 0.3, umap, vmap)
-    map:add(0.4)
-
-    local rivermap = Heightmap(w, h)
-    rivermap.noiseSeed = seed
-    rivermap:noise({x+21, y+12}, 0.1*s, 4)
-    rivermap:abs()
-    rivermap:mul(2.0)
-    rivermap:pow(0.15)
-    rivermap:max(0.3)
-    map:add(0.3)
-    map:mul(rivermap)
-    return map
-end
+biomes = {flat = {
+    parameters = {},
+    layers = {
+        {height=-1, block="core:obstacle"},
+    },
+    sea_layers = {
+        {height=-1, block="core:obstacle"}
+    }
+}}
 
 function generate_heightmap(x, y, w, h, seed)
-    -- blocks per dot
-    -- 8 - linear interpolation is visible, but not so much
-    -- 4 - high quality, but slower
-    -- 2 - you really don't need it
-    -- 1 - please have mercy on your CPU
-    local bpd = 4
-    local map = _generate_heightmap(
-        math.floor(x/bpd), math.floor(y/bpd), 
-        math.floor(w/bpd)+1, math.floor(h/bpd)+1, seed, bpd)
-    map:resize(w+bpd, h+bpd, 'linear')
-    map:crop(0, 0, w, h)
-    return map
-end
-
-local function _generate_biome_parameters(x, y, w, h, seed, s)
-    local tempmap = Heightmap(w, h)
-    tempmap.noiseSeed = seed + 5324
-    tempmap:noise({x, y}, 0.04*s, 6)
-    local hummap = Heightmap(w, h)
-    hummap.noiseSeed = seed + 953
-    hummap:noise({x, y}, 0.04*s, 6)
-    tempmap:pow(3)
-    hummap:pow(3)
-    return tempmap, hummap
-end
-
-function generate_biome_parameters(x, y, w, h, seed)
-    local bpd = 8
-    local tmap, hmap = _generate_biome_parameters(
-        math.floor(x/bpd), math.floor(y/bpd), 
-        math.floor(w/bpd)+1, math.floor(h/bpd)+1, seed, bpd) 
-    tmap:resize(w+bpd, h+bpd, 'linear')
-    tmap:crop(0, 0, w, h)
-
-    hmap:resize(w+bpd, h+bpd, 'linear')
-    hmap:crop(0, 0, w, h)
-    return tmap, hmap
+    return Heightmap(w, h)
 end

res/preload.json

@@ -1,8 +1,13 @@
 {
     "shaders": [
         "ui",
+        "ui3d",
         "main",
-        "lines"
+        "lines",
+        "entity",
+        "screen",
+        "background",
+        "skybox_gen"
     ],
     "textures": [
         "gui/menubg",