cameraType == Previewの場合、DistortionPassを追加しないように

CyberAgentGameEntertainment · Sep 25, 2023 · a584a72 · a584a72
1 parent f5e5ff7
commit a584a72
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/Assets/Nova/Runtime/Core/Scripts/ApplyDistortionPass.cs b/Assets/Nova/Runtime/Core/Scripts/ApplyDistortionPass.cs
@@ -45,13 +45,6 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData
             }
 
         #if UNITY_2022_1_OR_NEWER
-            // todo:後で詳しくGUI周りを調査する
-            // マテリアルGUI描画時、なぜかここがNullでエラーが出てしまうので、とりあえずNullチェックを入れる
-            // ランタイム実行に影響がない
-            if (renderingData.cameraData.renderer.cameraColorTargetHandle.rt == null)
-            {
-                return;
-            }
             var source = renderingData.cameraData.renderer.cameraColorTargetHandle.nameID;
         #else
             var source = renderingData.cameraData.renderer.cameraColorTarget;

diff --git a/Assets/Nova/Runtime/Core/Scripts/ScreenSpaceDistortion.cs b/Assets/Nova/Runtime/Core/Scripts/ScreenSpaceDistortion.cs
@@ -35,7 +35,10 @@ public override void Create()
 
         public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData)
         {
-            if (_applyDistortionShader == null || renderingData.cameraData.cameraType == CameraType.Reflection) return;
+            if (_applyDistortionShader == null 
+                || renderingData.cameraData.cameraType == CameraType.Reflection
+                || renderingData.cameraData.cameraType == CameraType.Preview)
+                return;
 
             var distortedUvBufferFormat = SystemInfo.SupportsRenderTextureFormat(RenderTextureFormat.RGHalf)
                 ? RenderTextureFormat.RGHalf