summaryrefslogtreecommitdiffstats
path: root/source/Generating
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/Generating/ChunkDesc.cpp219
-rw-r--r--source/Generating/ChunkDesc.h196
-rw-r--r--source/Generating/ChunkGenerator.cpp17
-rw-r--r--source/Generating/ChunkGenerator.h4
-rw-r--r--source/Generating/ComposableGenerator.cpp8
-rw-r--r--source/Generating/ComposableGenerator.h2
6 files changed, 276 insertions, 170 deletions
diff --git a/source/Generating/ChunkDesc.cpp b/source/Generating/ChunkDesc.cpp
new file mode 100644
index 000000000..29eb80be7
--- /dev/null
+++ b/source/Generating/ChunkDesc.cpp
@@ -0,0 +1,219 @@
+
+// ChunkDesc.cpp
+
+// Implements the cChunkDesc class representing the chunk description used while generating a chunk. This class is also exported to Lua for HOOK_CHUNK_GENERATING.
+
+#include "Globals.h"
+#include "ChunkDesc.h"
+
+
+
+
+
+cChunkDesc::cChunkDesc(void) :
+ m_bUseDefaultBiomes(true),
+ m_bUseDefaultHeight(true),
+ m_bUseDefaultComposition(true),
+ m_bUseDefaultStructures(true),
+ m_bUseDefaultFinish(true)
+{
+ memset(m_BlockTypes, 0, sizeof(cChunkDef::BlockTypes));
+ memset(m_BlockMeta, 0, sizeof(cChunkDef::BlockNibbles));
+ memset(m_BiomeMap, 0, sizeof(cChunkDef::BiomeMap));
+ memset(m_HeightMap, 0, sizeof(cChunkDef::HeightMap));
+}
+
+
+
+
+
+cChunkDesc::~cChunkDesc()
+{
+ // Nothing needed yet
+}
+
+
+
+
+
+void cChunkDesc::FillBlocks(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
+{
+ const NIBBLETYPE CompressedMeta = a_BlockMeta | (a_BlockMeta << 4);
+ memset(m_BlockTypes, a_BlockType, sizeof(cChunkDef::BlockTypes));
+ memset(m_BlockMeta, CompressedMeta, sizeof(cChunkDef::BlockNibbles));
+}
+
+
+
+
+
+void cChunkDesc::SetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
+{
+ int Index = cChunkDef::MakeIndex(a_RelX, a_RelY, a_RelZ);
+ cChunkDef::SetBlock(m_BlockTypes, Index, a_BlockType);
+ cChunkDef::SetNibble(m_BlockMeta, Index, a_BlockMeta);
+}
+
+
+
+
+
+void cChunkDesc::SetBlockType(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType)
+{
+ cChunkDef::SetBlock(m_BlockTypes, a_RelX, a_RelY, a_RelZ, a_BlockType);
+}
+
+
+
+
+
+BLOCKTYPE cChunkDesc::GetBlockType(int a_RelX, int a_RelY, int a_RelZ)
+{
+ return cChunkDef::GetBlock(m_BlockTypes, a_RelX, a_RelY, a_RelZ);
+}
+
+
+
+
+
+NIBBLETYPE cChunkDesc::GetBlockMeta(int a_RelX, int a_RelY, int a_RelZ)
+{
+ return cChunkDef::GetNibble(m_BlockMeta, a_RelX, a_RelY, a_RelZ);
+}
+
+
+
+
+
+void cChunkDesc::SetBlockMeta(int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE a_BlockMeta)
+{
+ cChunkDef::SetNibble(m_BlockMeta, a_RelX, a_RelY, a_RelZ, a_BlockMeta);
+}
+
+
+
+
+
+void cChunkDesc::SetBiome(int a_RelX, int a_RelZ, int a_BiomeID)
+{
+ cChunkDef::SetBiome(m_BiomeMap, a_RelX, a_RelZ, (EMCSBiome)a_BiomeID);
+}
+
+
+
+
+EMCSBiome cChunkDesc::GetBiome(int a_RelX, int a_RelZ)
+{
+ return cChunkDef::GetBiome(m_BiomeMap, a_RelX, a_RelZ);
+}
+
+
+
+
+
+void cChunkDesc::SetHeight(int a_RelX, int a_RelZ, int a_Height)
+{
+ cChunkDef::SetHeight(m_HeightMap, a_RelX, a_RelZ, a_Height);
+}
+
+
+
+
+
+int cChunkDesc::GetHeight(int a_RelX, int a_RelZ)
+{
+ return cChunkDef::GetHeight(m_HeightMap, a_RelX, a_RelZ);
+}
+
+
+
+
+
+void cChunkDesc::SetUseDefaultBiomes(bool a_bUseDefaultBiomes)
+{
+ m_bUseDefaultBiomes = a_bUseDefaultBiomes;
+}
+
+
+
+
+
+bool cChunkDesc::IsUsingDefaultBiomes(void) const
+{
+ return m_bUseDefaultBiomes;
+}
+
+
+
+
+
+void cChunkDesc::SetUseDefaultHeight(bool a_bUseDefaultHeight)
+{
+ m_bUseDefaultHeight = a_bUseDefaultHeight;
+}
+
+
+
+
+
+bool cChunkDesc::IsUsingDefaultHeight(void) const
+{
+ return m_bUseDefaultHeight;
+}
+
+
+
+
+
+void cChunkDesc::SetUseDefaultComposition(bool a_bUseDefaultComposition)
+{
+ m_bUseDefaultComposition = a_bUseDefaultComposition;
+}
+
+
+
+
+
+bool cChunkDesc::IsUsingDefaultComposition(void) const
+{
+ return m_bUseDefaultComposition;
+}
+
+
+
+
+
+void cChunkDesc::SetUseDefaultStructures(bool a_bUseDefaultStructures)
+{
+ m_bUseDefaultStructures = a_bUseDefaultStructures;
+}
+
+
+
+
+
+bool cChunkDesc::IsUsingDefaultStructures(void) const
+{
+ return m_bUseDefaultStructures;
+}
+
+
+
+
+
+void cChunkDesc::SetUseDefaultFinish(bool a_bUseDefaultFinish)
+{
+ m_bUseDefaultFinish = a_bUseDefaultFinish;
+}
+
+
+
+
+
+bool cChunkDesc::IsUsingDefaultFinish(void) const
+{
+ return m_bUseDefaultFinish;
+}
+
+
+
diff --git a/source/Generating/ChunkDesc.h b/source/Generating/ChunkDesc.h
index 02b67998a..e8d4aa17a 100644
--- a/source/Generating/ChunkDesc.h
+++ b/source/Generating/ChunkDesc.h
@@ -15,175 +15,69 @@
-class cChunkDesc // tolua_export
-{ // tolua_export
+// tolua_begin
+class cChunkDesc
+{
public:
- cChunkDesc(
- cChunkDef::BlockTypes & a_BlockTypes,
- cChunkDef::BlockNibbles & a_BlockNibbles ,
- cChunkDef::HeightMap & a_HeightMap,
- cChunkDef::BiomeMap & a_BiomeMap
- )
- : m_BiomeMap(a_BiomeMap)
- , m_BlockTypes(a_BlockTypes)
- , m_BlockMeta(a_BlockNibbles)
- , m_HeightMap(a_HeightMap)
- , m_bUseDefaultBiomes(true)
- , m_bUseDefaultHeight(true)
- , m_bUseDefaultComposition(true)
- , m_bUseDefaultStructures(true)
- , m_bUseDefaultFinish(true)
- {
- memset(m_BlockTypes, 0, sizeof(cChunkDef::BlockTypes));
- memset(m_BlockMeta, 0, sizeof(cChunkDef::BlockNibbles));
- memset(m_BiomeMap, 0, sizeof(cChunkDef::BiomeMap));
- memset(m_HeightMap, 0, sizeof(cChunkDef::HeightMap));
- }
+ // tolua_end
- ~cChunkDesc()
- {}
+ cChunkDesc(void);
+ ~cChunkDesc();
// tolua_begin
+ void FillBlocks(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta);
+ void SetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta);
-
- // Block functions:
- void FillBlocks(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
- {
- const NIBBLETYPE CompressedMeta = a_BlockMeta | a_BlockMeta << 4;
- memset(m_BlockTypes, a_BlockType, sizeof(cChunkDef::BlockTypes));
- memset(m_BlockMeta, CompressedMeta, sizeof(cChunkDef::BlockNibbles));
- }
-
-
- void SetBlock(int a_X, int a_Y, int a_Z, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
- {
- cChunkDef::SetBlock( m_BlockTypes, a_X, a_Y, a_Z, a_BlockType );
- cChunkDef::SetNibble( m_BlockMeta, a_X, a_Y, a_Z, a_BlockMeta );
- }
-
-
- BLOCKTYPE GetBlock( int a_X, int a_Y, int a_Z )
- {
- return cChunkDef::GetBlock( m_BlockTypes, a_X, a_Y, a_Z );
- }
-
-
- NIBBLETYPE GetBlockMeta( int a_X, int a_Y, int a_Z )
- {
- return cChunkDef::GetNibble( m_BlockMeta, a_X, a_Y, a_Z );
- }
-
-
-
- // Biome functinos
- void SetBiome( int a_X, int a_Z, int a_BiomeID )
- {
- cChunkDef::SetBiome( m_BiomeMap, a_X, a_Z, (EMCSBiome)a_BiomeID );
- }
-
-
- int GetBiome( int a_X, int a_Z )
- {
- return cChunkDef::GetBiome( m_BiomeMap, a_X, a_Z );
- }
-
-
-
- // Height functions
- void SetHeight( int a_X, int a_Z, int a_Height )
- {
- cChunkDef::SetHeight( m_HeightMap, a_X, a_Z, a_Height );
- }
-
-
- int GetHeight( int a_X, int a_Z )
- {
- return cChunkDef::GetHeight( m_HeightMap, a_X, a_Z );
- }
-
-
-
- // Functions to explicitly tell the server to use default behavior for certain parts of generating terrain
- void SetUseDefaultBiomes(bool a_bUseDefaultBiomes)
- {
- m_bUseDefaultBiomes = a_bUseDefaultBiomes;
- }
-
+ void SetBlockType(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType);
+ BLOCKTYPE GetBlockType(int a_RelX, int a_RelY, int a_RelZ);
- bool IsUsingDefaultBiomes(void) const
- {
- return m_bUseDefaultBiomes;
- }
-
-
- void SetUseDefaultHeight(bool a_bUseDefaultHeight)
- {
- m_bUseDefaultHeight = a_bUseDefaultHeight;
- }
-
-
- bool IsUsingDefaultHeight(void) const
- {
- return m_bUseDefaultHeight;
- }
-
-
- void SetUseDefaultComposition(bool a_bUseDefaultComposition)
- {
- m_bUseDefaultComposition = a_bUseDefaultComposition;
- }
-
-
- bool IsUsingDefaultComposition(void) const
- {
- return m_bUseDefaultComposition;
- }
-
-
- void SetUseDefaultStructures(bool a_bUseDefaultStructures)
- {
- m_bUseDefaultStructures = a_bUseDefaultStructures;
- }
-
-
- bool IsUsingDefaultStructures(void) const
- {
- return m_bUseDefaultStructures;
- }
-
-
- void SetUseDefaultFinish(bool a_bUseDefaultFinish)
- {
- m_bUseDefaultFinish = a_bUseDefaultFinish;
- }
-
-
- bool IsUsingDefaultFinish(void) const
- {
- return m_bUseDefaultFinish;
- }
+ void SetBlockMeta(int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE a_BlockMeta);
+ NIBBLETYPE GetBlockMeta(int a_RelX, int a_RelY, int a_RelZ);
+
+ void SetBiome(int a_RelX, int a_RelZ, int a_BiomeID);
+ EMCSBiome GetBiome(int a_RelX, int a_RelZ);
+
+ void SetHeight(int a_RelX, int a_RelZ, int a_Height);
+ int GetHeight(int a_RelX, int a_RelZ);
+
+ // Default generation:
+ void SetUseDefaultBiomes(bool a_bUseDefaultBiomes);
+ bool IsUsingDefaultBiomes(void) const;
+ void SetUseDefaultHeight(bool a_bUseDefaultHeight);
+ bool IsUsingDefaultHeight(void) const;
+ void SetUseDefaultComposition(bool a_bUseDefaultComposition);
+ bool IsUsingDefaultComposition(void) const;
+ void SetUseDefaultStructures(bool a_bUseDefaultStructures);
+ bool IsUsingDefaultStructures(void) const;
+ void SetUseDefaultFinish(bool a_bUseDefaultFinish);
+ bool IsUsingDefaultFinish(void) const;
// tolua_end
// Accessors used by cChunkGenerator::Generator descendants:
- cChunkDef::BiomeMap & GetBiomeMap (void) { return m_BiomeMap; }
- cChunkDef::BlockTypes & GetBlockTypes(void) { return m_BlockTypes; }
- cChunkDef::BlockNibbles & GetBlockMetas(void) { return m_BlockMeta; }
- cChunkDef::HeightMap & GetHeightMap (void) { return m_HeightMap; }
-
+ cChunkDef::BiomeMap & GetBiomeMap (void) { return m_BiomeMap; }
+ cChunkDef::BlockTypes & GetBlockTypes (void) { return m_BlockTypes; }
+ cChunkDef::BlockNibbles & GetBlockMetas (void) { return m_BlockMeta; }
+ cChunkDef::HeightMap & GetHeightMap (void) { return m_HeightMap; }
+ cEntityList & GetEntities (void) { return m_Entities; }
+ cBlockEntityList & GetBlockEntities(void) { return m_BlockEntities; }
+
private:
+ cChunkDef::BiomeMap m_BiomeMap;
+ cChunkDef::BlockTypes m_BlockTypes;
+ cChunkDef::BlockNibbles m_BlockMeta;
+ cChunkDef::HeightMap m_HeightMap;
+ cEntityList m_Entities; // Individual entities are NOT owned by this object!
+ cBlockEntityList m_BlockEntities; // Individual block entities are NOT owned by this object!
+
+
bool m_bUseDefaultBiomes;
bool m_bUseDefaultHeight;
bool m_bUseDefaultComposition;
bool m_bUseDefaultStructures;
bool m_bUseDefaultFinish;
-
- cChunkDef::BiomeMap & m_BiomeMap;
- cChunkDef::BlockTypes & m_BlockTypes;
- cChunkDef::BlockNibbles & m_BlockMeta;
- cChunkDef::HeightMap & m_HeightMap;
} ; // tolua_export
diff --git a/source/Generating/ChunkGenerator.cpp b/source/Generating/ChunkGenerator.cpp
index 70b95f0d9..0285fa7af 100644
--- a/source/Generating/ChunkGenerator.cpp
+++ b/source/Generating/ChunkGenerator.cpp
@@ -266,24 +266,17 @@ void cChunkGenerator::Execute(void)
void cChunkGenerator::DoGenerate(int a_ChunkX, int a_ChunkY, int a_ChunkZ)
{
- cChunkDef::BiomeMap BiomeMap;
- cChunkDef::BlockTypes BlockTypes;
- cChunkDef::BlockNibbles BlockMeta;
- cChunkDef::HeightMap HeightMap;
- cEntityList Entities;
- cBlockEntityList BlockEntities;
-
- cChunkDesc ChunkDesc(BlockTypes, BlockMeta, HeightMap, BiomeMap);
+ cChunkDesc ChunkDesc;
cRoot::Get()->GetPluginManager()->CallHookChunkGenerating(m_World, a_ChunkX, a_ChunkZ, &ChunkDesc);
- m_Generator->DoGenerate(a_ChunkX, a_ChunkZ, ChunkDesc, Entities, BlockEntities);
+ m_Generator->DoGenerate(a_ChunkX, a_ChunkZ, ChunkDesc);
cRoot::Get()->GetPluginManager()->CallHookChunkGenerated(m_World, a_ChunkX, a_ChunkZ, &ChunkDesc);
m_World->SetChunkData(
a_ChunkX, a_ChunkY, a_ChunkZ,
- BlockTypes, BlockMeta,
+ ChunkDesc.GetBlockTypes(), ChunkDesc.GetBlockMetas(),
NULL, NULL, // We don't have lighting, chunk will be lighted when needed
- &HeightMap, &BiomeMap,
- Entities, BlockEntities,
+ &ChunkDesc.GetHeightMap(), &ChunkDesc.GetBiomeMap(),
+ ChunkDesc.GetEntities(), ChunkDesc.GetBlockEntities(),
true
);
}
diff --git a/source/Generating/ChunkGenerator.h b/source/Generating/ChunkGenerator.h
index e89e9def8..2d3bb8082 100644
--- a/source/Generating/ChunkGenerator.h
+++ b/source/Generating/ChunkGenerator.h
@@ -56,8 +56,8 @@ public:
/// Returns the biome at the specified coords. Used by ChunkMap if an invalid chunk is queried for biome. Default implementation uses GenerateBiomes().
virtual EMCSBiome GetBiomeAt(int a_BlockX, int a_BlockZ);
- /// Called in a separate thread to do the actual chunk generation. Generator should generate into a_ChunkDesc, a_Entities and a_BlockEntities.
- virtual void DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a_ChunkDesc, cEntityList & a_Entities, cBlockEntityList & a_BlockEntities) = 0;
+ /// Called in a separate thread to do the actual chunk generation. Generator should generate into a_ChunkDesc.
+ virtual void DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a_ChunkDesc) = 0;
protected:
cChunkGenerator & m_ChunkGenerator;
diff --git a/source/Generating/ComposableGenerator.cpp b/source/Generating/ComposableGenerator.cpp
index a758d5049..793d6a449 100644
--- a/source/Generating/ComposableGenerator.cpp
+++ b/source/Generating/ComposableGenerator.cpp
@@ -88,14 +88,14 @@ void cComposableGenerator::GenerateBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef:
-void cComposableGenerator::DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a_ChunkDesc, cEntityList & a_Entities, cBlockEntityList & a_BlockEntities)
+void cComposableGenerator::DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a_ChunkDesc)
{
cChunkDef::BiomeMap & BiomeMap = a_ChunkDesc.GetBiomeMap();
cChunkDef::BlockTypes & BlockTypes = a_ChunkDesc.GetBlockTypes();
cChunkDef::BlockNibbles & BlockMeta = a_ChunkDesc.GetBlockMetas();
cChunkDef::HeightMap & HeightMap = a_ChunkDesc.GetHeightMap();
- cEntityList & Entities = a_Entities;
- cBlockEntityList & BlockEntities = a_BlockEntities;
+ cEntityList & Entities = a_ChunkDesc.GetEntities();
+ cBlockEntityList & BlockEntities = a_ChunkDesc.GetBlockEntities();
if (a_ChunkDesc.IsUsingDefaultBiomes())
{
@@ -109,7 +109,7 @@ void cComposableGenerator::DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a
if (a_ChunkDesc.IsUsingDefaultComposition())
{
- m_CompositionGen->ComposeTerrain(a_ChunkX, a_ChunkZ, BlockTypes, BlockMeta, HeightMap, BiomeMap, a_Entities, a_BlockEntities);
+ m_CompositionGen->ComposeTerrain(a_ChunkX, a_ChunkZ, BlockTypes, BlockMeta, HeightMap, BiomeMap, Entities, BlockEntities);
}
if (a_ChunkDesc.IsUsingDefaultStructures())
diff --git a/source/Generating/ComposableGenerator.h b/source/Generating/ComposableGenerator.h
index 327074436..b6f946eb3 100644
--- a/source/Generating/ComposableGenerator.h
+++ b/source/Generating/ComposableGenerator.h
@@ -150,7 +150,7 @@ public:
virtual void Initialize(cWorld * a_World, cIniFile & a_IniFile) override;
virtual void GenerateBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;
- virtual void DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a_ChunkDesc, cEntityList & a_Entities, cBlockEntityList & a_BlockEntities) override;
+ virtual void DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a_ChunkDesc) override;
protected:
// The generation composition:
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 22:23:03 +0100