Skip to content
This repository was archived by the owner on Nov 8, 2019. It is now read-only.

Commit 396e884

Browse files
rusmaxhamrusmaxham
committed
GVR SDK for Unity v1.150.0
1 parent 2687140 commit 396e884

File tree

154 files changed

+10982
-540
lines changed

Some content is hidden

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

154 files changed

+10982
-540
lines changed

‎Assets/GoogleVR/Demos/Editor/DemoInputManagerEditor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public override void OnInspectorGUI() {
4545
EditorGUI.EndDisabledGroup ();
4646

4747
EditorGUILayout.PropertyField(gvrControllerMainProp);
48-
EditorGUILayout.PropertyField(gvrControllerPointerProp);
48+
EditorGUILayout.PropertyField(gvrControllerPointerProp, true);
4949
EditorGUILayout.PropertyField(gvrReticlePointerProp);
5050

5151
if (DemoInputManager.playerSettingsHasCardboard() ==

‎Assets/GoogleVR/Demos/Editor/PermissionsDemoBuildProcessor.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ namespace GoogleVR.Demos
2525
using UnityEditor.Build.Reporting;
2626
#endif
2727

28+
#if UNITY_2018_1_OR_NEWER
29+
class PermissionsDemoBuildProcessor : IPreprocessBuildWithReport, IPostprocessBuildWithReport
30+
#else
2831
class PermissionsDemoBuildProcessor : IPreprocessBuild, IPostprocessBuild
32+
#endif
2933
{
3034
private const string SCENE_NAME_PERMISSIONS_DEMO = "PermissionsDemo";
3135

‎Assets/GoogleVR/Demos/Environment/CubeRoom.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,4 +193,4 @@ MeshCollider:
193193
m_Convex: 0
194194
m_InflateMesh: 0
195195
m_SkinWidth: 0.01
196-
m_Mesh: {fileID: 4300000, guid: 1b781ad67e8a54061b9897ddfbfdb479, type: 3}
196+
m_Mesh: {fileID: 4300000, guid: 0d17106c40ecd4920976ddf8d6effd9b, type: 3}

‎Assets/GoogleVR/Demos/Images/HelloVR_AppTile_bg.png.meta‎

Lines changed: 25 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GoogleVR/Demos/Images/HelloVR_AppTile_front.png.meta‎

Lines changed: 25 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GoogleVR/Demos/Images/ic_launcher_hello_vr_round.png.meta‎

Lines changed: 25 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GoogleVR/Demos/Prefabs/DemoSceneManager.prefab‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ GameObject:
1616
m_ObjectHideFlags: 0
1717
m_PrefabParentObject: {fileID: 0}
1818
m_PrefabInternal: {fileID: 100100000}
19-
serializedVersion: 4
19+
serializedVersion: 5
2020
m_Component:
21-
- 4: {fileID: 1509313747}
22-
- 114: {fileID: 1980163928}
21+
- component: {fileID: 1509313747}
22+
- component: {fileID: 1980163928}
23+
- component: {fileID: 114055343288806878}
2324
m_Layer: 0
2425
m_Name: DemoSceneManager
2526
m_TagString: Untagged
@@ -36,10 +37,10 @@ Transform:
3637
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3738
m_LocalPosition: {x: 0, y: 0, z: 0}
3839
m_LocalScale: {x: 1, y: 1, z: 1}
39-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4040
m_Children: []
4141
m_Father: {fileID: 0}
4242
m_RootOrder: 0
43+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4344
--- !u!114 &1980163928
4445
MonoBehaviour:
4546
m_ObjectHideFlags: 1
@@ -51,3 +52,16 @@ MonoBehaviour:
5152
m_Script: {fileID: 11500000, guid: 1bec9ea3efe7849ffae666549aca3cad, type: 3}
5253
m_Name:
5354
m_EditorClassIdentifier:
55+
--- !u!114 &114055343288806878
56+
MonoBehaviour:
57+
m_ObjectHideFlags: 1
58+
m_PrefabParentObject: {fileID: 0}
59+
m_PrefabInternal: {fileID: 100100000}
60+
m_GameObject: {fileID: 632161999}
61+
m_Enabled: 1
62+
m_EditorHideFlags: 0
63+
m_Script: {fileID: 11500000, guid: 94f5d450d1bd94c97b1dc8109b633ac0, type: 3}
64+
m_Name:
65+
m_EditorClassIdentifier:
66+
safetyRing: {fileID: 0}
67+
enableDebugLog: 0

‎Assets/GoogleVR/Demos/Scenes/HelloVR.unity‎

Lines changed: 96 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@ Prefab:
122122
m_Modification:
123123
m_TransformParent: {fileID: 0}
124124
m_Modifications:
125+
- target: {fileID: 11499020, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2}
126+
propertyPath: controllerPointers.Array.size
127+
value: 2
128+
objectReference: {fileID: 0}
125129
- target: {fileID: 452846, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2}
126130
propertyPath: m_LocalPosition.x
127131
value: 0
@@ -166,6 +170,14 @@ Prefab:
166170
propertyPath: reticlePointer
167171
value:
168172
objectReference: {fileID: 653818221}
173+
- target: {fileID: 11499020, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2}
174+
propertyPath: controllerPointers.Array.data[0]
175+
value:
176+
objectReference: {fileID: 189115713}
177+
- target: {fileID: 11499020, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2}
178+
propertyPath: controllerPointers.Array.data[1]
179+
value:
180+
objectReference: {fileID: 697565397}
169181
m_RemovedComponents: []
170182
m_ParentPrefab: {fileID: 100100000, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2}
171183
m_IsPrefabParent: 0
@@ -260,7 +272,7 @@ MonoBehaviour:
260272
m_Calls:
261273
- m_Target: {fileID: 148680885}
262274
m_MethodName: TeleportRandomly
263-
m_Mode: 1
275+
m_Mode: 0
264276
m_Arguments:
265277
m_ObjectArgument: {fileID: 0}
266278
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -467,6 +479,62 @@ MeshFilter:
467479
m_PrefabInternal: {fileID: 0}
468480
m_GameObject: {fileID: 148680882}
469481
m_Mesh: {fileID: 4300000, guid: 18ea1f717668b466d9b043f460af69d1, type: 3}
482+
--- !u!1001 &168835911
483+
Prefab:
484+
m_ObjectHideFlags: 0
485+
serializedVersion: 2
486+
m_Modification:
487+
m_TransformParent: {fileID: 907292808}
488+
m_Modifications:
489+
- target: {fileID: 1820761120, guid: 34c21f523e72f45509a4e37ed0293c3b, type: 2}
490+
propertyPath: m_LocalPosition.x
491+
value: 0
492+
objectReference: {fileID: 0}
493+
- target: {fileID: 1820761120, guid: 34c21f523e72f45509a4e37ed0293c3b, type: 2}
494+
propertyPath: m_LocalPosition.y
495+
value: 0
496+
objectReference: {fileID: 0}
497+
- target: {fileID: 1820761120, guid: 34c21f523e72f45509a4e37ed0293c3b, type: 2}
498+
propertyPath: m_LocalPosition.z
499+
value: 0
500+
objectReference: {fileID: 0}
501+
- target: {fileID: 1820761120, guid: 34c21f523e72f45509a4e37ed0293c3b, type: 2}
502+
propertyPath: m_LocalRotation.x
503+
value: -0
504+
objectReference: {fileID: 0}
505+
- target: {fileID: 1820761120, guid: 34c21f523e72f45509a4e37ed0293c3b, type: 2}
506+
propertyPath: m_LocalRotation.y
507+
value: -0
508+
objectReference: {fileID: 0}
509+
- target: {fileID: 1820761120, guid: 34c21f523e72f45509a4e37ed0293c3b, type: 2}
510+
propertyPath: m_LocalRotation.z
511+
value: -0
512+
objectReference: {fileID: 0}
513+
- target: {fileID: 1820761120, guid: 34c21f523e72f45509a4e37ed0293c3b, type: 2}
514+
propertyPath: m_LocalRotation.w
515+
value: 1
516+
objectReference: {fileID: 0}
517+
- target: {fileID: 1820761120, guid: 34c21f523e72f45509a4e37ed0293c3b, type: 2}
518+
propertyPath: m_RootOrder
519+
value: 2
520+
objectReference: {fileID: 0}
521+
- target: {fileID: 555767533, guid: 34c21f523e72f45509a4e37ed0293c3b, type: 2}
522+
propertyPath: m_Name
523+
value: GvrControllerPointer1
524+
objectReference: {fileID: 0}
525+
- target: {fileID: 114000013899574178, guid: 34c21f523e72f45509a4e37ed0293c3b,
526+
type: 2}
527+
propertyPath: controllerId
528+
value: 1
529+
objectReference: {fileID: 0}
530+
- target: {fileID: 114000013899574178, guid: 34c21f523e72f45509a4e37ed0293c3b,
531+
type: 2}
532+
propertyPath: controllerHand
533+
value: 3
534+
objectReference: {fileID: 0}
535+
m_RemovedComponents: []
536+
m_ParentPrefab: {fileID: 100100000, guid: 34c21f523e72f45509a4e37ed0293c3b, type: 2}
537+
m_IsPrefabParent: 0
470538
--- !u!1 &189115713 stripped
471539
GameObject:
472540
m_PrefabParentObject: {fileID: 555767533, guid: 34c21f523e72f45509a4e37ed0293c3b,
@@ -576,6 +644,10 @@ Prefab:
576644
propertyPath: m_RootOrder
577645
value: 1
578646
objectReference: {fileID: 0}
647+
- target: {fileID: 555767533, guid: 34c21f523e72f45509a4e37ed0293c3b, type: 2}
648+
propertyPath: m_Name
649+
value: GvrControllerPointer0
650+
objectReference: {fileID: 0}
579651
m_RemovedComponents: []
580652
m_ParentPrefab: {fileID: 100100000, guid: 34c21f523e72f45509a4e37ed0293c3b, type: 2}
581653
m_IsPrefabParent: 0
@@ -618,13 +690,28 @@ Prefab:
618690
propertyPath: m_RootOrder
619691
value: 2
620692
objectReference: {fileID: 0}
693+
- target: {fileID: 114063829130735768, guid: 5ca80f4596fa44b87912a0592346d260,
694+
type: 2}
695+
propertyPath: enablePositionalTracking
696+
value: 1
697+
objectReference: {fileID: 0}
621698
m_RemovedComponents: []
622699
m_ParentPrefab: {fileID: 100100000, guid: 5ca80f4596fa44b87912a0592346d260, type: 2}
623700
m_IsPrefabParent: 0
624701
--- !u!1 &653818221 stripped
625702
GameObject:
626703
m_PrefabParentObject: {fileID: 171526, guid: 60270cf52a5e94998a5a335989159738, type: 2}
627704
m_PrefabInternal: {fileID: 848404732}
705+
--- !u!1 &697565397 stripped
706+
GameObject:
707+
m_PrefabParentObject: {fileID: 555767533, guid: 34c21f523e72f45509a4e37ed0293c3b,
708+
type: 2}
709+
m_PrefabInternal: {fileID: 168835911}
710+
--- !u!4 &697565398 stripped
711+
Transform:
712+
m_PrefabParentObject: {fileID: 1820761120, guid: 34c21f523e72f45509a4e37ed0293c3b,
713+
type: 2}
714+
m_PrefabInternal: {fileID: 168835911}
628715
--- !u!1001 &781074293
629716
Prefab:
630717
m_ObjectHideFlags: 0
@@ -791,6 +878,7 @@ Transform:
791878
m_Children:
792879
- {fileID: 959308593}
793880
- {fileID: 34062306}
881+
- {fileID: 697565398}
794882
m_Father: {fileID: 0}
795883
m_RootOrder: 10
796884
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1055,7 +1143,7 @@ MonoBehaviour:
10551143
m_Calls:
10561144
- m_Target: {fileID: 955127921}
10571145
m_MethodName: TeleportRandomly
1058-
m_Mode: 1
1146+
m_Mode: 0
10591147
m_Arguments:
10601148
m_ObjectArgument: {fileID: 0}
10611149
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -1308,6 +1396,11 @@ Prefab:
13081396
propertyPath: m_RootOrder
13091397
value: 5
13101398
objectReference: {fileID: 0}
1399+
- target: {fileID: 114055343288806878, guid: 87c35d808850c410ca0e398a8da84e68,
1400+
type: 2}
1401+
propertyPath: safetyRing
1402+
value:
1403+
objectReference: {fileID: 1725746395}
13111404
m_RemovedComponents: []
13121405
m_ParentPrefab: {fileID: 100100000, guid: 87c35d808850c410ca0e398a8da84e68, type: 2}
13131406
m_IsPrefabParent: 0
@@ -1526,7 +1619,7 @@ MonoBehaviour:
15261619
m_Calls:
15271620
- m_Target: {fileID: 1490385950}
15281621
m_MethodName: TeleportRandomly
1529-
m_Mode: 1
1622+
m_Mode: 0
15301623
m_Arguments:
15311624
m_ObjectArgument: {fileID: 0}
15321625
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -1738,21 +1831,3 @@ GameObject:
17381831
m_PrefabParentObject: {fileID: 1251124450334416, guid: c12db6ac95da443448d6aa9e4cfc66c0,
17391832
type: 2}
17401833
m_PrefabInternal: {fileID: 873428114}
1741-
--- !u!1 &2100663267 stripped
1742-
GameObject:
1743-
m_PrefabParentObject: {fileID: 632161999, guid: 87c35d808850c410ca0e398a8da84e68,
1744-
type: 2}
1745-
m_PrefabInternal: {fileID: 1163767423}
1746-
--- !u!114 &2100663268
1747-
MonoBehaviour:
1748-
m_ObjectHideFlags: 0
1749-
m_PrefabParentObject: {fileID: 0}
1750-
m_PrefabInternal: {fileID: 0}
1751-
m_GameObject: {fileID: 2100663267}
1752-
m_Enabled: 1
1753-
m_EditorHideFlags: 0
1754-
m_Script: {fileID: 11500000, guid: 94f5d450d1bd94c97b1dc8109b633ac0, type: 3}
1755-
m_Name:
1756-
m_EditorClassIdentifier:
1757-
safetyRing: {fileID: 1725746395}
1758-
enableDebugLog: 1

0 commit comments

Comments
 (0)