From 24319b51a20977db598f98c825c6a1653d6f6cb1 Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 19 Sep 2018 18:26:56 +0200 Subject: [PATCH] First version of DetailsPanel rework 3D Model now is rendered to a texture to simplify layouting in DetailsPanel Fixed bugs in ProjectionEffectBehaviour and DetailsPanelBehaviour caused by CanvasScaler Added CanvasScaler to DisplayManager to easily access global canvas scale --- .../Materials/ObjectCameraMaterial.mat | 77 +++ .../Materials/ObjectCameraMaterial.mat.meta | 10 + .../ObjectCameraRenderTexture.renderTexture | 33 + ...jectCameraRenderTexture.renderTexture.meta | 10 + Assets/Resources/UI/ARView.prefab | 582 +++++++++++++----- .../Scripts/AppInitializerBehaviour.cs | 1 + .../Scripts/UI/DetailsPanelBehaviour.cs | 13 +- .../RothenburgAR/Scripts/UI/DisplayManager.cs | 6 + .../Scripts/UI/ProjectionEffectBehaviour.cs | 37 +- Assets/mainScene.unity | 23 +- 10 files changed, 604 insertions(+), 188 deletions(-) create mode 100644 Assets/Resources/Materials/ObjectCameraMaterial.mat create mode 100644 Assets/Resources/Materials/ObjectCameraMaterial.mat.meta create mode 100644 Assets/Resources/Materials/ObjectCameraRenderTexture.renderTexture create mode 100644 Assets/Resources/Materials/ObjectCameraRenderTexture.renderTexture.meta diff --git a/Assets/Resources/Materials/ObjectCameraMaterial.mat b/Assets/Resources/Materials/ObjectCameraMaterial.mat new file mode 100644 index 0000000..bfefdfe --- /dev/null +++ b/Assets/Resources/Materials/ObjectCameraMaterial.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: ObjectCameraMaterial + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHATEST_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 8400000, guid: 758df79ffe66c3c44b96f6ac5dce854f, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Resources/Materials/ObjectCameraMaterial.mat.meta b/Assets/Resources/Materials/ObjectCameraMaterial.mat.meta new file mode 100644 index 0000000..1628f06 --- /dev/null +++ b/Assets/Resources/Materials/ObjectCameraMaterial.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2d69022d4516264499a1a0abeae89af8 +timeCreated: 1537370325 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Materials/ObjectCameraRenderTexture.renderTexture b/Assets/Resources/Materials/ObjectCameraRenderTexture.renderTexture new file mode 100644 index 0000000..7e55dae --- /dev/null +++ b/Assets/Resources/Materials/ObjectCameraRenderTexture.renderTexture @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: ObjectCameraRenderTexture + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_Width: 512 + m_Height: 512 + m_AntiAliasing: 1 + m_DepthFormat: 2 + m_ColorFormat: 0 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 1 + m_UseDynamicScale: 1 + m_BindMS: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/Resources/Materials/ObjectCameraRenderTexture.renderTexture.meta b/Assets/Resources/Materials/ObjectCameraRenderTexture.renderTexture.meta new file mode 100644 index 0000000..1c8c546 --- /dev/null +++ b/Assets/Resources/Materials/ObjectCameraRenderTexture.renderTexture.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 758df79ffe66c3c44b96f6ac5dce854f +timeCreated: 1537369704 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/ARView.prefab b/Assets/Resources/UI/ARView.prefab index c804b6b..acfd717 100644 --- a/Assets/Resources/UI/ARView.prefab +++ b/Assets/Resources/UI/ARView.prefab @@ -92,15 +92,15 @@ GameObject: - component: {fileID: 224292492441239568} - component: {fileID: 222651095218169722} - component: {fileID: 114271944212076120} - - component: {fileID: 114067918789416470} - 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: 0 + m_IsActive: 1 --- !u!1 &1298020638438872 GameObject: m_ObjectHideFlags: 1 @@ -168,7 +168,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!1 &1365754499144302 GameObject: m_ObjectHideFlags: 1 @@ -177,7 +177,7 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 224888481017931948} - - component: {fileID: 114775556553022886} + - component: {fileID: 114014152039308068} m_Layer: 5 m_Name: DetailsContainer m_TagString: Untagged @@ -185,6 +185,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1380279798909964 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224126681634059420} + - component: {fileID: 222601834735527634} + - component: {fileID: 114013157313467306} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1386541956847342 GameObject: m_ObjectHideFlags: 0 @@ -200,6 +217,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1442634446812664 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224944142472828444} + - component: {fileID: 222757708461547688} + - component: {fileID: 114400082725147982} + - component: {fileID: 114584917988102786} + m_Layer: 5 + m_Name: Scrollbar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1443983083459540 GameObject: m_ObjectHideFlags: 0 @@ -212,7 +247,6 @@ GameObject: - component: {fileID: 114319331240875830} - component: {fileID: 114507205352577392} - component: {fileID: 114043246158556710} - - component: {fileID: 114923574649880128} m_Layer: 5 m_Name: ARView m_TagString: Untagged @@ -336,6 +370,25 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1630999023505358 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224568670868763796} + - component: {fileID: 114394030101927196} + - component: {fileID: 114835831483940740} + - component: {fileID: 222281876000192902} + - component: {fileID: 114850943686386882} + m_Layer: 5 + m_Name: ScrollContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1712603900453406 GameObject: m_ObjectHideFlags: 0 @@ -382,7 +435,7 @@ GameObject: - component: {fileID: 224258954071184956} - component: {fileID: 222511604970320398} - component: {fileID: 114941164005360912} - - component: {fileID: 114261071676795124} + - component: {fileID: 114374248921360494} m_Layer: 5 m_Name: DetailsText m_TagString: Untagged @@ -390,6 +443,21 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1894571920914764 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224251385334151864} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1977378795970684 GameObject: m_ObjectHideFlags: 1 @@ -417,7 +485,6 @@ GameObject: - component: {fileID: 224457627043515580} - component: {fileID: 222760257815341292} - component: {fileID: 114407377318976498} - - component: {fileID: 114824120747692980} m_Layer: 5 m_Name: Background m_TagString: Untagged @@ -552,6 +619,46 @@ Animation: m_PlayAutomatically: 0 m_AnimatePhysics: 0 m_CullingType: 0 +--- !u!114 &114013157313467306 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1380279798909964} + 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: 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &114014152039308068 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1365754499144302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!114 &114020375159146616 MonoBehaviour: m_ObjectHideFlags: 1 @@ -619,7 +726,7 @@ MonoBehaviour: m_EditorClassIdentifier: DetailsPanel: {fileID: 114451700018395534} ProjectionEffect: {fileID: 114717549802739924} ---- !u!114 &114067918789416470 +--- !u!114 &114047882587450334 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} @@ -627,17 +734,62 @@ MonoBehaviour: m_GameObject: {fileID: 1230596598073714} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: 260 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 + 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 @@ -899,25 +1051,6 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!114 &114261071676795124 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1816962923861122} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!114 &114271944212076120 MonoBehaviour: m_ObjectHideFlags: 1 @@ -929,9 +1062,9 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 2d69022d4516264499a1a0abeae89af8, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1020,6 +1153,77 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 +--- !u!114 &114374248921360494 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1816962923861122} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &114394030101927196 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1630999023505358} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 224258954071184956} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 0} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 114584917988102786} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 1 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &114400082725147982 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1442634446812664} + 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: 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &114403488752533328 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1060,7 +1264,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 184173fb9a2399341882a894edcac032, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1103,6 +1307,52 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!114 &114584917988102786 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1442634446812664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2061169968, 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: 114013157313467306} + m_HandleRect: {fileID: 224126681634059420} + m_Direction: 2 + m_Value: 0.4999999 + m_Size: 0.4911189 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &114591155496247950 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1196,28 +1446,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: LineMaterial: {fileID: 2100000, guid: d7c1ed00403294f44afec942af3cc296, type: 2} ---- !u!114 &114775556553022886 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1365754499144302} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 --- !u!114 &114784467059480262 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1245,86 +1473,45 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114824120747692980 +--- !u!114 &114835831483940740 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1986268301643462} + m_GameObject: {fileID: 1630999023505358} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -1200242548, 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 &114923574649880128 + m_ShowMaskGraphic: 0 +--- !u!114 &114850943686386882 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1443983083459540} + m_GameObject: {fileID: 1630999023505358} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.634} + 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!114 &114941164005360912 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1348,7 +1535,16 @@ MonoBehaviour: eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit - amet, consetetur sadipscing elitr, ' + amet, consetetur sadipscing elitr, Lorem ipsum dolor sit amet, consetetur sadipscing + elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam + erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. + Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, Lorem ipsum dolor sit + amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore + et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo + duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est + Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing + elitr, ' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 715b80e429c437e40867928a4e1fc975, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 715b80e429c437e40867928a4e1fc975, type: 2} @@ -1375,8 +1571,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 18 - m_fontSizeBase: 18 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1412,15 +1608,15 @@ MonoBehaviour: m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 60, y: 20, z: 20, w: 20} + m_margin: {x: 60, y: 0, z: 10, w: 0} m_textInfo: textComponent: {fileID: 114941164005360912} - characterCount: 353 + characterCount: 1059 spriteCount: 0 - spaceCount: 58 - wordCount: 58 + spaceCount: 174 + wordCount: 174 linkCount: 0 - lineCount: 9 + lineCount: 29 pageCount: 1 materialCount: 1 m_havePropertiesChanged: 1 @@ -1656,6 +1852,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1977378795970684} +--- !u!222 &222281876000192902 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1630999023505358} --- !u!222 &222380620736085646 CanvasRenderer: m_ObjectHideFlags: 1 @@ -1686,6 +1888,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1816962923861122} +--- !u!222 &222601834735527634 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1380279798909964} --- !u!222 &222651095218169722 CanvasRenderer: m_ObjectHideFlags: 1 @@ -1704,6 +1912,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1225498001622138} +--- !u!222 &222757708461547688 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1442634446812664} --- !u!222 &222760257815341292 CanvasRenderer: m_ObjectHideFlags: 1 @@ -1803,6 +2017,24 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224126681634059420 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1380279798909964} + 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: 224251385334151864} + 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: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224216194665817218 RectTransform: m_ObjectHideFlags: 1 @@ -1843,6 +2075,25 @@ RectTransform: m_AnchoredPosition: {x: 25, y: 25} m_SizeDelta: {x: 460, y: 375.3} m_Pivot: {x: 0, y: 0} +--- !u!224 &224251385334151864 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1894571920914764} + 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: 224126681634059420} + m_Father: {fileID: 224944142472828444} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224258954071184956 RectTransform: m_ObjectHideFlags: 1 @@ -1853,13 +2104,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224888481017931948} - m_RootOrder: 1 + m_Father: {fileID: 224568670868763796} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 230, y: -187.65} - m_SizeDelta: {x: 460, y: 375.3} + 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 &224272151730405692 RectTransform: @@ -1886,16 +2137,16 @@ RectTransform: 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: 0} + m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224888481017931948} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 230, y: -130} - m_SizeDelta: {x: 460, y: 260} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 381.8} + m_SizeDelta: {x: 460, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224415045131491092 RectTransform: @@ -1969,6 +2220,25 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224568670868763796 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1630999023505358} + 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: 224258954071184956} + m_Father: {fileID: 224888481017931948} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 460, y: 360} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224620536568054620 RectTransform: m_ObjectHideFlags: 1 @@ -2100,13 +2370,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 224292492441239568} - - {fileID: 224258954071184956} + - {fileID: 224568670868763796} + - {fileID: 224944142472828444} m_Father: {fileID: 224250538007241578} 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_AnchoredPosition: {x: 0, y: 0.5} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224932340658346134 @@ -2127,6 +2398,25 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224944142472828444 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1442634446812664} + 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: 224251385334151864} + m_Father: {fileID: 224888481017931948} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: 10, y: 360} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224954540062687134 RectTransform: m_ObjectHideFlags: 1 diff --git a/Assets/RothenburgAR/Scripts/AppInitializerBehaviour.cs b/Assets/RothenburgAR/Scripts/AppInitializerBehaviour.cs index d0124ae..e2b45d1 100644 --- a/Assets/RothenburgAR/Scripts/AppInitializerBehaviour.cs +++ b/Assets/RothenburgAR/Scripts/AppInitializerBehaviour.cs @@ -24,6 +24,7 @@ namespace RothenburgAR UIManager.Instance.InitStartView(); InputManager.Instance.Initialize(); + var init = DisplayManager.Instance; } void InitializeData() diff --git a/Assets/RothenburgAR/Scripts/UI/DetailsPanelBehaviour.cs b/Assets/RothenburgAR/Scripts/UI/DetailsPanelBehaviour.cs index d7fe10f..09e173e 100644 --- a/Assets/RothenburgAR/Scripts/UI/DetailsPanelBehaviour.cs +++ b/Assets/RothenburgAR/Scripts/UI/DetailsPanelBehaviour.cs @@ -13,6 +13,11 @@ namespace RothenburgAR.UI public TextMeshProUGUI DetailsText; public DetailsModelBehaviour DetailsModel; + private void Start() + { + gameObject.SetActive(false); + } + public bool HasModel { get { return _currentDisplayedModelGo != null; } @@ -92,11 +97,11 @@ namespace RothenburgAR.UI public void UpdateOpeningAnimation(Vector3 position) { float duration = .4f; + var scale = DisplayManager.Instance.GetComponent().localScale.x; + Vector3 screenMiddle = new Vector3(Screen.width / scale, Screen.height / scale, 0) * 0.5f; - Vector3 startPos = Camera.main.WorldToScreenPoint(position) - - (0.5f * new Vector3(Screen.width, Screen.height, 0)); - Vector3 endPos = -0.5f * new Vector3(Screen.width, Screen.height, 0) + new Vector3(25, 25, 0); - + Vector3 startPos = Camera.main.WorldToScreenPoint(position) / scale - screenMiddle; + Vector3 endPos = -screenMiddle + new Vector3(25, 25, 0); float startScale = 0.05f; float endScale = 1; diff --git a/Assets/RothenburgAR/Scripts/UI/DisplayManager.cs b/Assets/RothenburgAR/Scripts/UI/DisplayManager.cs index 8a8e12d..afcac2c 100644 --- a/Assets/RothenburgAR/Scripts/UI/DisplayManager.cs +++ b/Assets/RothenburgAR/Scripts/UI/DisplayManager.cs @@ -29,6 +29,12 @@ namespace RothenburgAR.UI instance = canvas.AddComponent(); DontDestroyOnLoad(canvas); + var scaler = canvas.AddComponent(); + scaler.uiScaleMode = UnityEngine.UI.CanvasScaler.ScaleMode.ScaleWithScreenSize; + scaler.referenceResolution = new Vector2(1024, 1024); + scaler.screenMatchMode = UnityEngine.UI.CanvasScaler.ScreenMatchMode.MatchWidthOrHeight; + scaler.matchWidthOrHeight = .5f; + instance.resolution = new Vector2(Screen.width, Screen.height); instance.orientation = Screen.orientation; } diff --git a/Assets/RothenburgAR/Scripts/UI/ProjectionEffectBehaviour.cs b/Assets/RothenburgAR/Scripts/UI/ProjectionEffectBehaviour.cs index 3583168..7587d4e 100644 --- a/Assets/RothenburgAR/Scripts/UI/ProjectionEffectBehaviour.cs +++ b/Assets/RothenburgAR/Scripts/UI/ProjectionEffectBehaviour.cs @@ -87,23 +87,23 @@ namespace RothenburgAR.UI if (!enabled || SelectedPOI == null) return; - - transform.localPosition = Camera.main.WorldToScreenPoint(SelectedPOI.transform.position) - - (0.5f * new Vector3(Screen.width, Screen.height, 0)); + var scale = DisplayManager.Instance.GetComponent().localScale.x; + Vector3 screenMiddle = new Vector3(Screen.width / scale, Screen.height / scale, 0) * 0.5f; + transform.localPosition = Camera.main.WorldToScreenPoint(SelectedPOI.transform.position) / scale - screenMiddle; RectTransform rt = UIManager.Instance.ARViewBehaviour.DetailsPanel.GetComponent(); Vector3 panelCenter = rt.transform.localPosition; Vector3[] panelCorners = new Vector3[4]; rt.GetLocalCorners(panelCorners); - + for (int i = 0; i < panelCorners.Length; i++) { - var scale = rt.localScale; + var localScale = rt.localScale; var corner = panelCorners[i]; - corner.Scale(scale); + corner.Scale(localScale); panelCorners[i] = corner; } - + List vertices = GenerateVertices(panelCenter, panelCorners); List uvs = GenerateUVs(vertices.Count); List normals = GenerateNormals(vertices.Count); @@ -157,18 +157,18 @@ namespace RothenburgAR.UI if (positionType == PositionType.Right || positionType == PositionType.Left) { var addedVector = new Vector3(0, 2); - vertices[(int) CornerIndex.TopLeft] -= addedVector; - vertices[(int) CornerIndex.TopRight] -= addedVector; - vertices[(int) CornerIndex.BottomLeft] += addedVector; - vertices[(int) CornerIndex.BottomRight] += addedVector; + vertices[(int)CornerIndex.TopLeft] -= addedVector; + vertices[(int)CornerIndex.TopRight] -= addedVector; + vertices[(int)CornerIndex.BottomLeft] += addedVector; + vertices[(int)CornerIndex.BottomRight] += addedVector; } else if (positionType == PositionType.Top || positionType == PositionType.Bottom) { var addedVector = new Vector3(2, 0); - vertices[(int) CornerIndex.BottomLeft] += addedVector; - vertices[(int) CornerIndex.TopLeft] += addedVector; - vertices[(int) CornerIndex.TopRight] -= addedVector; - vertices[(int) CornerIndex.BottomRight] -= addedVector; + vertices[(int)CornerIndex.BottomLeft] += addedVector; + vertices[(int)CornerIndex.TopLeft] += addedVector; + vertices[(int)CornerIndex.TopRight] -= addedVector; + vertices[(int)CornerIndex.BottomRight] -= addedVector; } } @@ -188,7 +188,7 @@ namespace RothenburgAR.UI { result = PositionType.TopLeft; } - else if (localPosition.x > absoluteCorners[(int) CornerIndex.TopRight].x) + else if (localPosition.x > absoluteCorners[(int)CornerIndex.TopRight].x) { result = PositionType.TopRight; } @@ -204,7 +204,7 @@ namespace RothenburgAR.UI { result = PositionType.Left; } - else if (localPosition.x > absoluteCorners[(int) CornerIndex.TopRight].x) + else if (localPosition.x > absoluteCorners[(int)CornerIndex.TopRight].x) { result = PositionType.Right; } @@ -219,7 +219,7 @@ namespace RothenburgAR.UI { result = PositionType.BottomLeft; } - else if (localPosition.x > absoluteCorners[(int) CornerIndex.TopRight].x) + else if (localPosition.x > absoluteCorners[(int)CornerIndex.TopRight].x) { result = PositionType.BottomRight; } @@ -268,7 +268,6 @@ namespace RothenburgAR.UI } return triangles.ToArray(); } - private List GenerateVertices(Vector3 panelCenter, Vector3[] panelCorners) { diff --git a/Assets/mainScene.unity b/Assets/mainScene.unity index 7742bdd..101090f 100644 --- a/Assets/mainScene.unity +++ b/Assets/mainScene.unity @@ -247,21 +247,6 @@ Transform: m_Father: {fileID: 1230455932} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!115 &658607817 -MonoScript: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: - serializedVersion: 4 - m_Script: - m_DefaultReferences: {} - m_Icon: {fileID: 0} - m_ExecutionOrder: 0 - m_ClassName: DefaultInitializationErrorHandlerPlaceHolder - m_Namespace: - m_AssemblyName: Vuforia.UnityExtensions - m_IsEditorScript: 0 --- !u!1 &1073945774 GameObject: m_ObjectHideFlags: 0 @@ -382,7 +367,7 @@ Camera: m_GameObject: {fileID: 1230455927} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 3 + m_ClearFlags: 2 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_NormalizedViewPortRect: serializedVersion: 2 @@ -400,12 +385,12 @@ Camera: serializedVersion: 2 m_Bits: 256 m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} + m_TargetTexture: {fileID: 8400000, guid: 758df79ffe66c3c44b96f6ac5dce854f, type: 2} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 + m_AllowDynamicResolution: 1 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 @@ -581,7 +566,7 @@ MonoBehaviour: m_GameObject: {fileID: 1650865715} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 658607817} + m_Script: {fileID: 11500000, guid: c47f92041efbb4b429a4eafca855ebe3, type: 3} m_Name: m_EditorClassIdentifier: --- !u!114 &1650865717