Fix stereo mirror for multi pass rendering

nicoco007 · Dec 3, 2023 · a5952a6 · a5952a6
1 parent acd076a
commit a5952a6
Showing 1 changed file with 14 additions and 19 deletions.
diff --git a/Source/CustomAvatar/Rendering/StereoMirrorRenderer.cs b/Source/CustomAvatar/Rendering/StereoMirrorRenderer.cs
@@ -14,13 +14,14 @@
 //  You should have received a copy of the GNU Lesser General Public License
 //  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-using CustomAvatar.Avatar;
-using CustomAvatar.Configuration;
-using CustomAvatar.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using CustomAvatar.Avatar;
+using CustomAvatar.Configuration;
+using CustomAvatar.Utilities;
 using UnityEngine;
+using UnityEngine.XR;
 using Zenject;
 
 namespace CustomAvatar.Rendering
@@ -65,7 +66,6 @@ public int antiAliasing
             }
         }
 
-
         #region Behaviour Lifecycle
 #pragma warning disable IDE0051
 
@@ -127,12 +127,6 @@ private Texture GetMirrorTexture(Vector3 reflectionPlanePosition, Vector3 reflec
                 return Texture2D.blackTexture;
             }
 
-            // return immediately if we've already rendered for this frame
-            if (_renderTextures.TryGetValue(camera, out RenderTexture renderTexture))
-            {
-                return renderTexture;
-            }
-
             Transform cameraTransform = camera.transform;
             Vector3 cameraPosition = cameraTransform.position;
             Quaternion cameraRotation = cameraTransform.rotation;
@@ -144,13 +138,15 @@ private Texture GetMirrorTexture(Vector3 reflectionPlanePosition, Vector3 reflec
                 return Texture2D.blackTexture;
             }
 
-            bool stereoEnabled = camera.stereoEnabled;
+            bool stereoEnabled = camera.stereoEnabled && XRSettings.stereoRenderingMode != XRSettings.StereoRenderingMode.MultiPass;
             int renderWidth = Mathf.RoundToInt(camera.pixelWidth * renderScale);
             int renderHeight = Mathf.RoundToInt(camera.pixelHeight * renderScale);
 
-            renderTexture = RenderTexture.GetTemporary(Mathf.Min(stereoEnabled ? renderWidth * 2 : renderWidth, SystemInfo.maxTextureSize), Mathf.Min(renderHeight, SystemInfo.maxTextureSize), 24, RenderTextureFormat.ARGB32, RenderTextureReadWrite.Default, _antiAliasing);
-
-            _renderTextures[camera] = renderTexture;
+            if (!_renderTextures.TryGetValue(camera, out RenderTexture renderTexture))
+            {
+                renderTexture = RenderTexture.GetTemporary(Mathf.Min(stereoEnabled ? renderWidth * 2 : renderWidth, SystemInfo.maxTextureSize), Mathf.Min(renderHeight, SystemInfo.maxTextureSize), 24, RenderTextureFormat.ARGB32, RenderTextureReadWrite.Default, _antiAliasing);
+                _renderTextures[camera] = renderTexture;
+            }
 
             UpdateMirrorCamera(camera, renderTexture);
 
@@ -159,27 +155,26 @@ private Texture GetMirrorTexture(Vector3 reflectionPlanePosition, Vector3 reflec
 
             if (stereoEnabled)
             {
-                Quaternion targetRotation = cameraRotation;
-
                 if (camera.stereoTargetEye is StereoTargetEyeMask.Both or StereoTargetEyeMask.Left)
                 {
                     Vector3 targetPosition = camera.ViewportToWorldPoint(Vector3.zero, Camera.MonoOrStereoscopicEye.Left);
                     Matrix4x4 stereoProjectionMatrix = camera.GetStereoProjectionMatrix(Camera.StereoscopicEye.Left);
 
-                    RenderMirror(targetPosition, targetRotation, stereoProjectionMatrix, kLeftRect, reflectionPlanePosition, reflectionPlaneNormal);
+                    RenderMirror(targetPosition, cameraRotation, stereoProjectionMatrix, kLeftRect, reflectionPlanePosition, reflectionPlaneNormal);
                 }
 
                 if (camera.stereoTargetEye is StereoTargetEyeMask.Both or StereoTargetEyeMask.Right)
                 {
                     Vector3 targetPosition = camera.ViewportToWorldPoint(Vector3.zero, Camera.MonoOrStereoscopicEye.Right);
                     Matrix4x4 stereoProjectionMatrix = camera.GetStereoProjectionMatrix(Camera.StereoscopicEye.Right);
 
-                    RenderMirror(targetPosition, targetRotation, stereoProjectionMatrix, kRightRect, reflectionPlanePosition, reflectionPlaneNormal);
+                    RenderMirror(targetPosition, cameraRotation, stereoProjectionMatrix, kRightRect, reflectionPlanePosition, reflectionPlaneNormal);
                 }
             }
             else
             {
-                RenderMirror(cameraPosition, cameraRotation, camera.projectionMatrix, kFullRect, reflectionPlanePosition, reflectionPlaneNormal);
+                Vector3 targetPosition = camera.ViewportToWorldPoint(Vector3.zero, camera.stereoActiveEye);
+                RenderMirror(targetPosition, cameraRotation, camera.projectionMatrix, kFullRect, reflectionPlanePosition, reflectionPlaneNormal);
             }
 
             GL.invertCulling = invertCulling;