Skip to content

Commit 44a2c9a

Browse files
demonixisdemonixis
committed
Added WaveVR initial support
1 parent 0bc51bb commit 44a2c9a

File tree

259 files changed

+31650
-50
lines changed

Some content is hidden

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

259 files changed

+31650
-50
lines changed

‎Assets/Plugins/Android/AndroidManifest.xml‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
43
package="com.unity3d.player"
5-
xmlns:tools="http://schemas.android.com/tools"
6-
android:installLocation="preferExternal">
7-
<supports-screens
8-
android:smallScreens="true"
9-
android:normalScreens="true"
10-
android:largeScreens="true"
11-
android:xlargeScreens="true"
12-
android:anyDensity="true"/>
13-
14-
<application
15-
android:theme="@style/UnityThemeSelector"
16-
android:icon="@mipmap/app_icon"
17-
android:label="@string/app_name">
18-
<activity android:name="com.unity3d.player.UnityPlayerActivity"
19-
android:label="@string/app_name">
4+
xmlns:tools="http://schemas.android.com/tools">
5+
<application android:icon="@drawable/app_icon"
6+
android:label="@string/app_name"
7+
android:theme="@style/Theme.WaveVR.Loading"
8+
android:resizeableActivity="false"
9+
tools:replace="android:theme"> <!--You can use your theme here.-->
10+
<activity android:name="com.htc.vr.unity.WVRUnityVRActivity"
11+
android:label="@string/app_name"
12+
android:enableVrMode="@string/wvr_vr_mode_component">
2013
<intent-filter>
2114
<action android:name="android.intent.action.MAIN" />
2215
<category android:name="android.intent.category.LAUNCHER" />
16+
<category android:name="com.htc.intent.category.VRAPP" />
2317
</intent-filter>
2418
<meta-data android:name="unityplayer.UnityActivity" android:value="true" />
19+
<meta-data android:name="unityplayer.SkipPermissionsDialog" android:value="true" />
2520
</activity>
2621
</application>
27-
28-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
22+
23+
<!-- <uses-permission android:name="android.permission.CAMERA" /> -->
24+
<!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> -->
25+
26+
<uses-permission android:name="com.htc.vr.core.server.VRDataWrite"/>
27+
<uses-permission android:name="com.htc.vr.core.server.VRDataRead"/>
28+
<uses-permission android:name="com.htc.vr.core.server.VRDataProvider" />
29+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
2930
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
3031
</manifest>
3132

‎Assets/Plugins/Android/_AndroidManifest-oculus.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
package="com.unity3d.player"
5+
xmlns:tools="http://schemas.android.com/tools"
6+
android:installLocation="preferExternal">
7+
<supports-screens
8+
android:smallScreens="true"
9+
android:normalScreens="true"
10+
android:largeScreens="true"
11+
android:xlargeScreens="true"
12+
android:anyDensity="true"/>
13+
14+
<application
15+
android:theme="@style/UnityThemeSelector"
16+
android:icon="@mipmap/app_icon"
17+
android:label="@string/app_name">
18+
<activity android:name="com.unity3d.player.UnityPlayerActivity"
19+
android:label="@string/app_name">
20+
<intent-filter>
21+
<action android:name="android.intent.action.MAIN" />
22+
<category android:name="android.intent.category.LAUNCHER" />
23+
</intent-filter>
24+
<meta-data android:name="unityplayer.UnityActivity" android:value="true" />
25+
</activity>
26+
</application>
27+
28+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
29+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
30+
</manifest>
31+

‎Assets/Plugins/Android/_AndroidManifest-oculus.xml.meta‎

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

‎Assets/Plugins/Android/_AndroidManifest-wavevr.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="com.unity3d.player"
4+
xmlns:tools="http://schemas.android.com/tools">
5+
<application android:icon="@drawable/app_icon"
6+
android:label="@string/app_name"
7+
android:theme="@style/Theme.WaveVR.Loading"
8+
android:resizeableActivity="false"
9+
tools:replace="android:theme"> <!--You can use your theme here.-->
10+
<activity android:name="com.htc.vr.unity.WVRUnityVRActivity"
11+
android:label="@string/app_name"
12+
android:enableVrMode="@string/wvr_vr_mode_component">
13+
<intent-filter>
14+
<action android:name="android.intent.action.MAIN" />
15+
<category android:name="android.intent.category.LAUNCHER" />
16+
<category android:name="com.htc.intent.category.VRAPP" />
17+
</intent-filter>
18+
<meta-data android:name="unityplayer.UnityActivity" android:value="true" />
19+
<meta-data android:name="unityplayer.SkipPermissionsDialog" android:value="true" />
20+
</activity>
21+
</application>
22+
23+
<!-- <uses-permission android:name="android.permission.CAMERA" /> -->
24+
<!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> -->
25+
26+
<uses-permission android:name="com.htc.vr.core.server.VRDataWrite"/>
27+
<uses-permission android:name="com.htc.vr.core.server.VRDataRead"/>
28+
<uses-permission android:name="com.htc.vr.core.server.VRDataProvider" />
29+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
30+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
31+
</manifest>
32+

‎Assets/Plugins/Android/_AndroidManifest-wavevr.xml.meta‎

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

