backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: make Tile::getTileAABB return AABB

Browse source
This commit is contained in:
orng 2026-03-28 00:30:07 -05:00
parent 7158fd398f
commit ddfe9b3d48
21 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/Rendering/LevelRenderer.cpp
View file

@ -2482,7 +2482,7 @@ void LevelRenderer::renderHitOutline(std::shared_ptr<Player> player,
AABB bb = Tile::tiles[tileId] AABB bb = Tile::tiles[tileId]
->getTileAABB(level[iPad], h->x, h->y, h->z) ->getTileAABB(level[iPad], h->x, h->y, h->z)
->grow(ss, ss, ss) .grow(ss, ss, ss)
.move(-xo, -yo, -zo); .move(-xo, -yo, -zo);
render(&bb); render(&bb);

4
Minecraft.World/Blocks/CactusTile.cpp
View file

@ -38,9 +38,9 @@ std::optional<AABB> CactusTile::getAABB(Level* level, int x, int y, int z) {
return AABB{x + r, static_cast<double>(y), z + r, x + 1 - r, y + 1 - r, z + 1 - r}; return AABB{x + r, static_cast<double>(y), z + r, x + 1 - r, y + 1 - r, z + 1 - r};
} }
AABB* CactusTile::getTileAABB(Level* level, int x, int y, int z) { AABB CactusTile::getTileAABB(Level* level, int x, int y, int z) {
float r = 1 / 16.0f; float r = 1 / 16.0f;
return AABB::newTemp(x + r, y, z + r, x + 1 - r, y + 1, z + 1 - r); return AABB(x + r, y, z + r, x + 1 - r, y + 1, z + 1 - r);
} }
Icon* CactusTile::getTexture(int face, int data) { Icon* CactusTile::getTexture(int face, int data) {

2
Minecraft.World/Blocks/CactusTile.h
View file

@ -21,7 +21,7 @@ protected:
public: public:
virtual void tick(Level* level, int x, int y, int z, Random* random); virtual void tick(Level* level, int x, int y, int z, Random* random);
virtual std::optional<AABB> getAABB(Level* level, int x, int y, int z); virtual std::optional<AABB> getAABB(Level* level, int x, int y, int z);
virtual AABB* getTileAABB(Level* level, int x, int y, int z); virtual AABB getTileAABB(Level* level, int x, int y, int z);
virtual Icon* getTexture(int face, int data); virtual Icon* getTexture(int face, int data);
virtual bool isCubeShaped(); virtual bool isCubeShaped();
virtual bool isSolidRender(bool isServerLevel = false); virtual bool isSolidRender(bool isServerLevel = false);

4
Minecraft.World/Blocks/CakeTile.cpp
View file

@ -42,12 +42,12 @@ std::optional<AABB> CakeTile::getAABB(Level* level, int x, int y, int z) {
return AABB{x + r2, static_cast<double>(y), z + r, x + 1 - r, y + h - r, z + 1 - r}; return AABB{x + r2, static_cast<double>(y), z + r, x + 1 - r, y + h - r, z + 1 - r};
} }
AABB* CakeTile::getTileAABB(Level* level, int x, int y, int z) { AABB CakeTile::getTileAABB(Level* level, int x, int y, int z) {
int d = level->getData(x, y, z); int d = level->getData(x, y, z);
float r = 1 / 16.0f; float r = 1 / 16.0f;
float r2 = (1 + d * 2) / 16.0f; float r2 = (1 + d * 2) / 16.0f;
float h = 8 / 16.0f; float h = 8 / 16.0f;
return AABB::newTemp(x + r2, y, z + r, x + 1 - r, y + h, z + 1 - r); return AABB(x + r2, y, z + r, x + 1 - r, y + h, z + 1 - r);
} }
Icon* CakeTile::getTexture(int face, int data) { Icon* CakeTile::getTexture(int face, int data) {

2
Minecraft.World/Blocks/CakeTile.h
View file

@ -25,7 +25,7 @@ protected:
TileEntity>()); // 4J added forceData, forceEntity param TileEntity>()); // 4J added forceData, forceEntity param
virtual void updateDefaultShape(); virtual void updateDefaultShape();
virtual std::optional<AABB> getAABB(Level* level, int x, int y, int z); virtual std::optional<AABB> getAABB(Level* level, int x, int y, int z);
virtual AABB* getTileAABB(Level* level, int x, int y, int z); virtual AABB getTileAABB(Level* level, int x, int y, int z);
virtual Icon* getTexture(int face, int data); virtual Icon* getTexture(int face, int data);
//@Override //@Override
void registerIcons(IconRegister* iconRegister); void registerIcons(IconRegister* iconRegister);

2
Minecraft.World/Blocks/CocoaTile.cpp
View file

@ -62,7 +62,7 @@ std::optional<AABB> CocoaTile::getAABB(Level* level, int x, int y, int z) {
return DirectionalTile::getAABB(level, x, y, z); return DirectionalTile::getAABB(level, x, y, z);
} }
AABB* CocoaTile::getTileAABB(Level* level, int x, int y, int z) { AABB CocoaTile::getTileAABB(Level* level, int x, int y, int z) {
updateShape(level, x, y, z); updateShape(level, x, y, z);
return DirectionalTile::getTileAABB(level, x, y, z); return DirectionalTile::getTileAABB(level, x, y, z);
} }

2
Minecraft.World/Blocks/CocoaTile.h
View file

@ -23,7 +23,7 @@ public:
virtual bool isCubeShaped(); virtual bool isCubeShaped();
virtual bool isSolidRender(bool isServerLevel = false); virtual bool isSolidRender(bool isServerLevel = false);
virtual std::optional<AABB> getAABB(Level* level, int x, int y, int z); virtual std::optional<AABB> getAABB(Level* level, int x, int y, int z);
virtual AABB* getTileAABB(Level* level, int x, int y, int z); virtual AABB getTileAABB(Level* level, int x, int y, int z);
virtual void updateShape(LevelSource* level, int x, int y, int z, virtual void updateShape(LevelSource* level, int x, int y, int z,
int forceData = -1, int forceData = -1,
std::shared_ptr<TileEntity> forceEntity = std::shared_ptr<TileEntity> forceEntity =

5
Minecraft.World/Blocks/DoorTile.cpp
View file

@ -85,10 +85,9 @@ bool DoorTile::isCubeShaped() { return false; }
int DoorTile::getRenderShape() { return Tile::SHAPE_DOOR; } int DoorTile::getRenderShape() { return Tile::SHAPE_DOOR; }
AABB* DoorTile::getTileAABB(Level* level, int x, int y, int z) { AABB DoorTile::getTileAABB(Level* level, int x, int y, int z) {
updateShape(level, x, y, z); updateShape(level, x, y, z);
AABB* retval = Tile::getTileAABB(level, x, y, z); return Tile::getTileAABB(level, x, y, z);
return retval;
} }
std::optional<AABB> DoorTile::getAABB(Level* level, int x, int y, int z) { std::optional<AABB> DoorTile::getAABB(Level* level, int x, int y, int z) {

2
Minecraft.World/Blocks/DoorTile.h
View file

@ -40,7 +40,7 @@ public:
virtual bool isSolidRender(bool isServerLevel = false); virtual bool isSolidRender(bool isServerLevel = false);
virtual bool isCubeShaped(); virtual bool isCubeShaped();
virtual int getRenderShape(); virtual int getRenderShape();
virtual AABB* getTileAABB(Level* level, int x, int y, int z); virtual AABB getTileAABB(Level* level, int x, int y, int z);
virtual std::optional<AABB> getAABB(Level* level, int x, int y, int z); virtual std::optional<AABB> getAABB(Level* level, int x, int y, int z);
virtual void updateShape( virtual void updateShape(
LevelSource* level, int x, int y, int z, int forceData = -1, LevelSource* level, int x, int y, int z, int forceData = -1,

2
Minecraft.World/Blocks/LadderTile.cpp
View file

@ -11,7 +11,7 @@ std::optional<AABB> LadderTile::getAABB(Level* level, int x, int y, int z) {
return Tile::getAABB(level, x, y, z); return Tile::getAABB(level, x, y, z);
} }
AABB* LadderTile::getTileAABB(Level* level, int x, int y, int z) { AABB LadderTile::getTileAABB(Level* level, int x, int y, int z) {
updateShape(level, x, y, z); updateShape(level, x, y, z);
return Tile::getTileAABB(level, x, y, z); return Tile::getTileAABB(level, x, y, z);
} }

2
Minecraft.World/Blocks/LadderTile.h
View file

@ -12,7 +12,7 @@ protected:
public: public:
virtual std::optional<AABB> getAABB(Level* level, int x, int y, int z); virtual std::optional<AABB> getAABB(Level* level, int x, int y, int z);
virtual AABB* getTileAABB(Level* level, int x, int y, int z); virtual AABB getTileAABB(Level* level, int x, int y, int z);
virtual void updateShape( virtual void updateShape(
LevelSource* level, int x, int y, int z, int forceData = -1, LevelSource* level, int x, int y, int z, int forceData = -1,
std::shared_ptr<TileEntity> forceEntity = std::shared_ptr< std::shared_ptr<TileEntity> forceEntity = std::shared_ptr<

2
Minecraft.World/Blocks/SignTile.cpp
View file

@ -27,7 +27,7 @@ void SignTile::updateDefaultShape() {
std::optional<AABB> SignTile::getAABB(Level* level, int x, int y, int z) { return std::nullopt; } std::optional<AABB> SignTile::getAABB(Level* level, int x, int y, int z) { return std::nullopt; }
AABB* SignTile::getTileAABB(Level* level, int x, int y, int z) { AABB SignTile::getTileAABB(Level* level, int x, int y, int z) {
updateShape(level, x, y, z); updateShape(level, x, y, z);
return BaseEntityTile::getTileAABB(level, x, y, z); return BaseEntityTile::getTileAABB(level, x, y, z);
} }

2
Minecraft.World/Blocks/SignTile.h
View file

@ -21,7 +21,7 @@ public:
Icon* getTexture(int face, int data); Icon* getTexture(int face, int data);
virtual void updateDefaultShape(); virtual void updateDefaultShape();
std::optional<AABB> getAABB(Level* level, int x, int y, int z); std::optional<AABB> getAABB(Level* level, int x, int y, int z);
AABB* getTileAABB(Level* level, int x, int y, int z); AABB getTileAABB(Level* level, int x, int y, int z);
void updateShape(LevelSource* level, int x, int y, int z, void updateShape(LevelSource* level, int x, int y, int z,
int forceData = -1, int forceData = -1,
std::shared_ptr<TileEntity> forceEntity = std::shared_ptr<TileEntity> forceEntity =

2
Minecraft.World/Blocks/StairTile.cpp
View file

@ -326,7 +326,7 @@ Icon* StairTile::getTexture(int face, int data) {
int StairTile::getTickDelay(Level* level) { return base->getTickDelay(level); } int StairTile::getTickDelay(Level* level) { return base->getTickDelay(level); }
AABB* StairTile::getTileAABB(Level* level, int x, int y, int z) { AABB StairTile::getTileAABB(Level* level, int x, int y, int z) {
return base->getTileAABB(level, x, y, z); return base->getTileAABB(level, x, y, z);
} }

2
Minecraft.World/Blocks/StairTile.h
View file

@ -65,7 +65,7 @@ public:
virtual int getRenderLayer(); virtual int getRenderLayer();
virtual Icon* getTexture(int face, int data); virtual Icon* getTexture(int face, int data);
virtual int getTickDelay(Level* level); virtual int getTickDelay(Level* level);
virtual AABB* getTileAABB(Level* level, int x, int y, int z); virtual AABB getTileAABB(Level* level, int x, int y, int z);
virtual void handleEntityInside(Level* level, int x, int y, int z, virtual void handleEntityInside(Level* level, int x, int y, int z,
std::shared_ptr<Entity> e, Vec3* current); std::shared_ptr<Entity> e, Vec3* current);
virtual bool mayPick(); virtual bool mayPick();

4
Minecraft.World/Blocks/Tile.cpp
View file

@ -2005,11 +2005,11 @@ Icon* Tile::getTexture(int face, int data) { return icon; }
Icon* Tile::getTexture(int face) { return getTexture(face, 0); } Icon* Tile::getTexture(int face) { return getTexture(face, 0); }
AABB* Tile::getTileAABB(Level* level, int x, int y, int z) { AABB Tile::getTileAABB(Level* level, int x, int y, int z) {
ThreadStorage* tls = m_tlsShape; ThreadStorage* tls = m_tlsShape;
// 4J Stu - Added this so that the TLS shape is correct for this tile // 4J Stu - Added this so that the TLS shape is correct for this tile
if (tls->tileId != this->id) updateDefaultShape(); if (tls->tileId != this->id) updateDefaultShape();
return AABB::newTemp(x + tls->xx0, y + tls->yy0, z + tls->zz0, x + tls->xx1, return AABB(x + tls->xx0, y + tls->yy0, z + tls->zz0, x + tls->xx1,
y + tls->yy1, z + tls->zz1); y + tls->yy1, z + tls->zz1);
} }

2
Minecraft.World/Blocks/Tile.h
View file

@ -631,7 +631,7 @@ public:
virtual Icon* getTexture(LevelSource* level, int x, int y, int z, int face); virtual Icon* getTexture(LevelSource* level, int x, int y, int z, int face);
virtual Icon* getTexture(int face, int data); virtual Icon* getTexture(int face, int data);
virtual Icon* getTexture(int face); virtual Icon* getTexture(int face);
virtual AABB* getTileAABB(Level* level, int x, int y, int z); virtual AABB getTileAABB(Level* level, int x, int y, int z);
virtual void addAABBs(Level* level, int x, int y, int z, AABB* box, virtual void addAABBs(Level* level, int x, int y, int z, AABB* box,
AABBList* boxes, std::shared_ptr<Entity> source); AABBList* boxes, std::shared_ptr<Entity> source);
virtual std::optional<AABB> getAABB(Level* level, int x, int y, int z); virtual std::optional<AABB> getAABB(Level* level, int x, int y, int z);

2
Minecraft.World/Blocks/TorchTile.cpp
View file

@ -12,7 +12,7 @@ TorchTile::TorchTile(int id) : Tile(id, Material::decoration, false) {
std::optional<AABB> TorchTile::getAABB(Level* level, int x, int y, int z) { return std::nullopt; } std::optional<AABB> TorchTile::getAABB(Level* level, int x, int y, int z) { return std::nullopt; }
AABB* TorchTile::getTileAABB(Level* level, int x, int y, int z) { AABB TorchTile::getTileAABB(Level* level, int x, int y, int z) {
updateShape(level, x, y, z); updateShape(level, x, y, z);
return Tile::getTileAABB(level, x, y, z); return Tile::getTileAABB(level, x, y, z);
} }

2
Minecraft.World/Blocks/TorchTile.h
View file

@ -13,7 +13,7 @@ protected:
public: public:
virtual std::optional<AABB> getAABB(Level* level, int x, int y, int z); virtual std::optional<AABB> getAABB(Level* level, int x, int y, int z);
virtual AABB* getTileAABB(Level* level, int x, int y, int z); virtual AABB getTileAABB(Level* level, int x, int y, int z);
virtual void updateShape( virtual void updateShape(
LevelSource* level, int x, int y, int z, int forceData = -1, LevelSource* level, int x, int y, int z, int forceData = -1,
std::shared_ptr<TileEntity> forceEntity = std::shared_ptr< std::shared_ptr<TileEntity> forceEntity = std::shared_ptr<

2
Minecraft.World/Blocks/TrapDoorTile.cpp
View file

@ -25,7 +25,7 @@ bool TrapDoorTile::isPathfindable(LevelSource* level, int x, int y, int z) {
int TrapDoorTile::getRenderShape() { return Tile::SHAPE_BLOCK; } int TrapDoorTile::getRenderShape() { return Tile::SHAPE_BLOCK; }
AABB* TrapDoorTile::getTileAABB(Level* level, int x, int y, int z) { AABB TrapDoorTile::getTileAABB(Level* level, int x, int y, int z) {
updateShape(level, x, y, z); updateShape(level, x, y, z);
return Tile::getTileAABB(level, x, y, z); return Tile::getTileAABB(level, x, y, z);
} }

2
Minecraft.World/Blocks/TrapDoorTile.h
View file

@ -37,7 +37,7 @@ public:
int getRenderShape(); int getRenderShape();
public: public:
AABB* getTileAABB(Level* level, int x, int y, int z); AABB getTileAABB(Level* level, int x, int y, int z);
public: public:
std::optional<AABB> getAABB(Level* level, int x, int y, int z); std::optional<AABB> getAABB(Level* level, int x, int y, int z);