mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-14 22:01:59 +00:00
Code Issues Projects Releases Wiki Activity

Pack wall connections into 7 bits for runtime data encoding

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-03-04 15:47:34 +00:00
parent 95c18ef99a
commit b9d62de29d
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/block/Block.php
View File

@ -54,7 +54,7 @@ use function get_class;
use const PHP_INT_MAX; use const PHP_INT_MAX;
class Block{ class Block{
public const INTERNAL_STATE_DATA_BITS = 9; public const INTERNAL_STATE_DATA_BITS = 8;
public const INTERNAL_STATE_DATA_MASK = ~(~0 << self::INTERNAL_STATE_DATA_BITS); public const INTERNAL_STATE_DATA_MASK = ~(~0 << self::INTERNAL_STATE_DATA_BITS);
protected BlockIdentifier $idInfo; protected BlockIdentifier $idInfo;

6
src/data/runtime/RuntimeDataReader.php
View File

@ -144,9 +144,10 @@ final class RuntimeDataReader implements RuntimeDataDescriber{
*/ */
public function wallConnections(array &$connections) : void{ public function wallConnections(array &$connections) : void{
$result = []; $result = [];
//TODO: we can pack this into 7 bits instead of 8 $offset = 0;
$packed = $this->readBoundedInt(7, 0, (3 ** 4) - 1);
foreach(Facing::HORIZONTAL as $facing){ foreach(Facing::HORIZONTAL as $facing){
$type = $this->readBoundedInt(2, 0, 2); $type = intdiv($packed, (3 ** $offset)) % 3;
if($type !== 0){ if($type !== 0){
$result[$facing] = match($type){ $result[$facing] = match($type){
1 => WallConnectionType::SHORT(), 1 => WallConnectionType::SHORT(),
@ -154,6 +155,7 @@ final class RuntimeDataReader implements RuntimeDataDescriber{
default => throw new AssumptionFailedError("Unreachable") default => throw new AssumptionFailedError("Unreachable")
}; };
} }
$offset++;
} }
$connections = $result; $connections = $result;

3
src/data/runtime/RuntimeDataSizeCalculator.php
View File

@ -81,8 +81,7 @@ final class RuntimeDataSizeCalculator implements RuntimeDataDescriber{
} }
public function wallConnections(array &$connections) : void{ public function wallConnections(array &$connections) : void{
//TODO: this can be reduced to 7 if we pack the trinary values $this->addBits(7);
$this->addBits(8);
} }
public function brewingStandSlots(array &$slots) : void{ public function brewingStandSlots(array &$slots) : void{

9
src/data/runtime/RuntimeDataWriter.php
View File

@ -133,15 +133,18 @@ final class RuntimeDataWriter implements RuntimeDataDescriber{
* @phpstan-param array<Facing::NORTH|Facing::EAST|Facing::SOUTH|Facing::WEST, WallConnectionType> $connections * @phpstan-param array<Facing::NORTH|Facing::EAST|Facing::SOUTH|Facing::WEST, WallConnectionType> $connections
*/ */
public function wallConnections(array &$connections) : void{ public function wallConnections(array &$connections) : void{
//TODO: we can pack this into 7 bits instead of 8 $packed = 0;
$offset = 0;
foreach(Facing::HORIZONTAL as $facing){ foreach(Facing::HORIZONTAL as $facing){
$this->writeBoundedInt(2, 0, 2, match($connections[$facing] ?? null){ $packed += match($connections[$facing] ?? null){
null => 0, null => 0,
WallConnectionType::SHORT() => 1, WallConnectionType::SHORT() => 1,
WallConnectionType::TALL() => 2, WallConnectionType::TALL() => 2,
default => throw new AssumptionFailedError("Unreachable") default => throw new AssumptionFailedError("Unreachable")
}); } * (3 ** $offset);
$offset++;
} }
$this->writeBoundedInt(7, 0, (3 ** 4) - 1, $packed);
} }
/** /**