diff --git a/res/generators/default.lua b/res/generators/default.lua index 921bfa06..713af232 100644 --- a/res/generators/default.lua +++ b/res/generators/default.lua @@ -62,17 +62,6 @@ biomes = { } } -function load_structures() - local structures = {} - local names = {"tree0", "tree1", "tree2", "tower"} - for i, name in ipairs(names) do - local filename = "core:default/"..name - debug.log("loading structure "..filename) - table.insert(structures, generation.load_structure(filename)) - end - return structures -end - function place_structures(x, z, w, d, seed, hmap) local placements = {} return placements diff --git a/src/logic/scripting/scripting_world_generation.cpp b/src/logic/scripting/scripting_world_generation.cpp index 16ffaee2..a05dade8 100644 --- a/src/logic/scripting/scripting_world_generation.cpp +++ b/src/logic/scripting/scripting_world_generation.cpp @@ -32,27 +32,6 @@ public: seaLevel(seaLevel) {} - std::vector> loadStructures() override { - std::vector> structures; - - auto L = lua::get_main_thread(); - lua::pushenv(L, *env); - if (lua::getfield(L, "load_structures")) { - if (lua::call_nothrow(L, 0, 1)) { - for (int i = 1; i <= lua::objlen(L, -1); i++) { - lua::rawgeti(L, i); - if (auto lstruct = - lua::touserdata(L, -1)) { - structures.push_back(lstruct->getStructure()); - } - lua::pop(L); - } - } - } - lua::pop(L); - return structures; - } - std::shared_ptr generateHeightmap( const glm::ivec2& offset, const glm::ivec2& size, uint64_t seed ) override { diff --git a/src/world/generator/GeneratorDef.hpp b/src/world/generator/GeneratorDef.hpp index acf8f61d..39539c53 100644 --- a/src/world/generator/GeneratorDef.hpp +++ b/src/world/generator/GeneratorDef.hpp @@ -123,9 +123,6 @@ class GeneratorScript { public: virtual ~GeneratorScript() = default; - /// @brief Load all structures - virtual std::vector> loadStructures() = 0; - /// @brief Generates a heightmap with values in range 0..1 /// @param offset position of the heightmap in the world /// @param size size of the heightmap diff --git a/src/world/generator/WorldGenerator.cpp b/src/world/generator/WorldGenerator.cpp index 1f297068..11602236 100644 --- a/src/world/generator/WorldGenerator.cpp +++ b/src/world/generator/WorldGenerator.cpp @@ -48,7 +48,6 @@ WorldGenerator::WorldGenerator( surroundMap.setLevelCallback(4, [this](int const x, int const z) { generateStructures(requirePrototype(x, z), x, z); }); - for (int i = 0; i < def.structures.size(); i++) { // pre-calculate rotated structure variants def.structures[i]->fragments[0]->prepare(*content);