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

Replace PowerData struct with PowerLevel

Browse Source 
* We no longer need to track the powering block with the removal of SolidBlockHandler. PowerLevel is now just an unsigned char
This commit is contained in:
Tiger Wang
2020-08-20 20:04:28 +01:00
parent 03557e978e
commit d8c8d0124d
25 changed files with 171 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Simulator/IncrementalRedstoneSimulator/ObserverHandler.h
View File

@@ -23,21 +23,36 @@ namespace ObserverHandler
return false;
}
// Cache the last seen block type and meta in the power data for this position
auto Observed = PoweringData(BlockType, BlockMeta);
auto Previous = a_Data.ExchangeUpdateOncePowerData(a_Position, Observed);
auto & ObserverCache = a_Data.ObserverCache;
const auto FindResult = ObserverCache.find(a_Position);
const auto Observed = std::make_pair(BlockType, BlockMeta);
if (FindResult == ObserverCache.end())
{
// Cache the last seen block for this position:
ObserverCache.emplace(a_Position, Observed);
// Definitely should signal update:
return true;
}
// The block this observer previously saw.
const auto Previous = FindResult->second;
// Update the last seen block:
FindResult->second = Observed;
// Determine if to signal an update based on the block previously observed changed
return (Previous.PoweringBlock != Observed.PoweringBlock) || (Previous.PowerLevel != Observed.PowerLevel);
return Previous != Observed;
}
inline unsigned char GetPowerDeliveredToPosition(const cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_BlockType, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType, bool IsLinked)
inline PowerLevel GetPowerDeliveredToPosition(const cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_BlockType, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType, bool IsLinked)
{
const auto Meta = a_Chunk.GetMeta(a_Position);
return (IsOn(Meta) && (a_QueryPosition == (a_Position + cBlockObserverHandler::GetSignalOutputOffset(Meta)))) ? 15 : 0;
}
inline void Update(cChunk & a_Chunk, cChunk & CurrentlyTicking, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, PoweringData a_PoweringData)
inline void Update(cChunk & a_Chunk, cChunk & CurrentlyTicking, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, const PowerLevel Power)
{
// LOGD("Evaluating Lenny the observer (%i %i %i)", a_Position.x, a_Position.y, a_Position.z);