fix: stop running OnValidate on immutable prefabs (#810)

homuler · Dec 17, 2022 · f545346 · f545346
1 parent a4c7077
commit f545346
Show file tree

Hide file tree

Showing 13 changed files with 106 additions and 45 deletions.
diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/Arrow.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/Arrow.cs
@@ -30,13 +30,18 @@ private void Start()
       ApplyMagnitude(_magnitude); // magnitude must be set after _capScale
     }
 
+#if UNITY_EDITOR
     private void OnValidate()
     {
-      ApplyDirection(_direction);
-      ApplyCapScale(_capScale);
-      ApplyLineWidth(_lineWidth);
-      ApplyMagnitude(_magnitude); // magnitude must be set after _capScale
+      if (!UnityEditor.PrefabUtility.IsPartOfAnyPrefab(this))
+      {
+        ApplyDirection(_direction);
+        ApplyCapScale(_capScale);
+        ApplyLineWidth(_lineWidth);
+        ApplyMagnitude(_magnitude); // magnitude must be set after _capScale
+      }
     }
+#endif
 
     private Transform _cone;
     private Transform cone

diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/CircleAnnotation.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/CircleAnnotation.cs
@@ -31,11 +31,16 @@ private void OnDisable()
       _lineRenderer.SetPositions(new Vector3[] { });
     }
 
+#if UNITY_EDITOR
     private void OnValidate()
     {
-      ApplyColor(_color);
-      ApplyLineWidth(_lineWidth);
+      if (!UnityEditor.PrefabUtility.IsPartOfAnyPrefab(this))
+      {
+        ApplyColor(_color);
+        ApplyLineWidth(_lineWidth);
+      }
     }
