Progress on Nudge direction being based on controller direction. Added SpatialFloorQuad to enable spatial mapping in test scenes.

Author: Jared Bienz

SpatialAlignment-Unity/Assembly-CSharp-Editor.csproj

@@ -138,10 +138,6 @@
     <Compile Include="Assets\HoloToolkit\UX\Scripts\Collections\Editor\CollectionEditor.cs" />
     <Compile Include="Assets\HoloToolkit\UX\Scripts\Editor\CompoundButtonSaveInterceptor.cs" />
     <Compile Include="Assets\HoloToolkit\UX\Scripts\Editor\KeyboardInputFieldEditor.cs" />
-    <Compile Include="Assets\HoloToolkit-Examples\Medical\Editor\VolumeInformationEditor.cs" />
-    <Compile Include="Assets\HoloToolkit-Preview\SpectatorView\Scripts\SpatialSync\MarkerGeneration3D\Editor\MarkerGeneration3DEditor.cs" />
-    <Compile Include="Assets\HoloToolkit-Preview\SpectatorView\Scripts\Utilities\Editor\PlatformSwitcherEditor.cs" />
-    <Compile Include="Assets\HoloToolkit-Preview\SpectatorView\UnityARKitPlugin\Plugins\iOS\UnityARKit\Editor\UnityARBuildPostprocessor.cs" />
     <Reference Include="Unity.TextMeshPro.Editor">
       <HintPath>C:/Users/jbienz/Code/JBienzMS/SpatialAlignment/SpatialAlignment-Unity/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
     </Reference>
@@ -415,9 +411,6 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>C:/Users/jbienz/Code/JBienzMS/SpatialAlignment/SpatialAlignment-Unity/Assets/HoloToolkit/Utilities/Scripts/GLTF/Plugins/JsonNet/Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="QRCodesTrackerPlugin.Placeholder">
-      <HintPath>C:/Users/jbienz/Code/JBienzMS/SpatialAlignment/SpatialAlignment-Unity/Assets/HoloToolkit-Preview/QRTracker/Plugins/QRCodesTrackerPlugin.Placeholder.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.Advertisements">
       <HintPath>C:/Users/jbienz/Code/JBienzMS/SpatialAlignment/SpatialAlignment-Unity/Library/PackageCache/[email protected]/Editor/UnityEditor.Advertisements.dll</HintPath>
     </Reference>

SpatialAlignment-Unity/Assembly-CSharp.csproj

@@ -336,6 +336,12 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 114129378875773704, guid: d29bc40b7f3df26479d6a0aac211c355,
+        type: 3}
+      propertyPath: FloorQuad
+      value: 
+      objectReference: {fileID: 1520281459093612, guid: 7272c8e73bd10ec44b3bd7cd4451165c,
+        type: 3}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3}
 --- !u!1001 &278732485
@@ -493,6 +499,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   refineOnStart: 0
+  targetTransform: {fileID: 0}
   controllerPrefab: {fileID: 1469530028792937992, guid: f16944cb4f51ca045bc297eb5098241a,
     type: 3}
   directionAmount: 0.01
@@ -575,6 +582,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   refineOnStart: 0
+  targetTransform: {fileID: 0}
   autoHideMeshes: 1
   directionPrefab: {fileID: 3882863017087187430, guid: 8e43969e520e5d149b6ca084446340d7,
     type: 3}

SpatialAlignment-Unity/Assets/HoloToolkit-Preview.meta

@@ -405,6 +405,12 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 114129378875773704, guid: d29bc40b7f3df26479d6a0aac211c355,
+        type: 3}
+      propertyPath: FloorQuad
+      value: 
+      objectReference: {fileID: 1520281459093612, guid: 7272c8e73bd10ec44b3bd7cd4451165c,
+        type: 3}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 3}
 --- !u!1001 &278732485
@@ -956,6 +962,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   refineOnStart: 0
+  targetTransform: {fileID: 0}
   autoHideMeshes: 1
   directionPrefab: {fileID: 3882863017087187430, guid: 8e43969e520e5d149b6ca084446340d7,
     type: 3}
@@ -1011,6 +1018,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   refineOnStart: 0
+  targetTransform: {fileID: 0}
   controllerPrefab: {fileID: 1469530028792937992, guid: f16944cb4f51ca045bc297eb5098241a,
     type: 3}
   directionAmount: 0.01

SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/Refinement/Scenes/SA-Refinement.unity

@@ -131,6 +131,7 @@ MonoBehaviour:
   Targets: []
   lockFocus: 0
   refinement: {fileID: 0}
+  useLookDirection: 1
 --- !u!65 &1848810891968837930
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -142,7 +143,7 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.5, y: 0.38, z: 0.02}
+  m_Size: {x: 0.5, y: 0.45, z: 0.02}
   m_Center: {x: 0, y: 0, z: 0.17}
 --- !u!114 &6313569961156761970
 MonoBehaviour:

SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/Refinement/Scenes/SA-RefinementBuilding.unity

@@ -23,6 +23,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+using HoloToolkit.Unity;
 using HoloToolkit.Unity.InputModule;
 using HoloToolkit.Unity.Receivers;
 using System;
@@ -43,8 +44,45 @@ public class NudgeController : InteractionReceiver
         [SerializeField]
         [Tooltip("The nudge refinement instance to control.")]
         private NudgeRefinement refinement;
+
+        [SerializeField]
+        [Tooltip("Whether the look direction of the controller should be used as the forward direction for nudge operations.")]
+        private bool useLookDirection = true;
         #endregion // Unity Inspector Variables
 
+        protected virtual RefinementDirection GetLookDirection()
+        {
+            // Which "forward" are we using
+            Vector3 forward;
+            if (refinement.Space == Space.World)
+            {
+                // Just use controller forward
+                forward = transform.forward;
+            }
+            else
+            {
+                // Use controller forward but in target local space
+                forward = refinement.TargetTransform.InverseTransformDirection(transform.forward);
+            }
+
+            // Normalize the forward direction
+            Vector3 normForward = forward.normalized;
+
+            // Round the normalized vector to 0 decimal places
+            Vector3 roundedForward = normForward.Round();
+
+            // Try to convert the vector to a direction
+            RefinementDirection direction;
+            if (roundedForward.TryGetDirection(out direction))
+            {
+                return direction;
+            }
+            else
+            {
+                return RefinementDirection.Forward;
+            }
+        }
+
         #region Overrides / Event Handlers
         protected override void InputUp(GameObject obj, InputEventData eventData)
         {
@@ -54,6 +92,12 @@ protected override void InputUp(GameObject obj, InputEventData eventData)
                 return;
             }
 
+            // Update forward direction to match look direction?
+            if (useLookDirection)
+            {
+                refinement.ForwardDirection = GetLookDirection();
+            }
+
             // Execute action and direction based on name
             switch (obj.name)
             {
@@ -88,6 +132,15 @@ protected override void InputUp(GameObject obj, InputEventData eventData)
         /// Gets or sets the nudge refinement instance to control.
         /// </summary>
         public NudgeRefinement Refinement { get { return refinement; } set { refinement = value; } }
+
+        /// <summary>
+        /// Gets or sets whether the look direction of the controller should be
+        /// used as the forward direction for nudge operations.
+        /// </summary>
+        /// <remarks>
+        /// The default is <c>true</c>.
+        /// </remarks>
+        public bool UseLookDirection { get { return useLookDirection; } set { useLookDirection = value; } }
         #endregion // Public Properties
     }
 }

SpatialAlignment-Unity/Assets/SpatialAlignment/Refinement/Prefabs/NudgeController.prefab

@@ -212,7 +212,6 @@ protected override void OnEnable()
             // Pass to base
             base.OnEnable();
         }
-
         #endregion // Unity Overrides
 
         #region Public Methods
@@ -248,15 +247,8 @@ public void Nudge(RefinementDirection direction)
             // Create the offset
             Vector3 offset = actualDireciton.ToVector() * directionAmount;
 
-            // Update the position
-            if (space == Space.World)
-            {
-                gameObject.transform.position += offset;
-            }
-            else
-            {
-                gameObject.transform.localPosition += offset;
-            }
+            // Update the position using the correct coordinate space (local vs world)
+            TargetTransform.Translate(offset, space);
         }
 
         /// <summary>
@@ -271,7 +263,7 @@ public void Nudge(NudgeRotation rotation)
             float angle = (rotation == NudgeRotation.Left ? -rotationAmount : rotationAmount);
 
             // Update the rotation
-            gameObject.transform.Rotate(upDirection.ToVector(), angle, space);
+            TargetTransform.Rotate(upDirection.ToVector(), angle, space);
         }
 
         /// <summary>

SpatialAlignment-Unity/Assets/SpatialAlignment/Refinement/Scripts/NudgeController.cs

@@ -222,7 +222,7 @@ private void NextStep()
                     CreateTarget(originPrefab, ref modelOrigin, currentStep.ToString());
 
                     // Parent the target
-                    modelOrigin.transform.SetParent(this.transform, worldPositionStays: true);
+                    modelOrigin.transform.SetParent(TargetTransform, worldPositionStays: true);
 
                     break;
 
@@ -233,7 +233,7 @@ private void NextStep()
                     CreateTarget(directionPrefab, ref modelDirection, currentStep.ToString());
 
                     // Parent the target
-                    modelDirection.transform.SetParent(this.transform, worldPositionStays: true);
+                    modelDirection.transform.SetParent(TargetTransform, worldPositionStays: true);
 
                     // Add line renderer
                     modelLine = AddLine(modelDirection);
@@ -278,9 +278,7 @@ private void NextStep()
 
                     // Get transform positions
                     Vector3 modelOriginWorld = modelOrigin.transform.position;
