fix shader frustum uniform

RogoShum · Apr 24, 2024 · ad13539 · ad13539
1 parent 747f671
commit ad13539
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/src/main/java/rogo/renderingculling/api/CullingHandler.java b/src/main/java/rogo/renderingculling/api/CullingHandler.java
@@ -17,7 +17,6 @@
 import net.minecraft.client.renderer.ShaderInstance;
 import net.minecraft.client.renderer.culling.Frustum;
 import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
@@ -35,7 +34,6 @@
 import rogo.renderingculling.api.impl.IEntitiesForRender;
 import rogo.renderingculling.api.impl.IRenderChunkInfo;
 import rogo.renderingculling.api.impl.IRenderSectionVisibility;
-import rogo.renderingculling.gui.ConfigScreen;
 import rogo.renderingculling.mixin.AccessorLevelRender;
 import rogo.renderingculling.mixin.AccessorMinecraft;
 import rogo.renderingculling.util.DepthContext;
@@ -52,7 +50,6 @@
 import static org.lwjgl.opengl.GL30.*;
 
 public class CullingHandler {
-    public static boolean SHADER_ENABLED = false;
     public static final String MOD_ID = "brute_force_rendering_culling";
     public static final Logger LOGGER = LogUtils.getLogger();
     public static EntityCullingMap ENTITY_CULLING_MAP = null;

diff --git a/src/main/java/rogo/renderingculling/api/CullingRenderEvent.java b/src/main/java/rogo/renderingculling/api/CullingRenderEvent.java
@@ -282,7 +282,7 @@ public static void setUniform(ShaderInstance shader) {
             shaderInstance.getCullingProjMat().set(CullingHandler.PROJECTION_MATRIX);
         }
         if(shaderInstance.getCullingFrustum() != null) {
-            Vector4f[] frustumData = ((AccessorFrustum.AccessorFrustumIntersection)((AccessorFrustum)CullingHandler.FRUSTUM).frustumIntersection()).planes();
+            Vector4f[] frustumData = ModLoader.getFrustumPlanes(((AccessorFrustum) CullingHandler.FRUSTUM).frustumIntersection());
             List<Float> data = new ArrayList<>();
             for (Vector4f frustumDatum : frustumData) {
                 data.add(frustumDatum.x());

diff --git a/src/main/java/rogo/renderingculling/api/ModLoader.java b/src/main/java/rogo/renderingculling/api/ModLoader.java
@@ -9,19 +9,19 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ShaderInstance;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.Level;
+import org.joml.FrustumIntersection;
+import org.joml.Vector4f;
 import rogo.renderingculling.event.WorldUnloadEvent;
 import rogo.renderingculling.gui.ConfigScreen;
+import rogo.renderingculling.mixin.AccessorFrustum;
 import rogo.renderingculling.util.OcclusionCullerThread;
-import rogo.renderingculling.util.ShaderLoader;
 
 import java.io.IOException;
 import java.util.function.Supplier;
 
 import static java.lang.Thread.MAX_PRIORITY;
 import static rogo.renderingculling.api.CullingHandler.*;
-import static rogo.renderingculling.api.CullingHandler.fromID;
 
 public class ModLoader implements ModInitializer {
 
@@ -35,6 +35,8 @@ public class ModLoader implements ModInitializer {
             ((0xFF) << 8) |
             ((0xFF));
 
+    public static boolean SHADER_ENABLED = false;
+
     @Override
     public void onInitialize() {
         callWhenOn(EnvType.CLIENT, () -> () -> {
@@ -118,4 +120,8 @@ public static int getBG() {
     public static int getB() {
         return B;
     }
+
+    public static Vector4f[] getFrustumPlanes(FrustumIntersection frustum) {
+        return ((AccessorFrustum.AccessorFrustumIntersection) ((AccessorFrustum) frustum).frustumIntersection()).planes();
+    }
 }
diff --git a/src/main/java/rogo/renderingculling/mixin/MixinShaderInstance.java b/src/main/java/rogo/renderingculling/mixin/MixinShaderInstance.java
@@ -16,6 +16,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import rogo.renderingculling.api.CullingHandler;
 import rogo.renderingculling.api.CullingRenderEvent;
+import rogo.renderingculling.api.ModLoader;
 import rogo.renderingculling.api.impl.ICullingShader;
 
 
@@ -79,20 +80,9 @@ public void construct(CallbackInfo ci) {
         this.CULLING_PROJ_MAT = this.getUniform("CullingProjMat");
     }
 
-    @ModifyArg(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/resources/ResourceLocation;<init>(Ljava/lang/String;)V"))
-    public String onInit(String string) {
-        if (CullingHandler.SHADER_ENABLED) {
-            string = string.replace(SHADER_CORE_PATH, "");
-            string = string.replace(".json", "");
-            ResourceLocation rl = ResourceLocation.tryParse(string);
-            string = rl.getNamespace() + ":" + SHADER_CORE_PATH + rl.getPath() + ".json";
-        }
-        return string;
-    }
-
     @ModifyArg(method = "getOrCreate", at = @At(value = "INVOKE", target = "Lnet/minecraft/resources/ResourceLocation;<init>(Ljava/lang/String;)V"))
     private static String onGetOrCreate(String string) {
-        if (CullingHandler.SHADER_ENABLED) {
+        if (ModLoader.SHADER_ENABLED) {
             string = string.replace(SHADER_CORE_PATH, "");
             Program.Type type = Program.Type.FRAGMENT;
             if (string.contains(".fsh"))
@@ -107,6 +97,17 @@ else if (string.contains(".vsh")) {
         return string;
     }
 
+    @ModifyArg(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/resources/ResourceLocation;<init>(Ljava/lang/String;)V"))
+    public String onInit(String string) {
+        if (ModLoader.SHADER_ENABLED) {
+            string = string.replace(SHADER_CORE_PATH, "");
+            string = string.replace(".json", "");
+            ResourceLocation rl = ResourceLocation.tryParse(string);
+            string = rl.getNamespace() + ":" + SHADER_CORE_PATH + rl.getPath() + ".json";
+        }
+        return string;
+    }
+
     @Override
     public Uniform getCullingFrustum() {
         return CULLING_FRUSTUM;