Enable axis locking for guides (#856)

* Enable access locking for guides and fix a bug with access locking for selections

* Simplify

Author: andybak

Assets/Scripts/Widgets/GrabWidget.cs

@@ -1440,11 +1440,30 @@ virtual protected TrTransform GetDesiredTransform(TrTransform xf_GS)
             return outXf_GS;
         }
 
-        protected virtual TrTransform ApplyAxisLocks(TrTransform xf_GS)
+        private TrTransform ApplyAxisLocks(TrTransform xf_GS)
         {
+            if (this is StencilWidget || this is MediaWidget || this is SelectionWidget)
+            {
+                xf_GS = CalculateAxisLocks(xf_GS);
+            }
             return xf_GS;
         }
 
+        private TrTransform CalculateAxisLocks(TrTransform xf_GS)
+        {
+            var outXf_CS = App.ActiveCanvas.Pose.inverse * xf_GS;
+            // Restore transforms for locked axes
+            if (SelectionManager.m_Instance.m_LockTranslationX) outXf_CS.translation.x = transform.localPosition.x;
+            if (SelectionManager.m_Instance.m_LockTranslationY) outXf_CS.translation.y = transform.localPosition.y;
+            if (SelectionManager.m_Instance.m_LockTranslationZ) outXf_CS.translation.z = transform.localPosition.z;
+            var euler = outXf_CS.rotation.eulerAngles;
+            if (SelectionManager.m_Instance.m_LockRotationX) euler.x = transform.localRotation.eulerAngles.x;
+            if (SelectionManager.m_Instance.m_LockRotationY) euler.y = transform.localRotation.eulerAngles.y;
+            if (SelectionManager.m_Instance.m_LockRotationZ) euler.z = transform.localRotation.eulerAngles.z;
+            outXf_CS.rotation.eulerAngles = euler;
+            return App.ActiveCanvas.Pose * outXf_CS;
+        }
+
         protected virtual bool AllowSnapping()
         {
             return m_AllowSnapping && SnapEnabled;

Assets/Scripts/Widgets/MediaWidget.cs

@@ -122,22 +122,6 @@ override public void Activate(bool bActive)
                 }
             }
         }
-
-        protected override TrTransform ApplyAxisLocks(TrTransform xf_GS)
-        {
-            var outXf_CS = App.ActiveCanvas.Pose.inverse * xf_GS;
-            // Restore transforms for locked axes
-            if (SelectionManager.m_Instance.m_LockTranslationX) outXf_CS.translation.x = transform.localPosition.x;
-            if (SelectionManager.m_Instance.m_LockTranslationY) outXf_CS.translation.y = transform.localPosition.y;
-            if (SelectionManager.m_Instance.m_LockTranslationZ) outXf_CS.translation.z = transform.localPosition.z;
-            var euler = outXf_CS.rotation.eulerAngles;
-            if (SelectionManager.m_Instance.m_LockRotationX) euler.x = transform.localRotation.eulerAngles.x;
-            if (SelectionManager.m_Instance.m_LockRotationY) euler.y = transform.localRotation.eulerAngles.y;
-            if (SelectionManager.m_Instance.m_LockRotationZ) euler.z = transform.localRotation.eulerAngles.z;
-            outXf_CS.rotation.eulerAngles = euler;
-            xf_GS = App.ActiveCanvas.Pose * outXf_CS;
-            return xf_GS;
-        }
     }
 
 } // namespace TiltBrush

Assets/Scripts/Widgets/SelectionWidget.cs

@@ -310,22 +310,6 @@ override protected void OnUserBeginInteracting()
             }
         }
 
-        protected override TrTransform ApplyAxisLocks(TrTransform xf_GS)
-        {
-            var outXf_CS = m_SelectionCanvas.Pose.inverse * xf_GS;
-            // Restore transforms for locked axes
-            if (SelectionManager.m_Instance.m_LockTranslationX) outXf_CS.translation.x = transform.localPosition.x;
-            if (SelectionManager.m_Instance.m_LockTranslationY) outXf_CS.translation.y = transform.localPosition.y;
-            if (SelectionManager.m_Instance.m_LockTranslationZ) outXf_CS.translation.z = transform.localPosition.z;
-            var euler = outXf_CS.rotation.eulerAngles;
-            if (SelectionManager.m_Instance.m_LockRotationX) euler.x = transform.localRotation.eulerAngles.x;
-            if (SelectionManager.m_Instance.m_LockRotationY) euler.y = transform.localRotation.eulerAngles.y;
-            if (SelectionManager.m_Instance.m_LockRotationZ) euler.z = transform.localRotation.eulerAngles.z;
-            outXf_CS.rotation.eulerAngles = euler;
-            xf_GS = m_SelectionCanvas.Pose * outXf_CS;
-            return xf_GS;
-        }
-
         protected override IEnumerable<StencilWidget> GetStencilsToIgnore()
         {
             return SelectionManager.m_Instance.SelectedWidgets.OfType<StencilWidget>();