Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow Enabling 90Hz mode for Oculus #108

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Assets/Scripts/UserConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ public struct VideoConfig

private const float kDefaultSmoothing = 0.98f;
private const float kDefaultOdsPoleCollapsing = 1.0f;
private const float kDefaultDisplayRefresh = 72.0f;

float? m_FPS;
public float FPS
Expand Down Expand Up @@ -476,6 +477,17 @@ public float OdsPoleCollapsing
}
}
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't sure if Video was the right section for this, but I didn't see anything better. It seems like it's mostly video out stuff...

float? m_DisplayRefresh;
public float DisplayRefresh
{
get { return m_DisplayRefresh ?? kDefaultDisplayRefresh; }
set
{
m_DisplayRefresh = value;
}
}

}

public VideoConfig Video;
Expand Down
23 changes: 23 additions & 0 deletions Assets/Scripts/VrSdk.cs
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,22 @@ void Awake()
manager.useRecommendedMSAALevel = false;

SetControllerStyle(TiltBrush.ControllerStyle.OculusTouch);

// Set custom refresh rate, if possible. To see the current framerate, look in the logs for prints like this one. The first number is the actual frame rate, the second is the display refresh rate (aka target)
// VrApi : FPS=90/90,Prd=33ms,Tear=0,Early=0...
float targetDisplayRefresh = App.UserConfig.Video.DisplayRefresh;
float[] freqs = OVRManager.display.displayFrequenciesAvailable;
foreach (float freq in freqs)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't sure if we should do this check here or in UserOptions, but it needs the OVRManager and that was throwing exceptions in UserOptions, so I left it here

{
if (Math.Abs(freq - targetDisplayRefresh) < 1)
{
OVRPlugin.systemDisplayFrequency = freq;
OVRManager.DisplayRefreshRateChanged += DisplayRefreshRateChanged;
Debug.Log($"Set display refresh to {freq}");
break;
}
}

// adding components to the VR Camera needed for fading view and getting controller poses.
m_VrCamera.gameObject.AddComponent<OculusCameraFade>();
m_VrCamera.gameObject.AddComponent<OculusPreCullHook>();
Expand Down Expand Up @@ -343,6 +359,13 @@ private void OnInputFocus(params object[] args)
m_HasVrFocus = (bool)args[0];
}

#if OCULUS_SUPPORTED
private void DisplayRefreshRateChanged (float fromRefreshRate, float ToRefreshRate)
{
Debug.LogWarning(string.Format("Refresh rate changed from {0} to {1}", fromRefreshRate, ToRefreshRate));
mikeskydev marked this conversation as resolved.
Show resolved Hide resolved
}
#endif

private void OnNewPoses()
{
if (NewControllerPosesApplied != null)
Expand Down