LegacyConsoleArchive/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-09-23 09:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: make AABBList own its values

Browse Source
This commit is contained in:
orng
2026-03-27 22:37:22 -05:00
parent d7d99db4c5
commit 78b5255224
7 changed files with 23 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Rendering/LevelRenderer.cpp
+7 -22
View File
@@ -3862,12 +3862,6 @@ LevelRenderer::DestroyedTileManager::RecentTile::RecentTile(int x, int y, int z,
rebuilt = false;
}
LevelRenderer::DestroyedTileManager::RecentTile::~RecentTile() {
for (AUTO_VAR(it, boxes.begin()); it != boxes.end(); it++) {
delete *it;
}
}
LevelRenderer::DestroyedTileManager::DestroyedTileManager() {
InitializeCriticalSection(&m_csDestroyedTiles);
}
@@ -3899,14 +3893,6 @@ void LevelRenderer::DestroyedTileManager::destroyingTileAt(Level* level, int x,
tile->addAABBs(level, x, y, z, &box, &recentTile->boxes, nullptr);
}
// Make these temporary AABBs into permanently allocated AABBs
for (unsigned int i = 0; i < recentTile->boxes.size(); i++) {
recentTile->boxes[i] =
new AABB(recentTile->boxes[i]->x0, recentTile->boxes[i]->y0,
recentTile->boxes[i]->z0, recentTile->boxes[i]->x1,
recentTile->boxes[i]->y1, recentTile->boxes[i]->z1);
}
m_destroyedTiles.push_back(recentTile);
LeaveCriticalSection(&m_csDestroyedTiles);
@@ -3977,14 +3963,13 @@ void LevelRenderer::DestroyedTileManager::addAABBs(Level* level, AABB* box,
// interested in, add them to the output list, making a temp
// AABB copy so that we can destroy our own copy without
// worrying about the lifespan of the copy we've passed out
if (m_destroyedTiles[i]->boxes[j]->intersects(*box)) {
AABB bb(m_destroyedTiles[i]->boxes[j]->x0,
m_destroyedTiles[i]->boxes[j]->y0,
m_destroyedTiles[i]->boxes[j]->z0,
m_destroyedTiles[i]->boxes[j]->x1,
m_destroyedTiles[i]->boxes[j]->y1,
m_destroyedTiles[i]->boxes[j]->z1);
boxes->push_back(&bb);
if (m_destroyedTiles[i]->boxes[j].intersects(*box)) {
boxes->push_back({m_destroyedTiles[i]->boxes[j].x0,
m_destroyedTiles[i]->boxes[j].y0,
m_destroyedTiles[i]->boxes[j].z0,
m_destroyedTiles[i]->boxes[j].x1,
m_destroyedTiles[i]->boxes[j].y1,
m_destroyedTiles[i]->boxes[j].z1});
}
}
}
Minecraft.Client/Rendering/LevelRenderer.h
+1 -1
View File
@@ -234,7 +234,7 @@ public:
int timeout_ticks;
bool rebuilt;
RecentTile(int x, int y, int z, Level* level);
~RecentTile();
~RecentTile() = default;
};
CRITICAL_SECTION m_csDestroyedTiles;
std::vector<RecentTile*> m_destroyedTiles;