Merge branch 'main' into text3d

This commit is contained in:
MihailRis
2024-11-13 01:14:19 +03:00
12 changed files with 84 additions and 21 deletions
+3
View File
@@ -15,7 +15,10 @@ class VoxelFragment;
struct GeneratorDef;
struct VoxelStructureMeta {
/// @brief Structure name
std::string name;
/// @brief Structure lowering on placement
int lowering = 0;
};
struct BlocksLayer {
+5 -4
View File
@@ -270,10 +270,11 @@ void WorldGenerator::generateStructures(
if (height < def.seaLevel) {
continue;
}
auto& structure = *def.structures[structureId]->fragments[rotation];
glm::ivec3 position {x, height, z};
position.x -= structure.getSize().x / 2;
position.z -= structure.getSize().z / 2;
auto& structure = *def.structures[structureId];
auto& fragment = *structure.fragments[rotation];
glm::ivec3 position {x, height-structure.meta.lowering, z};
position.x -= fragment.getSize().x / 2;
position.z -= fragment.getSize().z / 2;
placeStructure(
StructurePlacement {
structureId,