Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 2f69898

Browse files
GVR Unity SDK v1.60.0
1 parent 3ed73e5 commit 2f69898

26 files changed

+595
-148
lines changed

‎GoogleVR/Demos/Prefabs/Keyboard/KeyboardDelegateExample.prefab‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@ MonoBehaviour:
5252
m_Name:
5353
m_EditorClassIdentifier:
5454
KeyboardText: {fileID: 0}
55+
UpdateButton: {fileID: 0}

‎GoogleVR/Demos/Scenes/KeyboardDemo.unity‎

Lines changed: 313 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,13 @@ Prefab:
140140
value:
141141
objectReference: {fileID: 34730832}
142142
- target: {fileID: 2044164019, guid: 3b7eeb268f8424f809fc34c33b2a6820, type: 2}
143-
propertyPath: KeyboardInputField
143+
propertyPath: UpdateButton
144144
value:
145-
objectReference: {fileID: 0}
145+
objectReference: {fileID: 1053603994}
146+
- target: {fileID: 2044164019, guid: 3b7eeb268f8424f809fc34c33b2a6820, type: 2}
147+
propertyPath: UpdateCanvas
148+
value:
149+
objectReference: {fileID: 1202287596}
146150
m_RemovedComponents: []
147151
m_ParentPrefab: {fileID: 100100000, guid: 3b7eeb268f8424f809fc34c33b2a6820, type: 2}
148152
m_IsPrefabParent: 0
@@ -444,6 +448,82 @@ GameObject:
444448
m_PrefabParentObject: {fileID: 555767533, guid: 34c21f523e72f45509a4e37ed0293c3b,
445449
type: 2}
446450
m_PrefabInternal: {fileID: 264186650}
451+
--- !u!1 &356297968
452+
GameObject:
453+
m_ObjectHideFlags: 0
454+
m_PrefabParentObject: {fileID: 0}
455+
m_PrefabInternal: {fileID: 0}
456+
serializedVersion: 4
457+
m_Component:
458+
- 224: {fileID: 356297969}
459+
- 222: {fileID: 356297971}
460+
- 114: {fileID: 356297970}
461+
m_Layer: 5
462+
m_Name: Text
463+
m_TagString: Untagged
464+
m_Icon: {fileID: 0}
465+
m_NavMeshLayer: 0
466+
m_StaticEditorFlags: 0
467+
m_IsActive: 1
468+
--- !u!224 &356297969
469+
RectTransform:
470+
m_ObjectHideFlags: 0
471+
m_PrefabParentObject: {fileID: 0}
472+
m_PrefabInternal: {fileID: 0}
473+
m_GameObject: {fileID: 356297968}
474+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
475+
m_LocalPosition: {x: 0, y: 0, z: 0}
476+
m_LocalScale: {x: 1, y: 1, z: 1}
477+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
478+
m_Children: []
479+
m_Father: {fileID: 1053603995}
480+
m_RootOrder: 0
481+
m_AnchorMin: {x: 0, y: 0}
482+
m_AnchorMax: {x: 1, y: 1}
483+
m_AnchoredPosition: {x: 0, y: 0}
484+
m_SizeDelta: {x: 0, y: 0}
485+
m_Pivot: {x: 0.5, y: 0.5}
486+
--- !u!114 &356297970
487+
MonoBehaviour:
488+
m_ObjectHideFlags: 0
489+
m_PrefabParentObject: {fileID: 0}
490+
m_PrefabInternal: {fileID: 0}
491+
m_GameObject: {fileID: 356297968}
492+
m_Enabled: 1
493+
m_EditorHideFlags: 0
494+
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
495+
m_Name:
496+
m_EditorClassIdentifier:
497+
m_Material: {fileID: 0}
498+
m_Color: {r: 1, g: 1, b: 1, a: 1}
499+
m_RaycastTarget: 1
500+
m_OnCullStateChanged:
501+
m_PersistentCalls:
502+
m_Calls: []
503+
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
504+
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
505+
m_FontData:
506+
m_Font: {fileID: 12800000, guid: 4eedafad5084240419e649245c7b2093, type: 3}
507+
m_FontSize: 14
508+
m_FontStyle: 0
509+
m_BestFit: 0
510+
m_MinSize: 10
511+
m_MaxSize: 40
512+
m_Alignment: 4
513+
m_AlignByGeometry: 0
514+
m_RichText: 1
515+
m_HorizontalOverflow: 0
516+
m_VerticalOverflow: 0
517+
m_LineSpacing: 1
518+
m_Text: 'Click here to update the Daydream Keyboard from the Play Store.
519+
520+
This application will be closed for changes to take effect.'
521+
--- !u!222 &356297971
522+
CanvasRenderer:
523+
m_ObjectHideFlags: 0
524+
m_PrefabParentObject: {fileID: 0}
525+
m_PrefabInternal: {fileID: 0}
526+
m_GameObject: {fileID: 356297968}
447527
--- !u!1001 &407592334
448528
Prefab:
449529
m_ObjectHideFlags: 0
@@ -669,6 +749,213 @@ Transform:
669749
m_PrefabParentObject: {fileID: 642702418, guid: 6c99596fcbe574b168ae0faa3afe8546,
670750
type: 2}
671751
m_PrefabInternal: {fileID: 407592334}
752+
--- !u!1 &1053603994
753+
GameObject:
754+
m_ObjectHideFlags: 0
755+
m_PrefabParentObject: {fileID: 0}
756+
m_PrefabInternal: {fileID: 0}
757+
serializedVersion: 4
758+
m_Component:
759+
- 224: {fileID: 1053603995}
760+
- 222: {fileID: 1053603998}
761+
- 114: {fileID: 1053603997}
762+
m_Layer: 5
763+
m_Name: UpdateButton
764+
m_TagString: Untagged
765+
m_Icon: {fileID: 0}
766+
m_NavMeshLayer: 0
767+
m_StaticEditorFlags: 0
768+
m_IsActive: 1
769+
--- !u!224 &1053603995
770+
RectTransform:
771+
m_ObjectHideFlags: 0
772+
m_PrefabParentObject: {fileID: 0}
773+
m_PrefabInternal: {fileID: 0}
774+
m_GameObject: {fileID: 1053603994}
775+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
776+
m_LocalPosition: {x: 0, y: 0, z: 0}
777+
m_LocalScale: {x: 0.1, y: 0.1, z: 0}
778+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
779+
m_Children:
780+
- {fileID: 356297969}
781+
m_Father: {fileID: 1202287597}
782+
m_RootOrder: 0
783+
m_AnchorMin: {x: 0.5, y: 0.5}
784+
m_AnchorMax: {x: 0.5, y: 0.5}
785+
m_AnchoredPosition: {x: 0, y: 0}
786+
m_SizeDelta: {x: 450, y: 100}
787+
m_Pivot: {x: 0.5, y: 0.5}
788+
--- !u!114 &1053603997
789+
MonoBehaviour:
790+
m_ObjectHideFlags: 0
791+
m_PrefabParentObject: {fileID: 0}
792+
m_PrefabInternal: {fileID: 0}
793+
m_GameObject: {fileID: 1053603994}
794+
m_Enabled: 1
795+
m_EditorHideFlags: 0
796+
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
797+
m_Name:
798+
m_EditorClassIdentifier:
799+
m_Material: {fileID: 0}
800+
m_Color: {r: 0, g: 0, b: 0, a: 1}
801+
m_RaycastTarget: 1
802+
m_OnCullStateChanged:
803+
m_PersistentCalls:
804+
m_Calls: []
805+
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
806+
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
807+
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
808+
m_Type: 1
809+
m_PreserveAspect: 0
810+
m_FillCenter: 1
811+
m_FillMethod: 4
812+
m_FillAmount: 1
813+
m_FillClockwise: 1
814+
m_FillOrigin: 0
815+
--- !u!222 &1053603998
816+
CanvasRenderer:
817+
m_ObjectHideFlags: 0
818+
m_PrefabParentObject: {fileID: 0}
819+
m_PrefabInternal: {fileID: 0}
820+
m_GameObject: {fileID: 1053603994}
821+
--- !u!1 &1202287594
822+
GameObject:
823+
m_ObjectHideFlags: 0
824+
m_PrefabParentObject: {fileID: 0}
825+
m_PrefabInternal: {fileID: 0}
826+
serializedVersion: 4
827+
m_Component:
828+
- 224: {fileID: 1202287597}
829+
- 223: {fileID: 1202287596}
830+
- 114: {fileID: 1202287595}
831+
- 114: {fileID: 1202287599}
832+
- 65: {fileID: 1202287598}
833+
- 114: {fileID: 1202287600}
834+
m_Layer: 5
835+
m_Name: UpdateCanvas
836+
m_TagString: Untagged
837+
m_Icon: {fileID: 0}
838+
m_NavMeshLayer: 0
839+
m_StaticEditorFlags: 0
840+
m_IsActive: 1
841+
--- !u!114 &1202287595
842+
MonoBehaviour:
843+
m_ObjectHideFlags: 0
844+
m_PrefabParentObject: {fileID: 0}
845+
m_PrefabInternal: {fileID: 0}
846+
m_GameObject: {fileID: 1202287594}
847+
m_Enabled: 1
848+
m_EditorHideFlags: 0
849+
m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
850+
m_Name:
851+
m_EditorClassIdentifier:
852+
m_UiScaleMode: 0
853+
m_ReferencePixelsPerUnit: 100
854+
m_ScaleFactor: 1
855+
m_ReferenceResolution: {x: 800, y: 600}
856+
m_ScreenMatchMode: 0
857+
m_MatchWidthOrHeight: 0
858+
m_PhysicalUnit: 3
859+
m_FallbackScreenDPI: 96
860+
m_DefaultSpriteDPI: 96
861+
m_DynamicPixelsPerUnit: 1
862+
--- !u!223 &1202287596
863+
Canvas:
864+
m_ObjectHideFlags: 0
865+
m_PrefabParentObject: {fileID: 0}
866+
m_PrefabInternal: {fileID: 0}
867+
m_GameObject: {fileID: 1202287594}
868+
m_Enabled: 1
869+
serializedVersion: 2
870+
m_RenderMode: 2
871+
m_Camera: {fileID: 0}
872+
m_PlaneDistance: 100
873+
m_PixelPerfect: 0
874+
m_ReceivesEvents: 1
875+
m_OverrideSorting: 0
876+
m_OverridePixelPerfect: 0
877+
m_SortingBucketNormalizedSize: 0
878+
m_SortingLayerID: 0
879+
m_SortingOrder: 0
880+
m_TargetDisplay: 0
881+
--- !u!224 &1202287597
882+
RectTransform:
883+
m_ObjectHideFlags: 0
884+
m_PrefabParentObject: {fileID: 0}
885+
m_PrefabInternal: {fileID: 0}
886+
m_GameObject: {fileID: 1202287594}
887+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
888+
m_LocalPosition: {x: 0, y: 0, z: 5}
889+
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
890+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
891+
m_Children:
892+
- {fileID: 1053603995}
893+
m_Father: {fileID: 0}
894+
m_RootOrder: 9
895+
m_AnchorMin: {x: 0, y: 0}
896+
m_AnchorMax: {x: 0, y: 0}
897+
m_AnchoredPosition: {x: 0, y: 0.5}
898+
m_SizeDelta: {x: 450, y: 100}
899+
m_Pivot: {x: 0.5, y: 0.5}
900+
--- !u!65 &1202287598
901+
BoxCollider:
902+
m_ObjectHideFlags: 0
903+
m_PrefabParentObject: {fileID: 0}
904+
m_PrefabInternal: {fileID: 0}
905+
m_GameObject: {fileID: 1202287594}
906+
m_Material: {fileID: 0}
907+
m_IsTrigger: 0
908+
m_Enabled: 1
909+
serializedVersion: 2
910+
m_Size: {x: 160, y: 30, z: 1}
911+
m_Center: {x: 0, y: 0, z: 0}
912+
--- !u!114 &1202287599
913+
MonoBehaviour:
914+
m_ObjectHideFlags: 0
915+
m_PrefabParentObject: {fileID: 0}
916+
m_PrefabInternal: {fileID: 0}
917+
m_GameObject: {fileID: 1202287594}
918+
m_Enabled: 1
919+
m_EditorHideFlags: 0
920+
m_Script: {fileID: 11500000, guid: 739800cd36aba44e9b04ce977e5784bd, type: 3}
921+
m_Name:
922+
m_EditorClassIdentifier:
923+
raycastMode: 0
924+
ignoreReversedGraphics: 1
925+
blockingObjects: 0
926+
blockingMask:
927+
serializedVersion: 2
928+
m_Bits: 4294967295
929+
--- !u!114 &1202287600
930+
MonoBehaviour:
931+
m_ObjectHideFlags: 0
932+
m_PrefabParentObject: {fileID: 0}
933+
m_PrefabInternal: {fileID: 0}
934+
m_GameObject: {fileID: 1202287594}
935+
m_Enabled: 1
936+
m_EditorHideFlags: 0
937+
m_Script: {fileID: -1862395651, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
938+
m_Name:
939+
m_EditorClassIdentifier:
940+
m_Delegates:
941+
- eventID: 4
942+
callback:
943+
m_PersistentCalls:
944+
m_Calls:
945+
- m_Target: {fileID: 1762758481}
946+
m_MethodName: LaunchPlayStore
947+
m_Mode: 1
948+
m_Arguments:
949+
m_ObjectArgument: {fileID: 0}
950+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
951+
m_IntArgument: 0
952+
m_FloatArgument: 0
953+
m_StringArgument:
954+
m_BoolArgument: 0
955+
m_CallState: 2
956+
m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
957+
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
958+
delegates: []
672959
--- !u!1001 &1256067701
673960
Prefab:
674961
m_ObjectHideFlags: 0
@@ -988,6 +1275,30 @@ Prefab:
9881275
propertyPath: gvrEmulatedPlatformType
9891276
value: 0
9901277
objectReference: {fileID: 0}
1278+
- target: {fileID: 22412244, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2}
1279+
propertyPath: m_RootOrder
1280+
value: 1
1281+
objectReference: {fileID: 0}
1282+
- target: {fileID: 22450954, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2}
1283+
propertyPath: m_RootOrder
1284+
value: 0
1285+
objectReference: {fileID: 0}
1286+
- target: {fileID: 162814, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2}
1287+
propertyPath: m_IsActive
1288+
value: 1
1289+
objectReference: {fileID: 0}
1290+
- target: {fileID: 156300, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2}
1291+
propertyPath: m_IsActive
1292+
value: 1
1293+
objectReference: {fileID: 0}
1294+
- target: {fileID: 152284, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2}
1295+
propertyPath: m_IsActive
1296+
value: 1
1297+
objectReference: {fileID: 0}
1298+
- target: {fileID: 22484034, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2}
1299+
propertyPath: m_RootOrder
1300+
value: 0
1301+
objectReference: {fileID: 0}
9911302
m_RemovedComponents: []
9921303
m_ParentPrefab: {fileID: 100100000, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2}
9931304
m_IsPrefabParent: 0

‎GoogleVR/Demos/Scripts/DemoInputManager.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2016 Google Inc. All rights reserved.
1+
// Copyright 2017 Google Inc. All rights reserved.
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -43,8 +43,6 @@ void Start() {
4343
private const string FIELD_SDK_INT = "SDK_INT";
4444
private const string PACKAGE_BUILD_VERSION = "android.os.Build$VERSION";
4545
private const string PACKAGE_DAYDREAM_API_CLASS = "com.google.vr.ndk.base.DaydreamApi";
46-
private const string PACKAGE_UNITY_PLAYER = "com.unity3d.player.UnityPlayer";
47-
private const string METHOD_CURRENT_ACTIVITY = "currentActivity";
4846
private const string METHOD_IS_DAYDREAM_READY = "isDaydreamReadyPlatform";
4947

5048
private bool isDaydream = false;
@@ -102,8 +100,8 @@ void Start() {
102100
string vrDeviceName = UnityEngine.VR.VRSettings.loadedDeviceName;
103101
if (vrDeviceName != CARDBOARD_DEVICE_NAME &&
104102
vrDeviceName != DAYDREAM_DEVICE_NAME) {
105-
Debug.Log(string.Format("Loaded device was {0} must be one of {1} or {2}",
106-
vrDeviceName, DAYDREAM_DEVICE_NAME, CARDBOARD_DEVICE_NAME));
103+
Debug.LogErrorFormat("Loaded device was '{0}', must be one of '{1}' or '{2}'",
104+
vrDeviceName, DAYDREAM_DEVICE_NAME, CARDBOARD_DEVICE_NAME);
107105
return;
108106
}
109107

@@ -188,9 +186,7 @@ private static bool IsDeviceDaydreamReady() {
188186
// API level > 24, check whether the device is Daydream-ready..
189187
AndroidJavaObject androidActivity = null;
190188
try {
191-
using (AndroidJavaObject unityPlayer = new AndroidJavaClass(PACKAGE_UNITY_PLAYER)) {
192-
androidActivity = unityPlayer.GetStatic<AndroidJavaObject>(METHOD_CURRENT_ACTIVITY);
193-
}
189+
androidActivity = GvrActivityHelper.GetActivity();
194190
} catch (AndroidJavaException e) {
195191
Debug.LogError("Exception while connecting to the Activity: " + e);
196192
return false;

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /