Skip to content

Commit f33f974

Browse files
committed
Merge remote-tracking branch 'refs/remotes/Microsoft/RS2_WindowsMixedReality' into RS2_WindowsMixedReality
2 parents 291b097 + 3f13d57 commit f33f974

File tree

231 files changed

+30534
-6006
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+30534
-6006
lines changed

Assets/HoloToolkit-Examples/SharingWithUNET/Scenes/sharingwithunet.meta renamed to Assets/HoloToolkit-Examples/AdaptiveQuality.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using UnityEngine;
2+
using HoloToolkit.Unity;
3+
4+
public class AdaptiveQualityExample : MonoBehaviour
5+
{
6+
public TextMesh text;
7+
public AdaptiveQuality quality;
8+
9+
private void Update ()
10+
{
11+
text.text = string.Format("GPUTime:{0:N2}\nQualityLevel:{1}\nViewportScale:{2:N2}",
12+
GpuTiming.GetTime("Frame") * 1000.0f,
13+
quality.QualityLevel,
14+
UnityEngine.VR.VRSettings.renderViewportScale);
15+
}
16+
}

Assets/HoloToolkit-Examples/AdaptiveQuality/AdaptiveQualityExample.cs.meta

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)