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

renaming

Browse Source
This commit is contained in:
James Seibel
2026-03-09 12:05:50 -05:00
parent afdccfe087
commit 458cc9b505
12 changed files with 39 additions and 35 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 -3
View File
@@ -33,7 +33,7 @@ import com.mojang.blaze3d.systems.RenderPass;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormat;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil;
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
import com.seibel.distanthorizons.core.logging.DhLogger;
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
@@ -52,7 +52,6 @@ import java.nio.ByteOrder;
import java.util.Collection;
import java.util.OptionalDouble;
import java.util.OptionalInt;
import java.util.function.Supplier;
/**
* TODO
@@ -137,7 +136,7 @@ public class BlazeDebugWireframeRenderer implements IMcDebugRenderer
this.init = true;
this.vertexFormat = VertexFormat.builder()
.add("vPosition", DhBlazeVertexFormat.FLOAT_XYZ_POS)
.add("vPosition", DhBlazeVertexFormatUtil.FLOAT_XYZ_POS)
.build();
this.createPipelines();
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java
+4 -5
View File
@@ -43,7 +43,7 @@ import com.seibel.distanthorizons.api.objects.math.DhApiVec3d;
import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBox;
import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBoxGroupShading;
import com.seibel.distanthorizons.common.render.blaze.helpers.BlazeGenericObjectVertexContainer;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormat;
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.helpers.UniformHandler;
import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper;
@@ -54,7 +54,6 @@ import com.seibel.distanthorizons.core.logging.f3.F3Screen;
import com.seibel.distanthorizons.core.render.renderer.RenderParams;
import com.seibel.distanthorizons.core.render.renderer.generic.GenericRenderObjectFactory;
import com.seibel.distanthorizons.core.render.renderer.generic.IGenericObjectVertexBufferContainer;
import com.seibel.distanthorizons.core.render.renderer.generic.NativeGlGenericObjectVertexContainer;
import com.seibel.distanthorizons.core.render.renderer.generic.RenderableBoxGroup;
import com.seibel.distanthorizons.core.util.LodUtil;
import com.seibel.distanthorizons.core.util.math.Mat4f;
@@ -129,9 +128,9 @@ public class McGenericObjectRenderer implements IMcGenericRenderer
this.init = true;
this.vertexFormat = VertexFormat.builder()
.add("vPosition", DhBlazeVertexFormat.FLOAT_XYZ_POS)
.add("aColor", DhBlazeVertexFormat.RGBA_UBYTE_COLOR)
.add("aMaterial", DhBlazeVertexFormat.IRIS_MATERIAL)
.add("vPosition", DhBlazeVertexFormatUtil.FLOAT_XYZ_POS)
.add("aColor", DhBlazeVertexFormatUtil.RGBA_UBYTE_COLOR)
.add("aMaterial", DhBlazeVertexFormatUtil.IRIS_MATERIAL)
.build();
this.createPipelines();
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java
+8 -8
View File
@@ -18,7 +18,7 @@ import com.mojang.blaze3d.textures.*;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.seibel.distanthorizons.common.render.blaze.apply.DhApplyRenderer;
import com.seibel.distanthorizons.common.render.blaze.helpers.*;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormat;
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.common.render.blaze.wrappers.LodUniformBufferWrapper;
@@ -91,13 +91,13 @@ public class McLodRenderer implements IMcLodRenderer
private McLodRenderer()
{
this.vertexFormat = VertexFormat.builder()
.add("vPosition", DhBlazeVertexFormat.SHORT_XYZ_POS)
.add("meta", DhBlazeVertexFormat.META)
.add("vColor", DhBlazeVertexFormat.RGBA_UBYTE_COLOR)
.add("irisMaterial", DhBlazeVertexFormat.IRIS_MATERIAL)
.add("irisNormal", DhBlazeVertexFormat.IRIS_NORMAL)
.add("paddingTwo", DhBlazeVertexFormat.BYTE_PAD)
.add("paddingThree", DhBlazeVertexFormat.BYTE_PAD) // padding is to make sure the format is a multiple of 4
.add("vPosition", DhBlazeVertexFormatUtil.SHORT_XYZ_POS)
.add("meta", DhBlazeVertexFormatUtil.META)
.add("vColor", DhBlazeVertexFormatUtil.RGBA_UBYTE_COLOR)
.add("irisMaterial", DhBlazeVertexFormatUtil.IRIS_MATERIAL)
.add("irisNormal", DhBlazeVertexFormatUtil.IRIS_NORMAL)
.add("paddingTwo", DhBlazeVertexFormatUtil.BYTE_PAD)
.add("paddingThree", DhBlazeVertexFormatUtil.BYTE_PAD) // padding is to make sure the format is a multiple of 4
.build();
}
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/DhApplyRenderer.java
+2 -2
View File
@@ -31,7 +31,7 @@ import com.mojang.blaze3d.systems.RenderPass;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.textures.*;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormat;
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.util.BlazePostProcessUtil;
import com.seibel.distanthorizons.core.logging.DhLogger;
@@ -146,7 +146,7 @@ public class DhApplyRenderer
}
VertexFormat vertexFormat = VertexFormat.builder()
.add("vPosition", DhBlazeVertexFormat.SCREEN_POS)
.add("vPosition", DhBlazeVertexFormatUtil.SCREEN_POS)
.build();
RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder();
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java
+2 -2
View File
@@ -29,7 +29,7 @@ import com.mojang.blaze3d.systems.RenderPass;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.textures.*;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormat;
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.common.render.blaze.util.BlazePostProcessUtil;
@@ -80,7 +80,7 @@ public class McCopyRenderer
this.vertexFormat = VertexFormat.builder()
.add("vPosition", DhBlazeVertexFormat.SCREEN_POS)
.add("vPosition", DhBlazeVertexFormatUtil.SCREEN_POS)
.build();
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFarFadeRenderer.java
+2 -2
View File
@@ -36,7 +36,7 @@ import com.seibel.distanthorizons.common.render.blaze.McLodRenderer;
import com.seibel.distanthorizons.common.render.blaze.apply.McCopyRenderer;
import com.seibel.distanthorizons.common.render.blaze.helpers.*;
import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormat;
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;
@@ -91,7 +91,7 @@ public class McFarFadeRenderer implements IMcFarFadeRenderer
private McFarFadeRenderer()
{
this.vertexFormat = VertexFormat.builder()
.add("vPosition", DhBlazeVertexFormat.SCREEN_POS)
.add("vPosition", DhBlazeVertexFormatUtil.SCREEN_POS)
.build();
}
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java
+2 -2
View File
@@ -41,7 +41,7 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogMixMode;
import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
import com.seibel.distanthorizons.common.render.blaze.McLodRenderer;
import com.seibel.distanthorizons.common.render.blaze.apply.DhApplyRenderer;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormat;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureWrapper;
import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler;
@@ -100,7 +100,7 @@ public class McFogRenderer implements IMcFogRenderer
private McFogRenderer()
{
this.vertexFormat = VertexFormat.builder()
.add("vPosition", DhBlazeVertexFormat.SCREEN_POS)
.add("vPosition", DhBlazeVertexFormatUtil.SCREEN_POS)
.build();
}
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java
+2 -2
View File
@@ -38,7 +38,7 @@ import com.mojang.blaze3d.vertex.VertexFormat;
import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
import com.seibel.distanthorizons.common.render.blaze.McLodRenderer;
import com.seibel.distanthorizons.common.render.blaze.apply.DhApplyRenderer;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormat;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureWrapper;
import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler;
@@ -94,7 +94,7 @@ public class McSsaoRenderer implements IMcSsaoRenderer
private McSsaoRenderer()
{
this.vertexFormat = VertexFormat.builder()
.add("vPosition", DhBlazeVertexFormat.SCREEN_POS)
.add("vPosition", DhBlazeVertexFormatUtil.SCREEN_POS)
.build();
}
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java
+2 -2
View File
@@ -36,7 +36,7 @@ import com.seibel.distanthorizons.common.render.blaze.McLodRenderer;
import com.seibel.distanthorizons.common.render.blaze.apply.McCopyRenderer;
import com.seibel.distanthorizons.common.render.blaze.helpers.*;
import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormat;
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.config.Config;
@@ -93,7 +93,7 @@ public class McVanillaFadeRenderer implements IMcVanillaFadeRenderer
private McVanillaFadeRenderer()
{
this.vertexFormat = VertexFormat.builder()
.add("vPosition", DhBlazeVertexFormat.SCREEN_POS)
.add("vPosition", DhBlazeVertexFormatUtil.SCREEN_POS)
.build();
}
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/DhTestRenderer.java
+3 -3
View File
@@ -30,7 +30,7 @@ import com.mojang.blaze3d.systems.RenderPass;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.textures.*;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormat;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil;
import com.seibel.distanthorizons.core.logging.DhLogger;
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcTestRenderer;
@@ -83,8 +83,8 @@ public class DhTestRenderer implements IMcTestRenderer
VertexFormat vertexFormat = VertexFormat.builder()
.add("vPosition", DhBlazeVertexFormat.SCREEN_POS)
.add("vColor", DhBlazeVertexFormat.RGBA_FLOAT_COLOR)
.add("vPosition", DhBlazeVertexFormatUtil.SCREEN_POS)
.add("vColor", DhBlazeVertexFormatUtil.RGBA_FLOAT_COLOR)
.build();
//int breakpointOne = 0;
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazePostProcessUtil.java
+9 -3
View File
@@ -10,9 +10,7 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.function.Supplier;
/**
* Contains code that's used by all post-processing effects.
*/
/** Contains code that's used by all post-processing effects. */
public class BlazePostProcessUtil
{
@@ -30,6 +28,12 @@ public class BlazePostProcessUtil
};
//=========//
// methods //
//=========//
//region
public static GpuBuffer createAndUploadScreenVertexData(String name)
{
Supplier<String> labelSupplier = () -> "distantHorizons:"+name;
@@ -55,6 +59,8 @@ public class BlazePostProcessUtil
return vboGpuBuffer;
}
//endregion
}
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/DhBlazeVertexFormat.java → common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/DhBlazeVertexFormatUtil.java
+1 -1
View File
@@ -6,7 +6,7 @@ import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodQuad
/**
* @see LodQuadBuilder
*/
public class DhBlazeVertexFormat
public class DhBlazeVertexFormatUtil
{
public static final VertexFormatElement SCREEN_POS = VertexFormatElement.register(/*id*/7, /*index*/0, VertexFormatElement.Type.FLOAT, VertexFormatElement.Usage.POSITION, /*count*/ 2);
public static final VertexFormatElement RGBA_FLOAT_COLOR = VertexFormatElement.register(/*id*/8, /*index*/0, VertexFormatElement.Type.FLOAT, VertexFormatElement.Usage.COLOR, /*count*/ 4);