diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java index 5215d6558..ea99296f2 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java @@ -33,12 +33,10 @@ import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.VertexFormat; import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler; -import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil; import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import com.seibel.distanthorizons.core.render.RenderParams; import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer; import com.seibel.distanthorizons.core.util.math.Mat4f; import com.seibel.distanthorizons.core.util.math.Vec3d; @@ -49,7 +47,6 @@ import org.lwjgl.system.MemoryUtil; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import java.util.Collection; import java.util.OptionalDouble; import java.util.OptionalInt; @@ -227,8 +224,8 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer { this.init(); - if (McLodRenderer.INSTANCE.dhColorTextureWrapper.isEmpty() - || McLodRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty()) + if (BlazeDhTerrainRenderer.INSTANCE.dhColorTextureWrapper.isEmpty() + || BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty()) { return; } @@ -298,9 +295,9 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer try (RenderPass renderPass = commandEncoder.createRenderPass( this::getRenderPassName, - McLodRenderer.INSTANCE.dhColorTextureWrapper.textureView, + BlazeDhTerrainRenderer.INSTANCE.dhColorTextureWrapper.textureView, /*optionalClearColorAsInt*/ OptionalInt.empty(), - McLodRenderer.INSTANCE.dhDepthTextureWrapper.textureView, + BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.textureView, /*optionalDepthValueAsDouble*/ OptionalDouble.empty())) { // Bind instance data // diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java index a4575e5df..0fc61b3e5 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java @@ -53,14 +53,14 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.logging.f3.F3Screen; import com.seibel.distanthorizons.core.render.RenderParams; import com.seibel.distanthorizons.common.render.nativeGl.generic.GenericRenderObjectFactory; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IGenericObjectVertexBufferContainer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IDhGenericObjectVertexBufferContainer; import com.seibel.distanthorizons.common.render.nativeGl.generic.RenderableBoxGroup; import com.seibel.distanthorizons.core.util.LodUtil; import com.seibel.distanthorizons.core.util.math.Mat4f; import com.seibel.distanthorizons.core.util.math.Vec3d; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcGenericRenderer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhGenericRenderer; import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector; import com.seibel.distanthorizons.coreapi.ModInfo; import net.minecraft.resources.Identifier; @@ -80,7 +80,7 @@ import java.util.concurrent.ConcurrentHashMap; * @see IDhApiCustomRenderRegister * @see DhApiRenderableBox */ -public class BlazeDhGenericObjectRenderer implements IMcGenericRenderer +public class BlazeDhGenericObjectRenderer implements IDhGenericRenderer { private static final DhLogger LOGGER = new DhLoggerBuilder().build(); @@ -346,8 +346,8 @@ public class BlazeDhGenericObjectRenderer implements IMcGenericRenderer //#endregion - if (McLodRenderer.INSTANCE.dhColorTextureWrapper.isEmpty() - || McLodRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty()) + if (BlazeDhTerrainRenderer.INSTANCE.dhColorTextureWrapper.isEmpty() + || BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty()) { return; } @@ -397,7 +397,7 @@ public class BlazeDhGenericObjectRenderer implements IMcGenericRenderer boxGroup.tryUpdateInstancedDataAsync(); // skip groups that haven't been uploaded yet - if (boxGroup.vertexBufferContainer.getState() != IGenericObjectVertexBufferContainer.EState.RENDER) + if (boxGroup.vertexBufferContainer.getState() != IDhGenericObjectVertexBufferContainer.EState.RENDER) { continue; } @@ -497,9 +497,9 @@ public class BlazeDhGenericObjectRenderer implements IMcGenericRenderer try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass( this::getRenderPassName, - McLodRenderer.INSTANCE.dhColorTextureWrapper.textureView, + BlazeDhTerrainRenderer.INSTANCE.dhColorTextureWrapper.textureView, /*optionalClearColorAsInt*/ OptionalInt.empty(), - McLodRenderer.INSTANCE.dhDepthTextureWrapper.textureView, + BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.textureView, /*optionalDepthValueAsDouble*/ OptionalDouble.empty())) { this.renderBoxGroupInstanced(renderPass, renderEventParam, boxGroup, camPos, profiler); 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/BlazeDhTerrainRenderer.java similarity index 97% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java index 0330a1c38..c32b5122c 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/BlazeDhTerrainRenderer.java @@ -40,8 +40,8 @@ import com.seibel.distanthorizons.core.util.math.Mat4f; import com.seibel.distanthorizons.core.util.objects.SortedArraySet; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcLodRenderer; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IVertexBufferWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhTerrainRenderer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IVertexBufferWrapper; import net.minecraft.client.Minecraft; import net.minecraft.resources.Identifier; import org.lwjgl.opengl.GL32; @@ -52,19 +52,15 @@ import java.nio.ByteOrder; import java.util.OptionalDouble; import java.util.OptionalInt; -/** - * Renders a TODO - */ -public class McLodRenderer implements IMcLodRenderer +/** Renders rendering DH's LOD terrain. */ +public class BlazeDhTerrainRenderer implements IDhTerrainRenderer { public static final DhLogger LOGGER = new DhLoggerBuilder().build(); - private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class); - private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice(); private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder(); - public static final McLodRenderer INSTANCE = new McLodRenderer(); + public static final BlazeDhTerrainRenderer INSTANCE = new BlazeDhTerrainRenderer(); private BlazeDhApplyRenderer applyRenderer; @@ -89,7 +85,7 @@ public class McLodRenderer implements IMcLodRenderer //=============// //region - private McLodRenderer() + private BlazeDhTerrainRenderer() { this.vertexFormat = VertexFormat.builder() .add("vPosition", DhBlazeVertexFormatUtil.SHORT_XYZ_POS) @@ -307,6 +303,9 @@ public class McLodRenderer implements IMcLodRenderer this.dhDepthTextureWrapper.tryCreateOrResize(); this.dhColorTextureWrapper.tryCreateOrResize(); + + + // render pass setup { profiler.popPush("setup"); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeGenericObjectVertexContainer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeGenericObjectVertexContainer.java index 190c44f37..0620eab58 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeGenericObjectVertexContainer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/BlazeGenericObjectVertexContainer.java @@ -9,9 +9,8 @@ import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBox; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.common.render.nativeGl.glObject.GLEnums; -import com.seibel.distanthorizons.common.render.nativeGl.glObject.GLProxy; import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IGenericObjectVertexBufferContainer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IDhGenericObjectVertexBufferContainer; import com.seibel.distanthorizons.common.render.nativeGl.generic.RenderableBoxGroup; import com.seibel.distanthorizons.core.util.ColorUtil; import org.lwjgl.opengl.GL32; @@ -25,7 +24,7 @@ import java.util.List; * * @see RenderableBoxGroup */ -public class BlazeGenericObjectVertexContainer implements IGenericObjectVertexBufferContainer +public class BlazeGenericObjectVertexContainer implements IDhGenericObjectVertexBufferContainer { private static final DhLogger LOGGER = new DhLoggerBuilder().build(); @@ -69,9 +68,9 @@ public class BlazeGenericObjectVertexContainer implements IGenericObjectVertexBu private EState state = EState.NEW; @Override - public IGenericObjectVertexBufferContainer.EState getState() { return this.state; } + public IDhGenericObjectVertexBufferContainer.EState getState() { return this.state; } @Override - public void setState(IGenericObjectVertexBufferContainer.EState state) { this.state = state; } + public void setState(IDhGenericObjectVertexBufferContainer.EState state) { this.state = state; } 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 fef5c1da6..678c772cc 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 @@ -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.McLodRenderer; +import com.seibel.distanthorizons.common.render.blaze.BlazeDhTerrainRenderer; 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; @@ -43,7 +43,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.render.RenderParams; import com.seibel.distanthorizons.core.util.RenderUtil; import com.seibel.distanthorizons.core.util.math.Mat4f; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcFarFadeRenderer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhFarFadeRenderer; import net.minecraft.client.Minecraft; import net.minecraft.resources.Identifier; @@ -55,7 +55,7 @@ import java.util.OptionalInt; /** * Fades out DH's far clip plane */ -public class BlazeDhFarFadeRenderer implements IMcFarFadeRenderer +public class BlazeDhFarFadeRenderer implements IDhFarFadeRenderer { public static final DhLogger LOGGER = new DhLoggerBuilder().build(); @@ -136,8 +136,8 @@ public class BlazeDhFarFadeRenderer implements IMcFarFadeRenderer this.tryInit(); - if (McLodRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty() - || McLodRenderer.INSTANCE.dhColorTextureWrapper.isEmpty()) + if (BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty() + || BlazeDhTerrainRenderer.INSTANCE.dhColorTextureWrapper.isEmpty()) { return; } @@ -191,7 +191,7 @@ public class BlazeDhFarFadeRenderer implements IMcFarFadeRenderer this.renderFadeToTexture(); - BlazeDhCopyRenderer.INSTANCE.render(this.dhFadeColorTextureWrapper, McLodRenderer.INSTANCE.dhColorTextureWrapper); + BlazeDhCopyRenderer.INSTANCE.render(this.dhFadeColorTextureWrapper, BlazeDhTerrainRenderer.INSTANCE.dhColorTextureWrapper); } @@ -208,8 +208,8 @@ public class BlazeDhFarFadeRenderer implements IMcFarFadeRenderer renderPass.bindTexture("uMcColorTexture", this.mcColorTextureViewWrapper.textureView, this.mcColorTextureViewWrapper.textureSampler); // DH textures - renderPass.bindTexture("uDhDepthTexture", McLodRenderer.INSTANCE.dhDepthTextureWrapper.textureView, McLodRenderer.INSTANCE.dhDepthTextureWrapper.textureSampler); - renderPass.bindTexture("uDhColorTexture", McLodRenderer.INSTANCE.dhColorTextureWrapper.textureView, McLodRenderer.INSTANCE.dhColorTextureWrapper.textureSampler); + renderPass.bindTexture("uDhDepthTexture", BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.textureView, BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.textureSampler); + renderPass.bindTexture("uDhColorTexture", BlazeDhTerrainRenderer.INSTANCE.dhColorTextureWrapper.textureView, BlazeDhTerrainRenderer.INSTANCE.dhColorTextureWrapper.textureSampler); renderPass.setUniform("fragUniformBlock", this.fragUniformBuffer); 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 76514442d..8dab2b0dd 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 @@ -39,7 +39,7 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiFogColorMode; 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.BlazeDhTerrainRenderer; 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; @@ -52,7 +52,7 @@ import com.seibel.distanthorizons.core.util.LodUtil; import com.seibel.distanthorizons.core.util.math.Mat4f; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcFogRenderer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhFogRenderer; import net.minecraft.resources.Identifier; import java.awt.*; @@ -64,7 +64,7 @@ import java.util.OptionalInt; /** * Renders fog onto the LODs. */ -public class BlazeDhFogRenderer implements IMcFogRenderer +public class BlazeDhFogRenderer implements IDhFogRenderer { public static final DhLogger LOGGER = new DhLoggerBuilder().build(); @@ -154,8 +154,8 @@ public class BlazeDhFogRenderer implements IMcFogRenderer this.tryInit(); - if (McLodRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty() - || McLodRenderer.INSTANCE.dhColorTextureWrapper.isEmpty()) + if (BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty() + || BlazeDhTerrainRenderer.INSTANCE.dhColorTextureWrapper.isEmpty()) { return; } @@ -308,7 +308,7 @@ public class BlazeDhFogRenderer implements IMcFogRenderer this.renderFogToTexture(); - this.applyRenderer.render(this.fogColorTextureWrapper.texture, McLodRenderer.INSTANCE.dhDepthTextureWrapper.texture, McLodRenderer.INSTANCE.dhColorTextureWrapper.texture); + this.applyRenderer.render(this.fogColorTextureWrapper.texture, BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.texture, BlazeDhTerrainRenderer.INSTANCE.dhColorTextureWrapper.texture); } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhSsaoRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhSsaoRenderer.java index b10678a9c..16cd9569a 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhSsaoRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhSsaoRenderer.java @@ -36,7 +36,7 @@ import com.mojang.blaze3d.systems.RenderPass; 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.BlazeDhTerrainRenderer; 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; @@ -47,7 +47,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.util.RenderUtil; import com.seibel.distanthorizons.core.util.math.Mat4f; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcSsaoRenderer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhSsaoRenderer; import net.minecraft.resources.Identifier; import java.nio.ByteBuffer; @@ -56,7 +56,7 @@ import java.util.OptionalDouble; import java.util.OptionalInt; /** Renders SSAO to the DH LODs. */ -public class BlazeDhSsaoRenderer implements IMcSsaoRenderer +public class BlazeDhSsaoRenderer implements IDhSsaoRenderer { public static final DhLogger LOGGER = new DhLoggerBuilder().build(); @@ -145,8 +145,8 @@ public class BlazeDhSsaoRenderer implements IMcSsaoRenderer this.tryInit(); - if (McLodRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty() - || McLodRenderer.INSTANCE.dhColorTextureWrapper.isEmpty()) + if (BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty() + || BlazeDhTerrainRenderer.INSTANCE.dhColorTextureWrapper.isEmpty()) { return; } @@ -244,7 +244,7 @@ public class BlazeDhSsaoRenderer implements IMcSsaoRenderer this.renderSsaoToTexture(); this.applyRenderer.setUniform("applyFragUniformBlock", this.applyFragUniformBuffer); - this.applyRenderer.render(this.ssaoColorTextureWrapper.texture, McLodRenderer.INSTANCE.dhDepthTextureWrapper.texture, McLodRenderer.INSTANCE.dhColorTextureWrapper.texture); + this.applyRenderer.render(this.ssaoColorTextureWrapper.texture, BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.texture, BlazeDhTerrainRenderer.INSTANCE.dhColorTextureWrapper.texture); } @@ -257,7 +257,7 @@ public class BlazeDhSsaoRenderer implements IMcSsaoRenderer /*depthTexture*/ null, /*optionalDepthValueAsDouble*/ OptionalDouble.empty())) { - renderPass.bindTexture("uDhDepthTexture", McLodRenderer.INSTANCE.dhDepthTextureWrapper.textureView, McLodRenderer.INSTANCE.dhDepthTextureWrapper.textureSampler); + renderPass.bindTexture("uDhDepthTexture", BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.textureView, BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.textureSampler); renderPass.setUniform("fragUniformBlock", this.fragUniformBuffer); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeVanillaFadeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeVanillaFadeRenderer.java index 235147a24..cddb258a4 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeVanillaFadeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeVanillaFadeRenderer.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.McLodRenderer; +import com.seibel.distanthorizons.common.render.blaze.BlazeDhTerrainRenderer; 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; @@ -45,7 +45,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.util.RenderUtil; import com.seibel.distanthorizons.core.util.math.Mat4f; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcVanillaFadeRenderer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhVanillaFadeRenderer; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; import net.minecraft.client.Minecraft; import net.minecraft.resources.Identifier; @@ -59,7 +59,7 @@ import java.util.OptionalInt; * Fades the vanilla chunks * into DH's LODs. */ -public class BlazeVanillaFadeRenderer implements IMcVanillaFadeRenderer +public class BlazeVanillaFadeRenderer implements IDhVanillaFadeRenderer { public static final DhLogger LOGGER = new DhLoggerBuilder().build(); @@ -144,8 +144,8 @@ public class BlazeVanillaFadeRenderer implements IMcVanillaFadeRenderer { this.tryInit(); - if (McLodRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty() - || McLodRenderer.INSTANCE.dhColorTextureWrapper.isEmpty()) + if (BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty() + || BlazeDhTerrainRenderer.INSTANCE.dhColorTextureWrapper.isEmpty()) { return; } @@ -236,8 +236,8 @@ public class BlazeVanillaFadeRenderer implements IMcVanillaFadeRenderer renderPass.bindTexture("uMcDepthTexture", this.mcDepthTextureWrapper.textureView, this.mcDepthTextureWrapper.textureSampler); renderPass.bindTexture("uCombinedMcDhColorTexture", this.mcColorTextureWrapper.textureView, this.mcColorTextureWrapper.textureSampler); - renderPass.bindTexture("uDhDepthTexture", McLodRenderer.INSTANCE.dhDepthTextureWrapper.textureView, McLodRenderer.INSTANCE.dhDepthTextureWrapper.textureSampler); - renderPass.bindTexture("uDhColorTexture", McLodRenderer.INSTANCE.dhColorTextureWrapper.textureView, McLodRenderer.INSTANCE.dhColorTextureWrapper.textureSampler); + renderPass.bindTexture("uDhDepthTexture", BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.textureView, BlazeDhTerrainRenderer.INSTANCE.dhDepthTextureWrapper.textureSampler); + renderPass.bindTexture("uDhColorTexture", BlazeDhTerrainRenderer.INSTANCE.dhColorTextureWrapper.textureView, BlazeDhTerrainRenderer.INSTANCE.dhColorTextureWrapper.textureSampler); renderPass.setUniform("fragUniformBlock", this.fragUniformBuffer); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/BlazeDhTestRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/BlazeDhTestRenderer.java index a86d21719..e25f4e33e 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/BlazeDhTestRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/BlazeDhTestRenderer.java @@ -33,7 +33,7 @@ import com.mojang.blaze3d.vertex.VertexFormat; import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcTestRenderer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhTestTriangleRenderer; import net.minecraft.client.Minecraft; import net.minecraft.resources.Identifier; @@ -47,7 +47,7 @@ import java.util.OptionalInt; * to the center of the screen to confirm DH's * apply shader is running correctly */ -public class BlazeDhTestRenderer implements IMcTestRenderer +public class BlazeDhTestRenderer implements IDhTestTriangleRenderer { public static final DhLogger LOGGER = new DhLoggerBuilder().build(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/BlazeVertexBufferWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/BlazeVertexBufferWrapper.java index 862d9bc6f..aaf792df3 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/BlazeVertexBufferWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/BlazeVertexBufferWrapper.java @@ -5,7 +5,7 @@ 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.core.wrapperInterfaces.render.IVertexBufferWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IVertexBufferWrapper; import java.nio.ByteBuffer; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeLodUniformBufferWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeLodUniformBufferWrapper.java index 91578c52b..826f928c8 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeLodUniformBufferWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeLodUniformBufferWrapper.java @@ -4,7 +4,7 @@ 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.util.math.Vec3f; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.ILodContainerUniformBufferWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.ILodContainerUniformBufferWrapper; import java.nio.ByteBuffer; 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 fabb3a8ae..d0c448584 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 @@ -7,7 +7,7 @@ import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderSystem; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IUniformBufferWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IUniformBufferWrapper; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/LodRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/LodRenderer.java index a04372174..2e1784bba 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/LodRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/LodRenderer.java @@ -31,7 +31,6 @@ import com.seibel.distanthorizons.common.render.nativeGl.postProcessing.apply.Dh import com.seibel.distanthorizons.common.render.nativeGl.postProcessing.fade.DhFadeRenderer; import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftGLWrapper; import com.seibel.distanthorizons.core.config.Config; -import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBufferContainer; import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodQuadBuilder; import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; @@ -51,8 +50,8 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrap import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor; import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IIrisAccessor; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcGenericRenderer; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcTestRenderer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhGenericRenderer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhTestTriangleRenderer; import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector; import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector; import com.seibel.distanthorizons.core.util.math.Vec3f; @@ -160,7 +159,7 @@ public class LodRenderer } RenderBufferHandler renderBufferHandler = renderParams.renderBufferHandler; - IMcGenericRenderer genericRenderer = renderParams.genericRenderer; + IDhGenericRenderer genericRenderer = renderParams.genericRenderer; ILightMapWrapper lightmap = renderParams.lightmap; @@ -703,7 +702,7 @@ public class LodRenderer { // basic quad rendering - IMcTestRenderer testRenderer = SingletonInjector.INSTANCE.get(IMcTestRenderer.class); + IDhTestTriangleRenderer testRenderer = SingletonInjector.INSTANCE.get(IDhTestTriangleRenderer.class); testRenderer.render(); //TestRenderer.INSTANCE.render(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/generic/NativeGlGenericObjectVertexContainer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/generic/NativeGlGenericObjectVertexContainer.java index 87ec6eb80..6d232f05c 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/generic/NativeGlGenericObjectVertexContainer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/generic/NativeGlGenericObjectVertexContainer.java @@ -2,12 +2,10 @@ package com.seibel.distanthorizons.common.render.nativeGl.generic; import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBox; import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftGLWrapper; -import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.util.LodUtil; -import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IGenericObjectVertexBufferContainer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IDhGenericObjectVertexBufferContainer; import org.lwjgl.opengl.GL32; import java.awt.*; @@ -18,7 +16,7 @@ import java.util.List; * * @see RenderableBoxGroup */ -public class NativeGlGenericObjectVertexContainer implements IGenericObjectVertexBufferContainer +public class NativeGlGenericObjectVertexContainer implements IDhGenericObjectVertexBufferContainer { private static final DhLogger LOGGER = new DhLoggerBuilder().build(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/generic/GenericObjectRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/generic/OpenGlGenericObjectRenderer.java similarity index 98% rename from common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/generic/GenericObjectRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/generic/OpenGlGenericObjectRenderer.java index 4a449ee95..86c6d7660 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/generic/GenericObjectRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/generic/OpenGlGenericObjectRenderer.java @@ -45,7 +45,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRen import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper; import com.seibel.distanthorizons.core.util.math.Vec3d; import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcGenericRenderer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhGenericRenderer; import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector; import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector; import com.seibel.distanthorizons.coreapi.ModInfo; @@ -65,12 +65,11 @@ import java.util.concurrent.ConcurrentHashMap; * @see IDhApiCustomRenderRegister * @see DhApiRenderableBox */ -public class GenericObjectRenderer implements IMcGenericRenderer +public class OpenGlGenericObjectRenderer implements IDhGenericRenderer { private static final DhLogger LOGGER = new DhLoggerBuilder().build(); private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class); - private static final ISodiumAccessor SODIUM = ModAccessorInjector.INSTANCE.get(ISodiumAccessor.class); private static final MinecraftGLWrapper GLMC = MinecraftGLWrapper.INSTANCE; private static final DhApiRenderableBoxGroupShading DEFAULT_SHADING = DhApiRenderableBoxGroupShading.getUnshaded(); @@ -173,7 +172,7 @@ public class GenericObjectRenderer implements IMcGenericRenderer //=============// //region - public GenericObjectRenderer() { } + public OpenGlGenericObjectRenderer() { } public void init() { diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/generic/RenderableBoxGroup.java b/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/generic/RenderableBoxGroup.java index 2e354598e..83882fb36 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/generic/RenderableBoxGroup.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/generic/RenderableBoxGroup.java @@ -14,7 +14,7 @@ import com.seibel.distanthorizons.core.util.threading.PriorityTaskPicker; import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil; import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IGenericObjectVertexBufferContainer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IDhGenericObjectVertexBufferContainer; import org.jetbrains.annotations.Nullable; import java.io.Closeable; @@ -67,9 +67,9 @@ public class RenderableBoxGroup public Consumer afterRenderFunc; // instance data - public IGenericObjectVertexBufferContainer vertexBufferContainer = WRAPPER_FACTORY.createInstancedVboContainer(); + public IDhGenericObjectVertexBufferContainer vertexBufferContainer = WRAPPER_FACTORY.createInstancedVboContainer(); /** double buffering for thread safety and to prevent locking the render thread during update */ - private IGenericObjectVertexBufferContainer altVertexBufferContainer = WRAPPER_FACTORY.createInstancedVboContainer(); + private IDhGenericObjectVertexBufferContainer altVertexBufferContainer = WRAPPER_FACTORY.createInstancedVboContainer(); @@ -200,7 +200,7 @@ public class RenderableBoxGroup this.altVertexBufferContainer.uploadDataToGpu(); // swap VBO references for rendering - IGenericObjectVertexBufferContainer temp = this.vertexBufferContainer; + IDhGenericObjectVertexBufferContainer temp = this.vertexBufferContainer; this.vertexBufferContainer = this.altVertexBufferContainer; this.altVertexBufferContainer = temp; 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 ec598c669..639da81ab 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 @@ -21,7 +21,7 @@ package com.seibel.distanthorizons.common.wrappers; import com.seibel.distanthorizons.api.interfaces.render.IDhApiCustomRenderObjectFactory; import com.seibel.distanthorizons.common.render.blaze.BlazeDebugWireframeRenderer; -import com.seibel.distanthorizons.common.render.blaze.McLodRenderer; +import com.seibel.distanthorizons.common.render.blaze.BlazeDhTerrainRenderer; 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.BlazeDhSsaoRenderer; @@ -44,7 +44,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.*; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.*; /** * Binds all necessary dependencies, so we @@ -83,12 +83,12 @@ public class DependencySetup public static void createRenderBindings() { - 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, BlazeDhSsaoRenderer.INSTANCE); - SingletonInjector.INSTANCE.bind(IMcFogRenderer.class, BlazeDhFogRenderer.INSTANCE); - SingletonInjector.INSTANCE.bind(IMcFarFadeRenderer.class, BlazeDhFarFadeRenderer.INSTANCE); + SingletonInjector.INSTANCE.bind(IDhTestTriangleRenderer.class, BlazeDhTestRenderer.INSTANCE); + SingletonInjector.INSTANCE.bind(IDhVanillaFadeRenderer.class, BlazeVanillaFadeRenderer.INSTANCE); + SingletonInjector.INSTANCE.bind(IDhTerrainRenderer.class, BlazeDhTerrainRenderer.INSTANCE); + SingletonInjector.INSTANCE.bind(IDhSsaoRenderer.class, BlazeDhSsaoRenderer.INSTANCE); + SingletonInjector.INSTANCE.bind(IDhFogRenderer.class, BlazeDhFogRenderer.INSTANCE); + SingletonInjector.INSTANCE.bind(IDhFarFadeRenderer.class, BlazeDhFarFadeRenderer.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 038617ac3..3f5facabb 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 @@ -36,14 +36,14 @@ import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper; import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; import com.seibel.distanthorizons.core.level.IDhLevel; import com.seibel.distanthorizons.core.level.IDhServerLevel; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IGenericObjectVertexBufferContainer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IDhGenericObjectVertexBufferContainer; import com.seibel.distanthorizons.core.util.LodUtil; import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.ILodContainerUniformBufferWrapper; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcGenericRenderer; -import com.seibel.distanthorizons.core.wrapperInterfaces.render.IVertexBufferWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.ILodContainerUniformBufferWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhGenericRenderer; +import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IVertexBufferWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration.IBatchGeneratorEnvironmentWrapper; @@ -225,10 +225,10 @@ public class WrapperFactory implements IWrapperFactory public ILodContainerUniformBufferWrapper createLodContainerUniformWrapper() { return new BlazeLodUniformBufferWrapper(); } @Override - public IGenericObjectVertexBufferContainer createInstancedVboContainer() { return new BlazeGenericObjectVertexContainer(); } + public IDhGenericObjectVertexBufferContainer createInstancedVboContainer() { return new BlazeGenericObjectVertexContainer(); } @Override - public IMcGenericRenderer createGenericRenderer() { return new BlazeDhGenericObjectRenderer(); } + public IDhGenericRenderer createGenericRenderer() { return new BlazeDhGenericObjectRenderer(); } //endregion diff --git a/coreSubProjects b/coreSubProjects index 2ea3d645e..1dd244e88 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 2ea3d645e81f955de253a5a290c53fc5987c1d8e +Subproject commit 1dd244e889498ac84fb227a49b2c026e1de5b90e