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

debug render cleanup

Browse Source
This commit is contained in:
James Seibel
2026-02-07 08:31:51 -06:00
parent 69653336bf
commit ce20d3da32
5 changed files with 64 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/V2/FullDataUpdatePropagatorV2.java
-1
View File
@@ -14,7 +14,6 @@ import com.seibel.distanthorizons.core.util.threading.PriorityTaskPicker;
import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
import it.unimi.dsi.fastutil.longs.LongArrayList;
import org.jetbrains.annotations.Nullable;
import java.awt.*;
import java.util.HashMap;
core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/AbstractFullDataNetworkRequestQueue.java
-1
View File
@@ -1,7 +1,6 @@
package com.seibel.distanthorizons.core.multiplayer.client;
import com.google.common.base.Stopwatch;
import com.google.common.cache.CacheBuilder;
import com.seibel.distanthorizons.core.config.Config;
import com.seibel.distanthorizons.core.config.types.ConfigEntry;
import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
core/src/main/java/com/seibel/distanthorizons/core/render/QuadTree/LodQuadTree.java
-1
View File
@@ -56,7 +56,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
/**
core/src/main/java/com/seibel/distanthorizons/core/render/QuadTree/LodRenderSection.java
-1
View File
@@ -51,7 +51,6 @@ import java.awt.*;
import java.util.*;
import java.util.List;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
/**
* A render section represents an area that could be rendered.
core/src/main/java/com/seibel/distanthorizons/core/render/renderer/DebugRenderer.java
+64 -97
View File
@@ -25,8 +25,6 @@ import com.seibel.distanthorizons.core.config.types.ConfigEntry;
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
import com.seibel.distanthorizons.core.logging.DhLogger;
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
import com.seibel.distanthorizons.core.pos.DhLodPos;
import com.seibel.distanthorizons.core.pos.DhSectionPos;
import com.seibel.distanthorizons.core.render.glObject.buffer.GLElementBuffer;
import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer;
@@ -43,7 +41,6 @@ import org.jetbrains.annotations.Nullable;
import org.lwjgl.opengl.GL32;
import java.awt.*;
import java.io.Closeable;
import java.lang.ref.WeakReference;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
@@ -51,7 +48,8 @@ import java.util.*;
import java.util.concurrent.PriorityBlockingQueue;
/**
* Handles rendering the wireframe particles that are used for seeing what the system's doing.
* Handles rendering the wireframe particles
* that are used for seeing what the system's doing.
*/
public class DebugRenderer
{
@@ -86,6 +84,7 @@ public class DebugRenderer
/** A box from 0,0,0 to 1,1,1 */
private static final float[] BOX_VERTICES = {
//region
// Pos x y z
0, 0, 0,
1, 0, 0,
@@ -95,9 +94,11 @@ public class DebugRenderer
1, 0, 1,
1, 1, 1,
0, 1, 1,
//endregion
};
private static final int[] BOX_OUTLINE_INDICES = {
//region
0, 1,
1, 2,
2, 3,
@@ -112,6 +113,7 @@ public class DebugRenderer
1, 5,
2, 6,
3, 7,
//endregion
};
@@ -119,6 +121,7 @@ public class DebugRenderer
//=============//
// constructor //
//=============//
//region
private DebugRenderer() { }
@@ -162,11 +165,14 @@ public class DebugRenderer
}
//endregion
//==============//
// registration //
//==============//
//region
public static void makeParticle(BoxParticle particle)
{
@@ -184,11 +190,14 @@ public class DebugRenderer
public static void clearRenderables() { INSTANCE.rendererLists.clearRenderables(); }
//endregion
//===========//
// rendering //
//===========//
//region
public void render(Mat4f transform)
{
@@ -225,7 +234,8 @@ public class DebugRenderer
GL32.glPolygonMode(GL32.GL_FRONT_AND_BACK, GL32.GL_FILL);
for (BoxParticle particle : this.particles)
{
this.renderBox(particle.getBox());
// a new box is created each time since the height will be different based on the time it's lived
this.renderBox(particle.createNewRenderBox());
}
}
@@ -233,18 +243,24 @@ public class DebugRenderer
{
Mat4f boxTransform = Mat4f.createTranslateMatrix(box.minPos.x - this.camPosFloatThisFrame.x, box.minPos.y - this.camPosFloatThisFrame.y, box.minPos.z - this.camPosFloatThisFrame.z);
boxTransform.multiply(Mat4f.createScaleMatrix(box.maxPos.x - box.minPos.x, box.maxPos.y - box.minPos.y, box.maxPos.z - box.minPos.z));
Mat4f t = this.transformationMatrixThisFrame.copy();
t.multiply(boxTransform);
this.basicShader.setUniform(this.basicShader.getUniformLocation("uTransform"), t);
Mat4f transformMatrix = this.transformationMatrixThisFrame.copy();
transformMatrix.multiply(boxTransform);
this.basicShader.setUniform(this.basicShader.getUniformLocation("uTransform"), transformMatrix);
this.basicShader.setUniform(this.basicShader.getUniformLocation("uColor"), box.color);
GL32.glDrawElements(GL32.GL_LINES, BOX_OUTLINE_INDICES.length, GL32.GL_UNSIGNED_INT, 0);
}
//endregion
//================//
// helper classes //
//================//
//region
public static final class Box
{
@@ -254,6 +270,21 @@ public class DebugRenderer
public Box(long pos, float minY, float maxY, float marginPercent, Color color)
{
float edgeOffset = DhSectionPos.getBlockWidth(pos) * marginPercent;
int minBlockPosX = DhSectionPos.getMinCornerBlockX(pos);
int minBlockPosZ = DhSectionPos.getMinCornerBlockZ(pos);
int maxBlockPosX = minBlockPosX + DhSectionPos.getBlockWidth(pos);
int maxBlockPosZ = minBlockPosZ + DhSectionPos.getBlockWidth(pos);
this.minPos = new Vec3f(minBlockPosX + edgeOffset, minY, minBlockPosZ + edgeOffset);
this.maxPos = new Vec3f(maxBlockPosX - edgeOffset, maxY, maxBlockPosZ - edgeOffset);
this.color = color;
}
/** only used for */
public Box(Vec3f minPos, Vec3f maxPos, Color color)
{
this.minPos = minPos;
@@ -261,50 +292,6 @@ public class DebugRenderer
this.color = color;
}
public Box(Vec3f minPos, Vec3f maxPos, Color color, Vec3f margin)
{
this.minPos = minPos;
this.minPos.add(margin);
this.maxPos = maxPos;
this.maxPos.subtract(margin);
this.color = color;
}
public Box(DhLodPos pos, float minY, float maxY, float marginPercent, Color color)
{
DhBlockPos2D blockMin = pos.getCornerBlockPos();
DhBlockPos2D blockMax = blockMin.add(pos.getBlockWidth(), pos.getBlockWidth());
float edge = pos.getBlockWidth() * marginPercent;
Vec3f a = new Vec3f(blockMin.x + edge, minY, blockMin.z + edge);
Vec3f b = new Vec3f(blockMax.x - edge, maxY, blockMax.z - edge);
this.minPos = a;
this.maxPos = b;
this.color = color;
}
public Box(DhLodPos pos, float y, float yDiff, Object hash, float marginPercent, Color color)
{
float hashY = ((float) hash.hashCode() / Integer.MAX_VALUE) * yDiff;
DhBlockPos2D blockMin = pos.getCornerBlockPos();
DhBlockPos2D blockMax = blockMin.add(pos.getBlockWidth(), pos.getBlockWidth());
float edge = pos.getBlockWidth() * marginPercent;
Vec3f a = new Vec3f(blockMin.x + edge, hashY, blockMin.z + edge);
Vec3f b = new Vec3f(blockMax.x - edge, hashY, blockMax.z - edge);
this.minPos = a;
this.maxPos = b;
this.color = color;
}
public Box(long pos, float minY, float maxY, float marginPercent, Color color)
{
this(DhSectionPos.getSectionBBoxPos(pos), minY, maxY, marginPercent, color);
}
public Box(long pos, float y, float yDiff, Object hash, float marginPercent, Color color)
{
this(DhSectionPos.getSectionBBoxPos(pos), y, yDiff, hash, marginPercent, color);
}
}
public static final class BoxParticle implements Comparable<BoxParticle>
@@ -314,6 +301,7 @@ public class DebugRenderer
public long durationInMs;
public float yChange;
private BoxParticle(Box box, long startMsTime, long durationInMs, float yChange)
{
this.box = box;
@@ -322,66 +310,33 @@ public class DebugRenderer
this.yChange = yChange;
}
public BoxParticle(Box box, double secondDuration, float yChange) { this(box, System.currentTimeMillis(), (long) (secondDuration * 1_000), yChange); }
public BoxParticle(Box box, double secondDuration, float yChange)
{ this(box, System.currentTimeMillis(), (long) (secondDuration * 1_000), yChange); }
@Override
public int compareTo(@NotNull BoxParticle particle)
{
return Long.compare(this.startMsTime + this.durationInMs, particle.startMsTime + particle.durationInMs);
}
public int compareTo(@NotNull DebugRenderer.BoxParticle particle)
{ return Long.compare(this.startMsTime + this.durationInMs, particle.startMsTime + particle.durationInMs); }
public Box getBox()
/** will change each time it's called based on the yChange value and time */
public Box createNewRenderBox()
{
long nowMs = System.currentTimeMillis();
float percent = (nowMs - this.startMsTime) / (float) this.durationInMs;
percent = (float) Math.pow(percent, 4);
float yDiff = this.yChange * percent;
return new Box(new Vec3f(this.box.minPos.x, this.box.minPos.y + yDiff, this.box.minPos.z), new Vec3f(this.box.maxPos.x, this.box.maxPos.y + yDiff, this.box.maxPos.z), this.box.color);
return new Box(
new Vec3f(this.box.minPos.x, this.box.minPos.y + yDiff, this.box.minPos.z),
new Vec3f(this.box.maxPos.x, this.box.maxPos.y + yDiff, this.box.maxPos.z),
this.box.color);
}
public boolean isDead() { return (System.currentTimeMillis() - this.startMsTime) > this.durationInMs; }
}
public static final class BoxWithLife implements IDebugRenderable, Closeable
{
public Box box;
public BoxParticle particleOnClose;
public BoxWithLife(Box box, long ns, float yChange, Color deathColor)
{
this.box = box;
this.particleOnClose = new BoxParticle(new Box(box.minPos, box.maxPos, deathColor), -1, ns, yChange);
register(this, null);
}
public BoxWithLife(Box box, long ns, float yChange) { this(box, ns, yChange, box.color); }
public BoxWithLife(Box box, double s, float yChange, Color deathColor)
{
this.box = box;
this.particleOnClose = new BoxParticle(new Box(box.minPos, box.maxPos, deathColor), s, yChange);
}
public BoxWithLife(Box box, double s, float yChange) { this(box, s, yChange, box.color); }
@Override
public void debugRender(DebugRenderer renderer) { renderer.renderBox(this.box); }
@Override
public void close()
{
makeParticle(new BoxParticle(this.particleOnClose.getBox(), System.nanoTime(), this.particleOnClose.durationInMs, this.particleOnClose.yChange));
unregister(this, null);
}
}
private static class RendererLists
{
public final LinkedList<WeakReference<IDebugRenderable>> generalRenderableList = new LinkedList<>();
@@ -390,7 +345,10 @@ public class DebugRenderer
//==============//
// registration //
//==============//
//region
public void addRenderable(IDebugRenderable renderable, @Nullable ConfigEntry<Boolean> config)
{
@@ -463,9 +421,14 @@ public class DebugRenderer
}
}
//endregion
//===========//
// rendering //
//===========//
//region
public void render(DebugRenderer debugRenderer)
{
@@ -506,6 +469,10 @@ public class DebugRenderer
}
}
}
//endregion
}
//endregion
}