Fixes for light anchor #5915

Author: adrien-de-tocqueville

com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditor.cs

@@ -33,6 +33,7 @@ public class LightAnchorEditor : Editor
         SerializedProperty m_DistanceProperty;
         SerializedProperty m_FrameSpaceProperty;
         SerializedProperty m_AnchorPositionOverrideProperty;
+        SerializedProperty m_AnchorPositionOffsetProperty;
 
         LightAnchor manipulator
         {
@@ -132,7 +133,8 @@ public override void OnInspectorGUI()
 
                 EditorGUI.BeginChangeCheck();
                 EditorGUILayout.PropertyField(m_DistanceProperty, LightAnchorStyles.distanceProperty);
-                distanceChanged = EditorGUI.EndChangeCheck();
+                if (distanceChanged = EditorGUI.EndChangeCheck())
+                    m_DistanceProperty.floatValue = Mathf.Min(m_DistanceProperty.floatValue, LightAnchor.k_MaxDistance);
 
                 EditorGUI.BeginChangeCheck();
                 EditorGUILayout.PropertyField(m_FrameSpaceProperty, LightAnchorStyles.upDirectionProperty);
@@ -142,6 +144,15 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(m_AnchorPositionOverrideProperty, LightAnchorStyles.anchorPositionOverrideProperty);
                 positionOverrideChanged = EditorGUI.EndChangeCheck();
 
+                if (m_AnchorPositionOverrideProperty.objectReferenceValue != null)
+                {
+                    EditorGUI.indentLevel++;
+                    EditorGUI.BeginChangeCheck();
+                    EditorGUILayout.PropertyField(m_AnchorPositionOffsetProperty, LightAnchorStyles.anchorPositionOffsetProperty);
+                    positionOverrideChanged |= EditorGUI.EndChangeCheck();
+                    EditorGUI.indentLevel--;
+                }
+
                 if (m_FoldoutPreset = EditorGUILayout.Foldout(m_FoldoutPreset, "Common"))
                 {
                     Color cachedColor = GUI.backgroundColor;
@@ -301,8 +312,9 @@ public override void OnInspectorGUI()
                                 Debug.LogError($"Can't assign '{newTransform.name}' because it's a child of the Light Anchor component");
                             else
                             {
-                                float newDistance = Vector3.Distance(manipulator.transform.position, newTransform.position);
                                 manipulator.anchorPositionOverride = newTransform;
+                                manipulator.anchorPositionOffset = m_AnchorPositionOffsetProperty.vector3Value;
+                                float newDistance = Vector3.Distance(manipulator.transform.position, manipulator.anchorPosition);
                                 // Orient the object to face the new override position
                                 manipulator.SynchronizeOnTransform(camera);
                                 // And adjust it's distance to avoid modifying it's position.
@@ -358,6 +370,7 @@ void OnEnable()
             m_DistanceProperty = serializedObject.FindProperty("m_Distance");
             m_FrameSpaceProperty = serializedObject.FindProperty("m_FrameSpace");
             m_AnchorPositionOverrideProperty = serializedObject.FindProperty("m_AnchorPositionOverride");
+            m_AnchorPositionOffsetProperty = serializedObject.FindProperty("m_AnchorPositionOffset");
         }
 
         void EditorToolsOnactiveToolChanged()
@@ -599,6 +612,7 @@ static class LightAnchorStyles
         static public GUIContent distanceProperty = EditorGUIUtility.TrTextContent("Distance", "Controls how far 'back', the light is placed from its anchor");
         static public GUIContent upDirectionProperty = EditorGUIUtility.TrTextContent("Up direction", "Specifies the space in which the up direction of the anchor is defined. Local is relative to the camera.");
         static public GUIContent anchorPositionOverrideProperty = EditorGUIUtility.TrTextContent("Anchor Position Override", "Specifies the anchor position manually instead of relying on the angles, distance and transform position to compute the anchor position.");
+        static public GUIContent anchorPositionOffsetProperty = EditorGUIUtility.TrTextContent("Anchor Position Offset", "Specifies the anchor position offset relative to the anchor position override.");
         static public GUIContent[] angleSubContent = new[]
         {
             EditorGUIUtility.TrTextContent("Orbit"),

com.unity.render-pipelines.core/Runtime/Lights/LightAnchor.cs

@@ -17,13 +17,16 @@ public class LightAnchor : MonoBehaviour
     {
         const float k_ArcRadius = 5;
         const float k_AxisLength = 10;
+        internal const float k_MaxDistance = 10000f;
 
         [SerializeField, Min(0)]
         float m_Distance = 0f;
         [SerializeField]
         UpDirection m_FrameSpace = UpDirection.World;
         [SerializeField]
         Transform m_AnchorPositionOverride;
+        [SerializeField]
+        Vector3 m_AnchorPositionOffset;
 
         [SerializeField]
         float m_Yaw;
@@ -74,7 +77,7 @@ public float roll
         public float distance
         {
             get => m_Distance;
-            set => m_Distance = Mathf.Max(0, value);
+            set => m_Distance = Mathf.Clamp(value, 0f, k_MaxDistance);
         }
 
         /// <summary>
@@ -109,7 +112,7 @@ public Vector3 anchorPosition
             get
             {
                 if (anchorPositionOverride != null)
-                    return anchorPositionOverride.position;
+                    return anchorPositionOverride.position + anchorPositionOverride.TransformDirection(anchorPositionOffset);
                 else
                     return transform.position + transform.forward * distance;
             }
@@ -132,6 +135,15 @@ public Transform anchorPositionOverride
             set => m_AnchorPositionOverride = value;
         }
 
+        /// <summary>
+        /// Offset relative to the position of the anchor position override transform in object space.
+        /// </summary>
+        public Vector3 anchorPositionOffset
+        {
+            get => m_AnchorPositionOffset;
+            set => m_AnchorPositionOffset = value;
+        }
+
         /// <summary>
         /// Normalizes the input angle to be in the range of -180 and 180.
         /// </summary>

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -29,6 +29,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed support for orthographic camera in path tracing.
 - Fixed crossfade not working on the HD ST8 ShaderGraph [case 1369586](https://fogbugz.unity3d.com/f/cases/1369586/)
 
+### Changed
+- Changed the max distance for Light Anchors to avoid unstability with high values (case 1362802).
+
 ## [12.0.0] - 2021-01-11
 
 ### Added