‎Assets/Prefabs/Player.prefab‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ GameObject:
1111
- component: {fileID: 4000010397047646}
1212
- component: {fileID: 683780764699907693}
1313
- component: {fileID: 1968203508281764117}
14+
- component: {fileID: 4537370621232559901}
15+
- component: {fileID: 7398004323309537648}
1416
m_Layer: 0
1517
m_Name: Head
1618
m_TagString: Untagged
@@ -61,7 +63,36 @@ MonoBehaviour:
6163
m_Name:
6264
m_EditorClassIdentifier:
6365
m_priority: 0
64-
m_TiledMultiResLevel: 3
66+
--- !u!114 &4537370621232559901
67+
MonoBehaviour:
68+
m_ObjectHideFlags: 0
69+
m_CorrespondingSourceObject: {fileID: 0}
70+
m_PrefabInstance: {fileID: 0}
71+
m_PrefabAsset: {fileID: 0}
72+
m_GameObject: {fileID: 1000011355703082}
73+
m_Enabled: 1
74+
m_EditorHideFlags: 0
75+
m_Script: {fileID: 11500000, guid: f789080946055a44ab5c39ff6a830ec3, type: 3}
76+
m_Name:
77+
m_EditorClassIdentifier:
78+
m_priority: 0
79+
m_Enable: 0
80+
--- !u!114 &7398004323309537648
81+
MonoBehaviour:
82+
m_ObjectHideFlags: 0
83+
m_CorrespondingSourceObject: {fileID: 0}
84+
m_PrefabInstance: {fileID: 0}
85+
m_PrefabAsset: {fileID: 0}
86+
m_GameObject: {fileID: 1000011355703082}
87+
m_Enabled: 1
88+
m_EditorHideFlags: 0
89+
m_Script: {fileID: 11500000, guid: e2d61e51e1615c54c9eb75e7ef11fb4d, type: 3}
90+
m_Name:
91+
m_EditorClassIdentifier:
92+
m_priority: 0
93+
m_ReplaceTrackedPoseDriver: 1
94+
m_ControllerFollowsHead: 1
95+
m_DisableInEditor: 0
6596
--- !u!1 &1000011480992356
6697
GameObject:
6798
m_ObjectHideFlags: 0

‎Assets/Prefabs/Spectator.prefab‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ GameObject:
1212
- component: {fileID: 1167180997}
1313
- component: {fileID: 1167180998}
1414
- component: {fileID: 1167180999}
15+
- component: {fileID: 381918504775164703}
1516
m_Layer: 0
1617
m_Name: Head
1718
m_TagString: Untagged
@@ -64,7 +65,6 @@ MonoBehaviour:
6465
m_Name:
6566
m_EditorClassIdentifier:
6667
m_priority: 10
67-
m_TiledMultiResLevel: 0
6868
--- !u!114 &1167180999
6969
MonoBehaviour:
7070
m_ObjectHideFlags: 0
@@ -79,6 +79,22 @@ MonoBehaviour:
7979
m_EditorClassIdentifier:
8080
m_priority: 0
8181
m_Enable: 0
82+
--- !u!114 &381918504775164703
83+
MonoBehaviour:
84+
m_ObjectHideFlags: 0
85+
m_CorrespondingSourceObject: {fileID: 0}
86+
m_PrefabInstance: {fileID: 0}
87+
m_PrefabAsset: {fileID: 0}
88+
m_GameObject: {fileID: 1000010551146132}
89+
m_Enabled: 1
90+
m_EditorHideFlags: 0
91+
m_Script: {fileID: 11500000, guid: e2d61e51e1615c54c9eb75e7ef11fb4d, type: 3}
92+
m_Name:
93+
m_EditorClassIdentifier:
94+
m_priority: 0
95+
m_ReplaceTrackedPoseDriver: 1
96+
m_ControllerFollowsHead: 1
97+
m_DisableInEditor: 0
8298
--- !u!1 &1000012286035268
8399
GameObject:
84100
m_ObjectHideFlags: 0

‎Assets/Scenes/Menu.unity‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6362,11 +6362,6 @@ PrefabInstance:
63626362
propertyPath: m_LocalEulerAnglesHint.z
63636363
value: 0
63646364
objectReference: {fileID: 0}
6365-
- target: {fileID: 6209523026624487589, guid: 05215c92a43574f4a884ac60658dc925,
6366-
type: 3}
6367-
propertyPath: m_Menu
6368-
value:
6369-
objectReference: {fileID: 1214623308}
63706365
m_RemovedComponents: []
63716366
m_SourcePrefab: {fileID: 100100000, guid: 05215c92a43574f4a884ac60658dc925, type: 3}
63726367
--- !u!1 &1242347242

‎Assets/Scripts/Core/Input/OculusInput.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#if UNITY_ANDROID
2-
#define OCULUS_SDK
3-
#endif
4-
using Demonixis.Toolbox.XR;
1+
using Demonixis.Toolbox.XR;
52
using UnityEngine.XR;
63

74
namespace TESUnity.Inputs

‎Assets/Scripts/Core/Input/WaveVRInput.cs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System;
2+
3+
namespace TESUnity.Inputs
4+
{
5+
public sealed class WaveVRInput : IInputProvider
6+
{
7+
public float GetAxis(MWAxis axis)
8+
{
9+
throw new NotImplementedException();
10+
}
11+
12+
public bool GetButton(MWButton button)
13+
{
14+
throw new NotImplementedException();
15+
}
16+
17+
public bool GetButtonDown(MWButton button)
18+
{
19+
throw new NotImplementedException();
20+
}
21+
22+
public bool GetButtonUp(MWButton button)
23+
{
24+
throw new NotImplementedException();
25+
}
26+
27+
public bool TryInitialize()
28+
{
29+
#if WAVEVR_SDK
30+
return true;
31+
#else
32+
return false;
33+
#endif
34+
}
35+
}
36+
}

0 commit comments

Comments
 (0)