Skip to content

Commit cbca4a6

Browse files
committed
Change to one click installing Wave XR Plugin and OpenVR XR Plugin
1. Add registry 2. Install plugin 3. Assign XR loader
1 parent 65fbba9 commit cbca4a6

File tree

6 files changed

+122
-212
lines changed

6 files changed

+122
-212
lines changed

Assets/HTC.UnityPlugin/ViveInputUtility/Examples/2.2DDragDrop/Sprites/Orange.png.meta

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

Assets/HTC.UnityPlugin/ViveInputUtility/Examples/2.2DDragDrop/Sprites/Turquoise.png.meta

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

Assets/HTC.UnityPlugin/ViveInputUtility/Examples/2.2DDragDrop/Sprites/Yellow.png.meta

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

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VIUProjectSettings.cs

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,35 @@ public class VIUProjectSettings : ScriptableObject, ISerializationCallbackReceiv
1616
private static string s_defaultAssetPath;
1717
private static string s_partialActionDirPath;
1818

19-
public bool HTCRegistryLicenseAccepted
19+
[SerializeField] private bool m_isInstallingWaveXRPlugin;
20+
[SerializeField] private bool m_isInstallingOpenVRXRPlugin;
21+
[SerializeField] private List<string> m_ignoreKeys;
22+
23+
public bool isInstallingWaveXRPlugin
2024
{
2125
get
2226
{
23-
return m_HTCRegistryLicenseAccepted;
27+
return m_isInstallingWaveXRPlugin;
2428
}
2529
set
2630
{
27-
m_HTCRegistryLicenseAccepted = value;
28-
EditorUtility.SetDirty(this);
31+
m_isInstallingWaveXRPlugin = value;
32+
Save();
2933
}
3034
}
3135

32-
[SerializeField]
33-
private bool m_HTCRegistryLicenseAccepted;
34-
35-
[SerializeField]
36-
private List<string> m_ignoreKeys;
36+
public bool isInstallingOpenVRXRPlugin
37+
{
38+
get
39+
{
40+
return m_isInstallingOpenVRXRPlugin;
41+
}
42+
set
43+
{
44+
m_isInstallingOpenVRXRPlugin = value;
45+
Save();
46+
}
47+
}
3748

3849
private HashSet<string> m_ignoreKeySet;
3950
private bool m_isDirty;
@@ -79,9 +90,16 @@ public static string partialActionDirPath
7990
}
8091
}
8192

82-
public static string partialActionFileName { get { return "actions.json"; } }
93+
public static string partialActionFileName
94+
{
95+
get { return "actions.json"; }
96+
}
8397

84-
public static bool hasChanged { get { return Instance.m_isDirty; } }
98+
public static bool hasChanged
99+
{
100+
get { return Instance.m_isDirty; }
101+
set { Instance.m_isDirty = value; }
102+
}
85103

86104
public void OnBeforeSerialize()
87105
{

0 commit comments

Comments
 (0)