wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix QuadTree ringList removal assertion

Browse Source
This commit is contained in:
James Seibel
2023-03-06 21:25:54 -06:00
parent 03822f9e74
commit 7ab60df578
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/lod/core/render/LodQuadTree.java
+7 -2
View File
@@ -413,11 +413,12 @@ public class LodQuadTree implements AutoCloseable
if (section != null && targetDetailLevel > this.getLayerDataDetail(sectionDetailLevel))
{
// this section is a higher detail level than we want, mark it for deletion
section.childCount = -1;
if (SUPER_VERBOSE_LOGGING)
{
LOGGER.info("sect "+sectPos+" in top detail level & target>current. Mark as free.");
}
section.childCount = -1;
}
if (section == null && targetDetailLevel <= this.getLayerDataDetail(sectionDetailLevel))
@@ -581,7 +582,11 @@ public class LodQuadTree implements AutoCloseable
if (section.pos.sectionDetailLevel < this.treeMaxDetailLevel)
{
LodUtil.assertTrue(this.getParentSection(section.pos).childCount == 0);
int parentChildCount = this.getParentSection(section.pos).childCount;
if (parentChildCount != 0 && parentChildCount != -1)
{
LodUtil.assertNotReach("Incorrect section removal. Parent has ["+parentChildCount+"] children, expected [0] (empty parent) or [-1] (parent also marked for deletion).");
}
}
ringList.remove(pos.x, pos.y);