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

Prepare ChunkData for BlockState storage (#5105)

Browse Source 
* Rename ChunkData Creatable test

* Add missing Y-check in RedstoneWireHandler

* Remove ChunkDef.h dependency in Scoreboard

* Prepare ChunkData for BlockState storage

+ Split chunk block, meta, block & sky light storage
+ Load the height map from disk
- Reduce duplicated code in ChunkData
- Remove saving MCSBiomes, there aren't any
- Remove the allocation pool, ref #4315, #3864

* fixed build

* fixed test

* fixed the debug compile

Co-authored-by: 12xx12 <44411062+12xx12@users.noreply.github.com>
This commit is contained in:
Tiger Wang
2021-03-05 13:03:55 +00:00
committed by GitHub
parent 5fa45182e8
commit 868cd94ee9
39 changed files with 1106 additions and 2203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/NetherPortalScanner.cpp
View File

@@ -48,37 +48,73 @@ cNetherPortalScanner::cNetherPortalScanner(cEntity & a_MovingEntity, cWorld & a_
void cNetherPortalScanner::OnChunkAvailable(int a_ChunkX, int a_ChunkZ)
{
cChunkDef::BlockTypes blocks;
m_World.GetChunkBlockTypes(a_ChunkX, a_ChunkZ, blocks);
// Iterate through all of the blocks in the chunk
for (unsigned int i = 0; i < cChunkDef::NumBlocks; i++)
class PortalSearchCallback : public cChunkDataCallback
{
if (blocks[i] == E_BLOCK_NETHER_PORTAL)
{
Vector3i Coordinate = cChunkDef::IndexToCoordinate(i);
if (Coordinate.y >= m_MaxY)
{
// This is above the map, don't consider it.
continue;
}
public:
Vector3d PortalLoc = Vector3d(Coordinate.x + a_ChunkX * cChunkDef::Width, Coordinate.y, Coordinate.z + a_ChunkZ * cChunkDef::Width);
if (!m_FoundPortal)
PortalSearchCallback(const int a_ChunkX, const int a_ChunkZ, bool & a_FoundPortal, Vector3i & a_PortalLoc, const Vector3d a_Position, const int a_MaxY) :
m_ChunkX(a_ChunkX),
m_ChunkZ(a_ChunkZ),
m_FoundPortal(a_FoundPortal),
m_PortalLoc(a_PortalLoc),
m_Position(a_Position),
m_MaxY(a_MaxY)
{
}
private:
virtual void ChunkData(const ChunkBlockData & a_BlockData, const ChunkLightData &) override
{
for (size_t Y = 0; Y < cChunkDef::NumSections; ++Y)
{
m_FoundPortal = true;
m_PortalLoc = PortalLoc;
}
else
{
if ((PortalLoc - m_Position).SqrLength() < (m_PortalLoc - m_Position).SqrLength())
const auto Blocks = a_BlockData.GetSection(Y);
if (Blocks == nullptr)
{
m_FoundPortal = true;
m_PortalLoc = PortalLoc;
continue;
}
// Iterate through all of the blocks in the chunk:
for (size_t i = 0; i < ChunkBlockData::SectionBlockCount; i++)
{
if ((*Blocks)[i] != E_BLOCK_NETHER_PORTAL)
{
continue;
}
Vector3i Coordinate = cChunkDef::IndexToCoordinate(i + Y * ChunkBlockData::SectionBlockCount);
if (Coordinate.y >= m_MaxY)
{
// This is above the map, don't consider it:
continue;
}
Vector3d PortalLoc = Vector3d(Coordinate.x + m_ChunkX * cChunkDef::Width, Coordinate.y, Coordinate.z + m_ChunkZ * cChunkDef::Width);
if (!m_FoundPortal)
{
m_FoundPortal = true;
m_PortalLoc = PortalLoc;
}
else if ((PortalLoc - m_Position).SqrLength() < (m_PortalLoc - m_Position).SqrLength())
{
// Found a closer portal, use that instead:
m_PortalLoc = PortalLoc;
}
}
}
}
}
int m_ChunkX, m_ChunkZ;
bool & m_FoundPortal;
Vector3i & m_PortalLoc;
const Vector3d m_Position;
const int m_MaxY;
} Callback(a_ChunkX, a_ChunkZ, m_FoundPortal, m_PortalLoc, m_Position, m_MaxY);
[[maybe_unused]] const bool Result = m_World.GetChunkData({ a_ChunkX, a_ChunkZ }, Callback);
ASSERT(Result);
}