From c86c32b39e1b78bfea299d824c0a331588b4ccae Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 9 Mar 2026 11:28:52 -0500 Subject: [PATCH] Rename texture wrappers --- ....java => BlazeDebugWireframeRenderer.java} | 10 +++++----- .../render/blaze/McGenericObjectRenderer.java | 17 ++++++++-------- .../common/render/blaze/McLodRenderer.java | 20 +++++++++---------- .../render/blaze/apply/DhApplyRenderer.java | 20 ++++++++----------- .../render/blaze/apply/McCopyRenderer.java | 20 +++++++++---------- ...=> BlazeGenericObjectVertexContainer.java} | 4 ++-- ...sHelper.java => BlazePostProcessUtil.java} | 2 +- ...pper.java => BlazeTextureViewWrapper.java} | 2 +- ...eWrapper.java => BlazeTextureWrapper.java} | 8 ++++---- ...exFormat.java => DhBlazeVertexFormat.java} | 2 +- .../postProcessing/McFarFadeRenderer.java | 8 ++++---- .../blaze/postProcessing/McFogRenderer.java | 12 +++++------ .../blaze/postProcessing/McSsaoRenderer.java | 12 +++++------ .../postProcessing/McVanillaFadeRenderer.java | 10 +++++----- .../render/blaze/test/DhTestRenderer.java | 6 +++--- .../common/wrappers/DependencySetup.java | 4 ++-- .../common/wrappers/WrapperFactory.java | 5 ++--- .../common/wrappers/misc/LightMapWrapper.java | 6 +++--- 18 files changed, 81 insertions(+), 87 deletions(-) rename common/src/main/java/com/seibel/distanthorizons/common/render/blaze/{McDebugObjectRenderer.java => BlazeDebugWireframeRenderer.java} (97%) rename common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/{McInstancedVboContainer.java => BlazeGenericObjectVertexContainer.java} (98%) rename common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/{PostProcessHelper.java => BlazePostProcessUtil.java} (97%) rename common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/{McTextureViewWrapper.java => BlazeTextureViewWrapper.java} (97%) rename common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/{McTextureWrapper.java => BlazeTextureWrapper.java} (89%) rename common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/{DhVertexFormat.java => DhBlazeVertexFormat.java} (98%) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McDebugObjectRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java similarity index 97% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McDebugObjectRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java index 2967fe271..be7c9a761 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McDebugObjectRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java @@ -32,7 +32,7 @@ import com.mojang.blaze3d.systems.GpuDevice; 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.DhVertexFormat; +import com.seibel.distanthorizons.common.render.blaze.helpers.DhBlazeVertexFormat; import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLogger; @@ -57,7 +57,7 @@ import java.util.function.Supplier; /** * TODO */ -public class McDebugObjectRenderer implements IMcDebugRenderer +public class BlazeDebugWireframeRenderer implements IMcDebugRenderer { private static final DhLogger LOGGER = new DhLoggerBuilder().build(); @@ -66,7 +66,7 @@ public class McDebugObjectRenderer implements IMcDebugRenderer private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice(); private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder(); - public static McDebugObjectRenderer INSTANCE = new McDebugObjectRenderer(); + public static BlazeDebugWireframeRenderer INSTANCE = new BlazeDebugWireframeRenderer(); @@ -125,7 +125,7 @@ public class McDebugObjectRenderer implements IMcDebugRenderer //=============// //region - public McDebugObjectRenderer() { } + public BlazeDebugWireframeRenderer() { } public void init() { @@ -136,7 +136,7 @@ public class McDebugObjectRenderer implements IMcDebugRenderer this.init = true; this.vertexFormat = VertexFormat.builder() - .add("vPosition", DhVertexFormat.FLOAT_XYZ_POS) + .add("vPosition", DhBlazeVertexFormat.FLOAT_XYZ_POS) .build(); this.createPipelines(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java index 35176e0b0..338bbbb20 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java @@ -42,9 +42,9 @@ import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeG 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.DhVertexFormat; -import com.seibel.distanthorizons.common.render.blaze.helpers.McInstancedVboContainer; -import com.seibel.distanthorizons.common.render.blaze.helpers.McTextureViewWrapper; +import com.seibel.distanthorizons.common.render.blaze.helpers.DhBlazeVertexFormat; +import com.seibel.distanthorizons.common.render.blaze.helpers.BlazeGenericObjectVertexContainer; +import com.seibel.distanthorizons.common.render.blaze.helpers.BlazeTextureViewWrapper; import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler; import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; @@ -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", DhVertexFormat.FLOAT_XYZ_POS) - .add("aColor", DhVertexFormat.RGBA_UBYTE_COLOR) - .add("aMaterial", DhVertexFormat.IRIS_MATERIAL) + .add("vPosition", DhBlazeVertexFormat.FLOAT_XYZ_POS) + .add("aColor", DhBlazeVertexFormat.RGBA_UBYTE_COLOR) + .add("aMaterial", DhBlazeVertexFormat.IRIS_MATERIAL) .build(); this.createPipelines(); @@ -549,10 +548,10 @@ public class McGenericObjectRenderer implements IMcGenericRenderer profiler.push("vertex setup"); - McInstancedVboContainer container = (McInstancedVboContainer) boxGroup.instancedVbos; + BlazeGenericObjectVertexContainer container = (BlazeGenericObjectVertexContainer) boxGroup.instancedVbos; LightMapWrapper lightMapWrapper = (LightMapWrapper) renderEventParam.lightmap; - McTextureViewWrapper lightmapTextureViewWrapper = lightMapWrapper.getTextureViewWrapper(); + BlazeTextureViewWrapper lightmapTextureViewWrapper = lightMapWrapper.getTextureViewWrapper(); renderPass.bindTexture("uLightMap", lightmapTextureViewWrapper.textureView, lightmapTextureViewWrapper.textureSampler); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java index 0993b4ec8..9373cd892 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java @@ -73,8 +73,8 @@ public class McLodRenderer implements IMcLodRenderer private GpuBuffer fragUniformBuffer; private GpuBuffer vertSharedUniformBuffer; - public final McTextureWrapper dhDepthTextureWrapper = McTextureWrapper.createDepth("DhDepthTexture"); - public final McTextureWrapper dhColorTextureWrapper = McTextureWrapper.createColor("DhColorTexture"); + public final BlazeTextureWrapper dhDepthTextureWrapper = BlazeTextureWrapper.createDepth("DhDepthTexture"); + public final BlazeTextureWrapper dhColorTextureWrapper = BlazeTextureWrapper.createColor("DhColorTexture"); @@ -86,13 +86,13 @@ public class McLodRenderer implements IMcLodRenderer private McLodRenderer() { this.vertexFormat = VertexFormat.builder() - .add("vPosition", DhVertexFormat.SHORT_XYZ_POS) - .add("meta", DhVertexFormat.META) - .add("vColor", DhVertexFormat.RGBA_UBYTE_COLOR) - .add("irisMaterial", DhVertexFormat.IRIS_MATERIAL) - .add("irisNormal", DhVertexFormat.IRIS_NORMAL) - .add("paddingTwo", DhVertexFormat.BYTE_PAD) - .add("paddingThree", DhVertexFormat.BYTE_PAD) // padding is to make sure the format is a multiple of 4 + .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 .build(); } @@ -323,7 +323,7 @@ public class McLodRenderer implements IMcLodRenderer // bind MC Lightmap //renderPass.bindTexture("uLightMap", this.mcLightTextureViewWrapper.textureView, this.mcLightTextureViewWrapper.textureSampler); LightMapWrapper lightMapWrapper = (LightMapWrapper) renderEventParam.lightmap; - McTextureViewWrapper lightmapTextureViewWrapper = lightMapWrapper.getTextureViewWrapper(); + BlazeTextureViewWrapper lightmapTextureViewWrapper = lightMapWrapper.getTextureViewWrapper(); renderPass.bindTexture("uLightMap", lightmapTextureViewWrapper.textureView, lightmapTextureViewWrapper.textureSampler); // set pipeline diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/DhApplyRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/DhApplyRenderer.java index c6cb0d436..64b1a5774 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/DhApplyRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/DhApplyRenderer.java @@ -20,7 +20,6 @@ package com.seibel.distanthorizons.common.render.blaze.apply; import com.mojang.blaze3d.buffers.GpuBuffer; -import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.pipeline.BlendFunction; import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.platform.DepthTestFunction; @@ -32,21 +31,18 @@ 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.helpers.DhVertexFormat; -import com.seibel.distanthorizons.common.render.blaze.helpers.McTextureViewWrapper; -import com.seibel.distanthorizons.common.render.blaze.helpers.PostProcessHelper; +import com.seibel.distanthorizons.common.render.blaze.helpers.DhBlazeVertexFormat; +import com.seibel.distanthorizons.common.render.blaze.helpers.BlazeTextureViewWrapper; +import com.seibel.distanthorizons.common.render.blaze.helpers.BlazePostProcessUtil; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.coreapi.ModInfo; import net.minecraft.resources.Identifier; import org.jetbrains.annotations.Nullable; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; import java.util.Arrays; import java.util.OptionalDouble; import java.util.OptionalInt; -import java.util.function.Supplier; /** * TODO ??? @@ -71,10 +67,10 @@ public class DhApplyRenderer private final String vertexShaderPath; private final String fragmentShaderPath; - private final McTextureViewWrapper sourceColorTextureViewWrapper = new McTextureViewWrapper(); - private final McTextureViewWrapper sourceDepthTextureViewWrapper = new McTextureViewWrapper(); + private final BlazeTextureViewWrapper sourceColorTextureViewWrapper = new BlazeTextureViewWrapper(); + private final BlazeTextureViewWrapper sourceDepthTextureViewWrapper = new BlazeTextureViewWrapper(); - private final McTextureViewWrapper destinationColorTextureViewWrapper = new McTextureViewWrapper(); + private final BlazeTextureViewWrapper destinationColorTextureViewWrapper = new BlazeTextureViewWrapper(); /** * Can be set for special application shaders that need @@ -129,7 +125,7 @@ public class DhApplyRenderer GpuTexture destinationColorTexture) { this.createPipeline(); - this.vboGpuBuffer = PostProcessHelper.createAndUploadScreenVertexData(this.name); + this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData(this.name); this.sourceColorTextureViewWrapper.trySetup(sourceColorTexture); this.sourceDepthTextureViewWrapper.trySetup(sourceDepthTexture); @@ -145,7 +141,7 @@ public class DhApplyRenderer } VertexFormat vertexFormat = VertexFormat.builder() - .add("vPosition", DhVertexFormat.SCREEN_POS) + .add("vPosition", DhBlazeVertexFormat.SCREEN_POS) .build(); RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java index b53364e30..838e7a88b 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java @@ -29,10 +29,10 @@ 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.helpers.DhVertexFormat; -import com.seibel.distanthorizons.common.render.blaze.helpers.McTextureViewWrapper; -import com.seibel.distanthorizons.common.render.blaze.helpers.McTextureWrapper; -import com.seibel.distanthorizons.common.render.blaze.helpers.PostProcessHelper; +import com.seibel.distanthorizons.common.render.blaze.helpers.DhBlazeVertexFormat; +import com.seibel.distanthorizons.common.render.blaze.helpers.BlazeTextureViewWrapper; +import com.seibel.distanthorizons.common.render.blaze.helpers.BlazeTextureWrapper; +import com.seibel.distanthorizons.common.render.blaze.helpers.BlazePostProcessUtil; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import net.minecraft.resources.Identifier; @@ -82,7 +82,7 @@ public class McCopyRenderer this.vertexFormat = VertexFormat.builder() - .add("vPosition", DhVertexFormat.SCREEN_POS) + .add("vPosition", DhBlazeVertexFormat.SCREEN_POS) .build(); @@ -106,7 +106,7 @@ public class McCopyRenderer this.pipeline = pipelineBuilder.build(); - this.vboGpuBuffer = PostProcessHelper.createAndUploadScreenVertexData("McCopyRenderer"); + this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData("McCopyRenderer"); } @@ -120,16 +120,16 @@ public class McCopyRenderer //region public void render( - McTextureWrapper sourceColorTextureWrapper, - McTextureViewWrapper destinationColorTextureWrapper) + BlazeTextureWrapper sourceColorTextureWrapper, + BlazeTextureViewWrapper destinationColorTextureWrapper) { this.render( sourceColorTextureWrapper.textureView, sourceColorTextureWrapper.textureSampler, destinationColorTextureWrapper.textureView); } public void render( - McTextureWrapper sourceColorTextureWrapper, - McTextureWrapper destinationColorTextureWrapper) + BlazeTextureWrapper sourceColorTextureWrapper, + BlazeTextureWrapper destinationColorTextureWrapper) { this.render( sourceColorTextureWrapper.textureView, sourceColorTextureWrapper.textureSampler, diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McInstancedVboContainer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeGenericObjectVertexContainer.java similarity index 98% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McInstancedVboContainer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeGenericObjectVertexContainer.java index c479f632f..1c92bfbce 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McInstancedVboContainer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeGenericObjectVertexContainer.java @@ -28,7 +28,7 @@ import java.util.function.Supplier; * * @see RenderableBoxGroup */ -public class McInstancedVboContainer implements IGenericObjectVertexBufferContainer +public class BlazeGenericObjectVertexContainer implements IGenericObjectVertexBufferContainer { private static final DhLogger LOGGER = new DhLoggerBuilder().build(); @@ -290,7 +290,7 @@ public class McInstancedVboContainer implements IGenericObjectVertexBufferContai this.indexBuffer.flip(); - this.state = McInstancedVboContainer.EState.READY_TO_UPLOAD; + this.state = BlazeGenericObjectVertexContainer.EState.READY_TO_UPLOAD; } private int vertexBufferSize() diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/PostProcessHelper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazePostProcessUtil.java similarity index 97% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/PostProcessHelper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazePostProcessUtil.java index e30276f28..3e8554cc6 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/PostProcessHelper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazePostProcessUtil.java @@ -10,7 +10,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.function.Supplier; -public class PostProcessHelper +public class BlazePostProcessUtil { private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McTextureViewWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeTextureViewWrapper.java similarity index 97% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McTextureViewWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeTextureViewWrapper.java index 9686708ff..206025db6 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McTextureViewWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeTextureViewWrapper.java @@ -9,7 +9,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import java.util.OptionalDouble; -public class McTextureViewWrapper +public class BlazeTextureViewWrapper { public static final DhLogger LOGGER = new DhLoggerBuilder().build(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McTextureWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeTextureWrapper.java similarity index 89% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McTextureWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeTextureWrapper.java index bb508adee..7f1e2f42c 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McTextureWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeTextureWrapper.java @@ -12,7 +12,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRen import java.util.OptionalDouble; -public class McTextureWrapper +public class BlazeTextureWrapper { public static final DhLogger LOGGER = new DhLoggerBuilder().build(); @@ -31,10 +31,10 @@ public class McTextureWrapper - public static McTextureWrapper createDepth(String name) { return new McTextureWrapper(name, TextureFormat.DEPTH32); } - public static McTextureWrapper createColor(String name) { return new McTextureWrapper(name, TextureFormat.RGBA8); } + public static BlazeTextureWrapper createDepth(String name) { return new BlazeTextureWrapper(name, TextureFormat.DEPTH32); } + public static BlazeTextureWrapper createColor(String name) { return new BlazeTextureWrapper(name, TextureFormat.RGBA8); } - private McTextureWrapper(String name, TextureFormat textureFormat) + private BlazeTextureWrapper(String name, TextureFormat textureFormat) { this.name = name; this.textureFormat = textureFormat; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/DhVertexFormat.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/DhBlazeVertexFormat.java similarity index 98% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/DhVertexFormat.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/DhBlazeVertexFormat.java index 5cd213582..4582885d1 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/DhVertexFormat.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/DhBlazeVertexFormat.java @@ -6,7 +6,7 @@ import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodQuad /** * @see LodQuadBuilder */ -public class DhVertexFormat +public class DhBlazeVertexFormat { 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); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFarFadeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFarFadeRenderer.java index 1e61939e0..3e998ae19 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFarFadeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFarFadeRenderer.java @@ -74,8 +74,8 @@ public class McFarFadeRenderer implements IMcFarFadeRenderer private GpuBuffer vboGpuBuffer; - public final McTextureWrapper dhFadeColorTextureWrapper = McTextureWrapper.createColor("DhFadeColorTexture"); - public final McTextureViewWrapper mcColorTextureViewWrapper = new McTextureViewWrapper(); + public final BlazeTextureWrapper dhFadeColorTextureWrapper = BlazeTextureWrapper.createColor("DhFadeColorTexture"); + public final BlazeTextureViewWrapper mcColorTextureViewWrapper = new BlazeTextureViewWrapper(); @@ -87,7 +87,7 @@ public class McFarFadeRenderer implements IMcFarFadeRenderer private McFarFadeRenderer() { this.vertexFormat = VertexFormat.builder() - .add("vPosition", DhVertexFormat.SCREEN_POS) + .add("vPosition", DhBlazeVertexFormat.SCREEN_POS) .build(); } @@ -131,7 +131,7 @@ public class McFarFadeRenderer implements IMcFarFadeRenderer this.pipeline = pipelineBuilder.build(); - this.vboGpuBuffer = PostProcessHelper.createAndUploadScreenVertexData("McFadeRenderer"); + this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData("McFadeRenderer"); } //endregion diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java index 428bde0c7..09498675b 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java @@ -41,9 +41,9 @@ 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.helpers.DhVertexFormat; -import com.seibel.distanthorizons.common.render.blaze.helpers.McTextureWrapper; -import com.seibel.distanthorizons.common.render.blaze.helpers.PostProcessHelper; +import com.seibel.distanthorizons.common.render.blaze.helpers.DhBlazeVertexFormat; +import com.seibel.distanthorizons.common.render.blaze.helpers.BlazeTextureWrapper; +import com.seibel.distanthorizons.common.render.blaze.helpers.BlazePostProcessUtil; import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; @@ -88,7 +88,7 @@ public class McFogRenderer implements IMcFogRenderer private GpuBuffer vboGpuBuffer; - public McTextureWrapper fogColorTextureWrapper = McTextureWrapper.createColor("DhFogColorTexture"); + public BlazeTextureWrapper fogColorTextureWrapper = BlazeTextureWrapper.createColor("DhFogColorTexture"); @@ -100,7 +100,7 @@ public class McFogRenderer implements IMcFogRenderer private McFogRenderer() { this.vertexFormat = VertexFormat.builder() - .add("vPosition", DhVertexFormat.SCREEN_POS) + .add("vPosition", DhBlazeVertexFormat.SCREEN_POS) .build(); } @@ -149,7 +149,7 @@ public class McFogRenderer implements IMcFogRenderer this.pipeline = pipelineBuilder.build(); - this.vboGpuBuffer = PostProcessHelper.createAndUploadScreenVertexData("McFogRenderer"); + this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData("McFogRenderer"); } //endregion diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java index aed362df7..7db3f9c69 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java @@ -38,9 +38,9 @@ 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.helpers.DhVertexFormat; -import com.seibel.distanthorizons.common.render.blaze.helpers.McTextureWrapper; -import com.seibel.distanthorizons.common.render.blaze.helpers.PostProcessHelper; +import com.seibel.distanthorizons.common.render.blaze.helpers.DhBlazeVertexFormat; +import com.seibel.distanthorizons.common.render.blaze.helpers.BlazeTextureWrapper; +import com.seibel.distanthorizons.common.render.blaze.helpers.BlazePostProcessUtil; import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLogger; @@ -82,7 +82,7 @@ public class McSsaoRenderer implements IMcSsaoRenderer private GpuBuffer vboGpuBuffer; - public McTextureWrapper ssaoColorTextureWrapper = McTextureWrapper.createColor("DhSsaoTexture"); + public BlazeTextureWrapper ssaoColorTextureWrapper = BlazeTextureWrapper.createColor("DhSsaoTexture"); @@ -94,7 +94,7 @@ public class McSsaoRenderer implements IMcSsaoRenderer private McSsaoRenderer() { this.vertexFormat = VertexFormat.builder() - .add("vPosition", DhVertexFormat.SCREEN_POS) + .add("vPosition", DhBlazeVertexFormat.SCREEN_POS) .build(); } @@ -141,7 +141,7 @@ public class McSsaoRenderer implements IMcSsaoRenderer this.pipeline = pipelineBuilder.build(); - this.vboGpuBuffer = PostProcessHelper.createAndUploadScreenVertexData("McSsao"); + this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData("McSsao"); } //endregion diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java index 08aca0595..7f0b50659 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java @@ -74,10 +74,10 @@ public class McVanillaFadeRenderer implements IMcVanillaFadeRenderer private GpuBuffer vboGpuBuffer; - public final McTextureWrapper fadeColorTextureWrapper = McTextureWrapper.createColor("DhVanillaFadeTexture"); + public final BlazeTextureWrapper fadeColorTextureWrapper = BlazeTextureWrapper.createColor("DhVanillaFadeTexture"); - public final McTextureViewWrapper mcDepthTextureWrapper = new McTextureViewWrapper(); - public final McTextureViewWrapper mcColorTextureWrapper = new McTextureViewWrapper(); + public final BlazeTextureViewWrapper mcDepthTextureWrapper = new BlazeTextureViewWrapper(); + public final BlazeTextureViewWrapper mcColorTextureWrapper = new BlazeTextureViewWrapper(); @@ -89,7 +89,7 @@ public class McVanillaFadeRenderer implements IMcVanillaFadeRenderer private McVanillaFadeRenderer() { this.vertexFormat = VertexFormat.builder() - .add("vPosition", DhVertexFormat.SCREEN_POS) + .add("vPosition", DhBlazeVertexFormat.SCREEN_POS) .build(); } @@ -134,7 +134,7 @@ public class McVanillaFadeRenderer implements IMcVanillaFadeRenderer this.pipeline = pipelineBuilder.build(); - this.vboGpuBuffer = PostProcessHelper.createAndUploadScreenVertexData("McFadeRenderer"); + this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData("McFadeRenderer"); } //endregion diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/DhTestRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/DhTestRenderer.java index d15016f8d..3a4f0d7b3 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/DhTestRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/DhTestRenderer.java @@ -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.helpers.DhVertexFormat; +import com.seibel.distanthorizons.common.render.blaze.helpers.DhBlazeVertexFormat; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcTestRenderer; @@ -84,8 +84,8 @@ public class DhTestRenderer implements IMcTestRenderer VertexFormat vertexFormat = VertexFormat.builder() - .add("vPosition", DhVertexFormat.SCREEN_POS) - .add("vColor", DhVertexFormat.RGBA_FLOAT_COLOR) + .add("vPosition", DhBlazeVertexFormat.SCREEN_POS) + .add("vColor", DhBlazeVertexFormat.RGBA_FLOAT_COLOR) .build(); //int breakpointOne = 0; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java index cffbce4ec..c31afe887 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java @@ -19,7 +19,7 @@ package com.seibel.distanthorizons.common.wrappers; -import com.seibel.distanthorizons.common.render.blaze.McDebugObjectRenderer; +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.McFogRenderer; @@ -86,7 +86,7 @@ public class DependencySetup SingletonInjector.INSTANCE.bind(IMcSsaoRenderer.class, McSsaoRenderer.INSTANCE); SingletonInjector.INSTANCE.bind(IMcFogRenderer.class, McFogRenderer.INSTANCE); SingletonInjector.INSTANCE.bind(IMcFarFadeRenderer.class, McFarFadeRenderer.INSTANCE); - SingletonInjector.INSTANCE.bind(IMcDebugRenderer.class, McDebugObjectRenderer.INSTANCE); + SingletonInjector.INSTANCE.bind(IMcDebugRenderer.class, BlazeDebugWireframeRenderer.INSTANCE); } } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java index ca36bce37..2d45c86d4 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java @@ -26,7 +26,7 @@ import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper; import com.seibel.distanthorizons.api.interfaces.factories.IDhApiWrapperFactory; import com.seibel.distanthorizons.common.render.blaze.McGenericObjectRenderer; import com.seibel.distanthorizons.common.render.blaze.helpers.LodContainerUniformBufferWrapper; -import com.seibel.distanthorizons.common.render.blaze.helpers.McInstancedVboContainer; +import com.seibel.distanthorizons.common.render.blaze.helpers.BlazeGenericObjectVertexContainer; import com.seibel.distanthorizons.common.render.blaze.helpers.VertexBufferWrapper; import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper; import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper; @@ -37,7 +37,6 @@ import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGeneratio import com.seibel.distanthorizons.core.level.IDhLevel; import com.seibel.distanthorizons.core.level.IDhServerLevel; import com.seibel.distanthorizons.core.render.renderer.generic.IGenericObjectVertexBufferContainer; -import com.seibel.distanthorizons.core.render.renderer.generic.IGenericObjectVertexBufferContainer; import com.seibel.distanthorizons.core.util.LodUtil; import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; @@ -369,7 +368,7 @@ public class WrapperFactory implements IWrapperFactory public ILodContainerUniformBufferWrapper createLodContainerUniformWrapper() { return new LodContainerUniformBufferWrapper(); } @Override - public IGenericObjectVertexBufferContainer createInstancedVboContainer() { return new McInstancedVboContainer(); } + public IGenericObjectVertexBufferContainer createInstancedVboContainer() { return new BlazeGenericObjectVertexContainer(); } @Override public IMcGenericRenderer createGenericRenderer() { return new McGenericObjectRenderer(); } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java index bd6978e13..d9219c6ae 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java @@ -21,7 +21,7 @@ package com.seibel.distanthorizons.common.wrappers.misc; import com.mojang.blaze3d.platform.NativeImage; import com.mojang.blaze3d.textures.GpuTexture; -import com.seibel.distanthorizons.common.render.blaze.helpers.McTextureViewWrapper; +import com.seibel.distanthorizons.common.render.blaze.helpers.BlazeTextureViewWrapper; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper; @@ -42,7 +42,7 @@ public class LightMapWrapper implements ILightMapWrapper private int textureId = 0; private GpuTexture gpuTexture = null; - private final McTextureViewWrapper lightmapTextureWrapper = new McTextureViewWrapper(); + private final BlazeTextureViewWrapper lightmapTextureWrapper = new BlazeTextureViewWrapper(); @@ -119,7 +119,7 @@ public class LightMapWrapper implements ILightMapWrapper //==============// //region - public McTextureViewWrapper getTextureViewWrapper() { return this.lightmapTextureWrapper; } + public BlazeTextureViewWrapper getTextureViewWrapper() { return this.lightmapTextureWrapper; } @Override public void bind()