Spawning targets near the last spawned target (fixes "fly-in" of targets). Removed hack comments. Ready for next device build.

Author: Jared Bienz

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

@@ -77,14 +77,13 @@ public enum RayRefinementStep
     /// </summary>
     public class RayRefinement : RefinementController, IInputClickHandler
     {
-        private Vector3 keepLocation; // HACK:
-
         #region Constants
         private const float DEF_SCALE = 0.05f;
         #endregion // Constants
 
         #region Member Variables
         private RayRefinementStep currentStep;      // What step we're on in the refinement
+        private Vector3 lastTargetPosition;			// The last position where a target was placed
         private GameObject modelDirection;          // GameObject instance representing the models direction
         private LineRenderer modelLine;             // Used to render a line pointing from the model origin in the model direction
         private GameObject modelOrigin;				// GameObject instance representing the models origin
@@ -182,6 +181,10 @@ private void CreateTarget(GameObject prefab, ref GameObject target, string name)
             // Create prefab
             target = GameObject.Instantiate(prefab);
 
+            // Start this target at the same location as the last target
+            // or near the user if there is no last target position
+            target.transform.position = (lastTargetPosition != Vector3.zero ? lastTargetPosition : CameraCache.Main.transform.position);
+
             // Make sure it's active (in case inactive due to auto generation)
             target.SetActive(true);
 
@@ -299,8 +302,6 @@ private void NextStep()
                     // Update parent rotation, but around placement origin
                     gameObject.transform.RotateAround(placementOriginWorld, Vector3.up, rotation);
 
-                    // HACK: keepLocation = placementOriginWorld;
-
                     // Finish refinement
                     FinishRefinement();
 
@@ -327,10 +328,11 @@ private void StopAndCleanup()
             // Cleanup resources
             Cleanup(ref modelOrigin);
             Cleanup(ref modelDirection);
-            // HACK:
-            //Cleanup(ref placementOrigin);
-            //Cleanup(ref placementDirection);
+            Cleanup(ref placementOrigin);
+            Cleanup(ref placementDirection);
 
+            // Reset placeholders
+            lastTargetPosition = Vector3.zero;
             modelLine = null;
             placementLine = null;
             targetInterpolator = null;
@@ -439,12 +441,6 @@ protected override void Update()
             // Pass to base first
             base.Update();
 
-            // HACK:
-            if (keepLocation != Vector3.zero)
-            {
-                gameObject.transform.RotateAround(keepLocation, Vector3.up, Time.deltaTime * 20);
-            }
-
             // If not moving targets, nothing to do
             if (currentStep == RayRefinementStep.None || currentStep == RayRefinementStep.Refinement) { return; }
 
@@ -464,8 +460,11 @@ protected override void Update()
             RaycastHit hitInfo;
             if (Physics.Raycast(cameraTransform.position, cameraTransform.forward, out hitInfo, maxDistance, layers))
             {
+                // Store new position as last
+                lastTargetPosition = hitInfo.point;
+
                 // Tell the target to move to the new position
-                targetInterpolator.SetTargetPosition(hitInfo.point);
+                targetInterpolator.SetTargetPosition(lastTargetPosition);
 
                 // Target has been placed
                 targetPlaced = true;