diff --git a/README.md b/README.md index 24f6151..fdea308 100644 --- a/README.md +++ b/README.md @@ -17,5 +17,4 @@ In this repository you will find the source code, assets and project settings of | ~0.1~ | ~Material UI framework and orbiting streamed objects~ | | ~0.2~ | ~Touch support and focussing view on streams~ | | 0.3 | Select objects and inspect their data | -| 0.4 | Scale some UI panels according to screen dimensions | | 1.0 | Toggle Augmented Reality view to place, move and scale a world anchor in AR | diff --git a/Speckle Viewer/Assets/Scenes/Main Scene.unity b/Speckle Viewer/Assets/Scenes/Main Scene.unity index 14322cc..0c20929 100644 --- a/Speckle Viewer/Assets/Scenes/Main Scene.unity +++ b/Speckle Viewer/Assets/Scenes/Main Scene.unity @@ -277,6 +277,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 148932, guid: 082542cfbb8fa9f4297abec3067902cc, type: 3} m_PrefabInstance: {fileID: 102809981} m_PrefabAsset: {fileID: 0} +--- !u!114 &36885946 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 11463184, guid: 082542cfbb8fa9f4297abec3067902cc, type: 3} + m_PrefabInstance: {fileID: 102809981} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 36885945} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b9c3ac3231ee844ab57c6f29c644a11, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &36885947 MonoBehaviour: m_ObjectHideFlags: 0 @@ -813,10 +824,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b418c8026b3dacf4c8fe3ce8a8968bfe, type: 3} m_Name: m_EditorClassIdentifier: + touchSensitivity: 0.2 + pinchSensitvity: 0.001 + panSensitivity: 0.02 mouseSensitivity: 4 - touchSensitivity: 0.01 scrollSensitvity: 2 - pinchSensitvity: 0.005 orbitDampening: 20 scrollDampening: 20 cameraDisabled: 0 @@ -1017,6 +1029,7 @@ RectTransform: - {fileID: 1883747712} - {fileID: 36885948} - {fileID: 517812423} + - {fileID: 1794285001} - {fileID: 2846798710941463741} - {fileID: 1582266170} m_Father: {fileID: 0} @@ -1034,138 +1047,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 291294774} m_Modifications: - - target: {fileID: 154308, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_Name - value: Add Receiver - objectReference: {fileID: 0} - - target: {fileID: 154314, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_Name - value: Remove Receiver - objectReference: {fileID: 0} - - target: {fileID: 154320, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_Name - value: Logout - objectReference: {fileID: 0} - target: {fileID: 173644, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} propertyPath: m_Name value: Nav Drawer objectReference: {fileID: 0} - - target: {fileID: 11454286, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 797cb35038f43b14cba3d3036d08ed9e, type: 3} - - target: {fileID: 11454294, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_Text - value: Speckle Viewer v0.2.0a - objectReference: {fileID: 0} - - target: {fileID: 11454300, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11454300, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11454300, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11454300, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 11454300, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: MaterialUI.DialogBoxConfig, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 11454300, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: Open - objectReference: {fileID: 0} - - target: {fileID: 11454300, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 11454300, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1458477643} - - target: {fileID: 11454300, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OnAddStream - objectReference: {fileID: 0} - - target: {fileID: 11454300, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 11454300, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: NavDrawerBehaviour, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 11454302, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 829c3f8d4975ede43b76bfa5446bd5de, type: 3} - - target: {fileID: 11454304, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_Text - value: Add A Stream - objectReference: {fileID: 0} - - target: {fileID: 11454310, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11454310, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1458477643} - - target: {fileID: 11454310, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OnRemoveStream - objectReference: {fileID: 0} - - target: {fileID: 11454310, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 11454310, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: NavDrawerBehaviour, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 11454312, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 7c29a0274a9adcd4796ae1de3518f902, type: 3} - - target: {fileID: 11454314, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_Text - value: Remove A Stream - objectReference: {fileID: 0} - - target: {fileID: 11454320, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11454320, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1458477643} - - target: {fileID: 11454320, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OnLogout - objectReference: {fileID: 0} - - target: {fileID: 11454320, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 11454320, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: NavDrawerBehaviour, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 11454322, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 886d2b819e5ded54da91ac0e91773113, type: 3} - - target: {fileID: 11454324, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - propertyPath: m_Text - value: Logout - objectReference: {fileID: 0} - target: {fileID: 22454300, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} propertyPath: m_SizeDelta.y value: 0 @@ -1254,6 +1139,18 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1458477643, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} + propertyPath: streamSelector + value: + objectReference: {fileID: 36885947} + - target: {fileID: 1458477643, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} + propertyPath: streamRemover + value: + objectReference: {fileID: 517812426} + - target: {fileID: 1458477643, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} + propertyPath: helpDialog + value: + objectReference: {fileID: 1794285000} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} --- !u!114 &450243087 stripped @@ -1604,7 +1501,19 @@ MonoBehaviour: dividerPrefab: {fileID: 132128, guid: b72eac2f7b2219346ac30be5ae66f0dc, type: 3} streamDataPrefab: {fileID: 4284069231333763393, guid: e10f048ff949aec47ab96fe7c15cd2c8, type: 3} dataRoot: {fileID: 517812424} - errorDialog: {fileID: 0} + errorDialog: {fileID: 578378543} + cameraSystem: {fileID: 0} +--- !u!114 &517812427 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 11463184, guid: 082542cfbb8fa9f4297abec3067902cc, type: 3} + m_PrefabInstance: {fileID: 517812422} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 517812425} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b9c3ac3231ee844ab57c6f29c644a11, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &578378543 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 11414586, guid: aa1074633aaef0347819d09f4cd681db, type: 3} @@ -1719,6 +1628,10 @@ PrefabInstance: propertyPath: m_Name value: AR Button objectReference: {fileID: 0} + - target: {fileID: 100012, guid: 63615b8cc575fc3419a99b345e5bbe37, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 11400000, guid: 63615b8cc575fc3419a99b345e5bbe37, type: 3} propertyPath: m_Sprite value: @@ -1892,7 +1805,7 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 11473638, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} m_PrefabInstance: {fileID: 432278129} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1458477642} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 32baaf00a94c64a40b8ae54d26055a36, type: 3} @@ -1959,6 +1872,17 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 +--- !u!114 &879305737 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 11416436, guid: b966cc67a22bba847a96fb2cc4b67220, type: 3} + m_PrefabInstance: {fileID: 1883747711} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b9c3ac3231ee844ab57c6f29c644a11, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1037302567 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100002, guid: 84e6a53f37e667a4080d9e91dd4fa1e4, type: 3} @@ -2127,25 +2051,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1458477642 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 173644, guid: e07df7de26af1e34e9de5271838ce87b, type: 3} - m_PrefabInstance: {fileID: 432278129} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1458477643 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1458477642} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2b9113c3ba655264a942bfe6b8ae0088, type: 3} - m_Name: - m_EditorClassIdentifier: - streamSelector: {fileID: 36885947} - streamRemover: {fileID: 517812426} --- !u!1 &1537965276 GameObject: m_ObjectHideFlags: 0 @@ -2226,6 +2131,86 @@ PrefabInstance: propertyPath: m_Name value: Error Dialog Box objectReference: {fileID: 0} + - target: {fileID: 164166, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_Name + value: Okay + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 879305737} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: MaterialUI.DialogBoxConfig, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: Close + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName + value: MaterialUI.DialogBoxConfig, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName + value: MaterialUI.DialogBoxConfig, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 36885946} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target + value: + objectReference: {fileID: 517812427} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: Close + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName + value: Close + objectReference: {fileID: 0} + - target: {fileID: 11464158, guid: aa1074633aaef0347819d09f4cd681db, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 22414586, guid: aa1074633aaef0347819d09f4cd681db, type: 3} propertyPath: m_SizeDelta.y value: 222.33333 @@ -2260,7 +2245,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22437372, guid: aa1074633aaef0347819d09f4cd681db, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 22437372, guid: aa1074633aaef0347819d09f4cd681db, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2408,6 +2393,175 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1794284999 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 291294774} + m_Modifications: + - target: {fileID: 137372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_Name + value: Help Dialog + objectReference: {fileID: 0} + - target: {fileID: 22414586, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_SizeDelta.y + value: 296.66666 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_SizeDelta.x + value: 362 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_SizeDelta.y + value: 285 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22437376, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454764, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454764, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454764, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454764, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454764, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454764, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454766, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454766, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454766, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454766, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454766, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454766, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} +--- !u!114 &1794285000 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 11414586, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + m_PrefabInstance: {fileID: 1794284999} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b9c3ac3231ee844ab57c6f29c644a11, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &1794285001 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 22437372, guid: e4c9884fd38664946a3632c518eaf5a7, type: 3} + m_PrefabInstance: {fileID: 1794284999} + m_PrefabAsset: {fileID: 0} --- !u!114 &1867497315 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 11400010, guid: 84e6a53f37e667a4080d9e91dd4fa1e4, type: 3} @@ -2959,7 +3113,7 @@ RectTransform: - {fileID: 2846798710941478331} - {fileID: 2846798710941464385} m_Father: {fileID: 291294774} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -3702,7 +3856,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4d6cb4ce8fac6f140bd0c09b2abb583f, type: 3} m_Name: m_EditorClassIdentifier: - useInjectedValues: 1 + useInjectedValues: 0 credentials: {fileID: 11400000, guid: b8947b43132c17848ab403a0c67bbaab, type: 2} manager: {fileID: 1537965277} dialog: {fileID: 2846798710951429499} diff --git a/Speckle Viewer/Assets/Scripts/Camera System/CameraSystem.cs b/Speckle Viewer/Assets/Scripts/Camera System/CameraSystem.cs index e568a14..ab883dc 100644 --- a/Speckle Viewer/Assets/Scripts/Camera System/CameraSystem.cs +++ b/Speckle Viewer/Assets/Scripts/Camera System/CameraSystem.cs @@ -13,10 +13,13 @@ public class CameraSystem : MonoBehaviour protected Vector3 eulerRotation = new Vector3 (15, 30, 0); protected float distanceFromPivot = 30f; - public float mouseSensitivity = 4f; public float touchSensitivity = 0.2f; - public float scrollSensitvity = 2f; public float pinchSensitvity = 0.2f; + public float panSensitivity = 0.5f; + + [Space, Space] + public float mouseSensitivity = 4f; + public float scrollSensitvity = 2f; public float orbitDampening = 20f; public float scrollDampening = 20f; @@ -47,7 +50,8 @@ void LateUpdate () if (cameraDisabled) return; if (InputValidation.IsPointerOverUIObject ()) return; - RegisterDesktopInput (); + if (Application.platform != RuntimePlatform.Android) + RegisterDesktopInput (); RegisterTouchInput (); //Actual Camera Rig Transformations @@ -103,15 +107,16 @@ private void RegisterTouchInput () { float currentPinchDistance = Vector2.Distance (Input.GetTouch (0).position, Input.GetTouch (1).position); - if (Input.GetTouch (1).phase == TouchPhase.Began) - { - previousPinchDistance = currentPinchDistance; - } - else if (Input.GetTouch (1).phase == TouchPhase.Moved) - { - distanceFromPivot += (previousPinchDistance - currentPinchDistance) * pinchSensitvity; - } + distanceFromPivot += currentPinchDistance * pinchSensitvity * (currentPinchDistance > previousPinchDistance ? -1 : 1); + previousPinchDistance = currentPinchDistance; + } + + if (Input.touchCount == 3 && Input.GetTouch (0).phase == TouchPhase.Moved) + { + pivotTransform.Translate (Vector3.right * Input.GetTouch (0).deltaPosition.x * panSensitivity * -1); + pivotTransform.Translate (transform.up * Input.GetTouch (0).deltaPosition.y * panSensitivity * -1, Space.World); } + /* if (Touch.activeTouches.Count == 1) { diff --git a/Speckle Viewer/Assets/Scripts/UI/LoginBehaviour.cs b/Speckle Viewer/Assets/Scripts/UI/LoginBehaviour.cs index 05bc006..c83b03b 100644 --- a/Speckle Viewer/Assets/Scripts/UI/LoginBehaviour.cs +++ b/Speckle Viewer/Assets/Scripts/UI/LoginBehaviour.cs @@ -73,7 +73,12 @@ private void UpdateLoginButtonState () loginButton.interactable = serverFieldHasInput && emailFieldHasInput && passwordFieldHasInput; } - public async void AttemptLogin () + public void AttemptLogin () + { + _ = RunAsyncLogin (); + } + + private async Task RunAsyncLogin () { manager.SetServerUrl (serverURL); diff --git a/Speckle Viewer/Assets/Scripts/UI/NavDrawerBehaviour.cs b/Speckle Viewer/Assets/Scripts/UI/NavDrawerBehaviour.cs index 9025b04..c60f105 100644 --- a/Speckle Viewer/Assets/Scripts/UI/NavDrawerBehaviour.cs +++ b/Speckle Viewer/Assets/Scripts/UI/NavDrawerBehaviour.cs @@ -9,6 +9,7 @@ public class NavDrawerBehaviour : MonoBehaviour public StreamSelectionBehaviour streamSelector; public StreamRemoverBehaviour streamRemover; + public DialogBoxConfig helpDialog; private NavDrawerConfig navDrawer; @@ -30,6 +31,11 @@ public void OnRemoveStream () navDrawer.Close (); } + public void OnHelp () + { + helpDialog.Open (); + } + public void OnLogout () { SceneManager.LoadScene (0); diff --git a/Speckle Viewer/Assets/Scripts/UI/StreamRemoverBehaviour.cs b/Speckle Viewer/Assets/Scripts/UI/StreamRemoverBehaviour.cs index b21bc7e..e54d4a7 100644 --- a/Speckle Viewer/Assets/Scripts/UI/StreamRemoverBehaviour.cs +++ b/Speckle Viewer/Assets/Scripts/UI/StreamRemoverBehaviour.cs @@ -5,6 +5,8 @@ public class StreamRemoverBehaviour : StreamSelectionBehaviour { + public CameraSystem cameraSystem; + public override void Initialize () { dialogBox.Open (); @@ -16,5 +18,8 @@ public override void SelectStream (SpeckleStream stream) { dialogBox.Close (); manager.RemoveReceiver (stream.StreamId); + + Bounds modelBounds = manager.GetBoundsForAllReceivedStreams (); + cameraSystem.FocusOnModel (modelBounds); } } diff --git a/Speckle Viewer/Assets/Sprites/speckle-logo-inverted.png b/Speckle Viewer/Assets/Sprites/speckle-logo-inverted.png index 204fcf4..dc96f5d 100644 Binary files a/Speckle Viewer/Assets/Sprites/speckle-logo-inverted.png and b/Speckle Viewer/Assets/Sprites/speckle-logo-inverted.png differ diff --git a/Speckle Viewer/Assets/UIMaterialElements/Runtime/ComponentPrefabs/Help Dialog.prefab b/Speckle Viewer/Assets/UIMaterialElements/Runtime/ComponentPrefabs/Help Dialog.prefab new file mode 100644 index 0000000..0d95ba3 --- /dev/null +++ b/Speckle Viewer/Assets/UIMaterialElements/Runtime/ComponentPrefabs/Help Dialog.prefab @@ -0,0 +1,636 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &114586 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 22414586} + - component: {fileID: 22214586} + - component: {fileID: 11414588} + - component: {fileID: 22514586} + - component: {fileID: 11454766} + m_Layer: 5 + m_Name: Shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &22414586 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114586} + 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: 22437372} + 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: 362, y: 294} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &22214586 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114586} + m_CullTransparentMesh: 0 +--- !u!114 &11414588 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114586} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ce4b7ac9fc527fa4aaa1abd7fadc4545, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!225 &22514586 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114586} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 0 + m_BlocksRaycasts: 0 + m_IgnoreParentGroups: 0 +--- !u!114 &11454766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114586} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dbaec9a00473d954ca92aab1f07adf76, type: 3} + m_Name: + m_EditorClassIdentifier: + targetRect: {fileID: 22437376} + xPadding: 62 + yPadding: 62 + percentage: 0 + xPercent: 0 + yPercent: 0 + snapEveryFrame: 1 + sizeOnly: 0 +--- !u!1 &137372 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 22437372} + - component: {fileID: 11454514} + - component: {fileID: 11414586} + m_Layer: 5 + m_Name: Help Dialog + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &22437372 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137372} + 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: 22437374} + - {fileID: 22414586} + - {fileID: 22437376} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 362, y: 285} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &11454514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137372} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dbaec9a00473d954ca92aab1f07adf76, type: 3} + m_Name: + m_EditorClassIdentifier: + targetRect: {fileID: 22414586} + xPadding: 0 + yPadding: 0 + percentage: 0 + xPercent: 0 + yPercent: 0 + snapEveryFrame: 0 + sizeOnly: 1 +--- !u!114 &11414586 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137372} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b9c3ac3231ee844ab57c6f29c644a11, type: 3} + m_Name: + m_EditorClassIdentifier: + darkenBackground: 1 + canClickBackgroundToCancel: 1 + animationDuration: 1 + backgroundTransform: {fileID: 22437374} +--- !u!1 &137374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 22437374} + - component: {fileID: 22237374} + - component: {fileID: 11437372} + - component: {fileID: 22537376} + - component: {fileID: 11448216} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &22437374 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137374} + 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: 22437372} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &22237374 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137374} + m_CullTransparentMesh: 0 +--- !u!114 &11437372 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.2627451} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!225 &22537376 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137374} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 0 + m_IgnoreParentGroups: 0 +--- !u!114 &11448216 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 0 + 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 11437372} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 11414586} + m_TargetAssemblyTypeName: + m_MethodName: BackgroundClick + 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 +--- !u!1 &137376 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 22437376} + - component: {fileID: 22237376} + - component: {fileID: 11437376} + - component: {fileID: 11454760} + - component: {fileID: 11454762} + - component: {fileID: 11463284} + m_Layer: 5 + m_Name: DialogLayer + m_TagString: MaterialButtonLayer + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &22437376 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137376} + 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: 22454764} + - {fileID: 22454766} + m_Father: {fileID: 22437372} + 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: 300, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &22237376 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137376} + m_CullTransparentMesh: 0 +--- !u!114 &11437376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137376} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: bdb3c2fa2edce14428c2588d923d9431, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &11454760 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137376} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 24 + m_Right: 24 + m_Top: 24 + m_Bottom: 24 + m_ChildAlignment: 0 + m_Spacing: 16 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &11454762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137376} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &11463284 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137376} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b9242969ab3c7f540abb7f880e43c080, type: 3} + m_Name: + m_EditorClassIdentifier: + sprite1x: {fileID: 21300000, guid: bdb3c2fa2edce14428c2588d923d9431, type: 3} + sprite2x: {fileID: 21300000, guid: f8e0ae8fe4abe4e44bb4a9a89648eea4, type: 3} + sprite4x: {fileID: 21300000, guid: ea5374f26645a6843a8727fbebe2cdb0, type: 3} +--- !u!1 &154764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 22454764} + - component: {fileID: 22254764} + - component: {fileID: 11454756} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &22454764 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154764} + 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: 22437376} + 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.5, y: 0.5} +--- !u!222 &22254764 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154764} + m_CullTransparentMesh: 0 +--- !u!114 &11454756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154764} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.1953125, g: 0.1953125, b: 0.1953125, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: ad105ce5c1a24a84f87df69819b699f8, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Help +--- !u!1 &154766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 22454766} + - component: {fileID: 22254766} + - component: {fileID: 11454758} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &22454766 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154766} + 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: 22437376} + m_RootOrder: 1 + 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.5, y: 0.5} +--- !u!222 &22254766 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154766} + m_CullTransparentMesh: 0 +--- !u!114 &11454758 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.1953125, g: 0.1953125, b: 0.1953125, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: fbe3c09b43ce4304e86e7496c81bb9ed, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Add and remove streams that are available to your account to view them + in 3D space. + + + Controls: + + + 1 Finger - Orbit + + 2 Fingers - Zoom + + 3 + Fingers - Pan' diff --git a/Speckle Viewer/Assets/UIMaterialElements/Runtime/ComponentPrefabs/Help Dialog.prefab.meta b/Speckle Viewer/Assets/UIMaterialElements/Runtime/ComponentPrefabs/Help Dialog.prefab.meta new file mode 100644 index 0000000..1213ec6 --- /dev/null +++ b/Speckle Viewer/Assets/UIMaterialElements/Runtime/ComponentPrefabs/Help Dialog.prefab.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: e4c9884fd38664946a3632c518eaf5a7 +NativeFormatImporter: + userData: diff --git a/Speckle Viewer/Assets/UIMaterialElements/Runtime/ComponentPrefabs/Nav Drawer.prefab b/Speckle Viewer/Assets/UIMaterialElements/Runtime/ComponentPrefabs/Nav Drawer.prefab index 49fa0ac..4fdc973 100644 --- a/Speckle Viewer/Assets/UIMaterialElements/Runtime/ComponentPrefabs/Nav Drawer.prefab +++ b/Speckle Viewer/Assets/UIMaterialElements/Runtime/ComponentPrefabs/Nav Drawer.prefab @@ -62,6 +62,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -166,10 +168,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 98d3ea346b618da499ae0a3780678a7c, type: 3} + m_Sprite: {fileID: 21300000, guid: 797cb35038f43b14cba3d3036d08ed9e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -253,6 +257,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.5019608} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -326,6 +332,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -403,6 +411,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.7019608} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -419,7 +429,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: This is a subtitle + m_Text: Speckle Viewer v0.2.0a --- !u!1 &154308 GameObject: m_ObjectHideFlags: 0 @@ -434,7 +444,7 @@ GameObject: - component: {fileID: 11454298} - component: {fileID: 11454300} m_Layer: 5 - m_Name: List Item + m_Name: Add Receiver m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -484,6 +494,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -564,8 +576,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 11473638} - m_MethodName: Close + - m_Target: {fileID: 1458477643} + m_TargetAssemblyTypeName: NavDrawerBehaviour, Assembly-CSharp + m_MethodName: OnAddStream m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -635,10 +648,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.5411765} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 037023c4f8a42184a9180eda840a70bd, type: 3} + m_Sprite: {fileID: 21300000, guid: 829c3f8d4975ede43b76bfa5446bd5de, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -708,6 +723,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.8745098} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -724,7 +741,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: List Item 1 + m_Text: Add A Stream --- !u!1 &154314 GameObject: m_ObjectHideFlags: 0 @@ -739,7 +756,7 @@ GameObject: - component: {fileID: 11454308} - component: {fileID: 11454310} m_Layer: 5 - m_Name: List Item + m_Name: Remove Receiver m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -789,6 +806,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -869,8 +888,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 11473638} - m_MethodName: Close + - m_Target: {fileID: 1458477643} + m_TargetAssemblyTypeName: NavDrawerBehaviour, Assembly-CSharp + m_MethodName: OnRemoveStream m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -940,10 +960,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.5411765} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 037023c4f8a42184a9180eda840a70bd, type: 3} + m_Sprite: {fileID: 21300000, guid: 7c29a0274a9adcd4796ae1de3518f902, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1013,6 +1035,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.8745098} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1029,7 +1053,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: List Item 2 + m_Text: Remove A Stream --- !u!1 &154320 GameObject: m_ObjectHideFlags: 0 @@ -1044,7 +1068,7 @@ GameObject: - component: {fileID: 11454318} - component: {fileID: 11454320} m_Layer: 5 - m_Name: List Item + m_Name: Help m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1094,6 +1118,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1174,8 +1200,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 11473638} - m_MethodName: Close + - m_Target: {fileID: 1458477643} + m_TargetAssemblyTypeName: NavDrawerBehaviour, Assembly-CSharp + m_MethodName: OnHelp m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1245,10 +1272,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.5411765} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 037023c4f8a42184a9180eda840a70bd, type: 3} + m_Sprite: {fileID: 21300000, guid: bae0556fc231c1649b138ac2a177d886, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1318,6 +1347,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.8745098} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1334,7 +1365,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: List Item 3 + m_Text: Help --- !u!1 &160364 GameObject: m_ObjectHideFlags: 0 @@ -1397,6 +1428,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1496,6 +1529,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.2509804} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1519,6 +1554,7 @@ GameObject: m_Component: - component: {fileID: 22473644} - component: {fileID: 11473638} + - component: {fileID: 1458477643} m_Layer: 5 m_Name: Nav Drawer m_TagString: Untagged @@ -1566,6 +1602,21 @@ MonoBehaviour: darkenBackground: 1 tapBackgroundToClose: 1 animationDuration: 0.5 +--- !u!114 &1458477643 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 173644} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b9113c3ba655264a942bfe6b8ae0088, type: 3} + m_Name: + m_EditorClassIdentifier: + streamSelector: {fileID: 0} + streamRemover: {fileID: 0} + helpDialog: {fileID: 0} --- !u!1 &173646 GameObject: m_ObjectHideFlags: 0 @@ -1600,6 +1651,7 @@ RectTransform: - {fileID: 22454308} - {fileID: 22454314} - {fileID: 22454320} + - {fileID: 1722981975845876354} m_Father: {fileID: 22473644} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1631,10 +1683,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bdb3c2fa2edce14428c2588d923d9431, type: 3} + m_Sprite: {fileID: 21300000, guid: ea5374f26645a6843a8727fbebe2cdb0, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1722,6 +1776,8 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.2627451} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1805,6 +1861,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11473638} + m_TargetAssemblyTypeName: m_MethodName: BackgroundTap m_Mode: 1 m_Arguments: @@ -1815,3 +1872,315 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &901544649545915796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1722981975845876354} + - component: {fileID: 7734942014396924421} + - component: {fileID: 863834224332137209} + - component: {fileID: 6742243556661181655} + - component: {fileID: 1999949304351405408} + m_Layer: 5 + m_Name: Logout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1722981975845876354 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 901544649545915796} + 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: 6457732900059204413} + - {fileID: 7532970558636642625} + m_Father: {fileID: 22473646} + m_RootOrder: 4 + 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: -336.71002} + m_SizeDelta: {x: 0, y: 48} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7734942014396924421 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 901544649545915796} + m_CullTransparentMesh: 0 +--- !u!114 &863834224332137209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 901544649545915796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6742243556661181655 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 901544649545915796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2eb2ff9f02bd9b4db2ae7a194623fac, type: 3} + m_Name: + m_EditorClassIdentifier: + autoSize: 1 + sizePercentage: 75 + rippleSize: 0 + rippleSpeed: 6 + rippleColor: {r: 0, g: 0, b: 0, a: 1} + rippleStartAlpha: 0.5 + rippleEndAlpha: 0.3 + highlightWhen: 2 + moveTowardCenter: 0 + toggleMask: 1 + dontRippleOnScroll: 0 + scrollDelayCheckTime: 0.05 +--- !u!114 &1999949304351405408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 901544649545915796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 0 + 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 863834224332137209} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1458477643} + m_TargetAssemblyTypeName: NavDrawerBehaviour, Assembly-CSharp + m_MethodName: OnLogout + 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 +--- !u!1 &1548834328250747569 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7532970558636642625} + - component: {fileID: 3069426092128033188} + - component: {fileID: 1606699697715869197} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7532970558636642625 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1548834328250747569} + 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: 1722981975845876354} + 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: 28, y: 0} + m_SizeDelta: {x: -88, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3069426092128033188 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1548834328250747569} + m_CullTransparentMesh: 0 +--- !u!114 &1606699697715869197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1548834328250747569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.8745098} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: fbe3c09b43ce4304e86e7496c81bb9ed, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Logout +--- !u!1 &1834998512605412497 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6457732900059204413} + - component: {fileID: 791854276897688894} + - component: {fileID: 5955627121072845317} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6457732900059204413 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1834998512605412497} + 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: 1722981975845876354} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 16, y: 0} + m_SizeDelta: {x: 32, y: 32} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &791854276897688894 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1834998512605412497} + m_CullTransparentMesh: 0 +--- !u!114 &5955627121072845317 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1834998512605412497} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.5411765} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 886d2b819e5ded54da91ac0e91773113, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help.meta b/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help.meta new file mode 100644 index 0000000..46d1242 --- /dev/null +++ b/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c16b8563864b1954fa9b446e2e41fbed +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 100%.png b/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 100%.png new file mode 100644 index 0000000..38f3715 Binary files /dev/null and b/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 100%.png differ diff --git a/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 100%.png.meta b/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 100%.png.meta new file mode 100644 index 0000000..52c0e2e --- /dev/null +++ b/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 100%.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: a97ab22dc7da5dc44adaad1308093d3c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 200%.png b/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 200%.png new file mode 100644 index 0000000..af4bd73 Binary files /dev/null and b/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 200%.png differ diff --git a/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 200%.png.meta b/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 200%.png.meta new file mode 100644 index 0000000..f7dd180 --- /dev/null +++ b/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 200%.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: ea7077472f677084f8913671a1e33931 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 400%.png b/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 400%.png new file mode 100644 index 0000000..a4a6458 Binary files /dev/null and b/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 400%.png differ diff --git a/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 400%.png.meta b/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 400%.png.meta new file mode 100644 index 0000000..51d28eb --- /dev/null +++ b/Speckle Viewer/Assets/UIMaterialElements/Runtime/Images/Help/help 400%.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: bae0556fc231c1649b138ac2a177d886 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Speckle Viewer/ProjectSettings/ProjectSettings.asset b/Speckle Viewer/ProjectSettings/ProjectSettings.asset index 5eccc15..b550e6a 100644 --- a/Speckle Viewer/ProjectSettings/ProjectSettings.asset +++ b/Speckle Viewer/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: Speckle Systems - productName: SpeckleViewer + productName: Speckle defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.9333334, g: 0.9333334, b: 0.9333334, a: 1} @@ -129,6 +129,7 @@ PlayerSettings: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 0} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1