Merge pull request #283 from darax/master

Fix issues #280 and #282

Author: NeerajW

Assets/HoloToolkit/Input/Scripts/GazeStabilizer.cs

@@ -44,9 +44,9 @@ public class GazeStabilizer : MonoBehaviour
 
         public struct GazeSample
         {
-            public Vector3 position;
-            public Vector3 direction;
-            public float timestamp;
+            public Vector3 Position;
+            public Vector3 Direction;
+            public float Timestamp;
         };
 
         private LinkedList<GazeSample> stabilitySamples = new LinkedList<GazeSample>();
@@ -96,9 +96,9 @@ private void AddGazeSample(Vector3 positionSample, Vector3 directionSample)
         {
             // Record and save sample data.
             GazeSample newStabilitySample;
-            newStabilitySample.position = positionSample;
-            newStabilitySample.direction = directionSample;
-            newStabilitySample.timestamp = Time.time;
+            newStabilitySample.Position = positionSample;
+            newStabilitySample.Direction = directionSample;
+            newStabilitySample.Timestamp = Time.time;
 
             if (stabilitySamples != null)
             {
@@ -114,19 +114,6 @@ private void AddGazeSample(Vector3 positionSample, Vector3 directionSample)
 
         private void UpdateInstability(out float positionInstability, out float directionInstability)
         {
-            GazeSample mostRecentSample;
-
-            float positionDeltaMin = 0.0f;
-            float positionDeltaMax = 0.0f;
-            float positionDeltaMean = 0.0f;
-
-            float directionDeltaMin = 0.0f;
-            float directionDeltaMax = 0.0f;
-            float directionDeltaMean = 0.0f;
-
-            float positionDelta = 0.0f;
-            float directionDelta = 0.0f;
-
             positionInstability = 0.0f;
             directionInstability = 0.0f;
 
@@ -136,37 +123,39 @@ private void UpdateInstability(out float positionInstability, out float directio
                 return;
             }
 
-            mostRecentSample = stabilitySamples.Last.Value;
+            GazeSample mostRecentSample = stabilitySamples.Last.Value;
 
-            bool first = true;
-            foreach(GazeSample sample in stabilitySamples)
-            {    
-                // Calculate difference between current sample and most recent sample.
-                positionDelta = Vector3.Magnitude(sample.position - mostRecentSample.position);
+            float positionDeltaMin = float.MaxValue;
+            float positionDeltaMax = float.MinValue;
+            float positionDeltaMean = 0.0f;
 
-                directionDelta = Vector3.Angle(sample.direction, mostRecentSample.direction) * Mathf.Deg2Rad;
+            float directionDeltaMin = float.MaxValue;
+            float directionDeltaMax = float.MinValue;
+            float directionDeltaMean = 0.0f;
 
-                // Initialize max and min on first sample.
-                if (first)
+            float positionDelta = 0.0f;
+            float directionDelta = 0.0f;
+
+            foreach (GazeSample sample in stabilitySamples)
+            {
+                if (sample.Timestamp == mostRecentSample.Timestamp)
                 {
-                    positionDeltaMin = positionDelta;
-                    positionDeltaMax = positionDelta;
-                    directionDeltaMin = directionDelta;
-                    directionDeltaMax = directionDelta;
-                    first = false;
+                    continue;
                 }
-                else
-                {
-                    // Update maximum, minimum and mean differences from most recent sample.
-                    positionDeltaMin = Mathf.Min(positionDelta, positionDeltaMin);
-                    positionDeltaMax = Mathf.Max(positionDelta, positionDeltaMax);
 
-                    directionDeltaMin = Mathf.Min(directionDelta, directionDeltaMin);
-                    directionDeltaMax = Mathf.Max(directionDelta, directionDeltaMax);
-                }
+                // Calculate difference between current sample and most recent sample.
+                positionDelta = Vector3.Magnitude(sample.Position - mostRecentSample.Position);
+                directionDelta = Vector3.Angle(sample.Direction, mostRecentSample.Direction) * Mathf.Deg2Rad;
+
+                // Update maximum, minimum and mean differences from most recent sample.
+                positionDeltaMin = Mathf.Min(positionDelta, positionDeltaMin);
+                positionDeltaMax = Mathf.Max(positionDelta, positionDeltaMax);
+
+                directionDeltaMin = Mathf.Min(directionDelta, directionDeltaMin);
+                directionDeltaMax = Mathf.Max(directionDelta, directionDeltaMax);
 
                 positionDeltaMean += positionDelta;
-                directionDeltaMean += directionDelta; 
+                directionDeltaMean += directionDelta;
             }
 
             positionDeltaMean = positionDeltaMean / (stabilitySamples.Count - 1);

Assets/HoloToolkit/SpatialMapping/Scripts/SpatialProcessing/RemoveSurfaceVertices.cs

@@ -135,8 +135,15 @@ private IEnumerator RemoveSurfaceVerticesWithinBoundsRoutine()
                     }
 
                     Mesh mesh = filter.sharedMesh;
-
-                    if (mesh != null && !mesh.bounds.Intersects(bounds))
+                    MeshRenderer renderer = filter.GetComponent<MeshRenderer>();
+                    
+                    // The mesh renderer bounds are in world space.
+                    // If the mesh is null there is nothing to process
+                    // If the renderer is null we can't get the renderer bounds
+                    // If the renderer's bounds aren't contained inside of the current
+                    // bounds from the bounds queue there is no reason to process
+                    // If any of the above conditions are met, then we should go to the next meshfilter. 
+                    if (mesh == null || renderer == null || !renderer.bounds.Intersects(bounds))
                     {
                         // We don't need to do anything to this mesh, move to the next one.
                         continue;
@@ -149,7 +156,7 @@ private IEnumerator RemoveSurfaceVerticesWithinBoundsRoutine()
                     // Find which mesh vertices are within the bounds.
                     for (int i = 0; i < verts.Length; ++i)
                     {
-                        if (bounds.Contains(verts[i]))
+                        if (bounds.Contains(filter.transform.TransformPoint(verts[i])))
                         {
                             // These vertices are within bounds, so mark them for removal.
                             vertsToRemove.Add(i);