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/BlazeDhGenericObjectRenderer.java similarity index 99% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java index 9d303b8f1..ce1db4375 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/BlazeDhGenericObjectRenderer.java @@ -80,7 +80,7 @@ import java.util.concurrent.ConcurrentHashMap; * @see IDhApiCustomRenderRegister * @see DhApiRenderableBox */ -public class McGenericObjectRenderer implements IMcGenericRenderer +public class BlazeDhGenericObjectRenderer implements IMcGenericRenderer { private static final DhLogger LOGGER = new DhLoggerBuilder().build(); @@ -117,7 +117,7 @@ public class McGenericObjectRenderer implements IMcGenericRenderer //=============// //region - public McGenericObjectRenderer() { } + public BlazeDhGenericObjectRenderer() { } public void init() { 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 eedda4dd5..129a6dd43 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 @@ -16,13 +16,13 @@ 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.apply.DhApplyRenderer; +import com.seibel.distanthorizons.common.render.blaze.apply.BlazeDhApplyRenderer; import com.seibel.distanthorizons.common.render.blaze.helpers.*; import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil; import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper; import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper; -import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.LodUniformBufferWrapper; -import com.seibel.distanthorizons.common.render.blaze.wrappers.buffer.VertexBufferWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.BlazeLodUniformBufferWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.buffer.BlazeVertexBufferWrapper; import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBufferContainer; @@ -66,7 +66,7 @@ public class McLodRenderer implements IMcLodRenderer public static final McLodRenderer INSTANCE = new McLodRenderer(); - private DhApplyRenderer applyRenderer; + private BlazeDhApplyRenderer applyRenderer; private VertexFormat vertexFormat; private RenderPipeline opaquePipeline; @@ -110,7 +110,7 @@ public class McLodRenderer implements IMcLodRenderer this.init = true; // todo only set when succeeded (in case of exception) - this.applyRenderer = new DhApplyRenderer( + this.applyRenderer = new BlazeDhApplyRenderer( "dh_apply_to_mc", null, "apply/blaze/vert", "apply/blaze/frag" @@ -341,7 +341,7 @@ public class McLodRenderer implements IMcLodRenderer profiler.popPush("binding"); LodBufferContainer bufferContainer = bufferContainers.get(lodIndex); - LodUniformBufferWrapper uniformWrapper = (LodUniformBufferWrapper)bufferContainer.uniformContainer; + BlazeLodUniformBufferWrapper uniformWrapper = (BlazeLodUniformBufferWrapper)bufferContainer.uniformContainer; boolean columnBuilderDebugEnabled = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugEnable.get(); if (columnBuilderDebugEnabled) @@ -368,7 +368,7 @@ public class McLodRenderer implements IMcLodRenderer IVertexBufferWrapper[] bufferWrapperList = opaquePass ? bufferContainer.vbos : bufferContainer.vbosTransparent; for (int i = 0; i < bufferWrapperList.length; i++) { - VertexBufferWrapper bufferWrapper = (VertexBufferWrapper) bufferWrapperList[i]; + BlazeVertexBufferWrapper bufferWrapper = (BlazeVertexBufferWrapper) bufferWrapperList[i]; if (!bufferWrapper.uploaded || bufferWrapper.vertexCount == 0) { 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/BlazeDhApplyRenderer.java similarity index 98% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/DhApplyRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java index 2f5478c71..2539c2cf1 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/BlazeDhApplyRenderer.java @@ -50,9 +50,9 @@ import java.util.OptionalInt; * Often used to apply post processing effects or * the DH texture to MC's color texture.

* - * @see McCopyRenderer + * @see BlazeDhCopyRenderer */ -public class DhApplyRenderer +public class BlazeDhApplyRenderer { public static final DhLogger LOGGER = new DhLoggerBuilder().build(); @@ -93,7 +93,7 @@ public class DhApplyRenderer // constructor // //=============// //region - public DhApplyRenderer( + public BlazeDhApplyRenderer( String name, @Nullable BlendFunction blendFunction, String vertexShaderPath, String fragmentShaderPath @@ -106,7 +106,7 @@ public class DhApplyRenderer new String[0] // no extra uniforms ); } - public DhApplyRenderer( + public BlazeDhApplyRenderer( String name, @Nullable BlendFunction blendFunction, String vertexShaderPath, String fragmentShaderPath, 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/BlazeDhCopyRenderer.java similarity index 95% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhCopyRenderer.java index c8585d3dc..429e8ac21 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/BlazeDhCopyRenderer.java @@ -29,7 +29,6 @@ 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.DhBlazeVertexFormatUtil; import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper; import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper; import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil; @@ -43,16 +42,16 @@ import java.util.OptionalInt; /** * Blindly copies one texture into another. * - * @see DhApplyRenderer + * @see BlazeDhApplyRenderer */ -public class McCopyRenderer +public class BlazeDhCopyRenderer { public static final DhLogger LOGGER = new DhLoggerBuilder().build(); private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice(); private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder(); - public static final McCopyRenderer INSTANCE = new McCopyRenderer(); + public static final BlazeDhCopyRenderer INSTANCE = new BlazeDhCopyRenderer(); private RenderPipeline pipeline; private boolean init = false; @@ -66,7 +65,7 @@ public class McCopyRenderer //=============// //region - private McCopyRenderer() { } + private BlazeDhCopyRenderer() { } private void tryInit() { diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java index 536893254..b1b949ca9 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java @@ -33,10 +33,9 @@ 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.McLodRenderer; -import com.seibel.distanthorizons.common.render.blaze.apply.McCopyRenderer; +import com.seibel.distanthorizons.common.render.blaze.apply.BlazeDhCopyRenderer; 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.DhBlazeVertexFormatUtil; import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper; import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper; import com.seibel.distanthorizons.core.logging.DhLogger; @@ -192,7 +191,7 @@ public class BlazeDhFarFadeRenderer implements IMcFarFadeRenderer this.renderFadeToTexture(); - McCopyRenderer.INSTANCE.render(this.dhFadeColorTextureWrapper, McLodRenderer.INSTANCE.dhColorTextureWrapper); + BlazeDhCopyRenderer.INSTANCE.render(this.dhFadeColorTextureWrapper, McLodRenderer.INSTANCE.dhColorTextureWrapper); } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java index 148cefde5..76514442d 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java @@ -40,8 +40,7 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogDirection; 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.DhBlazeVertexFormatUtil; +import com.seibel.distanthorizons.common.render.blaze.apply.BlazeDhApplyRenderer; import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper; import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil; import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler; @@ -78,7 +77,7 @@ public class BlazeDhFogRenderer implements IMcFogRenderer public static final BlazeDhFogRenderer INSTANCE = new BlazeDhFogRenderer(); - private DhApplyRenderer applyRenderer; + private BlazeDhApplyRenderer applyRenderer; private RenderPipeline pipeline; private boolean init = false; @@ -109,7 +108,7 @@ public class BlazeDhFogRenderer implements IMcFogRenderer - this.applyRenderer = new DhApplyRenderer( + this.applyRenderer = new BlazeDhApplyRenderer( "fog_apply_to_dh", new BlendFunction(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ONE_MINUS_SRC_ALPHA), "apply/blaze/vert", "apply/blaze/frag" 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/BlazeDhSsaoRenderer.java similarity index 95% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhSsaoRenderer.java index b13d71935..b10678a9c 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/BlazeDhSsaoRenderer.java @@ -37,8 +37,7 @@ import com.mojang.blaze3d.systems.RenderSystem; 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.DhBlazeVertexFormatUtil; +import com.seibel.distanthorizons.common.render.blaze.apply.BlazeDhApplyRenderer; import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper; import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil; import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler; @@ -56,10 +55,8 @@ import java.nio.ByteOrder; import java.util.OptionalDouble; import java.util.OptionalInt; -/** - * Renders a TODO - */ -public class McSsaoRenderer implements IMcSsaoRenderer +/** Renders SSAO to the DH LODs. */ +public class BlazeDhSsaoRenderer implements IMcSsaoRenderer { public static final DhLogger LOGGER = new DhLoggerBuilder().build(); @@ -68,10 +65,10 @@ public class McSsaoRenderer implements IMcSsaoRenderer private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice(); private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder(); - public static final McSsaoRenderer INSTANCE = new McSsaoRenderer(); + public static final BlazeDhSsaoRenderer INSTANCE = new BlazeDhSsaoRenderer(); - private DhApplyRenderer applyRenderer; + private BlazeDhApplyRenderer applyRenderer; private RenderPipeline pipeline; private boolean init = false; @@ -90,7 +87,7 @@ public class McSsaoRenderer implements IMcSsaoRenderer //=============// //region - private McSsaoRenderer() { } + private BlazeDhSsaoRenderer() { } private void tryInit() { @@ -101,7 +98,7 @@ public class McSsaoRenderer implements IMcSsaoRenderer this.init = true; - this.applyRenderer = new DhApplyRenderer( + this.applyRenderer = new BlazeDhApplyRenderer( "ssao_apply_to_dh", new BlendFunction(SourceFactor.ZERO, DestFactor.SRC_ALPHA, SourceFactor.ZERO, DestFactor.ONE), "apply/blaze/vert", "ssao/blaze/apply", diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazePostProcessUtil.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazePostProcessUtil.java deleted file mode 100644 index 574354191..000000000 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazePostProcessUtil.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.seibel.distanthorizons.common.render.blaze.postProcessing; - -import com.mojang.blaze3d.buffers.GpuBuffer; -import com.mojang.blaze3d.buffers.GpuBufferSlice; -import com.mojang.blaze3d.systems.CommandEncoder; -import com.mojang.blaze3d.systems.GpuDevice; -import com.mojang.blaze3d.systems.RenderSystem; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.util.function.Supplier; - -/** - * Contains code that's used by all post-processing effects. - */ -public class BlazePostProcessUtil -{ - - private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice(); - private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder(); - - // vertices for a full-screen quad - private static final float[] VERTICES = new float[] - { - // PosX,Y, - -1f, -1f, - 1f, -1f, - 1f, 1f, - -1f, 1f, - }; - - - public static GpuBuffer createAndUploadScreenVertexData(String name) - { - Supplier labelSupplier = () -> "distantHorizons:"+name; - - int usage = GpuBuffer.USAGE_COPY_DST - | GpuBuffer.USAGE_VERTEX; - int size = VERTICES.length * Float.BYTES; - GpuBuffer vboGpuBuffer = GPU_DEVICE.createBuffer(labelSupplier, usage, size); - - { - int length = VERTICES.length * Float.BYTES; - GpuBufferSlice bufferSlice = new GpuBufferSlice(vboGpuBuffer, /*offset*/ 0, length); - - ByteBuffer byteBuffer = ByteBuffer.allocateDirect(VERTICES.length * Float.BYTES); - // Fill buffer with vertices. - byteBuffer.order(ByteOrder.nativeOrder()); - byteBuffer.asFloatBuffer().put(VERTICES); - byteBuffer.rewind(); - - COMMAND_ENCODER.writeToBuffer(bufferSlice, byteBuffer); - } - - return vboGpuBuffer; - } - - - -} 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/BlazeVanillaFadeRenderer.java similarity index 95% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeVanillaFadeRenderer.java index 0e13bc59c..235147a24 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/BlazeVanillaFadeRenderer.java @@ -33,10 +33,9 @@ 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.McLodRenderer; -import com.seibel.distanthorizons.common.render.blaze.apply.McCopyRenderer; +import com.seibel.distanthorizons.common.render.blaze.apply.BlazeDhCopyRenderer; 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.DhBlazeVertexFormatUtil; import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper; import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper; import com.seibel.distanthorizons.core.config.Config; @@ -57,9 +56,10 @@ import java.util.OptionalDouble; import java.util.OptionalInt; /** - * Renders a TODO + * Fades the vanilla chunks + * into DH's LODs. */ -public class McVanillaFadeRenderer implements IMcVanillaFadeRenderer +public class BlazeVanillaFadeRenderer implements IMcVanillaFadeRenderer { public static final DhLogger LOGGER = new DhLoggerBuilder().build(); @@ -68,7 +68,7 @@ public class McVanillaFadeRenderer implements IMcVanillaFadeRenderer private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice(); private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder(); - public static final McVanillaFadeRenderer INSTANCE = new McVanillaFadeRenderer(); + public static final BlazeVanillaFadeRenderer INSTANCE = new BlazeVanillaFadeRenderer(); private RenderPipeline pipeline; private boolean init = false; @@ -89,7 +89,7 @@ public class McVanillaFadeRenderer implements IMcVanillaFadeRenderer //=============// //region - private McVanillaFadeRenderer() { } + private BlazeVanillaFadeRenderer() { } private void tryInit() { @@ -220,7 +220,7 @@ public class McVanillaFadeRenderer implements IMcVanillaFadeRenderer this.renderFadeToTexture(); - McCopyRenderer.INSTANCE.render(this.fadeColorTextureWrapper, this.mcColorTextureWrapper); + BlazeDhCopyRenderer.INSTANCE.render(this.fadeColorTextureWrapper, this.mcColorTextureWrapper); } 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/BlazeDhTestRenderer.java similarity index 96% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/DhTestRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/BlazeDhTestRenderer.java index 21dc44b89..a86d21719 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/BlazeDhTestRenderer.java @@ -47,14 +47,14 @@ import java.util.OptionalInt; * to the center of the screen to confirm DH's * apply shader is running correctly */ -public class DhTestRenderer implements IMcTestRenderer +public class BlazeDhTestRenderer implements IMcTestRenderer { public static final DhLogger LOGGER = new DhLoggerBuilder().build(); private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice(); private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder(); - public static final DhTestRenderer INSTANCE = new DhTestRenderer(); + public static final BlazeDhTestRenderer INSTANCE = new BlazeDhTestRenderer(); private RenderPipeline pipeline; private boolean init = false; @@ -70,7 +70,7 @@ public class DhTestRenderer implements IMcTestRenderer //=============// //region - private DhTestRenderer() { } + private BlazeDhTestRenderer() { } private void tryInit() { diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/VertexBufferWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/BlazeVertexBufferWrapper.java similarity index 92% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/VertexBufferWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/BlazeVertexBufferWrapper.java index c4c0f5c76..862d9bc6f 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/VertexBufferWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/BlazeVertexBufferWrapper.java @@ -9,7 +9,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.render.IVertexBufferWra import java.nio.ByteBuffer; -public class VertexBufferWrapper implements IVertexBufferWrapper +public class BlazeVertexBufferWrapper implements IVertexBufferWrapper { private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice(); private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder(); @@ -30,7 +30,7 @@ public class VertexBufferWrapper implements IVertexBufferWrapper //=============// //region - public VertexBufferWrapper(String name) { this.name = name; } + public BlazeVertexBufferWrapper(String name) { this.name = name; } //endregion diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/LodUniformBufferWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeLodUniformBufferWrapper.java similarity index 77% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/LodUniformBufferWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeLodUniformBufferWrapper.java index ea7017619..91578c52b 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/LodUniformBufferWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeLodUniformBufferWrapper.java @@ -3,18 +3,12 @@ package com.seibel.distanthorizons.common.render.blaze.wrappers.uniform; import com.mojang.blaze3d.buffers.Std140Builder; import com.mojang.blaze3d.buffers.Std140SizeCalculator; import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBufferContainer; -import com.seibel.distanthorizons.core.render.renderer.RenderParams; -import com.seibel.distanthorizons.core.util.math.Mat4f; -import com.seibel.distanthorizons.core.util.math.Vec3d; import com.seibel.distanthorizons.core.util.math.Vec3f; import com.seibel.distanthorizons.core.wrapperInterfaces.render.ILodContainerUniformBufferWrapper; import java.nio.ByteBuffer; -/** - * TODO ?? - */ -public class LodUniformBufferWrapper extends UniformBufferWrapper implements ILodContainerUniformBufferWrapper +public class BlazeLodUniformBufferWrapper extends UniformBufferWrapper implements ILodContainerUniformBufferWrapper { private boolean uploaded = false; @@ -26,7 +20,7 @@ public class LodUniformBufferWrapper extends UniformBufferWrapper implements ILo //=============// //region - public LodUniformBufferWrapper() { super(LodUniformBufferWrapper.class.getName()); } + public BlazeLodUniformBufferWrapper() { super(BlazeLodUniformBufferWrapper.class.getName()); } //endregion diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/UniformBufferWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/UniformBufferWrapper.java index 37b6388c1..fabb3a8ae 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/UniformBufferWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/UniformBufferWrapper.java @@ -5,7 +5,6 @@ import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderSystem; -import com.seibel.distanthorizons.common.render.blaze.wrappers.buffer.VertexBufferWrapper; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.wrapperInterfaces.render.IUniformBufferWrapper; 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 ae74fa0e9..b0afbc502 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 @@ -23,9 +23,9 @@ import com.seibel.distanthorizons.common.render.blaze.BlazeDebugWireframeRendere import com.seibel.distanthorizons.common.render.blaze.McLodRenderer; import com.seibel.distanthorizons.common.render.blaze.postProcessing.BlazeDhFarFadeRenderer; import com.seibel.distanthorizons.common.render.blaze.postProcessing.BlazeDhFogRenderer; -import com.seibel.distanthorizons.common.render.blaze.postProcessing.McSsaoRenderer; -import com.seibel.distanthorizons.common.render.blaze.postProcessing.McVanillaFadeRenderer; -import com.seibel.distanthorizons.common.render.blaze.test.DhTestRenderer; +import com.seibel.distanthorizons.common.render.blaze.postProcessing.BlazeDhSsaoRenderer; +import com.seibel.distanthorizons.common.render.blaze.postProcessing.BlazeVanillaFadeRenderer; +import com.seibel.distanthorizons.common.render.blaze.test.BlazeDhTestRenderer; import com.seibel.distanthorizons.common.wrappers.gui.ClassicConfigGUI; import com.seibel.distanthorizons.common.wrappers.gui.LangWrapper; import com.seibel.distanthorizons.common.wrappers.level.KeyedClientLevelManager; @@ -80,10 +80,10 @@ public class DependencySetup public static void createRenderBindings() { - SingletonInjector.INSTANCE.bind(IMcTestRenderer.class, DhTestRenderer.INSTANCE); - SingletonInjector.INSTANCE.bind(IMcVanillaFadeRenderer.class, McVanillaFadeRenderer.INSTANCE); + SingletonInjector.INSTANCE.bind(IMcTestRenderer.class, BlazeDhTestRenderer.INSTANCE); + SingletonInjector.INSTANCE.bind(IMcVanillaFadeRenderer.class, BlazeVanillaFadeRenderer.INSTANCE); SingletonInjector.INSTANCE.bind(IMcLodRenderer.class, McLodRenderer.INSTANCE); - SingletonInjector.INSTANCE.bind(IMcSsaoRenderer.class, McSsaoRenderer.INSTANCE); + SingletonInjector.INSTANCE.bind(IMcSsaoRenderer.class, BlazeDhSsaoRenderer.INSTANCE); SingletonInjector.INSTANCE.bind(IMcFogRenderer.class, BlazeDhFogRenderer.INSTANCE); SingletonInjector.INSTANCE.bind(IMcFarFadeRenderer.class, BlazeDhFarFadeRenderer.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 8471bedf6..add474398 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 @@ -24,10 +24,10 @@ import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper; import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; 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.BlazeDhGenericObjectRenderer; import com.seibel.distanthorizons.common.render.blaze.helpers.BlazeGenericObjectVertexContainer; -import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.LodUniformBufferWrapper; -import com.seibel.distanthorizons.common.render.blaze.wrappers.buffer.VertexBufferWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.BlazeLodUniformBufferWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.buffer.BlazeVertexBufferWrapper; import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper; import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper; import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; @@ -220,15 +220,15 @@ public class WrapperFactory implements IWrapperFactory @Override - public IVertexBufferWrapper createVboWrapper(String name) { return new VertexBufferWrapper(name); } + public IVertexBufferWrapper createVboWrapper(String name) { return new BlazeVertexBufferWrapper(name); } @Override - public ILodContainerUniformBufferWrapper createLodContainerUniformWrapper() { return new LodUniformBufferWrapper(); } + public ILodContainerUniformBufferWrapper createLodContainerUniformWrapper() { return new BlazeLodUniformBufferWrapper(); } @Override public IGenericObjectVertexBufferContainer createInstancedVboContainer() { return new BlazeGenericObjectVertexContainer(); } @Override - public IMcGenericRenderer createGenericRenderer() { return new McGenericObjectRenderer(); } + public IMcGenericRenderer createGenericRenderer() { return new BlazeDhGenericObjectRenderer(); } //endregion