Skip to content

Commit 4525e6d

Browse files
MorbeavusMorbeavus
committed
Upgraded to v32
Change log can be found here: https://developer.oculus.com/downloads/package/unity-integration/32.0
1 parent e8ae380 commit 4525e6d

File tree

239 files changed

+35827
-8801
lines changed

Some content is hidden

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

239 files changed

+35827
-8801
lines changed

‎Core/Firebase.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.

‎Core/Firebase/Editor.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.

‎Core/Firebase/Editor/FirebaseEnabler.cs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
using UnityEditor;
2+
3+
public class FirebaseEnabler
4+
{
5+
private static readonly string FirebaseBuildDefinition = "OVR_SAMPLES_ENABLE_FIREBASE";
6+
7+
[MenuItem("Oculus/Samples/Firebase/Enable Firebase Sample")]
8+
public static void EnableFirebaseSample()
9+
{
10+
var defineString = PlayerSettings.GetScriptingDefineSymbolsForGroup(BuildTargetGroup.Android);
11+
PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.Android, $"{defineString};{FirebaseBuildDefinition}");
12+
}
13+
14+
[MenuItem("Oculus/Samples/Firebase/Disable Firebase Sample")]
15+
public static void DisableFirebaseSample()
16+
{
17+
var defineString = PlayerSettings.GetScriptingDefineSymbolsForGroup(BuildTargetGroup.Android);
18+
var defines = defineString.Split(new char[] { ';' }, System.StringSplitOptions.RemoveEmptyEntries);
19+
var filtered = System.Array.FindAll(defines, d => d != FirebaseBuildDefinition);
20+
PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.Android, string.Join(";", filtered));
21+
}
22+
}

‎Core/Firebase/Editor/FirebaseEnabler.cs.meta‎

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

‎Core/Firebase/Editor/Oculus.SampleFramewrok.Core.Firebase.Editor.asmdef‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"name": "Oculus.SampleFramewrok.Core.Firebase.Editor",
3+
"rootNamespace": "",
4+
"references": [
5+
"GUID:c7394a0699131374ba4de230e8b12ec9"
6+
],
7+
"includePlatforms": [
8+
"Editor"
9+
],
10+
"excludePlatforms": [],
11+
"allowUnsafeCode": false,
12+
"overrideReferences": false,
13+
"precompiledReferences": [],
14+
"autoReferenced": true,
15+
"defineConstraints": [],
16+
"versionDefines": [],
17+
"noEngineReferences": false
18+
}

‎Core/Firebase/Editor/Oculus.SampleFramewrok.Core.Firebase.Editor.asmdef.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.

‎Core/Gradle/Editor/Oculus.SampleFramework.Core.Gradle.Editor.asmdef‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"name": "Oculus.SampleFramework.Core.Gradle.Editor",
3+
"rootNamespace": "",
4+
"references": [
5+
"GUID:c7394a0699131374ba4de230e8b12ec9"
6+
],
7+
"includePlatforms": [
8+
"Editor"
9+
],
10+
"excludePlatforms": [],
11+
"allowUnsafeCode": false,
12+
"overrideReferences": false,
13+
"precompiledReferences": [],
14+
"autoReferenced": true,
15+
"defineConstraints": [],
16+
"versionDefines": [],
17+
"noEngineReferences": false
18+
}

‎Core/Gradle/Editor/Oculus.SampleFramework.Core.Gradle.Editor.asmdef.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.

‎Core/HandsInteraction/Materials/DefaultHandMaterial.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: DefaultHandMaterial
1011
m_Shader: {fileID: 4800000, guid: 8aba22c2208aff640a2fdc9a5e45a9dd, type: 3}
1112
m_ShaderKeywords:

