Merge remote-tracking branch 'refs/remotes/Microsoft/RS2_WindowsMixed…

…Reality' into RS2_WindowsMixedReality
microsoft · Jul 11, 2017 · 0cdbbd6 · 0cdbbd6
2 parents e95caff + 47ed9c1
commit 0cdbbd6
Show file tree

Hide file tree

Showing 48 changed files with 18,771 additions and 21 deletions.
diff --git a/Assets/HoloToolkit-Examples/AdaptiveQuality.meta b/Assets/HoloToolkit-Examples/AdaptiveQuality.meta
diff --git a/Assets/HoloToolkit-Examples/AdaptiveQuality/AdaptiveQualityExample.cs b/Assets/HoloToolkit-Examples/AdaptiveQuality/AdaptiveQualityExample.cs
@@ -0,0 +1,16 @@
+using UnityEngine;
+using HoloToolkit.Unity;
+
+public class AdaptiveQualityExample : MonoBehaviour
+{
+	public TextMesh text;
+	public AdaptiveQuality quality;
+
+	private void Update ()
+	{
+		text.text = string.Format("GPUTime:{0:N2}\nQualityLevel:{1}\nViewportScale:{2:N2}", 
+			GpuTiming.GetTime("Frame") * 1000.0f,
+			quality.QualityLevel,
+			UnityEngine.VR.VRSettings.renderViewportScale);
+	}
+}
diff --git a/Assets/HoloToolkit-Examples/AdaptiveQuality/AdaptiveQualityExample.cs.meta b/Assets/HoloToolkit-Examples/AdaptiveQuality/AdaptiveQualityExample.cs.meta