From e573e69243d46571185073e55407d44973177d1f Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 26 Oct 2018 15:52:41 +0200 Subject: [PATCH] Implemented Fullscreen view for 3d Models --- Assets/Resources/UI/ARView.prefab | 706 ++++++---------- .../Resources/UI/FullscreenModelView.prefab | 764 ++++++++++++++++++ .../UI/FullscreenModelView.prefab.meta | 10 + .../Scripts/PointOfInterest/PoiData.cs | 6 +- .../Scripts/UI/ARViewBehaviour.cs | 7 +- .../Scripts/UI/DetailsPanelBehaviour.cs | 120 +-- .../UI/FullscreenModelViewBehaviour.cs | 106 +++ .../UI/FullscreenModelViewBehaviour.cs.meta | 13 + Assets/RothenburgAR/Scripts/UI/UIManager.cs | 18 +- Assets/mainScene.unity | 155 ---- 10 files changed, 1171 insertions(+), 734 deletions(-) create mode 100644 Assets/Resources/UI/FullscreenModelView.prefab create mode 100644 Assets/Resources/UI/FullscreenModelView.prefab.meta create mode 100644 Assets/RothenburgAR/Scripts/UI/FullscreenModelViewBehaviour.cs create mode 100644 Assets/RothenburgAR/Scripts/UI/FullscreenModelViewBehaviour.cs.meta diff --git a/Assets/Resources/UI/ARView.prefab b/Assets/Resources/UI/ARView.prefab index 6128585..59c6694 100644 --- a/Assets/Resources/UI/ARView.prefab +++ b/Assets/Resources/UI/ARView.prefab @@ -64,23 +64,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1125399514285838 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224988931619594536} - - component: {fileID: 222805632229339052} - - component: {fileID: 114283102023446632} - m_Layer: 5 - m_Name: ModelTexture - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1191674719837668 GameObject: m_ObjectHideFlags: 1 @@ -110,43 +93,7 @@ GameObject: - component: {fileID: 114312924644555460} - component: {fileID: 114251327453181138} m_Layer: 5 - m_Name: ButtonClose - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1230596598073714 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224292492441239568} - - component: {fileID: 222651095218169722} - - component: {fileID: 114183846072457360} - - component: {fileID: 114047882587450334} - m_Layer: 5 - m_Name: DetailsModel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1298020638438872 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224105959217507050} - - component: {fileID: 222883275204112786} - - component: {fileID: 114642005439168118} - - component: {fileID: 111933338744172718} - m_Layer: 5 - m_Name: IconLoading + m_Name: ButtonModel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -184,23 +131,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1330246529418430 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224870609926564584} - - component: {fileID: 222450161345885808} - - component: {fileID: 114566290632908284} - m_Layer: 5 - m_Name: Icon3D - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1348036272423586 GameObject: m_ObjectHideFlags: 0 @@ -268,6 +198,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1398176435121294 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224757765789199188} + - component: {fileID: 222236948176362722} + - component: {fileID: 114411963973466940} + - component: {fileID: 114904644596449060} + m_Layer: 5 + m_Name: ButtonClose + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1442634446812664 GameObject: m_ObjectHideFlags: 1 @@ -476,6 +424,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1742407731261398 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224954076543083872} + - component: {fileID: 222918187402141866} + - component: {fileID: 114754286816552714} + m_Layer: 5 + m_Name: Hitbox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1746021583617026 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224644166547657496} + - component: {fileID: 222353937617573936} + - component: {fileID: 114830247008306672} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1753054310650300 GameObject: m_ObjectHideFlags: 1 @@ -561,40 +543,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1977378795970684 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224450108705652292} - - component: {fileID: 222195425983271856} - - component: {fileID: 114123453402779744} - m_Layer: 5 - m_Name: Border - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1986268301643462 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224457627043515580} - - component: {fileID: 222760257815341292} - - component: {fileID: 114407377318976498} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 --- !u!4 &4112130633259944 Transform: m_ObjectHideFlags: 1 @@ -722,21 +670,6 @@ Animation: m_PlayAutomatically: 0 m_AnimatePhysics: 0 m_CullingType: 0 ---- !u!111 &111933338744172718 -Animation: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1298020638438872} - m_Enabled: 1 - serializedVersion: 3 - m_Animation: {fileID: 7400000, guid: 9d97cbcd95f31c049b86a589f83768fa, type: 2} - m_Animations: - - {fileID: 7400000, guid: 9d97cbcd95f31c049b86a589f83768fa, type: 2} - m_WrapMode: 0 - m_PlayAutomatically: 1 - m_AnimatePhysics: 0 - m_CullingType: 0 --- !u!114 &114013157313467306 MonoBehaviour: m_ObjectHideFlags: 1 @@ -823,7 +756,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 25c300b5f8ebb4d4aac98e07ba35ce08, type: 3} + m_Sprite: {fileID: 21300000, guid: 5ebf3714321c5f74784cc76bbde2fb85, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -844,70 +777,6 @@ MonoBehaviour: m_EditorClassIdentifier: DetailsPanel: {fileID: 114451700018395534} ProjectionEffect: {fileID: 114717549802739924} ---- !u!114 &114047882587450334 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1230596598073714} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 5 - callback: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 114451700018395534} - m_MethodName: OnDetailsPanelDrag - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 14 - callback: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 114451700018395534} - m_MethodName: OnDetailsPanelEndDrag - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 114451700018395534} - m_MethodName: OnDetailsPanelPointerDown - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] --- !u!114 &114116594606330924 MonoBehaviour: m_ObjectHideFlags: 1 @@ -935,33 +804,6 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114123453402779744 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1977378795970684} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: d7c1ed00403294f44afec942af3cc296, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 26eb50ae3c8418745bdac31ddc6d13fc, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 --- !u!114 &114129011032390252 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1001,18 +843,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 ---- !u!114 &114183846072457360 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1230596598073714} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332ff911daea518428ef352c212becad, type: 3} - m_Name: - m_EditorClassIdentifier: - CurrentModel: {fileID: 0} --- !u!114 &114190413637310400 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1131,8 +961,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 114043246158556710} - m_MethodName: HidePoiDetails + - m_Target: {fileID: 114451700018395534} + m_MethodName: SwitchToFullscreenModelView m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1223,33 +1053,6 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114283102023446632 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1125399514285838} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 2d69022d4516264499a1a0abeae89af8, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 --- !u!114 &114312924644555460 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1435,18 +1238,18 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114407377318976498 +--- !u!114 &114411963973466940 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1986268301643462} + m_GameObject: {fileID: 1398176435121294} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 184173fb9a2399341882a894edcac032, type: 2} + m_Material: {fileID: 2100000, guid: b49170becc957054782e78d161ecef43, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: @@ -1454,8 +1257,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 48ecc8a9d56982a4b9d0c2d373cbcbb5, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1475,9 +1278,7 @@ MonoBehaviour: m_EditorClassIdentifier: DetailsText: {fileID: 114941164005360912} DetailsTextScrollRect: {fileID: 114394030101927196} - DetailsModel: {fileID: 114183846072457360} - IconLoading: {fileID: 1298020638438872} - Icon3D: {fileID: 1330246529418430} + ModelButton: {fileID: 1225498001622138} --- !u!114 &114507205352577392 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1521,33 +1322,6 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114566290632908284 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1330246529418430} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 5ebf3714321c5f74784cc76bbde2fb85, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 --- !u!114 &114584917988102786 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1648,33 +1422,6 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114642005439168118 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1298020638438872} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1957047573239854895a9ba2a69c12c8, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 --- !u!114 &114717549802739924 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1687,6 +1434,33 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: LineMaterial: {fileID: 2100000, guid: d7c1ed00403294f44afec942af3cc296, type: 2} +--- !u!114 &114754286816552714 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1742407731261398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &114784467059480262 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1714,6 +1488,33 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114830247008306672 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1746021583617026} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 25c300b5f8ebb4d4aac98e07ba35ce08, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &114835831483940740 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1753,6 +1554,58 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114904644596449060 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1398176435121294} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 114411963973466940} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 114043246158556710} + m_MethodName: HidePoiDetails + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &114933178627092868 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2114,18 +1967,24 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1457712183709236} ---- !u!222 &222195425983271856 +--- !u!222 &222236948176362722 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1977378795970684} + m_GameObject: {fileID: 1398176435121294} --- !u!222 &222281876000192902 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1630999023505358} +--- !u!222 &222353937617573936 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1746021583617026} --- !u!222 &222380620736085646 CanvasRenderer: m_ObjectHideFlags: 1 @@ -2138,12 +1997,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1553995320662558} ---- !u!222 &222450161345885808 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1330246529418430} --- !u!222 &222450742828561450 CanvasRenderer: m_ObjectHideFlags: 1 @@ -2174,12 +2027,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1380279798909964} ---- !u!222 &222651095218169722 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1230596598073714} --- !u!222 &222705686455758288 CanvasRenderer: m_ObjectHideFlags: 1 @@ -2204,12 +2051,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1442634446812664} ---- !u!222 &222760257815341292 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1986268301643462} --- !u!222 &222761787578298562 CanvasRenderer: m_ObjectHideFlags: 1 @@ -2222,18 +2063,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1045492388477854} ---- !u!222 &222805632229339052 +--- !u!222 &222918187402141866 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1125399514285838} ---- !u!222 &222883275204112786 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1298020638438872} + m_GameObject: {fileID: 1742407731261398} --- !u!222 &222966107194084688 CanvasRenderer: m_ObjectHideFlags: 1 @@ -2272,18 +2107,18 @@ RectTransform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1225498001622138} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994} m_Children: - {fileID: 224482629410315180} - {fileID: 224701352370170208} m_Father: {fileID: 224250538007241578} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -30} + m_AnchoredPosition: {x: 30.000004, y: -90} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224060988043194314 @@ -2304,24 +2139,6 @@ RectTransform: m_AnchoredPosition: {x: -75.5, y: 0} m_SizeDelta: {x: -200, y: 2} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224105959217507050 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1298020638438872} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224292492441239568} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224126681634059420 RectTransform: m_ObjectHideFlags: 1 @@ -2389,6 +2206,7 @@ RectTransform: - {fileID: 224200271212345534} - {fileID: 224923893760777956} - {fileID: 224888481017931948} + - {fileID: 224757765789199188} - {fileID: 224017865803686938} m_Father: {fileID: 224804495073354866} m_RootOrder: 3 @@ -2453,29 +2271,6 @@ RectTransform: m_AnchoredPosition: {x: -110, y: -66} m_SizeDelta: {x: 93.8, y: 2} m_Pivot: {x: 1, y: 0.5} ---- !u!224 &224292492441239568 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1230596598073714} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -1} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 224870609926564584} - - {fileID: 224105959217507050} - - {fileID: 224988931619594536} - - {fileID: 224457627043515580} - - {fileID: 224450108705652292} - m_Father: {fileID: 224888481017931948} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 175} - m_SizeDelta: {x: 0, y: 350} - m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224415045131491092 RectTransform: m_ObjectHideFlags: 1 @@ -2494,42 +2289,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224450108705652292 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1977378795970684} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224292492441239568} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.5} - m_SizeDelta: {x: 0, y: 1} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224457627043515580 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1986268301643462} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224292492441239568} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224482629410315180 RectTransform: m_ObjectHideFlags: 1 @@ -2546,7 +2305,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 100, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224567183914418614 RectTransform: @@ -2578,7 +2337,7 @@ RectTransform: m_Children: - {fileID: 224258954071184956} m_Father: {fileID: 224888481017931948} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2626,6 +2385,24 @@ RectTransform: m_AnchoredPosition: {x: -75, y: -75} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224644166547657496 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1746021583617026} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224757765789199188} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.25, y: 0.25} + m_AnchorMax: {x: 0.75, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224701352370170208 RectTransform: m_ObjectHideFlags: 1 @@ -2644,6 +2421,26 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224757765789199188 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1398176435121294} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 224954076543083872} + - {fileID: 224644166547657496} + m_Father: {fileID: 224250538007241578} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30.000017, y: -30} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224781237586130416 RectTransform: m_ObjectHideFlags: 1 @@ -2723,24 +2520,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224870609926564584 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1330246529418430} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224292492441239568} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 75} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224888481017931948 RectTransform: m_ObjectHideFlags: 1 @@ -2751,7 +2530,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 224292492441239568} - {fileID: 224568670868763796} - {fileID: 224944142472828444} m_Father: {fileID: 224250538007241578} @@ -2810,13 +2588,31 @@ RectTransform: m_Children: - {fileID: 224251385334151864} m_Father: {fileID: 224888481017931948} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -7, y: 0} m_SizeDelta: {x: 10, y: -4} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224954076543083872 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1742407731261398} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224757765789199188} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 75} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224954540062687134 RectTransform: m_ObjectHideFlags: 1 @@ -2837,21 +2633,3 @@ RectTransform: m_AnchoredPosition: {x: -75, y: -100} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224988931619594536 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1125399514285838} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224292492441239568} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 350, y: 350} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Resources/UI/FullscreenModelView.prefab b/Assets/Resources/UI/FullscreenModelView.prefab new file mode 100644 index 0000000..2370179 --- /dev/null +++ b/Assets/Resources/UI/FullscreenModelView.prefab @@ -0,0 +1,764 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1845347203963508} + m_IsPrefabParent: 1 +--- !u!1 &1175797697954400 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224034239137159526} + - component: {fileID: 222972658998828100} + - component: {fileID: 114690370919472744} + m_Layer: 5 + m_Name: Icon3D + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1410416279157706 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224411256630293298} + - component: {fileID: 222914052018138736} + - component: {fileID: 114481541986733408} + - component: {fileID: 114151414466304328} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1460878772242034 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224847826353125020} + - component: {fileID: 222614532417809800} + - component: {fileID: 114713924690249236} + - component: {fileID: 114820600822383130} + m_Layer: 5 + m_Name: DetailsModel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1530640290346280 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224360344833465170} + - component: {fileID: 222727468347014598} + - component: {fileID: 114911072403513640} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1593863150254430 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224893211876998240} + m_Layer: 5 + m_Name: ButtonBack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1666907970834032 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224178829673496998} + - component: {fileID: 222506448608230978} + - component: {fileID: 114138456519706054} + m_Layer: 5 + m_Name: ModelTexture + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1828790478856174 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224213410668540270} + - component: {fileID: 222011145370522848} + - component: {fileID: 114891783888147370} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1845347203963508 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224214707840811800} + - component: {fileID: 223845593349625282} + - component: {fileID: 114084412175737104} + - component: {fileID: 114654703456914014} + - component: {fileID: 222629574231414602} + - component: {fileID: 114674653572052640} + m_Layer: 5 + m_Name: FullscreenModelView + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1931910535789486 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224603290751646008} + - component: {fileID: 222755484491393880} + - component: {fileID: 114496977881750338} + - component: {fileID: 111566064023668920} + m_Layer: 5 + m_Name: IconLoading + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!111 &111566064023668920 +Animation: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1931910535789486} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 7400000, guid: 9d97cbcd95f31c049b86a589f83768fa, type: 2} + m_Animations: + - {fileID: 7400000, guid: 9d97cbcd95f31c049b86a589f83768fa, type: 2} + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 0 + m_CullingType: 0 +--- !u!114 &114084412175737104 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1845347203963508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1024, y: 1024} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0.5 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!114 &114138456519706054 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1666907970834032} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 2d69022d4516264499a1a0abeae89af8, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &114151414466304328 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1410416279157706} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 114481541986733408} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 114674653572052640} + m_MethodName: SwitchToARView + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &114481541986733408 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1410416279157706} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b49170becc957054782e78d161ecef43, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 48ecc8a9d56982a4b9d0c2d373cbcbb5, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &114496977881750338 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1931910535789486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 1957047573239854895a9ba2a69c12c8, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &114654703456914014 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1845347203963508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &114674653572052640 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1845347203963508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d203a1df46c2f1c4288ad9a0e2c2574b, type: 3} + m_Name: + m_EditorClassIdentifier: + DetailsModel: {fileID: 114713924690249236} + IconLoading: {fileID: 1931910535789486} + Icon3D: {fileID: 1175797697954400} +--- !u!114 &114690370919472744 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1175797697954400} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 5ebf3714321c5f74784cc76bbde2fb85, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &114713924690249236 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1460878772242034} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332ff911daea518428ef352c212becad, type: 3} + m_Name: + m_EditorClassIdentifier: + CurrentModel: {fileID: 0} +--- !u!114 &114820600822383130 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1460878772242034} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 5 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 114674653572052640} + m_MethodName: OnModelDrag + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 14 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 114674653572052640} + m_MethodName: OnModelEndDrag + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 114674653572052640} + m_MethodName: OnModelPointerDown + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &114891783888147370 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1828790478856174} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 25c300b5f8ebb4d4aac98e07ba35ce08, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &114911072403513640 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1530640290346280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 184173fb9a2399341882a894edcac032, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &222011145370522848 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1828790478856174} +--- !u!222 &222506448608230978 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1666907970834032} +--- !u!222 &222614532417809800 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1460878772242034} +--- !u!222 &222629574231414602 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1845347203963508} +--- !u!222 &222727468347014598 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1530640290346280} +--- !u!222 &222755484491393880 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1931910535789486} +--- !u!222 &222914052018138736 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1410416279157706} +--- !u!222 &222972658998828100 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1175797697954400} +--- !u!223 &223845593349625282 +Canvas: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1845347203963508} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 27 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &224034239137159526 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1175797697954400} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224847826353125020} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 130} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224178829673496998 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1666907970834032} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224847826353125020} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 768, y: 768} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224213410668540270 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1828790478856174} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224893211876998240} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.25, y: 0.25} + m_AnchorMax: {x: 0.75, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224214707840811800 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1845347203963508} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 224360344833465170} + - {fileID: 224847826353125020} + - {fileID: 224893211876998240} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!224 &224360344833465170 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1530640290346280} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224214707840811800} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224411256630293298 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1410416279157706} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224893211876998240} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224603290751646008 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1931910535789486} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224847826353125020} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224847826353125020 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1460878772242034} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 224034239137159526} + - {fileID: 224603290751646008} + - {fileID: 224178829673496998} + m_Father: {fileID: 224214707840811800} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224893211876998240 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1593863150254430} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 224411256630293298} + - {fileID: 224213410668540270} + m_Father: {fileID: 224214707840811800} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -75, y: -75} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Resources/UI/FullscreenModelView.prefab.meta b/Assets/Resources/UI/FullscreenModelView.prefab.meta new file mode 100644 index 0000000..da2b8b5 --- /dev/null +++ b/Assets/Resources/UI/FullscreenModelView.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 477a9202e24168c4fb258032b17c81b7 +timeCreated: 1540557340 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RothenburgAR/Scripts/PointOfInterest/PoiData.cs b/Assets/RothenburgAR/Scripts/PointOfInterest/PoiData.cs index 146b465..f8b1fc0 100644 --- a/Assets/RothenburgAR/Scripts/PointOfInterest/PoiData.cs +++ b/Assets/RothenburgAR/Scripts/PointOfInterest/PoiData.cs @@ -49,10 +49,8 @@ namespace RothenburgAR.PointOfInterest ThreadStart start = new ThreadStart(loader.ParseObjFile); Thread t = new Thread(start); t.Start(); - while (t.ThreadState != ThreadState.Stopped) - { - yield return new WaitForSecondsRealtime(.1f); - } + + yield return new WaitUntil(() => t.ThreadState == ThreadState.Stopped); try { diff --git a/Assets/RothenburgAR/Scripts/UI/ARViewBehaviour.cs b/Assets/RothenburgAR/Scripts/UI/ARViewBehaviour.cs index 9095c56..af8534f 100644 --- a/Assets/RothenburgAR/Scripts/UI/ARViewBehaviour.cs +++ b/Assets/RothenburgAR/Scripts/UI/ARViewBehaviour.cs @@ -8,8 +8,6 @@ namespace RothenburgAR.UI public DetailsPanelBehaviour DetailsPanel; public ProjectionEffectBehaviour ProjectionEffect; - private GameObject _currentDisplayedModelGo = null; - public void DisplayPoiDetails(PoiBehaviour poi) { // if POI has no Details to display, do nothing @@ -26,10 +24,9 @@ namespace RothenburgAR.UI DetailsPanel.gameObject.SetActive(true); DetailsPanel.SetText(data.Description); - DetailsPanel.RemoveModel(); + DetailsPanel.SelectedPoi = data; - if (data.HasModelDescription) - DetailsPanel.SetModelFromPoi(data); + DetailsPanel.DisplayModelButton(data); DetailsPanel.UpdateOpeningAnimation(poi.transform.position); diff --git a/Assets/RothenburgAR/Scripts/UI/DetailsPanelBehaviour.cs b/Assets/RothenburgAR/Scripts/UI/DetailsPanelBehaviour.cs index ffc4fbe..f7c8095 100644 --- a/Assets/RothenburgAR/Scripts/UI/DetailsPanelBehaviour.cs +++ b/Assets/RothenburgAR/Scripts/UI/DetailsPanelBehaviour.cs @@ -14,9 +14,8 @@ namespace RothenburgAR.UI { public TextMeshProUGUI DetailsText; public ScrollRect DetailsTextScrollRect; - public DetailsModelBehaviour DetailsModel; - public GameObject IconLoading; - public GameObject Icon3D; + public GameObject ModelButton; + public PoiData SelectedPoi; private float initialHeight; private float initialWidth; @@ -35,7 +34,6 @@ namespace RothenburgAR.UI private void OnDestroy() { DisplayManager.Instance.RemoveOrientationChangeListener(SetSize); - RemoveModel(); } private void SetSize() @@ -67,12 +65,25 @@ namespace RothenburgAR.UI } } - public bool HasModel + public void DisplayModelButton(PoiData data) { - get { return _currentDisplayedModelGo != null; } + if (data.HasModelDescription) + { + ModelButton.SetActive(true); + } + else + { + ModelButton.SetActive(false); + } + //TODO implement } - private GameObject _currentDisplayedModelGo; + public void SwitchToFullscreenModelView() + { + var viewGo = UIManager.Instance.SwitchToView(ViewName.FullscreenModelView); + var view = viewGo.GetComponent(); + view.SetModelFromPoi(SelectedPoi); + } public void SetText(TextElement el) { @@ -87,86 +98,6 @@ namespace RothenburgAR.UI DetailsTextScrollRect.normalizedPosition = new Vector2(0, 1); } - public void SetModelFromPoi(PoiData data) - { - if (!data.HasModelDescription) return; - - StartCoroutine("SetModelCoroutine", data); - } - - public IEnumerator SetModelCoroutine(PoiData data) - { - if (!data.IsModelLoaded) - { - StartCoroutine(data.LoadModel()); - - DetailsModel.gameObject.SetActive(true); - Icon3D.SetActive(true); - IconLoading.SetActive(true); - - while (!data.IsModelLoaded && !data.ModelLoadFailed) - { - yield return new WaitForSecondsRealtime(.1f); - } - } - - if (data.ModelLoadFailed) - { - //TODO maybe display error message to user - RemoveModel(); - yield break; - } - - try - { - SetModel(data.InstantiateModelPrefab()); - } - catch (Exception) - { - // ignore, just do not display an object - RemoveModel(); - } - } - - public void SetModel(GameObject modelGo) - { - modelGo.transform.SetParent(UIManager.Instance.UIObjectCamera.transform, false); - - var meshFilter = modelGo.GetComponentInChildren(); - if (meshFilter == null) throw new Exception("No MeshFilter in Object!"); - - var mesh = meshFilter.mesh; - if (mesh == null) throw new Exception("No Mesh in Model!"); - - //TODO remove when metadata model rotation is no longer a thing - mesh.RecalculateBounds(); - - var scale = 1f / Mathf.Max(mesh.bounds.size.x, mesh.bounds.size.y, mesh.bounds.size.z); - modelGo.transform.localScale = new Vector3(scale, scale, scale); - modelGo.transform.localPosition = mesh.bounds.center * scale + new Vector3(0, 0, 1.8f); - - _currentDisplayedModelGo = modelGo; - DetailsModel.CurrentModel = _currentDisplayedModelGo; - - DetailsModel.gameObject.SetActive(true); - Icon3D.SetActive(false); - IconLoading.SetActive(false); - } - - public void RemoveModel() - { - DetailsModel.gameObject.SetActive(false); - DetailsModel.CurrentModel = null; - - if (HasModel) - { - Destroy(_currentDisplayedModelGo); - _currentDisplayedModelGo = null; - Icon3D.SetActive(false); - IconLoading.SetActive(false); - } - } - public void UpdateOpeningAnimation(Vector3 position) { float duration = .4f; @@ -223,20 +154,5 @@ namespace RothenburgAR.UI yield return new WaitForSecondsRealtime(duration); SetSize(); } - - public void OnDetailsPanelDrag(BaseEventData data) - { - DetailsModel.RotateModelByDrag(data as PointerEventData); - } - - public void OnDetailsPanelPointerDown(BaseEventData data) - { - DetailsModel.BeginRotateModelByDrag(data as PointerEventData); - } - - public void OnDetailsPanelEndDrag(BaseEventData data) - { - DetailsModel.EndRotateModelByDrag(data as PointerEventData); - } } } \ No newline at end of file diff --git a/Assets/RothenburgAR/Scripts/UI/FullscreenModelViewBehaviour.cs b/Assets/RothenburgAR/Scripts/UI/FullscreenModelViewBehaviour.cs new file mode 100644 index 0000000..e9437d8 --- /dev/null +++ b/Assets/RothenburgAR/Scripts/UI/FullscreenModelViewBehaviour.cs @@ -0,0 +1,106 @@ +using UnityEngine; +using RothenburgAR.PointOfInterest; +using System.Collections; +using System; +using UnityEngine.EventSystems; + +namespace RothenburgAR.UI +{ + public class FullscreenModelViewBehaviour : BaseViewBehaviour + { + public DetailsModelBehaviour DetailsModel; + public GameObject IconLoading; + public GameObject Icon3D; + + private GameObject _currentDisplayedModelGo; + + public void SetModelFromPoi(PoiData data) + { + if (!data.HasModelDescription) return; + + StartCoroutine("SetModelCoroutine", data); + } + + public IEnumerator SetModelCoroutine(PoiData data) + { + if (!data.IsModelLoaded) + { + StartCoroutine(data.LoadModel()); + + DetailsModel.gameObject.SetActive(true); + Icon3D.SetActive(true); + IconLoading.SetActive(true); + + yield return new WaitUntil(() => data.IsModelLoaded || data.ModelLoadFailed); + } + + if (data.ModelLoadFailed) + { + //TODO display error message to user + RemoveModel(); + yield break; + } + + SetModel(data.InstantiateModelPrefab()); + } + + private void SetModel(GameObject modelGo) + { + modelGo.transform.SetParent(UIManager.Instance.UIObjectCamera.transform, false); + + var meshFilter = modelGo.GetComponentInChildren(); + if (meshFilter == null) throw new Exception("No MeshFilter in Object!"); + + var mesh = meshFilter.mesh; + if (mesh == null) throw new Exception("No Mesh in Model!"); + + //TODO remove when metadata model rotation is no longer a thing + mesh.RecalculateBounds(); + + var scale = 1f / Mathf.Max(mesh.bounds.size.x, mesh.bounds.size.y, mesh.bounds.size.z); + modelGo.transform.localScale = new Vector3(scale, scale, scale); + modelGo.transform.localPosition = mesh.bounds.center * scale + new Vector3(0, 0, 1.8f); + + _currentDisplayedModelGo = modelGo; + DetailsModel.CurrentModel = _currentDisplayedModelGo; + + DetailsModel.gameObject.SetActive(true); + Icon3D.SetActive(false); + IconLoading.SetActive(false); + } + + private void RemoveModel() + { + DetailsModel.gameObject.SetActive(false); + DetailsModel.CurrentModel = null; + + if (_currentDisplayedModelGo != null) + { + Destroy(_currentDisplayedModelGo); + _currentDisplayedModelGo = null; + Icon3D.SetActive(false); + IconLoading.SetActive(false); + } + } + + private void OnDestroy() + { + RemoveModel(); + } + + public void OnModelDrag(BaseEventData data) + { + DetailsModel.RotateModelByDrag(data as PointerEventData); + } + + public void OnModelPointerDown(BaseEventData data) + { + DetailsModel.BeginRotateModelByDrag(data as PointerEventData); + } + + public void OnModelEndDrag(BaseEventData data) + { + DetailsModel.EndRotateModelByDrag(data as PointerEventData); + } + } +} \ No newline at end of file diff --git a/Assets/RothenburgAR/Scripts/UI/FullscreenModelViewBehaviour.cs.meta b/Assets/RothenburgAR/Scripts/UI/FullscreenModelViewBehaviour.cs.meta new file mode 100644 index 0000000..147458a --- /dev/null +++ b/Assets/RothenburgAR/Scripts/UI/FullscreenModelViewBehaviour.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: d203a1df46c2f1c4288ad9a0e2c2574b +timeCreated: 1540557834 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RothenburgAR/Scripts/UI/UIManager.cs b/Assets/RothenburgAR/Scripts/UI/UIManager.cs index 3150711..cb68c89 100644 --- a/Assets/RothenburgAR/Scripts/UI/UIManager.cs +++ b/Assets/RothenburgAR/Scripts/UI/UIManager.cs @@ -13,7 +13,8 @@ namespace RothenburgAR.UI CreditsView, LanguageSelectView, ColorSelectView, - FontsizeSelectView + FontsizeSelectView, + FullscreenModelView } public class UIManager : Singleton @@ -115,6 +116,13 @@ namespace RothenburgAR.UI ViewName = ViewName.FontsizeSelectView, PrefabName = "UI/FontsizeSelectView" }); + + _availableViews.Add(ViewName.FullscreenModelView, + new View() + { + ViewName = ViewName.FullscreenModelView, + PrefabName = "UI/FullscreenModelView" + }); } public void InitStartView() @@ -123,19 +131,19 @@ namespace RothenburgAR.UI StartingUp = true; } - public void SwitchToView(ViewName nextViewName) + public GameObject SwitchToView(ViewName nextViewName) { if (_currentView != null && _currentView.ViewName == nextViewName) { Debug.Log("Tried to switch to view '" + nextViewName + "', but it is already loaded."); - return; + return null; } View nextView; if (!_availableViews.TryGetValue(nextViewName, out nextView)) { Debug.Log("Tried to switch to view '" + nextViewName + "', but it failed."); - return; + return null; } if (_currentView != null) @@ -184,6 +192,8 @@ namespace RothenburgAR.UI { nextView.OnEnter(); } + + return _currentViewInstance; } void Update() diff --git a/Assets/mainScene.unity b/Assets/mainScene.unity index b7fd982..ba52d04 100644 --- a/Assets/mainScene.unity +++ b/Assets/mainScene.unity @@ -248,161 +248,6 @@ Transform: m_Father: {fileID: 1230455932} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &551443671 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224360344833465170, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114931716620727830, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_havePropertiesChanged - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114931716620727830, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_isInputParsingRequired - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114486179054376702, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_havePropertiesChanged - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114486179054376702, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_isInputParsingRequired - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224050213375353252, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 224050213375353252, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224050213375353252, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224050213375353252, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224050213375353252, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224050213375353252, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224050213375353252, guid: 123197cf7d2a56b4585741a3a0a86dde, - type: 2} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 123197cf7d2a56b4585741a3a0a86dde, type: 2} - m_IsPrefabParent: 0 --- !u!1 &1073945774 GameObject: m_ObjectHideFlags: 0