fix dumb stupid shit again

Aeroluna · Nov 8, 2024 · 4d836d8 · 4d836d8
1 parent d0a4b1f
commit 4d836d8
Show file tree

Hide file tree

Showing 4 changed files with 220 additions and 216 deletions.
diff --git a/Vivify/HarmonyPatches/AddComponentsToCamera.cs b/Vivify/HarmonyPatches/AddComponentsToCamera.cs
@@ -32,6 +32,14 @@ private void AddComponents(MainEffectController __instance)
         SafeAddComponent<CameraPropertyController>(gameObject);
     }
 
+    [AffinityPrefix]
+    [AffinityPatch(typeof(ImageEffectController), nameof(ImageEffectController.OnRenderImage))]
+    private bool StopRenderImage(RenderTexture src, RenderTexture dest)
+    {
+        Graphics.Blit(src, dest);
+        return false;
+    }
+
     private void SafeAddComponent<T>(GameObject gameObject)
         where T : Component
     {

diff --git a/Vivify/HarmonyPatches/CameraEffectApplier.cs b/Vivify/HarmonyPatches/CameraEffectApplier.cs
@@ -70,66 +70,24 @@ private void Reset()
 
     [AffinityPrefix]
     [AffinityPatch(typeof(MainEffectController), nameof(MainEffectController.ImageEffectControllerCallback))]
-    private bool ApplyVivifyEffect(MainEffectController __instance, RenderTexture src, RenderTexture dest)
+    private void ApplyVivifyEffect(MainEffectController __instance, RenderTexture src, RenderTexture dest)
     {
-        if (!_postProcessingControllers.TryGetValue(__instance, out PostProcessingController? postProcessingController))
+        if (_postProcessingControllers.TryGetValue(__instance, out PostProcessingController? postProcessingController))
         {
-            postProcessingController = __instance.GetComponent<PostProcessingController?>();
-            if (postProcessingController == null)
-            {
-                return true;
-            }
-
-            _postProcessingControllers[__instance] = postProcessingController;
-            postProcessingController.CameraDatas = CameraDatas;
-            postProcessingController.DeclaredTextureDatas = DeclaredTextureDatas;
-            postProcessingController.PrewarmCameras(_prewarmCount);
+            return;
         }
 
-        RenderTextureDescriptor descriptor = src.descriptor;
-        postProcessingController.CreateDeclaredTextures(descriptor);
-        RenderTexture main = src;
-        if (PreEffects.Count > 0)
+        postProcessingController = __instance.GetComponent<PostProcessingController?>();
+        if (postProcessingController == null)
         {
-            main = postProcessingController.RenderImage(main, PreEffects);
+            return;
         }
 
-        MainEffectSO mainEffect = __instance._mainEffectContainer.mainEffect;
-
-        if (PostEffects.Count > 0)
-        {
-            RenderTexture temp = RenderTexture.GetTemporary(descriptor);
-            mainEffect.Render(main, temp, __instance._fadeValue);
-            if (main != src)
-            {
-                RenderTexture.ReleaseTemporary(main);
-            }
-
-            if (postProcessingController.MainEffect)
-            {
-                main = postProcessingController.RenderImage(temp, PostEffects);
-                if (temp != main)
-                {
-                    RenderTexture.ReleaseTemporary(temp);
-                }
-            }
-            else
-            {
-                main = temp;
-            }
-
-            Graphics.Blit(main, dest);
-            RenderTexture.ReleaseTemporary(main);
-        }
-        else
-        {
-            mainEffect.Render(main, dest, __instance._fadeValue);
-            if (main != src)
-            {
-                RenderTexture.ReleaseTemporary(main);
-            }
-        }
-
-        return false;
+        _postProcessingControllers[__instance] = postProcessingController;
+        postProcessingController.CameraDatas = CameraDatas;
+        postProcessingController.DeclaredTextureDatas = DeclaredTextureDatas;
+        postProcessingController.PreEffects = PreEffects;
+        postProcessingController.PostEffects = PostEffects;
+        postProcessingController.PrewarmCameras(_prewarmCount);
     }
 }
diff --git a/Vivify/PostProcessing/CullingTextureController.cs b/Vivify/PostProcessing/CullingTextureController.cs
@@ -66,6 +66,9 @@ protected override void OnPreCull()
         transform1.localPosition = Vector3.zero;
         transform1.localRotation = Quaternion.identity;
         camera.cullingMatrix = other.projectionMatrix * other.worldToCameraMatrix;
+        camera.projectionMatrix = other.projectionMatrix;
+        camera.nonJitteredProjectionMatrix = other.nonJitteredProjectionMatrix;
+        camera.worldToCameraMatrix = other.worldToCameraMatrix;
     }
 
     // very simple comparison
@@ -100,6 +103,7 @@ private void RefreshCamera()
         // copyfrom lags for some reason
         ////Camera.CopyFrom(_postProcessingController.Camera);
         Camera other = _postProcessingController.Camera;
+        Camera.stereoTargetEye = other.stereoTargetEye;
         Camera.fieldOfView = other.fieldOfView;
         Camera.aspect = other.aspect;
         Camera.depth = other.depth - 1;