Merge branch 'HTK-master' into HTK-local

Author: Stephen Hodgson

Assets/HoloToolkit-Examples/SpatialUnderstanding/SpatialUnderstanding-FeatureOverview/Scripts/AppState.cs

@@ -5,6 +5,7 @@
 using HoloToolkit.Unity;
 using System;
 using HoloToolkit.Unity.InputModule;
+using HoloToolkit.Unity.SpatialMapping;
 
 public class AppState : Singleton<AppState>, ISourceStateHandler, IInputClickHandler
 {

Assets/HoloToolkit/SpatialMapping/Scripts/TapToPlace.cs

@@ -46,12 +46,6 @@ public class TapToPlace : MonoBehaviour, IInputClickHandler
         /// </summary>
         private SpatialMappingManager spatialMappingManager;
 
-        /// <summary>
-        /// Keeps track of the relative position between the parent object to be moved and
-        /// the current gameobject this script is attached to.
-        /// </summary>
-        private Vector3 parentPositionRelativeToChild;
-
         public virtual void Start()
         {
             // Make sure we have all the components in the scene we need.
@@ -79,14 +73,12 @@ public virtual void Start()
 
             if (PlaceParentOnTap)
             {
-                if  (ParentGameObjectToPlace != null && !gameObject.transform.IsChildOf(ParentGameObjectToPlace.transform))
+                if (ParentGameObjectToPlace != null && !gameObject.transform.IsChildOf(ParentGameObjectToPlace.transform))
                 {
                     Debug.LogError("The specified parent object is not a parent of this object.");
                 }
 
                 DetermineParent();
-
-                parentPositionRelativeToChild = gameObject.transform.position - ParentGameObjectToPlace.transform.position;
             }
         }
 
@@ -117,7 +109,8 @@ public virtual void Update()
                     if (PlaceParentOnTap)
                     {
                         // Place the parent object as well but keep the focus on the current game object
-                        ParentGameObjectToPlace.transform.position = hitInfo.point - parentPositionRelativeToChild;
+                        Vector3 currentMovement = hitInfo.point - gameObject.transform.position;
+                        ParentGameObjectToPlace.transform.position += currentMovement;
                         ParentGameObjectToPlace.transform.rotation = toQuat;
                     }
                     else

Assets/HoloToolkit/Utilities/Editor/EditorGUILayoutExtensions.cs

@@ -9,7 +9,7 @@
 namespace HoloToolkit.Unity
 {
     /// <summary>
-    /// Extensions for the UnityEnditor.EditorGUILayout class.
+    /// Extensions for the UnityEditor.EditorGUILayout class.
     /// </summary>
     public static class EditorGUILayoutExtensions
     {
@@ -40,10 +40,16 @@ public static void Label(string text, GUIStyle style, params GUILayoutOption[] o
             EditorGUILayout.EndHorizontal();
         }
 
-        public static T ObjectField<T>(GUIContent guiContent, T value, bool allowSceneObjects, GUILayoutOption[] guiLayoutOptions = null)
+        public static T ObjectField<T>(GUIContent guiContent, T value, bool allowSceneObjects = false, GUILayoutOption[] guiLayoutOptions = null)
         {
             object objValue = value;
 
+            if (objValue == null)
+            {
+                // We want to return null so we can display our blank field.
+                return (T)objValue;
+            }
+
             Type valueType = objValue.GetType();
             if (valueType == typeof(Material))
             {
@@ -70,4 +76,4 @@ public static T ObjectField<T>(GUIContent guiContent, T value, bool allowSceneOb
             return (T)objValue;
         }
     }
-}
+}

Assets/HoloToolkit/Utilities/Scripts/Extensions/VectorExtensions.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 
 namespace HoloToolkit.Unity
@@ -50,5 +52,34 @@ public static Vector3 InverseTransformPoint(this Vector3 point, Vector3 translat
             var scaleInv = new Vector3(1 / lossyScale.x, 1 / lossyScale.y, 1 / lossyScale.z);
             return Vector3.Scale(scaleInv, (Quaternion.Inverse(rotation) * (point - translation)));
         }
+
+        public static Vector3 Average(ICollection<Vector3> vectors)
+        {
+            if (vectors.Count == 0)
+            {
+                return Vector3.zero;
+            }
+
+            var x = 0f;
+            var y = 0f;
+            var z = 0f;
+            foreach (var pos in vectors)
+            {
+                x += pos.x;
+                y += pos.y;
+                z += pos.z;
+            }
+            return new Vector3(x / vectors.Count, y / vectors.Count, z / vectors.Count);
+        }
+
+        public static Vector3 Median(ICollection<Vector3> vectors)
+        {
+            if (vectors.Count == 0)
+            {
+                return Vector3.zero;
+            }
+
+            return vectors.OrderBy(v => v.sqrMagnitude).ElementAt(vectors.Count / 2);
+        }
     }
-}
+}