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

MC -> blaze renaming and getName() cleanup

Browse Source
This commit is contained in:
James Seibel
2026-03-09 12:20:13 -05:00
parent 385d6919fb
commit b04a308090
12 changed files with 40 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java
+2 -2
View File
@@ -307,7 +307,7 @@ public class BlazeDebugWireframeRenderer implements IMcDebugRenderer
// render //
try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
this::getName,
this::getRenderPassName,
McLodRenderer.INSTANCE.dhColorTextureWrapper.textureView,
/*optionalClearColorAsInt*/ OptionalInt.empty(),
McLodRenderer.INSTANCE.dhDepthTextureWrapper.textureView,
@@ -328,7 +328,7 @@ public class BlazeDebugWireframeRenderer implements IMcDebugRenderer
/*instanceCount*/1);
}
}
private String getName() { return "distantHorizons:McDebugRenderer"; }
private String getRenderPassName() { return "distantHorizons:McDebugRenderer"; }
//endregion
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java
+2 -2
View File
@@ -496,7 +496,7 @@ public class McGenericObjectRenderer implements IMcGenericRenderer
profiler.push(boxGroup.getResourceLocationPath());
try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
this::getName,
this::getRenderPassName,
McLodRenderer.INSTANCE.dhColorTextureWrapper.textureView,
/*optionalClearColorAsInt*/ OptionalInt.empty(),
McLodRenderer.INSTANCE.dhDepthTextureWrapper.textureView,
@@ -528,7 +528,7 @@ public class McGenericObjectRenderer implements IMcGenericRenderer
//endregion
}
private String getName() { return "distantHorizons:McGenericObjectRenderer"; }
private String getRenderPassName() { return "distantHorizons:McGenericObjectRenderer"; }
//endregion
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java
+4 -5
View File
@@ -282,7 +282,7 @@ public class McLodRenderer implements IMcLodRenderer
QuadElementBuffer.buildBuffer(LodBufferContainer.MAX_QUADS_PER_BUFFER, buffer, GL32.GL_UNSIGNED_INT);
// create VBO if needed
// create buffer if needed
if (this.indexBuffer == null
|| this.indexBuffer.size() < buffer.capacity())
{
@@ -293,8 +293,7 @@ public class McLodRenderer implements IMcLodRenderer
this.indexBuffer = GPU_DEVICE.createBuffer(this::getIndexBufferName, usage, buffer.capacity());
}
int offset = 0;
GpuBufferSlice bufferSlice = new GpuBufferSlice(this.indexBuffer, offset, buffer.capacity());
GpuBufferSlice bufferSlice = new GpuBufferSlice(this.indexBuffer, /*offset*/ 0, buffer.capacity());
COMMAND_ENCODER.writeToBuffer(bufferSlice, buffer);
}
}
@@ -311,7 +310,7 @@ public class McLodRenderer implements IMcLodRenderer
OptionalDouble optionalDepthValueAsDouble = OptionalDouble.empty();
try(RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
this::getName,
this::getRenderPassName,
this.dhColorTextureWrapper.textureView,
optionalClearColorAsInt,
this.dhDepthTextureWrapper.textureView, optionalDepthValueAsDouble)
@@ -393,7 +392,7 @@ public class McLodRenderer implements IMcLodRenderer
profiler.pop();
}
private String getIndexBufferName() { return "distantHorizons:LodIndexBuffer"; }
private String getName() { return "distantHorizons:McLodRenderer"; }
private String getRenderPassName() { return "distantHorizons:McLodRenderer"; }
@Override
public void applyToMcTexture()
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java
+2 -2
View File
@@ -142,7 +142,7 @@ public class McCopyRenderer
this.tryInit();
try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
this::getName,
this::getRenderPassName,
destinationTextureView,
/*optionalClearColorAsInt*/ OptionalInt.empty(),
/*depthTexture*/ null,
@@ -157,7 +157,7 @@ public class McCopyRenderer
}
}
private String getName() { return "distantHorizons:McCopyRenderer"; }
private String getRenderPassName() { return "distantHorizons:McCopyRenderer"; }
//endregion
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/AbstractUniformBufferWrapper.java
+2 -2
View File
@@ -54,7 +54,7 @@ public abstract class AbstractUniformBufferWrapper implements IUniformBufferWrap
| GpuBuffer.USAGE_VERTEX
| GpuBuffer.USAGE_UNIFORM;
int byteSize = (this.buffer.limit() - this.buffer.position());
this.gpuBuffer = GPU_DEVICE.createBuffer(this::getName, usage, byteSize);
this.gpuBuffer = GPU_DEVICE.createBuffer(this::getBufferName, usage, byteSize);
}
return this.buffer;
@@ -81,7 +81,7 @@ public abstract class AbstractUniformBufferWrapper implements IUniformBufferWrap
LOGGER.warn("Uploading to buffer ["+this.name+"] failed due to already being closed");
}
}
private String getName() { return this.name; }
private String getBufferName() { return this.name; }
//endregion
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeGenericObjectVertexContainer.java
+4 -3
View File
@@ -215,7 +215,7 @@ public class BlazeGenericObjectVertexContainer implements IGenericObjectVertexBu
{
int usage = GpuBuffer.USAGE_COPY_DST
| GpuBuffer.USAGE_VERTEX;
this.vboGpuBuffer = GPU_DEVICE.createBuffer(this::getName, usage, totalVertexByteSize);
this.vboGpuBuffer = GPU_DEVICE.createBuffer(this::getVertexBufferName, usage, totalVertexByteSize);
}
GpuBufferSlice bufferSlice = new GpuBufferSlice(this.vboGpuBuffer, /*offset*/0, totalVertexByteSize);
@@ -232,7 +232,7 @@ public class BlazeGenericObjectVertexContainer implements IGenericObjectVertexBu
| GpuBuffer.USAGE_VERTEX
| GpuBuffer.USAGE_INDEX
| GpuBuffer.USAGE_UNIFORM;
this.indexGpuBuffer = GPU_DEVICE.createBuffer(this::getName, usage, totalVertexByteSize);
this.indexGpuBuffer = GPU_DEVICE.createBuffer(this::getIndexBufferName, usage, totalVertexByteSize);
}
int offset = 0;
@@ -243,7 +243,8 @@ public class BlazeGenericObjectVertexContainer implements IGenericObjectVertexBu
this.state = EState.RENDER;
}
private String getName() { return "distantHorizons:GenericContainerIndex"; }
private String getVertexBufferName() { return "distantHorizons:GenericVertexBuffer"; }
private String getIndexBufferName() { return "distantHorizons:GenericIndexBuffer"; }
//endregion
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFarFadeRenderer.java → common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java
+14 -20
View File
@@ -39,13 +39,11 @@ import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureViewWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureWrapper;
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.render.renderer.RenderParams;
import com.seibel.distanthorizons.core.util.RenderUtil;
import com.seibel.distanthorizons.core.util.math.Mat4f;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcFarFadeRenderer;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.Identifier;
@@ -56,19 +54,16 @@ import java.util.OptionalDouble;
import java.util.OptionalInt;
/**
* Renders a TODO
* Fades out DH's far clip plane
*/
public class McFarFadeRenderer implements IMcFarFadeRenderer
public class BlazeDhFarFadeRenderer implements IMcFarFadeRenderer
{
public static final DhLogger LOGGER = new DhLoggerBuilder().build();
private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice();
private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder();
public static final McFarFadeRenderer INSTANCE = new McFarFadeRenderer();
public static final BlazeDhFarFadeRenderer INSTANCE = new BlazeDhFarFadeRenderer();
private VertexFormat vertexFormat;
private RenderPipeline pipeline;
@@ -88,7 +83,7 @@ public class McFarFadeRenderer implements IMcFarFadeRenderer
//=============//
//region
private McFarFadeRenderer()
private BlazeDhFarFadeRenderer()
{
this.vertexFormat = VertexFormat.builder()
.add("vPosition", DhBlazeVertexFormatUtil.SCREEN_POS)
@@ -142,8 +137,8 @@ public class McFarFadeRenderer implements IMcFarFadeRenderer
//========//
//region
@Override // TODO can probably just be DH mvm/proj matricies
public void render(Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix)
@Override
public void render(RenderParams renderParams)
{
this.tryInit();
@@ -175,13 +170,12 @@ public class McFarFadeRenderer implements IMcFarFadeRenderer
float fadeEndDistance = dhFarClipDistance * 0.9f;
Mat4f dhProjectionMatrix = RenderUtil.createLodProjectionMatrix(mcProjectionMatrix);
Mat4f dhModelViewMatrix = RenderUtil.createLodModelViewMatrix(mcModelViewMatrix);
Mat4f dhProjectionMatrix = RenderUtil.createLodProjectionMatrix(renderParams.mcProjectionMatrix);
Mat4f dhModelViewMatrix = RenderUtil.createLodModelViewMatrix(renderParams.mcModelViewMatrix);
Mat4f inverseDhModelViewProjectionMatrix = new Mat4f(dhProjectionMatrix);
inverseDhModelViewProjectionMatrix.multiply(dhModelViewMatrix);
inverseDhModelViewProjectionMatrix.invert();
Mat4f inverseDhMvmProjMatrix = inverseDhModelViewProjectionMatrix;
Mat4f inverseDhMvmProjMatrix = new Mat4f(dhProjectionMatrix);
inverseDhMvmProjMatrix.multiply(dhModelViewMatrix);
inverseDhMvmProjMatrix.invert();
@@ -211,7 +205,7 @@ public class McFarFadeRenderer implements IMcFarFadeRenderer
private void renderFadeToTexture()
{
try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
this::getName,
this::getRenderPassName,
this.dhFadeColorTextureWrapper.textureView,
/*optionalClearColorAsInt*/ OptionalInt.empty(),
/*depthTexture*/ null,
@@ -232,7 +226,7 @@ public class McFarFadeRenderer implements IMcFarFadeRenderer
renderPass.draw(/*indexStart*/ 0, /*indexCount*/ 4);
}
}
private String getName() { return "distantHorizons:McFadeRenderer"; }
private String getRenderPassName() { return "distantHorizons:McFadeRenderer"; }
//endregion
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java
+2 -2
View File
@@ -339,7 +339,7 @@ public class McFogRenderer implements IMcFogRenderer
private void renderFogToTexture()
{
try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
this::getName,
this::getRenderPassName,
this.fogColorTextureWrapper.textureView,
/*optionalClearColorAsInt*/ OptionalInt.empty(),
/*depthTexture*/ null,
@@ -355,7 +355,7 @@ public class McFogRenderer implements IMcFogRenderer
renderPass.draw(/*indexStart*/ 0, /*indexCount*/ 4);
}
}
private String getName() { return "distantHorizons:McFogRenderer"; }
private String getRenderPassName() { return "distantHorizons:McFogRenderer"; }
//endregion
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java
+2 -2
View File
@@ -260,7 +260,7 @@ public class McSsaoRenderer implements IMcSsaoRenderer
private void renderSsaoToTexture()
{
try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
this::getName,
this::getRenderPassName,
this.ssaoColorTextureWrapper.textureView,
/*optionalClearColorAsInt*/ OptionalInt.empty(),
/*depthTexture*/ null,
@@ -276,7 +276,7 @@ public class McSsaoRenderer implements IMcSsaoRenderer
renderPass.draw(/*indexStart*/ 0, /*indexCount*/ 4);
}
}
private String getName() { return "distantHorizons:McSsaoRenderer"; }
private String getRenderPassName() { return "distantHorizons:McSsaoRenderer"; }
//endregion
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/DhTestRenderer.java
+3 -3
View File
@@ -133,7 +133,7 @@ public class DhTestRenderer implements IMcTestRenderer
int usage = GpuBuffer.USAGE_COPY_DST
| GpuBuffer.USAGE_VERTEX;
int size = vertices.length * Float.BYTES;
this.vboGpuBuffer = GPU_DEVICE.createBuffer(this::getName, usage, size);
this.vboGpuBuffer = GPU_DEVICE.createBuffer(this::getRenderPassName, usage, size);
{
int offset = 0;
@@ -164,7 +164,7 @@ public class DhTestRenderer implements IMcTestRenderer
this.tryInit();
try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
this::getName,
this::getRenderPassName,
this.mcColorTextureView,
/*optionalClearColorAsInt*/ OptionalInt.empty(),
/*mcDepthTextureView*/ null,
@@ -175,7 +175,7 @@ public class DhTestRenderer implements IMcTestRenderer
renderPass.draw(/*indexStart*/ 0, /*indexCount*/ 3);
}
}
private String getName() { return "distantHorizons:DhTestRenderer"; }
private String getRenderPassName() { return "distantHorizons:DhTestRenderer"; }
//endregion
common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java
+2 -2
View File
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.common.wrappers;
import com.seibel.distanthorizons.common.render.blaze.BlazeDebugWireframeRenderer;
import com.seibel.distanthorizons.common.render.blaze.McLodRenderer;
import com.seibel.distanthorizons.common.render.blaze.postProcessing.McFarFadeRenderer;
import com.seibel.distanthorizons.common.render.blaze.postProcessing.BlazeDhFarFadeRenderer;
import com.seibel.distanthorizons.common.render.blaze.postProcessing.McFogRenderer;
import com.seibel.distanthorizons.common.render.blaze.postProcessing.McSsaoRenderer;
import com.seibel.distanthorizons.common.render.blaze.postProcessing.McVanillaFadeRenderer;
@@ -85,7 +85,7 @@ public class DependencySetup
SingletonInjector.INSTANCE.bind(IMcLodRenderer.class, McLodRenderer.INSTANCE);
SingletonInjector.INSTANCE.bind(IMcSsaoRenderer.class, McSsaoRenderer.INSTANCE);
SingletonInjector.INSTANCE.bind(IMcFogRenderer.class, McFogRenderer.INSTANCE);
SingletonInjector.INSTANCE.bind(IMcFarFadeRenderer.class, McFarFadeRenderer.INSTANCE);
SingletonInjector.INSTANCE.bind(IMcFarFadeRenderer.class, BlazeDhFarFadeRenderer.INSTANCE);
SingletonInjector.INSTANCE.bind(IMcDebugRenderer.class, BlazeDebugWireframeRenderer.INSTANCE);
}
coreSubProjects
+1 -1
Submodule coreSubProjects updated: a8c15d22c3...fee0aadcbe