-                    // Vector3 modelOriginLocal = modelOrigin.transform.localPosition;
                     Vector3 modelDirectionWorld = modelDirection.transform.position;
-                    // Vector3 modelDirectionLocal = modelDirection.transform.localPosition;
                     Vector3 placementOriginWorld = placementOrigin.transform.position;
                     Vector3 placementDirectionWorld = placementDirection.transform.position;
 
@@ -297,10 +295,10 @@ private void NextStep()
                     float rotation = (placementAngle - modelAngle);
 
                     // Update parent position to align origins
-                    gameObject.transform.position += offset;
+                    TargetTransform.position += offset;
 
                     // Update parent rotation, but around placement origin
-                    gameObject.transform.RotateAround(placementOriginWorld, Vector3.up, rotation);
+                    TargetTransform.RotateAround(placementOriginWorld, Vector3.up, rotation);
 
                     // Finish refinement
                     FinishRefinement();
@@ -433,15 +431,15 @@ protected override void Start()
             if (originPrefab == null)
             {
                 originPrefab = GameObject.CreatePrimitive(PrimitiveType.Sphere);
-                originPrefab.transform.SetParent(transform, worldPositionStays: true);
+                originPrefab.transform.SetParent(TargetTransform, worldPositionStays: true);
                 originPrefab.GetComponent<Collider>().enabled = false;
                 originPrefab.transform.localScale = new Vector3(DEF_SCALE, DEF_SCALE, DEF_SCALE);
                 originPrefab.SetActive(false);
             }
             if (directionPrefab == null)
             {
                 directionPrefab = GameObject.CreatePrimitive(PrimitiveType.Capsule);
-                directionPrefab.transform.SetParent(transform, worldPositionStays: true);
+                directionPrefab.transform.SetParent(TargetTransform, worldPositionStays: true);
                 directionPrefab.GetComponent<Collider>().enabled = false;
                 directionPrefab.transform.localScale = new Vector3(DEF_SCALE, DEF_SCALE, DEF_SCALE);
                 directionPrefab.SetActive(false);
@@ -500,7 +498,7 @@ protected override void Update()
                 Vector3 relativePos = direction.position - origin.position;
 
                 // Rotate the target direction to point away from the origin
-                targetInterpolator.SetTargetRotation(Quaternion.FromToRotation(transform.up, relativePos));
+                targetInterpolator.SetTargetRotation(Quaternion.FromToRotation(TargetTransform.up, relativePos));
 
                 // Get the line renderer
                 LineRenderer line = (isModel ? modelLine : placementLine);

SpatialAlignment-Unity/Assets/SpatialAlignment/Refinement/Scripts/NudgeRefinement.cs

@@ -82,6 +82,10 @@ public class RefinementBase : MonoBehaviour
         [SerializeField]
         [Tooltip("Whether to begin refining when the behavior starts.")]
         private bool refineOnStart;
+
+        [SerializeField]
+        [Tooltip("Optional transform where nudge operations will be applied. If none is specified, the transform of the applied GameObject will be used.")]
+        private Transform targetTransform;
         #endregion // Unity Inspector Variables
 
         #region Overrides / Event Handlers
@@ -122,21 +126,33 @@ protected virtual void OnRefinementStarted()
         /// </summary>
         protected virtual void RestoreLastTransform()
         {
-            transform.position = lastPosition;
-            transform.rotation = lastRotation;
+            targetTransform.position = lastPosition;
+            targetTransform.rotation = lastRotation;
         }
 
         /// <summary>
         /// Saves the current transform as the last transform.
         /// </summary>
         protected virtual void SaveLastTransform()
         {
-            lastPosition = transform.position;
-            lastRotation = transform.rotation;
+            lastPosition = targetTransform.position;
+            lastRotation = targetTransform.rotation;
         }
         #endregion // Overrides / Event Handlers
 
         #region Unity Overrides
+        /// <summary>
+        /// Awake is called when the script instance is being loaded.
+        /// </summary>
+        protected virtual void Awake()
+        {
+            // If no transform is specified, use the GameObjects transform
+            if (targetTransform == null)
+            {
+                targetTransform = gameObject.transform;
+            }
+        }
+
         /// <summary>
         /// This function is called after all frame updates for the last frame of the object’s existence.
         /// </summary>
@@ -260,6 +276,11 @@ public void StartRefinement()
         /// Gets or sets whether to begin refining when the behavior starts.
         /// </summary>
         public bool RefineOnStart { get => refineOnStart; set => refineOnStart = value; }
+
+        /// <summary>
+        /// Gets or sets an optional transform where nudge operations will be applied. If none is specified, the transform of the applied GameObject will be used.
+        /// </summary>
+        public Transform TargetTransform { get { return targetTransform; } set { targetTransform = value; } }
         #endregion // Public Properties
 
         #region Public Events