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

Rename texture wrappers

Browse Source
This commit is contained in:
James Seibel
2026-03-09 11:28:52 -05:00
parent 3c680b5daf
commit c86c32b39e
18 changed files with 81 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McDebugObjectRenderer.java → common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java
+5 -5
View File
@@ -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();
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java
+8 -9
View File
@@ -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);
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java
+10 -10
View File
@@ -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
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/DhApplyRenderer.java
+8 -12
View File
@@ -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();
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java
+10 -10
View File
@@ -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,
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McInstancedVboContainer.java → common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeGenericObjectVertexContainer.java
+2 -2
View File
@@ -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()
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/PostProcessHelper.java → common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazePostProcessUtil.java
+1 -1
View File
@@ -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();
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McTextureViewWrapper.java → common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeTextureViewWrapper.java
+1 -1
View File
@@ -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();
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McTextureWrapper.java → common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeTextureWrapper.java
+4 -4
View File
@@ -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;
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/DhVertexFormat.java → common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/DhBlazeVertexFormat.java
+1 -1
View File
@@ -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);
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFarFadeRenderer.java
+4 -4
View File
@@ -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
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java
+6 -6
View File
@@ -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
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java
+6 -6
View File
@@ -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
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java
+5 -5
View File
@@ -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
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.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;
common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java
+2 -2
View File
@@ -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);
}
}
common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java
+2 -3
View File
@@ -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(); }
common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java
+3 -3
View File
@@ -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()