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

Add WakeUp/AddBlock distinction

Browse Source 
* WakeUp is for singular changes (block breaking for example). The simulator should check blocks around the position and discover other affected blocks as it sees fit
* AddBlock is for when you know a whole area is to be updated; chunk loading, or area wakeups for example
+ Prepares for correct handling of destroyed blocks after removal of SolidBlockHandler in the redstone simulator
This commit is contained in:
Tiger Wang
2020-07-29 00:12:45 +01:00
parent 6d7b83a69d
commit 99856df686
20 changed files with 144 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Simulator/Simulator.cpp
View File

@@ -1,33 +1,38 @@
#include "Globals.h"
#include "../World.h"
#include "../Defines.h"
#include "Simulator.h"
#include "../Chunk.h"
#include "../Cuboid.h"
#ifdef __clang__
#pragma clang diagnostic ignored "-Wweak-template-vtables"
#endif // __clang__
#include "Simulator.h"
#include "../World.h"
void cSimulator::WakeUp(Vector3i a_Block, cChunk * a_Chunk)
void cSimulator::WakeUp(cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_Block)
{
AddBlock(a_Block, a_Chunk);
ASSERT(a_Chunk.IsValid());
AddBlock(a_Chunk, a_Position, a_Block);
}
void cSimulator::WakeUpArea(const cCuboid & a_Area)
void cSimulator::WakeUp(cChunk & a_Chunk, Vector3i a_Position, Vector3i a_Offset, BLOCKTYPE a_Block)
{
ASSERT(a_Chunk.IsValid());
WakeUp(a_Chunk, a_Position, a_Block);
}
void cSimulator::WakeUp(const cCuboid & a_Area)
{
cCuboid area(a_Area);
area.Sort();
@@ -60,7 +65,8 @@ void cSimulator::WakeUpArea(const cCuboid & a_Area)
{
for (int x = startX; x <= endX; ++x)
{
AddBlock({x, y, z}, &a_CBChunk);
const auto Position = cChunkDef::AbsoluteToRelative({ x, y, z });
AddBlock(a_CBChunk, Position, a_CBChunk.GetBlock(Position));
} // for x
} // for z
} // for y
@@ -70,7 +76,3 @@ void cSimulator::WakeUpArea(const cCuboid & a_Area)
} // for cx
} // for cz
}