‎Core/HandsInteraction/Prefabs/InteractableToolsSDKDriver.prefab‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1001 &100100000
4-
Prefab:
5-
m_ObjectHideFlags: 1
6-
serializedVersion: 2
7-
m_Modification:
8-
m_TransformParent: {fileID: 0}
9-
m_Modifications: []
10-
m_RemovedComponents: []
11-
m_ParentPrefab: {fileID: 0}
12-
m_RootGameObject: {fileID: 1099536711198800}
13-
m_IsPrefabParent: 1
143
--- !u!1 &1099536711198800
154
GameObject:
165
m_ObjectHideFlags: 0
17-
m_PrefabParentObject: {fileID: 0}
18-
m_PrefabInternal: {fileID: 100100000}
19-
serializedVersion: 5
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
2010
m_Component:
2111
- component: {fileID: 4344865891687486}
2212
- component: {fileID: 114894749535269414}
@@ -30,9 +20,10 @@ GameObject:
3020
m_IsActive: 1
3121
--- !u!4 &4344865891687486
3222
Transform:
33-
m_ObjectHideFlags: 1
34-
m_PrefabParentObject: {fileID: 0}
35-
m_PrefabInternal: {fileID: 100100000}
23+
m_ObjectHideFlags: 0
24+
m_CorrespondingSourceObject: {fileID: 0}
25+
m_PrefabInstance: {fileID: 0}
26+
m_PrefabAsset: {fileID: 0}
3627
m_GameObject: {fileID: 1099536711198800}
3728
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3829
m_LocalPosition: {x: 0, y: 0, z: 0.49675}
@@ -41,31 +32,41 @@ Transform:
4132
m_Father: {fileID: 0}
4233
m_RootOrder: 0
4334
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
44-
--- !u!114 &114475763992432942
35+
--- !u!114 &114894749535269414
4536
MonoBehaviour:
46-
m_ObjectHideFlags: 1
47-
m_PrefabParentObject: {fileID: 0}
48-
m_PrefabInternal: {fileID: 100100000}
37+
m_ObjectHideFlags: 0
38+
m_CorrespondingSourceObject: {fileID: 0}
39+
m_PrefabInstance: {fileID: 0}
40+
m_PrefabAsset: {fileID: 0}
4941
m_GameObject: {fileID: 1099536711198800}
5042
m_Enabled: 1
5143
m_EditorHideFlags: 0
52-
m_Script: {fileID: 11500000, guid: 85fb71180be543b44a6c8c1e4253dce4, type: 3}
44+
m_Script: {fileID: 11500000, guid: 83ffd5d8c717af84394416b29a9135e1, type: 3}
5345
m_Name:
5446
m_EditorClassIdentifier:
55-
--- !u!114 &114894749535269414
47+
LeftHandTools:
48+
- {fileID: 4663491353866464, guid: 54e898404b081ae438d0b5d097aae07a, type: 3}
49+
- {fileID: 4212808563549492, guid: 50f797a2ff610ca4099b5cf42214abd5, type: 3}
50+
- {fileID: 4663491353866464, guid: fa0335bbc63fc1b46b9b6d2b41d39f6d, type: 3}
51+
- {fileID: 4663491353866464, guid: d64b2e1f5538eca479e4bc093f451518, type: 3}
52+
- {fileID: 4663491353866464, guid: b6168aea9d5fbf2448d74ed414bdca3b, type: 3}
53+
- {fileID: 4663491353866464, guid: cf111ea2144c9504d95ffc8cd94475bc, type: 3}
54+
RightHandTools:
55+
- {fileID: 4212808563549492, guid: 50f797a2ff610ca4099b5cf42214abd5, type: 3}
56+
- {fileID: 4663491353866464, guid: 54e898404b081ae438d0b5d097aae07a, type: 3}
57+
- {fileID: 4663491353866464, guid: fa0335bbc63fc1b46b9b6d2b41d39f6d, type: 3}
58+
- {fileID: 4663491353866464, guid: d64b2e1f5538eca479e4bc093f451518, type: 3}
59+
- {fileID: 4663491353866464, guid: b6168aea9d5fbf2448d74ed414bdca3b, type: 3}
60+
- {fileID: 4663491353866464, guid: cf111ea2144c9504d95ffc8cd94475bc, type: 3}
61+
--- !u!114 &114475763992432942
5662
MonoBehaviour:
57-
m_ObjectHideFlags: 1
58-
m_PrefabParentObject: {fileID: 0}
59-
m_PrefabInternal: {fileID: 100100000}
63+
m_ObjectHideFlags: 0
64+
m_CorrespondingSourceObject: {fileID: 0}
65+
m_PrefabInstance: {fileID: 0}
66+
m_PrefabAsset: {fileID: 0}
6067
m_GameObject: {fileID: 1099536711198800}
6168
m_Enabled: 1
6269
m_EditorHideFlags: 0
63-
m_Script: {fileID: 11500000, guid: 83ffd5d8c717af84394416b29a9135e1, type: 3}
70+
m_Script: {fileID: 11500000, guid: 85fb71180be543b44a6c8c1e4253dce4, type: 3}
6471
m_Name:
6572
m_EditorClassIdentifier:
66-
LeftHandTools:
67-
- {fileID: 4663491353866464, guid: 54e898404b081ae438d0b5d097aae07a, type: 2}
68-
- {fileID: 4212808563549492, guid: 50f797a2ff610ca4099b5cf42214abd5, type: 2}
69-
RightHandTools:
70-
- {fileID: 4212808563549492, guid: 50f797a2ff610ca4099b5cf42214abd5, type: 2}
71-
- {fileID: 4663491353866464, guid: 54e898404b081ae438d0b5d097aae07a, type: 2}

0 commit comments

Comments
 (0)