flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

DungeonRooms: Changed to work with the new shape generators.

Browse Source
This commit is contained in:
Mattes D 2014-11-15 11:17:05 +01:00
parent 7a3b3aeb3c
commit 30fa6a642c
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Generating/DungeonRoomsFinisher.cpp
View File

@ -78,7 +78,8 @@ protected:
/** Decodes the position index along the room walls into a proper 2D position for a chest. */ /** Decodes the position index along the room walls into a proper 2D position for a chest.
The Y coord of the returned vector specifies the chest's meta value*/
Vector3i DecodeChestCoords(int a_PosIdx, int a_SizeX, int a_SizeZ) Vector3i DecodeChestCoords(int a_PosIdx, int a_SizeX, int a_SizeZ)
{ {
if (a_PosIdx < a_SizeX) if (a_PosIdx < a_SizeX)
@ -293,17 +294,21 @@ cDungeonRoomsFinisher::cStructurePtr cDungeonRoomsFinisher::CreateStructure(int
int ChunkX, ChunkZ; int ChunkX, ChunkZ;
int RelX = a_OriginX, RelY = 0, RelZ = a_OriginZ; int RelX = a_OriginX, RelY = 0, RelZ = a_OriginZ;
cChunkDef::AbsoluteToRelative(RelX, RelY, RelZ, ChunkX, ChunkZ); cChunkDef::AbsoluteToRelative(RelX, RelY, RelZ, ChunkX, ChunkZ);
/* cChunkDesc::Shape shape;
// TODO m_ShapeGen->GenShape(ChunkX, ChunkZ, shape);
cChunkDef::HeightMap HeightMap; int height = 0;
m_HeightGen->GenHeightMap(ChunkX, ChunkZ, HeightMap); int idx = RelX * 256 + RelZ * 16 * 256;
int Height = cChunkDef::GetHeight(HeightMap, RelX, RelZ); // Max room height at {a_OriginX, a_OriginZ} for (int y = 6; y < cChunkDef::Height; y++)
Height = Clamp(m_HeightProbability.MapValue(rnd % m_HeightProbability.GetSum()), 10, Height - 5); {
*/ if (shape[idx + y] != 0)
int Height = 62; {
continue;
}
height = Clamp(m_HeightProbability.MapValue(rnd % m_HeightProbability.GetSum()), 10, y - 5);
}
// Create the dungeon room descriptor: // Create the dungeon room descriptor:
return cStructurePtr(new cDungeonRoom(a_GridX, a_GridZ, a_OriginX, a_OriginZ, HalfSizeX, HalfSizeZ, Height, m_Noise)); return cStructurePtr(new cDungeonRoom(a_GridX, a_GridZ, a_OriginX, a_OriginZ, HalfSizeX, HalfSizeZ, height, m_Noise));
} }