From 385d6919fbf115966d03bf30e8198789b91e90fa Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 9 Mar 2026 12:09:10 -0500 Subject: [PATCH] texture method renaming --- .../common/render/blaze/McLodRenderer.java | 4 ++-- .../render/blaze/apply/DhApplyRenderer.java | 6 ++--- .../postProcessing/McFarFadeRenderer.java | 4 ++-- .../blaze/postProcessing/McFogRenderer.java | 2 +- .../blaze/postProcessing/McSsaoRenderer.java | 2 +- .../postProcessing/McVanillaFadeRenderer.java | 6 ++--- .../wrappers/BlazeTextureViewWrapper.java | 11 ++++++++-- .../blaze/wrappers/BlazeTextureWrapper.java | 22 ++++++++++++++----- .../common/wrappers/misc/LightMapWrapper.java | 2 +- 9 files changed, 39 insertions(+), 20 deletions(-) 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 0955c5f1e..f676b786e 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 @@ -300,8 +300,8 @@ public class McLodRenderer implements IMcLodRenderer } // textures - this.dhDepthTextureWrapper.trySetup(); - this.dhColorTextureWrapper.trySetup(); + this.dhDepthTextureWrapper.tryCreateOrResize(); + this.dhColorTextureWrapper.tryCreateOrResize(); { profiler.popPush("setup"); 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 0350b81bb..a63e48858 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 @@ -132,10 +132,10 @@ public class DhApplyRenderer this.createPipeline(); this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData(this.name); - this.sourceColorTextureViewWrapper.trySetup(sourceColorTexture); - this.sourceDepthTextureViewWrapper.trySetup(sourceDepthTexture); + this.sourceColorTextureViewWrapper.tryWrap(sourceColorTexture); + this.sourceDepthTextureViewWrapper.tryWrap(sourceDepthTexture); - this.destinationColorTextureViewWrapper.trySetup(destinationColorTexture); + this.destinationColorTextureViewWrapper.tryWrap(destinationColorTexture); } private void createPipeline() 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 7e8780c65..edab46e75 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 @@ -157,8 +157,8 @@ public class McFarFadeRenderer implements IMcFarFadeRenderer // textures - this.dhFadeColorTextureWrapper.trySetup(); - this.mcColorTextureViewWrapper.trySetup(Minecraft.getInstance().getMainRenderTarget().getColorTexture()); + this.dhFadeColorTextureWrapper.tryCreateOrResize(); + this.mcColorTextureViewWrapper.tryWrap(Minecraft.getInstance().getMainRenderTarget().getColorTexture()); { int uniformBufferSize = new Std140SizeCalculator() 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 e32bbd2f7..e1380b62a 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 @@ -170,7 +170,7 @@ public class McFogRenderer implements IMcFogRenderer - this.fogColorTextureWrapper.trySetup(); + this.fogColorTextureWrapper.tryCreateOrResize(); { 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 f68a96c02..031ff1450 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 @@ -163,7 +163,7 @@ public class McSsaoRenderer implements IMcSsaoRenderer // textures - this.ssaoColorTextureWrapper.trySetup(); + this.ssaoColorTextureWrapper.tryCreateOrResize(); // frag uniforms { 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 0ceca3a01..40fd2bb9f 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 @@ -158,10 +158,10 @@ public class McVanillaFadeRenderer implements IMcVanillaFadeRenderer // textures - this.fadeColorTextureWrapper.trySetup(); + this.fadeColorTextureWrapper.tryCreateOrResize(); - this.mcDepthTextureWrapper.trySetup(Minecraft.getInstance().getMainRenderTarget().getDepthTexture()); - this.mcColorTextureWrapper.trySetup(Minecraft.getInstance().getMainRenderTarget().getColorTexture()); + this.mcDepthTextureWrapper.tryWrap(Minecraft.getInstance().getMainRenderTarget().getDepthTexture()); + this.mcColorTextureWrapper.tryWrap(Minecraft.getInstance().getMainRenderTarget().getColorTexture()); { diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureViewWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureViewWrapper.java index 6538bfc12..eccf93226 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureViewWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureViewWrapper.java @@ -17,13 +17,18 @@ public class BlazeTextureViewWrapper private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder(); - public GpuTextureView textureView = null; public GpuSampler textureSampler = null; - public void trySetup(GpuTexture texture) + //=======// + // setup // + //=======// + //region + + /** does nothing if the texture is already wrapped */ + public void tryWrap(GpuTexture texture) { this.tryRecreateTextureView(texture); this.tryCreateSampler(); @@ -54,6 +59,8 @@ public class BlazeTextureViewWrapper } } + //endregion + } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureWrapper.java index 079701a2c..fcc5be7fb 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureWrapper.java @@ -34,9 +34,10 @@ public class BlazeTextureWrapper private int height = -1; - //=============// - // constructor // - //=============// + + //==============// + // constructors // + //==============// //region public static BlazeTextureWrapper createDepth(String name) { return new BlazeTextureWrapper(name, TextureFormat.DEPTH32); } @@ -73,7 +74,8 @@ public class BlazeTextureWrapper //=======// //region - public void trySetup() + /** does nothing if the texture is already created and the correct size */ + public void tryCreateOrResize() { this.tryCreateTexture(); this.tryCreateSampler(); @@ -126,8 +128,15 @@ public class BlazeTextureWrapper + //==========// + // clearing // + //==========// + //region - /** @see ColorUtil#argbToInt */ + /** + * Will throw an exception if not a color texture. + * @see ColorUtil#argbToInt + */ public void clearColor(int clearArgbColor) { if (this.texture != null) @@ -136,6 +145,7 @@ public class BlazeTextureWrapper } } + /** Will throw an exception if not a depth texture. */ public void clearDepth(float depth) { if (this.texture != null) @@ -144,6 +154,8 @@ public class BlazeTextureWrapper } } + //endregion + } 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 266d06c1a..440f5b7aa 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 @@ -107,7 +107,7 @@ public class LightMapWrapper implements ILightMapWrapper public void setLightmapGpuTexture(GpuTexture gpuTexture) { this.gpuTexture = gpuTexture; - this.lightmapTextureWrapper.trySetup(this.gpuTexture); + this.lightmapTextureWrapper.tryWrap(this.gpuTexture); } //endregion