Merge pull request #1178 from StephenHodgson/MRTK-DevMerge

Dev Branch -> Master Merge

.gitignore

@@ -33,7 +33,6 @@ obj/
 *.ipch
 *.opensdf
 *.sdf
-*.obj
 *.tlog
 *.log
 *.idb

Assets/HoloToolkit-Examples/AdaptiveQuality/AdaptiveQualityExample.cs

@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+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,
+#if UNITY_2017_2_OR_NEWER
+            UnityEngine.XR.XRSettings.renderViewportScale);
+#else
+            UnityEngine.VR.VRSettings.renderViewportScale);
+#endif
+    }
+}