Undo experimental change to LOD reloading
This commit is contained in:
@@ -512,12 +512,8 @@ public class LodQuadTree extends QuadTree<LodRenderSection> implements IDebugRen
|
||||
QuadNode<LodRenderSection> quadNode = nodeIterator.next();
|
||||
if (quadNode.value != null)
|
||||
{
|
||||
if (quadNode.value.renderingEnabled)
|
||||
{
|
||||
quadNode.value.cancelGpuUpload();
|
||||
quadNode.value.uploadRenderDataToGpuAsync();
|
||||
}
|
||||
|
||||
quadNode.value.close();
|
||||
quadNode.value = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -313,9 +313,12 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
|
||||
public void cancelGpuUpload()
|
||||
{
|
||||
CompletableFuture<Void> future = this.uploadRenderDataToGpuFuture;
|
||||
this.uploadRenderDataToGpuFuture = null;
|
||||
if (future != null)
|
||||
{
|
||||
future.cancel(true);
|
||||
// interrupting the future speeds things up, but also causes
|
||||
// some LODs to never load in properly
|
||||
future.cancel(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user