Merge pull request #552 from mironec/fix-spatial-mapping-time

David Kline · web-flow · commit f001b78b7772 · 2017-03-10T09:19:26.000-08:00
Make Spatial Mapping use unscaledTime
diff --git a/Assets/HoloToolkit/SpatialMapping/Scripts/SpatialMappingManager.cs b/Assets/HoloToolkit/SpatialMapping/Scripts/SpatialMappingManager.cs
@@ -212,7 +212,7 @@ public void StartObserver()
             if (!IsObserverRunning())
             {
                 surfaceObserver.StartObserving();
-                StartTime = Time.time;
+                StartTime = Time.unscaledTime;
             }
         }
 
diff --git a/Assets/HoloToolkit/SpatialMapping/Scripts/SpatialMappingObserver.cs b/Assets/HoloToolkit/SpatialMapping/Scripts/SpatialMappingObserver.cs
@@ -150,10 +150,10 @@ private void Update()
                         ReclaimSurface(newSurface);
                     }
                 }
-                else if ((Time.time - updateTime) >= TimeBetweenUpdates)
+                else if ((Time.unscaledTime - updateTime) >= TimeBetweenUpdates)
                 {
                     observer.Update(SurfaceObserver_OnSurfaceChanged);
-                    updateTime = Time.time;
+                    updateTime = Time.unscaledTime;
                 }
             }
         }
diff --git a/Assets/HoloToolkit/SpatialMapping/Tests/Scripts/SpatialProcessingTest.cs b/Assets/HoloToolkit/SpatialMapping/Tests/Scripts/SpatialProcessingTest.cs
@@ -48,7 +48,7 @@ private void Update()
             {
                 // Check to see if enough scanning time has passed
                 // since starting the observer.
-                if ((Time.time - SpatialMappingManager.Instance.StartTime) < scanTime)
+                if ((Time.unscaledTime - SpatialMappingManager.Instance.StartTime) < scanTime)
                 {
                     // If we have a limited scanning time, then we should wait until
                     // enough time has passed before processing the mesh.

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ public void StartObserver()`
`212`	`212`	`if (!IsObserverRunning())`
`213`	`213`	`{`
`214`	`214`	`surfaceObserver.StartObserving();`
`215`		`- StartTime = Time.time;`
	`215`	`+ StartTime = Time.unscaledTime;`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`
Original file line number	Diff line number	Diff line change
`@@ -150,10 +150,10 @@ private void Update()`
`150`	`150`	`ReclaimSurface(newSurface);`
`151`	`151`	`}`
`152`	`152`	`}`
`153`		`- else if ((Time.time - updateTime) >= TimeBetweenUpdates)`
	`153`	`+ else if ((Time.unscaledTime - updateTime) >= TimeBetweenUpdates)`
`154`	`154`	`{`
`155`	`155`	`observer.Update(SurfaceObserver_OnSurfaceChanged);`
`156`		`- updateTime = Time.time;`
	`156`	`+ updateTime = Time.unscaledTime;`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ private void Update()`
`48`	`48`	`{`
`49`	`49`	`// Check to see if enough scanning time has passed`
`50`	`50`	`// since starting the observer.`
`51`		`- if ((Time.time - SpatialMappingManager.Instance.StartTime) < scanTime)`
	`51`	`+ if ((Time.unscaledTime - SpatialMappingManager.Instance.StartTime) < scanTime)`
`52`	`52`	`{`
`53`	`53`	`// If we have a limited scanning time, then we should wait until`
`54`	`54`	`// enough time has passed before processing the mesh.`