Skip to content

Prevent VCS thrashing - Use platform-independent paths in OpenVRSettings #112

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prevent VCS thrashing - Use platform-independent paths in OpenVRSettings #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 26 additions & 5 deletions com.valve.openvr/Runtime/OpenVRSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,25 @@ namespace Unity.XR.OpenVR
[System.Serializable]
public class OpenVRSettings : ScriptableObject
{
// Convert backslashes in relative paths to forward-slashes for cross-platform compatibility
// Windows Volume-prefixed paths and POSIX absolute paths have semantics preserved.
// Only call on output paths constructed with System.IO.Path.* on the current platform;
// For paths coming from other platforms, forward-slash must be valid or decoded;
// This is not necessary here, as forward-slash is valid in all Unity targets.
private static string SlashifyPath(string path) {
var sep = System.IO.Path.DirectorySeparatorChar;
var sepAlt = System.IO.Path.AltDirectorySeparatorChar;
// Only convert when both back slashes and forward slashes are semantically valid in the
// context of the current platform's Path handling.
// Avoids semantic alteration of questionable paths on POSIX systems where backslash is
// usually used as an escape character, and are not generally included within the path.
if ((sep == '\\' || sepAlt == '\\') && (sep == '/' || sepAlt == '/'))
{
return path.Replace('\\', '/');
}
return path;
}

public enum StereoRenderingModes
{
MultiPass = 0,
Expand Down Expand Up @@ -162,6 +181,7 @@ public static OpenVRSettings GetSettings(bool create = true)

public bool InitializeActionManifestFileRelativeFilePath()
{
#if UNITY_EDITOR
string oldPath = ActionManifestFileRelativeFilePath;
string newPath;

Expand All @@ -174,13 +194,14 @@ public bool InitializeActionManifestFileRelativeFilePath()

if (newPath.StartsWith("Assets"))
newPath = newPath.Remove(0, "Assets".Length + 1);

newPath = SlashifyPath(newPath);
}
else
{
newPath = null;
}

#if UNITY_EDITOR
if (newPath != oldPath)
{
ActionManifestFileRelativeFilePath = newPath;
Expand All @@ -205,10 +226,10 @@ public void Awake()
#else
public static OpenVRSettings s_Settings;

public void Awake()
{
s_Settings = this;
}
public void Awake()
{
s_Settings = this;
}
#endif
}
}