diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java index 1e600a29a..048b266fe 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java @@ -46,6 +46,7 @@ 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.EDhRenderApi; +import com.seibel.distanthorizons.core.render.EDhRenderDepth; import com.seibel.distanthorizons.core.util.RenderUtil; import com.seibel.distanthorizons.core.util.math.Mat4f; import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition; @@ -245,13 +246,13 @@ public class BlazeDhApplyRenderer { int uniformBufferSize = new Std140SizeCalculator() - .putInt() // uIsVulkan + .putInt() // uIsReverseZDepth .get(); ByteBuffer buffer = ByteBuffer.allocateDirect(uniformBufferSize); buffer.order(ByteOrder.nativeOrder()); buffer = Std140Builder.intoBuffer(buffer) - .putInt((RENDER_API_DEF.getRenderApi() == EDhRenderApi.VULKAN) ? 1 : 0) // uIsVulkan + .putInt((RENDER_API_DEF.getRenderDepth() == EDhRenderDepth.REVERSE_Z) ? 1 : 0) // uIsReverseZDepth .get() ; 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 2b2b1c655..3c9abc51c 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 @@ -45,6 +45,7 @@ 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.EDhRenderApi; +import com.seibel.distanthorizons.core.render.EDhRenderDepth; import com.seibel.distanthorizons.core.render.RenderParams; import com.seibel.distanthorizons.core.util.RenderUtil; import com.seibel.distanthorizons.core.util.math.Mat4f; @@ -165,7 +166,7 @@ public class BlazeDhFarFadeRenderer implements IDhFarFadeRenderer .putFloat() // uStartFadeBlockDistance .putFloat() // uEndFadeBlockDistance .putMat4f() // uDhInvMvmProj - .putInt() // uIsVulkan + .putInt() // uIsReverseZDepth .get(); @@ -193,7 +194,7 @@ public class BlazeDhFarFadeRenderer implements IDhFarFadeRenderer .putFloat(fadeStartDistance) // uStartFadeBlockDistance .putFloat(fadeEndDistance) // uEndFadeBlockDistance .putMat4f(inverseDhMvmProjMatrix.createJomlMatrix()) // uDhInvMvmProj - .putInt((RENDER_API_DEF.getRenderApi() == EDhRenderApi.VULKAN) ? 1 : 0) // uIsVulkan + .putInt((RENDER_API_DEF.getRenderDepth() == EDhRenderDepth.REVERSE_Z) ? 1 : 0) // uIsReverseZDepth .get() ; 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 ee2b24fa1..cd6b8fc44 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 @@ -38,6 +38,7 @@ 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.EDhRenderApi; +import com.seibel.distanthorizons.core.render.EDhRenderDepth; import com.seibel.distanthorizons.core.render.RenderParams; import com.seibel.distanthorizons.core.util.LodUtil; import com.seibel.distanthorizons.core.util.math.Mat4f; @@ -221,7 +222,7 @@ public class BlazeDhFogRenderer implements IDhFogRenderer .putMat4f() // uInvMvmProj - .putInt() // uIsVulkan + .putInt() // uIsReverseZDepth .get(); @@ -317,7 +318,7 @@ public class BlazeDhFogRenderer implements IDhFogRenderer .putMat4f(inverseMvmProjMatrix.createJomlMatrix()) // uInvMvmProj - .putInt((RENDER_API_DEF.getRenderApi() == EDhRenderApi.VULKAN) ? 1 : 0) // uIsVulkan + .putInt((RENDER_API_DEF.getRenderDepth() == EDhRenderDepth.REVERSE_Z) ? 1 : 0) // uIsReverseZDepth .get() ; 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 10fbf7616..f57cda94c 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 @@ -34,6 +34,7 @@ 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.EDhRenderApi; +import com.seibel.distanthorizons.core.render.EDhRenderDepth; import com.seibel.distanthorizons.core.render.RenderParams; import com.seibel.distanthorizons.core.util.RenderUtil; import com.seibel.distanthorizons.core.util.math.Mat4f; @@ -192,7 +193,7 @@ public class BlazeDhSsaoRenderer implements IDhSsaoRenderer .putMat4f() // uInvProj .putMat4f() // uProj - .putInt() // uIsVulkan + .putInt() // uIsReverseZDepth .get(); @@ -219,7 +220,7 @@ public class BlazeDhSsaoRenderer implements IDhSsaoRenderer .putMat4f(invertedProjMatrix.createJomlMatrix()) .putMat4f(projMatrix.createJomlMatrix()) - .putInt((RENDER_API_DEF.getRenderApi() == EDhRenderApi.VULKAN) ? 1 : 0) // uIsVulkan + .putInt((RENDER_API_DEF.getRenderDepth() == EDhRenderDepth.REVERSE_Z) ? 1 : 0) // uIsReverseZDepth .get() ; 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 4c294b90f..884e45432 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 @@ -49,6 +49,7 @@ 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.EDhRenderApi; +import com.seibel.distanthorizons.core.render.EDhRenderDepth; import com.seibel.distanthorizons.core.render.RenderParams; import com.seibel.distanthorizons.core.util.RenderUtil; import com.seibel.distanthorizons.core.util.math.Mat4f; @@ -180,7 +181,7 @@ public class BlazeVanillaFadeRenderer implements IDhVanillaFadeRenderer .putFloat() // uMaxLevelHeight .putMat4f() // uDhInvMvmProj .putMat4f() // uMcInvMvmProj - .putInt() // uIsVulkan + .putInt() // uIsReverseZDepth .get(); @@ -221,7 +222,7 @@ public class BlazeVanillaFadeRenderer implements IDhVanillaFadeRenderer .putFloat(renderParams.clientLevelWrapper.getMaxHeight()) // uMaxLevelHeight .putMat4f(inverseDhMvmProjMatrix.createJomlMatrix()) // uDhInvMvmProj .putMat4f(inverseMcMvmProjMatrix.createJomlMatrix()) // uMcInvMvmProj - .putInt((RENDER_API_DEF.getRenderApi() == EDhRenderApi.VULKAN) ? 1 : 0) // uIsVulkan + .putInt((RENDER_API_DEF.getRenderDepth() == EDhRenderDepth.REVERSE_Z) ? 1 : 0) // uIsReverseZDepth .get() ; diff --git a/coreSubProjects b/coreSubProjects index f67d9e4e0..2f9504b16 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit f67d9e4e04d43ca2b768aee4183f56d28e7cccb7 +Subproject commit 2f9504b16768283cb9c1bb261a6409d3e19d71ef