Skip to content

Commit f53376b

Browse files
committed
added HTC Vive Wave support. updated unity version
1 parent 6567ab8 commit f53376b

18 files changed

Lines changed: 2267 additions & 257 deletions

Assets/Plugins.meta

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

Assets/Plugins/Android.meta

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

Assets/VRstudios/Scenes/Example.unity

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
41+
m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -735,49 +735,6 @@ Transform:
735735
m_Father: {fileID: 0}
736736
m_RootOrder: 2
737737
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
738-
--- !u!1 &1526383946
739-
GameObject:
740-
m_ObjectHideFlags: 0
741-
m_CorrespondingSourceObject: {fileID: 0}
742-
m_PrefabInstance: {fileID: 0}
743-
m_PrefabAsset: {fileID: 0}
744-
serializedVersion: 6
745-
m_Component:
746-
- component: {fileID: 1526383948}
747-
- component: {fileID: 1526383947}
748-
m_Layer: 0
749-
m_Name: Test OpenXR Haptics
750-
m_TagString: Untagged
751-
m_Icon: {fileID: 0}
752-
m_NavMeshLayer: 0
753-
m_StaticEditorFlags: 0
754-
m_IsActive: 1
755-
--- !u!114 &1526383947
756-
MonoBehaviour:
757-
m_ObjectHideFlags: 0
758-
m_CorrespondingSourceObject: {fileID: 0}
759-
m_PrefabInstance: {fileID: 0}
760-
m_PrefabAsset: {fileID: 0}
761-
m_GameObject: {fileID: 1526383946}
762-
m_Enabled: 1
763-
m_EditorHideFlags: 0
764-
m_Script: {fileID: 11500000, guid: 18ac43be360e6a4418a30b5a0b0473d1, type: 3}
765-
m_Name:
766-
m_EditorClassIdentifier:
767-
--- !u!4 &1526383948
768-
Transform:
769-
m_ObjectHideFlags: 0
770-
m_CorrespondingSourceObject: {fileID: 0}
771-
m_PrefabInstance: {fileID: 0}
772-
m_PrefabAsset: {fileID: 0}
773-
m_GameObject: {fileID: 1526383946}
774-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
775-
m_LocalPosition: {x: 0, y: 0, z: 0}
776-
m_LocalScale: {x: 1, y: 1, z: 1}
777-
m_Children: []
778-
m_Father: {fileID: 0}
779-
m_RootOrder: 4
780-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
781738
--- !u!1 &1622342815
782739
GameObject:
783740
m_ObjectHideFlags: 0

Assets/VRstudios/XRInput/API/UnityEngine_XR.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,13 @@ public override bool GatherInput(XRControllerState[] state_controllers, out int
5959

6060
var controller = state_controllers[controllerCount];
6161
controller.connected = true;
62-
62+
6363
// set type
6464
if (c.name.StartsWith("Oculus")) controller.type = XRInputControllerType.Oculus;
6565
else if (c.name.StartsWith("Spatial Controller")) controller.type = XRInputControllerType.WMR;
6666
else if (c.name.StartsWith("HP Reverb G2 Controller")) controller.type = XRInputControllerType.WMR_G2;
6767
else if (c.name.StartsWith("HTC Vive")) controller.type = XRInputControllerType.HTCVive;
68+
else if (c.name.StartsWith("WVR_CR")) controller.type = XRInputControllerType.HTCViveWave;
6869
else if (c.name.StartsWith("Index Controller")) controller.type = XRInputControllerType.ValveIndex;
6970
else controller.type = XRInputControllerType.Unknown;
7071

Assets/VRstudios/XRInput/XRInput.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private IEnumerator Start()
6363
singleton = this;
6464

6565
// print version
66-
Debug.Log("XRInput version: 1.0.6");
66+
Debug.Log("XRInput version: 1.0.7");
6767

6868
// wait for XR loader
6969
while (loader == null || !XRSettings.enabled)
@@ -740,6 +740,7 @@ public enum XRInputControllerType
740740
Unknown,
741741
Oculus,
742742
HTCVive,
743+
HTCViveWave,
743744
ValveIndex,
744745
WMR,
745746
WMR_G2
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 6a675179231eb4b31a3b3ad747a18a9f, type: 3}
13+
m_Name: Wave XR Loader
14+
m_EditorClassIdentifier:

Assets/XR/Loaders/Wave XR Loader.asset.meta

Lines changed: 8 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)