refactor

mob-sakai · Aug 10, 2024 · f94c5f2 · f94c5f2
1 parent 388a73f
commit f94c5f2
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 21 deletions.
diff --git a/Editor/AssetModification/SoftMaskComponentModifier_Alpha.cs b/Editor/AssetModification/SoftMaskComponentModifier_Alpha.cs
@@ -1,6 +1,5 @@
 using Coffee.UISoftMaskInternal.AssetModification;
 using UnityEditor;
-using UnityEngine;
 
 #pragma warning disable CS0612, CS0618 // Type or member is obsolete
 

diff --git a/Editor/AssetModification/SoftMaskableShaderModifier.cs b/Editor/AssetModification/SoftMaskableShaderModifier.cs
@@ -22,7 +22,7 @@ public static Modifier Create(string path)
  // -> color.a *= SoftMask(input.IN.vertex, IN.worldPosition, color.a);
  new TextReplaceModifier(
  @"(([^. \t]+).*\*=\s*SoftMask\(.*[^.][^a])\);.*$",
- $"$1, $2.a); // Add for soft mask")
+ "$1, $2.a); // Add for soft mask")
  }
  };
  }

diff --git a/Editor/AutoGeneratedEditor.cs b/Editor/AutoGeneratedEditor.cs
@@ -10,7 +10,7 @@ public class AutoGeneratedEditor : Editor
 
  public override void OnInspectorGUI()
  {
- EditorGUILayout.HelpBox(s_Help, true);
+ EditorGUILayout.HelpBox(s_Help);
  }
  }
 

diff --git a/Runtime/MaskingShape/MaskingShape.cs b/Runtime/MaskingShape/MaskingShape.cs
@@ -5,7 +5,6 @@
 using UnityEngine.EventSystems;
 using UnityEngine.Profiling;
 using UnityEngine.Rendering;
-using UnityEngine.Serialization;
 using UnityEngine.UI;
 
 namespace Coffee.UISoftMask

diff --git a/Runtime/ProjectSettings/UISoftMaskProjectSettings.cs b/Runtime/ProjectSettings/UISoftMaskProjectSettings.cs
@@ -81,9 +81,9 @@ public enum TransformSensitivity
 
 #if UNITY_MODULE_VR
  public static bool stereoEnabled =>
- #if UNITY_EDITOR
+#if UNITY_EDITOR
  Application.isPlaying &&
- #endif
+#endif
  softMaskEnabled && instance.m_StereoEnabled && XRSettings.enabled;
 #else
  public static bool stereoEnabled => false;

diff --git a/Runtime/SoftMask.cs b/Runtime/SoftMask.cs
@@ -6,7 +6,6 @@
 using UnityEngine.Events;
 using UnityEngine.Profiling;
 using UnityEngine.Rendering;
-using UnityEngine.Serialization;
 using UnityEngine.UI;
 
 namespace Coffee.UISoftMask

diff --git a/Runtime/SoftMaskable.cs b/Runtime/SoftMaskable.cs
@@ -18,14 +18,6 @@ public class SoftMaskable : MonoBehaviour, IMaterialModifier, IMaskable
  private int _softMaskDepth;
  private int _stencilBits;
 
-#if UNITY_EDITOR
- private Action _updateSceneViewMatrix;
- private static readonly int s_GameVp = Shader.PropertyToID("_GameVP");
- private static readonly int s_GameTvp = Shader.PropertyToID("_GameTVP");
- private static readonly int s_GameVp2 = Shader.PropertyToID("_GameVP_2");
- private static readonly int s_GameTvp2 = Shader.PropertyToID("_GameTVP_2");
-#endif
-
  private bool isTerminal => _graphic is TerminalMaskingShape;
 
  private void OnEnable()
@@ -198,6 +190,11 @@ private void CheckGraphic()
  }
 
 #if UNITY_EDITOR
+ private Action _updateSceneViewMatrix;
+ private static readonly int s_GameVp = Shader.PropertyToID("_GameVP");
+ private static readonly int s_GameTvp = Shader.PropertyToID("_GameTVP");
+ private static readonly int s_GameVp2 = Shader.PropertyToID("_GameVP_2");
+ private static readonly int s_GameTvp2 = Shader.PropertyToID("_GameTVP_2");
  private void UpdateSceneViewMatrix()
  {
  if (!_graphic || !_graphic.canvas || !_maskableMaterial) return;
@@ -216,9 +213,7 @@ private void UpdateSceneViewMatrix()
  var cam = canvas.worldCamera;
  if (canvas && canvas.renderMode != RenderMode.ScreenSpaceOverlay && cam)
  {
- var eye = isStereo
- ? Camera.MonoOrStereoscopicEye.Left
- : Camera.MonoOrStereoscopicEye.Mono;
+ var eye = isStereo ? Camera.MonoOrStereoscopicEye.Left : Camera.MonoOrStereoscopicEye.Mono;
  canvas.GetViewProjectionMatrix(eye, out var vMatrix, out var pMatrix);
  gameVp = gameTvp = pMatrix * vMatrix;
  }

diff --git a/Runtime/Utilities/SoftMaskUtils.cs b/Runtime/Utilities/SoftMaskUtils.cs
@@ -5,9 +5,6 @@
 using UnityEngine;
 using UnityEngine.Profiling;
 using UnityEngine.Rendering;
-#if UNITY_MODULE_VR
-using UnityEngine.XR;
-#endif
 #if TMP_ENABLE
 using TMPro;
 #endif