+#endif
 
     public void SetColor(Color color)
     {

diff --git a/...com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/ConnectionListAnnotation.cs b/...com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/ConnectionListAnnotation.cs
@@ -19,11 +19,16 @@ public sealed class ConnectionListAnnotation : ListAnnotation<ConnectionAnnotati
     [SerializeField] private Color _color = Color.red;
     [SerializeField, Range(0, 1)] private float _lineWidth = 1.0f;
 
+#if UNITY_EDITOR
     private void OnValidate()
     {
-      ApplyColor(_color);
-      ApplyLineWidth(_lineWidth);
+      if (!UnityEditor.PrefabUtility.IsPartOfAnyPrefab(this))
+      {
+        ApplyColor(_color);
+        ApplyLineWidth(_lineWidth);
+      }
     }
+#endif
 
     public void Fill(IList<(int, int)> connections, PointListAnnotation points)
     {

diff --git a/...ges/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/CuboidListAnnotation.cs b/...ges/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/CuboidListAnnotation.cs
@@ -22,15 +22,20 @@ public class CuboidListAnnotation : ListAnnotation<CuboidAnnotation>
     [SerializeField] private float _arrowLengthScale = 1.0f;
     [SerializeField, Range(0, 1)] private float _arrowWidth = 1.0f;
 
+#if UNITY_EDITOR
     private void OnValidate()
     {
-      ApplyPointColor(_pointColor);
-      ApplyLineColor(_lineColor);
-      ApplyLineWidth(_lineWidth);
-      ApplyArrowCapScale(_arrowCapScale);
-      ApplyArrowLengthScale(_arrowLengthScale);
-      ApplyArrowWidth(_arrowWidth);
+      if (!UnityEditor.PrefabUtility.IsPartOfAnyPrefab(this))
+      {
+        ApplyPointColor(_pointColor);
+        ApplyLineColor(_lineColor);
+        ApplyLineWidth(_lineWidth);
+        ApplyArrowCapScale(_arrowCapScale);
+        ApplyArrowLengthScale(_arrowLengthScale);
+        ApplyArrowWidth(_arrowWidth);
+      }
     }
+#endif
 
     public void SetPointColor(Color pointColor)
     {

diff --git a/.../com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/DetectionListAnnotation.cs b/.../com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/DetectionListAnnotation.cs
@@ -9,20 +9,21 @@
 
 namespace Mediapipe.Unity
 {
-#pragma warning disable IDE0065
-  using Color = UnityEngine.Color;
-#pragma warning restore IDE0065
-
   public sealed class DetectionListAnnotation : ListAnnotation<DetectionAnnotation>
   {
     [SerializeField, Range(0, 1)] private float _lineWidth = 1.0f;
     [SerializeField] private float _keypointRadius = 15.0f;
 
+#if UNITY_EDITOR
     private void OnValidate()
     {
-      ApplyLineWidth(_lineWidth);
-      ApplyKeypointRadius(_keypointRadius);
+      if (!UnityEditor.PrefabUtility.IsPartOfAnyPrefab(this))
+      {
+        ApplyLineWidth(_lineWidth);
+        ApplyKeypointRadius(_keypointRadius);
+      }
     }
+#endif
 
     public void SetLineWidth(float lineWidth)
     {

diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/LineAnnotation.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/LineAnnotation.cs
@@ -29,11 +29,16 @@ private void OnDisable()
       ApplyLineWidth(0.0f);
     }
 
+#if UNITY_EDITOR
     private void OnValidate()
     {
-      ApplyColor(_color);
-      ApplyLineWidth(_lineWidth);
+      if (!UnityEditor.PrefabUtility.IsPartOfAnyPrefab(this))
+      {
+        ApplyColor(_color);
+        ApplyLineWidth(_lineWidth);
+      }
     }
+#endif
 
     public void SetColor(Color color)
     {

diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/MaskAnnotation.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/MaskAnnotation.cs
@@ -42,11 +42,16 @@ private void OnDisable()
       }
     }
 
+#if UNITY_EDITOR
     private void OnValidate()
     {
-      ApplyMaskTexture(_maskTexture, _color);
-      ApplyThreshold(_threshold);
+      if (!UnityEditor.PrefabUtility.IsPartOfAnyPrefab(this))
+      {
+        ApplyMaskTexture(_maskTexture, _color);
+        ApplyThreshold(_threshold);
+      }
     }
+#endif
 
     private void OnDestroy()
     {

diff --git a/...hub.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/MultiFaceLandmarkListAnnotation.cs b/...hub.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/MultiFaceLandmarkListAnnotation.cs
@@ -24,17 +24,22 @@ public sealed class MultiFaceLandmarkListAnnotation : ListAnnotation<FaceLandmar
     [SerializeField, Range(0, 1)] private float _faceConnectionWidth = 1.0f;
     [SerializeField, Range(0, 1)] private float _irisCircleWidth = 1.0f;
 
+#if UNITY_EDITOR
     private void OnValidate()
     {
-      ApplyFaceLandmarkColor(_faceLandmarkColor);
-      ApplyIrisLandmarkColor(_irisLandmarkColor);
-      ApplyFaceLandmarkRadius(_faceLandmarkRadius);
-      ApplyIrisLandmarkRadius(_irisLandmarkRadius);
-      ApplyFaceConnectionColor(_faceConnectionColor);
-      ApplyIrisCircleColor(_irisCircleColor);
-      ApplyFaceConnectionWidth(_faceConnectionWidth);
-      ApplyIrisCircleWidth(_irisCircleWidth);
+      if (!UnityEditor.PrefabUtility.IsPartOfAnyPrefab(this))
+      {
+        ApplyFaceLandmarkColor(_faceLandmarkColor);
+        ApplyIrisLandmarkColor(_irisLandmarkColor);
+        ApplyFaceLandmarkRadius(_faceLandmarkRadius);
+        ApplyIrisLandmarkRadius(_irisLandmarkRadius);
+        ApplyFaceConnectionColor(_faceConnectionColor);
+        ApplyIrisCircleColor(_irisCircleColor);
+        ApplyFaceConnectionWidth(_faceConnectionWidth);
+        ApplyIrisCircleWidth(_irisCircleWidth);
+      }
     }
+#endif
 
     public void SetFaceLandmarkRadius(float radius)
     {

diff --git a/...hub.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/MultiHandLandmarkListAnnotation.cs b/...hub.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/MultiHandLandmarkListAnnotation.cs
@@ -21,14 +21,19 @@ public sealed class MultiHandLandmarkListAnnotation : ListAnnotation<HandLandmar
     [SerializeField] private Color _connectionColor = Color.white;
     [SerializeField, Range(0, 1)] private float _connectionWidth = 1.0f;
 
+#if UNITY_EDITOR
     private void OnValidate()
     {
-      ApplyLeftLandmarkColor(_leftLandmarkColor);
-      ApplyRightLandmarkColor(_rightLandmarkColor);
-      ApplyLandmarkRadius(_landmarkRadius);
-      ApplyConnectionColor(_connectionColor);
-      ApplyConnectionWidth(_connectionWidth);
+      if (!UnityEditor.PrefabUtility.IsPartOfAnyPrefab(this))
+      {
+        ApplyLeftLandmarkColor(_leftLandmarkColor);
+        ApplyRightLandmarkColor(_rightLandmarkColor);
+        ApplyLandmarkRadius(_landmarkRadius);
+        ApplyConnectionColor(_connectionColor);
+        ApplyConnectionWidth(_connectionWidth);
+      }
     }
+#endif
 
     public void SetLeftLandmarkColor(Color leftLandmarkColor)
     {

diff --git a/...ages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/PointListAnnotation.cs b/...ages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/PointListAnnotation.cs
@@ -20,11 +20,16 @@ public class PointListAnnotation : ListAnnotation<PointAnnotation>
     [SerializeField] private Color _color = Color.green;
     [SerializeField] private float _radius = 15.0f;
 
+#if UNITY_EDITOR
     private void OnValidate()
     {
-      ApplyColor(_color);
-      ApplyRadius(_radius);
+      if (!UnityEditor.PrefabUtility.IsPartOfAnyPrefab(this))
+      {
+        ApplyColor(_color);
+        ApplyRadius(_radius);
+      }
     }
+#endif
 
     public void SetColor(Color color)
     {

diff --git a/...m.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/PoseLandmarkListAnnotation.cs b/...m.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/PoseLandmarkListAnnotation.cs
@@ -121,11 +121,16 @@ private void Start()
       _connectionListAnnotation.Fill(_Connections, _landmarkListAnnotation);
     }
 
+#if UNITY_EDITOR
     private void OnValidate()
     {
-      ApplyLeftLandmarkColor(_leftLandmarkColor);
-      ApplyRightLandmarkColor(_rightLandmarkColor);
+      if (!UnityEditor.PrefabUtility.IsPartOfAnyPrefab(this))
+      {
+        ApplyLeftLandmarkColor(_leftLandmarkColor);
+        ApplyRightLandmarkColor(_rightLandmarkColor);
+      }
     }
+#endif
 
     public void SetLeftLandmarkColor(Color leftLandmarkColor)
     {

diff --git a/...ages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/RectangleAnnotation.cs b/...ages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/RectangleAnnotation.cs
@@ -35,11 +35,16 @@ private void OnDisable()
       _lineRenderer.SetPositions(_EmptyPositions);
     }
 
+#if UNITY_EDITOR
     private void OnValidate()
     {
-      ApplyColor(_color);
-      ApplyLineWidth(_lineWidth);
+      if (!UnityEditor.PrefabUtility.IsPartOfAnyPrefab(this))
+      {
+        ApplyColor(_color);
+        ApplyLineWidth(_lineWidth);
+      }
     }
+#endif
 
     public void SetColor(Color color)
     {

diff --git a/.../com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/RectangleListAnnotation.cs b/.../com.github.homuler.mediapipe/Runtime/Scripts/Unity/Annotation/RectangleListAnnotation.cs
@@ -18,11 +18,16 @@ public class RectangleListAnnotation : ListAnnotation<RectangleAnnotation>
     [SerializeField] private Color _color = Color.red;
     [SerializeField, Range(0, 1)] private float _lineWidth = 1.0f;
 
+#if UNITY_EDITOR
     private void OnValidate()
     {
-      ApplyColor(_color);
-      ApplyLineWidth(_lineWidth);
+      if (!UnityEditor.PrefabUtility.IsPartOfAnyPrefab(this))
+      {
+        ApplyColor(_color);
+        ApplyLineWidth(_lineWidth);
+      }
     }
+#endif
 
     public void SetColor(Color color)
     {