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

Simulators: Added area-based wakeup.

Browse Source
This commit is contained in:
Mattes D
2017-07-14 16:18:33 +02:00
committed by Lukas Pioch
parent 41d016cf5b
commit 167c4bf2e6
9 changed files with 93 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Simulator/Simulator.cpp
View File

@@ -5,6 +5,7 @@
#include "../BlockID.h"
#include "../Defines.h"
#include "../Chunk.h"
#include "../Cuboid.h"
#ifdef __clang__
#pragma clang diagnostic ignored "-Wweak-template-vtables"
@@ -38,3 +39,52 @@ void cSimulator::WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chu
void cSimulator::WakeUpArea(const cCuboid & a_Area)
{
cCuboid area(a_Area);
area.Sort();
area.Expand(1, 1, 1, 1, 1, 1); // Expand the area to contain the neighbors, too.
area.ClampY(0, cChunkDef::Height - 1);
// Add all blocks, in a per-chunk manner:
int chunkStartX, chunkStartZ, chunkEndX, chunkEndZ;
cChunkDef::BlockToChunk(area.p1.x, area.p1.z, chunkStartX, chunkStartZ);
cChunkDef::BlockToChunk(area.p2.x, area.p2.z, chunkEndX, chunkEndZ);
for (int cz = chunkStartZ; cz <= chunkEndZ; ++cz)
{
for (int cx = chunkStartX; cx <= chunkEndX; ++cx)
{
m_World.DoWithChunk(cx, cz, [this, &area](cChunk & a_CBChunk) -> bool
{
if (!a_CBChunk.IsValid())
{
LOGWARNING("%s: Trying to wake up inside a non-valid chunk [%d, %d]. Ignoring.",
__FUNCTION__, a_CBChunk.GetPosX(), a_CBChunk.GetPosZ()
);
return true;
}
int startX = std::max(area.p1.x, a_CBChunk.GetPosX() * cChunkDef::Width);
int startZ = std::max(area.p1.z, a_CBChunk.GetPosZ() * cChunkDef::Width);
int endX = std::min(area.p2.x, a_CBChunk.GetPosX() * cChunkDef::Width + cChunkDef::Width - 1);
int endZ = std::min(area.p2.z, a_CBChunk.GetPosZ() * cChunkDef::Width + cChunkDef::Width - 1);
for (int y = area.p1.y; y <= area.p2.y; ++y)
{
for (int z = startZ; z <= endZ; ++z)
{
for (int x = startX; x <= endX; ++x)
{
AddBlock(x, y, z, &a_CBChunk);
} // for x
} // for z
} // for y
return true;
} // lambda
); // DoWithChunk
} // for cx
} // for cz
}