diff --git a/Assets/HoloToolkit-Examples/Input/Prefabs/LinearControllerPointerMultiColors.prefab b/Assets/HoloToolkit-Examples/Input/Prefabs/LinearControllerPointerMultiColors.prefab deleted file mode 100644 index 1a2ab78ed41..00000000000 --- a/Assets/HoloToolkit-Examples/Input/Prefabs/LinearControllerPointerMultiColors.prefab +++ /dev/null @@ -1,327 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1406990951443512} - m_IsPrefabParent: 1 ---- !u!1 &1406990951443512 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4078510770057468} - - component: {fileID: 114475473728920830} - - component: {fileID: 114253695620597976} - - component: {fileID: 114337282513792584} - - component: {fileID: 114056157604016048} - m_Layer: 0 - m_Name: LinearControllerPointerMultiColors - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4078510770057468 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1406990951443512} - 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: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &114056157604016048 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1406990951443512} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f9a4d6e2d0d55194788e9a2df9c0261f, type: 3} - m_Name: - m_EditorClassIdentifier: - source: {fileID: 114337282513792584} - LineColor: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - LineWidth: - serializedVersion: 2 - m_Curve: - - serializedVersion: 2 - time: 0 - value: 0.05 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - serializedVersion: 2 - time: 1 - value: 0.05 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - WidthMultiplier: 0.1 - ColorOffset: 0 - WidthOffset: 0 - RotationOffset: 0 - StepMode: 0 - NumLineSteps: 10 - InterpolationMode: 1 - StepLength: 0.05 - MaxLineSteps: 2048 - StepLengthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 2 - time: 0 - value: 1 - inSlope: 0 - outSlope: -0.5 - tangentMode: 0 - - serializedVersion: 2 - time: 1 - value: 0.5 - inSlope: -0.5 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - LineMaterial: {fileID: 2100000, guid: d9f5efc2f1dfc6846a9ebeac2f029eff, type: 2} - RoundedEdges: 1 - RoundedCaps: 1 - lineRenderer: {fileID: 0} ---- !u!114 &114253695620597976 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1406990951443512} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: df317dc594e50444da58008aa4ee1475, type: 3} - m_Name: - m_EditorClassIdentifier: - element: 6 - handedness: 0 - SetChildrenInactiveWhenDetached: 1 - PositionOffset: {x: 0, y: 0, z: 0} - RotationOffset: {x: 0, y: 0, z: 0} - ScaleOffset: {x: 1, y: 1, z: 1} - SetScaleOnAttach: 0 - CurrentPointerOrientation: 0 - extentOverride: 2 - RaycastOrigin: {fileID: 0} - LineColorSelected: - serializedVersion: 2 - key0: {r: 0, g: 0.57254905, b: 0.57254905, a: 0} - key1: {r: 0, g: 0.35686275, b: 0.42745098, a: 1} - key2: {r: 0, g: 0.1882353, b: 0.3019608, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 33751 - ctime2: 65535 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 4981 - atime2: 60554 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 3 - m_NumAlphaKeys: 4 - LineColorValid: - serializedVersion: 2 - key0: {r: 0.06666667, g: 0.57254905, b: 0, a: 0} - key1: {r: 0, g: 0.42745098, b: 0.003921569, a: 1} - key2: {r: 0.011764706, g: 0.3019608, b: 0, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 33751 - ctime2: 65535 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 4981 - atime2: 60554 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 3 - m_NumAlphaKeys: 4 - LineColorNoTarget: - serializedVersion: 2 - key0: {r: 0.52156866, g: 0.52156866, b: 0.52156866, a: 0} - key1: {r: 0.32156864, g: 0.32156864, b: 0.32156864, a: 1} - key2: {r: 0.15294118, g: 0.15294118, b: 0.15294118, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 33751 - ctime2: 65535 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 4981 - atime2: 60554 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 3 - m_NumAlphaKeys: 4 - LineCastResolution: 25 - LineBase: {fileID: 0} - LineRenderers: [] ---- !u!114 &114337282513792584 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1406990951443512} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bec4b46028f8fb94c9b03b88fca37bd6, type: 3} - m_Name: - m_EditorClassIdentifier: - LineStartClamp: 0 - LineEndClamp: 1 - RotationType: 1 - FlipUpVector: 0 - OriginOffset: {x: 0, y: 0, z: 0} - ManualUpVectorBlend: 0 - ManualUpVectors: - - {x: 0, y: 1, z: 0} - - {x: 0, y: 1, z: 0} - - {x: 0, y: 1, z: 0} - VelocitySearchRange: 0.02 - VelocityBlend: 0.5 - DistortionType: 0 - DistortionStrength: - serializedVersion: 2 - m_Curve: - - serializedVersion: 2 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - serializedVersion: 2 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - UniformDistortionStrength: 1 - distorters: [] - loops: 0 - Start: {x: 0, y: 0, z: 0} - End: {x: 1, y: 1, z: 1} ---- !u!114 &114475473728920830 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1406990951443512} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3be3fb966fbcc0f44add9a39d15cd3d0, type: 3} - m_Name: - m_EditorClassIdentifier: - distortOrder: 0 - distortStrength: 1 - LocalCenterOfGravity: {x: 0, y: 0, z: 0} - AxisStrength: {x: 1, y: 1, z: 1} - Radius: 0.5 - GravityStrength: - serializedVersion: 2 - m_Curve: - - serializedVersion: 2 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - serializedVersion: 2 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 diff --git a/Assets/HoloToolkit-Examples/Input/Prefabs/LinearControllerPointerMultiColors.prefab.meta b/Assets/HoloToolkit-Examples/Input/Prefabs/LinearControllerPointerMultiColors.prefab.meta deleted file mode 100644 index 3bb8c94726a..00000000000 --- a/Assets/HoloToolkit-Examples/Input/Prefabs/LinearControllerPointerMultiColors.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: e9556ced730993f4d986bf3a04c1a459 -timeCreated: 1527028987 -licenseType: Pro -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit-Examples/Input/Scenes/MotionControllerTest.unity b/Assets/HoloToolkit-Examples/Input/Scenes/MotionControllerTest.unity index 4131f4f9346..263cefe8f87 100644 --- a/Assets/HoloToolkit-Examples/Input/Scenes/MotionControllerTest.unity +++ b/Assets/HoloToolkit-Examples/Input/Scenes/MotionControllerTest.unity @@ -1533,9 +1533,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 2 m_Convex: 0 - m_CookingOptions: 14 + m_InflateMesh: 0 m_SkinWidth: 0.01 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &370377251 @@ -2766,6 +2766,35 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 +--- !u!1 &648067039 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 648067040} + m_Layer: 0 + m_Name: Managers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &648067040 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 648067039} + 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: 844015981} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &663988535 GameObject: m_ObjectHideFlags: 0 @@ -3454,6 +3483,11 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 +--- !u!4 &844015981 stripped +Transform: + m_PrefabParentObject: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, + type: 2} + m_PrefabInternal: {fileID: 1873443075} --- !u!1 &852192631 GameObject: m_ObjectHideFlags: 0 @@ -7598,7 +7632,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 648067040} m_Modifications: - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} propertyPath: m_LocalPosition.x @@ -7614,15 +7648,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} propertyPath: m_LocalRotation.w @@ -7630,7 +7664,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114742747811649402, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} diff --git a/Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/GenericNetworkTransmitter.cs b/Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/GenericNetworkTransmitter.cs index 119efd588a6..1ecfae6a850 100644 --- a/Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/GenericNetworkTransmitter.cs +++ b/Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/GenericNetworkTransmitter.cs @@ -1,11 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. +using HoloToolkit.Unity; using System; using System.Collections.Generic; using UnityEngine; -#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0) +#if !UNITY_EDITOR && UNITY_WSA using Windows.Networking.Sockets; using Windows.Storage.Streams; using Windows.Networking; @@ -29,6 +30,10 @@ public class GenericNetworkTransmitter : Singleton /// The data that arrived. public delegate void OnDataReady(byte[] data); +#if UNITY_WSA + public event OnDataReady DataReadyEvent; +#endif + /// /// The server to connect to when data is needed. /// @@ -44,7 +49,7 @@ public class GenericNetworkTransmitter : Singleton /// private byte[] mostRecentDataBuffer; -#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0) +#if !UNITY_EDITOR && UNITY_WSA /// /// Tracks the network connection to the remote machine we are sending meshes to. /// @@ -59,8 +64,6 @@ public class GenericNetworkTransmitter : Singleton /// If we cannot connect to the server, this is how long we will wait before retrying. /// private float timeToDeferFailedConnections = 10.0f; - - public event OnDataReady DataReadyEvent; #endif /// @@ -104,7 +107,7 @@ private void Update() } // A lot of the work done in this class can only be done in UWP. The editor is not a UWP app. -#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0) +#if !UNITY_EDITOR && UNITY_WSA private void RequestDataRetry() { if (!RequestAndGetData()) @@ -119,7 +122,7 @@ private void RequestDataRetry() /// public void ConfigureAsServer() { -#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0) +#if !UNITY_EDITOR && UNITY_WSA Task t = new Task(() => { networkListener = new StreamSocketListener(); @@ -140,7 +143,7 @@ public void ConfigureAsServer() /// private bool ConnectListener() { -#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0) +#if !UNITY_EDITOR && UNITY_WSA if (waitingForConnection) { Debug.Log("Not a good time to connect listener"); @@ -162,7 +165,7 @@ private bool ConnectListener() #endif } -#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0) +#if !UNITY_EDITOR && UNITY_WSA /// /// When a connection is made to us, this call back gets called and /// we send our data. diff --git a/Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/UNetAnchorManager.cs b/Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/UNetAnchorManager.cs index d6e463681b8..f386046869b 100644 --- a/Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/UNetAnchorManager.cs +++ b/Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/UNetAnchorManager.cs @@ -187,7 +187,7 @@ private void Start() return; } -#if UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0) +#if UNITY_WSA #if UNITY_2017_2_OR_NEWER if (HolographicSettings.IsDisplayOpaque) #else diff --git a/Assets/HoloToolkit-Examples/SpatialSound/Scripts/LoFiFilterSelection.cs b/Assets/HoloToolkit-Examples/SpatialSound/Scripts/LoFiFilterSelection.cs index 159381ef417..d8fc339a883 100644 --- a/Assets/HoloToolkit-Examples/SpatialSound/Scripts/LoFiFilterSelection.cs +++ b/Assets/HoloToolkit-Examples/SpatialSound/Scripts/LoFiFilterSelection.cs @@ -9,19 +9,19 @@ public class LoFiFilterSelection : MonoBehaviour, IInputClickHandler { [Tooltip("Material used when the emitter is set to Narrow Band Telephony")] [SerializeField] - private Material NarrowBandTelephony = null; + private Material NarrowBandTelephony; [Tooltip("Material used when the emitter is set to AM Radio")] [SerializeField] - private Material AmRadio = null; + private Material AmRadio; [Tooltip("Material used when the emitter is set to Full Range")] [SerializeField] - private Material FullRange = null; + private Material FullRange; [Tooltip("Material used when the emitter is set to an unknown quality")] [SerializeField] - private Material UnknownQuality = null; + private Material UnknownQuality; private AudioLoFiEffect loFiEffect; diff --git a/Assets/HoloToolkit-Examples/UX/Scenes/BoundingBoxGizmoExample.unity b/Assets/HoloToolkit-Examples/UX/Scenes/BoundingBoxGizmoExample.unity index 95f28fb7ac3..57fc57dda9c 100644 --- a/Assets/HoloToolkit-Examples/UX/Scenes/BoundingBoxGizmoExample.unity +++ b/Assets/HoloToolkit-Examples/UX/Scenes/BoundingBoxGizmoExample.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.50224054, g: 0.5020953, b: 0.501867, a: 1} + m_IndirectSpecularColor: {r: 0.50217825, g: 0.5020953, b: 0.5018046, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -420,24 +420,6 @@ Transform: m_PrefabParentObject: {fileID: 4000010330146594, guid: bfdc7f60d7205c84f82a4806a5352d60, type: 2} m_PrefabInternal: {fileID: 116723879} ---- !u!1 &170656240 stripped -GameObject: - m_PrefabParentObject: {fileID: 100004, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - m_PrefabInternal: {fileID: 1197191672} ---- !u!64 &170656244 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 170656240} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Convex: 0 - m_InflateMesh: 0 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 4300000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} --- !u!1 &503309311 GameObject: m_ObjectHideFlags: 0 @@ -968,24 +950,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1191689814 stripped -GameObject: - m_PrefabParentObject: {fileID: 100004, guid: 284d5c2c421022e4f9056fb0a21ff91c, type: 3} - m_PrefabInternal: {fileID: 1222626213} ---- !u!64 &1191689818 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1191689814} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Convex: 1 - m_InflateMesh: 0 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 4300000, guid: 284d5c2c421022e4f9056fb0a21ff91c, type: 3} --- !u!1001 &1197191672 Prefab: m_ObjectHideFlags: 0 @@ -1073,7 +1037,6 @@ MonoBehaviour: type: 2} interactingMaterial: {fileID: 2100000, guid: b614a09bc429623478e946d8170b15ae, type: 2} scaleRate: 4 - appBarHoverOffsetZ: 0.05 maxScale: 2 rotationType: 0 handMotionToRotate: 1 @@ -1081,6 +1044,20 @@ MonoBehaviour: type: 2} appBarPrefab: {fileID: 114050950401502068, guid: aa610ada334bff640a535f0d23a9a15c, type: 2} +--- !u!64 &1197191676 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1197191674} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 4300000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} --- !u!1001 &1222626213 Prefab: m_ObjectHideFlags: 0 @@ -1168,7 +1145,6 @@ MonoBehaviour: type: 2} interactingMaterial: {fileID: 2100000, guid: b614a09bc429623478e946d8170b15ae, type: 2} scaleRate: 4 - appBarHoverOffsetZ: 0.05 maxScale: 2 rotationType: 0 handMotionToRotate: 1 @@ -1176,6 +1152,20 @@ MonoBehaviour: type: 2} appBarPrefab: {fileID: 114050950401502068, guid: aa610ada334bff640a535f0d23a9a15c, type: 2} +--- !u!64 &1222626217 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1222626215} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 4300000, guid: 284d5c2c421022e4f9056fb0a21ff91c, type: 3} --- !u!114 &1222626218 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1555,8 +1545,8 @@ CanvasRenderer: GameObject: m_PrefabParentObject: {fileID: 100004, guid: aa39033344b08ce4bab10cc11dc6d6b8, type: 3} m_PrefabInternal: {fileID: 1575359649} ---- !u!65 &1423768206 -BoxCollider: +--- !u!64 &1423768206 +MeshCollider: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} @@ -1565,8 +1555,10 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 2.5053554, y: 2.1822224, z: 1.9755292} - m_Center: {x: 0.26491338, y: 1.1037669, z: -0.00000014901163} + m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 4300000, guid: aa39033344b08ce4bab10cc11dc6d6b8, type: 3} --- !u!1 &1428215743 stripped GameObject: m_PrefabParentObject: {fileID: 100002, guid: aa39033344b08ce4bab10cc11dc6d6b8, type: 3} @@ -1592,7 +1584,6 @@ MonoBehaviour: type: 2} interactingMaterial: {fileID: 2100000, guid: b614a09bc429623478e946d8170b15ae, type: 2} scaleRate: 4 - appBarHoverOffsetZ: 0.05 maxScale: 2 rotationType: 0 handMotionToRotate: 1 @@ -1858,14 +1849,6 @@ Prefab: propertyPath: m_LocalPosition.y value: -0.007 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: aa39033344b08ce4bab10cc11dc6d6b8, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400004, guid: aa39033344b08ce4bab10cc11dc6d6b8, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: aa39033344b08ce4bab10cc11dc6d6b8, type: 3} m_IsPrefabParent: 0 @@ -1994,7 +1977,6 @@ MonoBehaviour: type: 2} interactingMaterial: {fileID: 2100000, guid: b614a09bc429623478e946d8170b15ae, type: 2} scaleRate: 4 - appBarHoverOffsetZ: 0.05 maxScale: 2 rotationType: 0 handMotionToRotate: 1 @@ -2096,22 +2078,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1722965370} ---- !u!1 &1859408062 stripped -GameObject: - m_PrefabParentObject: {fileID: 100000, guid: aa39033344b08ce4bab10cc11dc6d6b8, type: 3} - m_PrefabInternal: {fileID: 1575359649} ---- !u!65 &1859408066 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1859408062} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1.7544937, y: 0.08, z: 1.7544943} - m_Center: {x: 0, y: -0.0000004379902, z: 0} --- !u!1 &1946117762 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/HoloToolkit-Examples/UX/Scenes/ObjectCollectionExample.unity b/Assets/HoloToolkit-Examples/UX/Scenes/ObjectCollectionExample.unity index 5fe21c3b9bf..1a32d8f3632 100644 --- a/Assets/HoloToolkit-Examples/UX/Scenes/ObjectCollectionExample.unity +++ b/Assets/HoloToolkit-Examples/UX/Scenes/ObjectCollectionExample.unity @@ -88,7 +88,6 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 0 --- !u!196 &4 @@ -113,245 +112,309 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!4 &102595616 stripped -Transform: - m_PrefabParentObject: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, - type: 2} - m_PrefabInternal: {fileID: 1167993178} ---- !u!1001 &106511345 +--- !u!1001 &57729464 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 1813752216} m_Modifications: - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.x - value: -0.14527647 + value: -0.29515308 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.y - value: -0.2970819 + value: -0.43106988 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.z - value: 1.1950887 + value: -0.7205298 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.x - value: 0.120452255 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.y - value: -0.060005262 + value: 0.98116535 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.z - value: 0.007294315 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.w - value: 0.99087715 + value: -0.19316968 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_RootOrder - value: 12 + value: 33 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalScale.x - value: 0.13137002 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - propertyPath: m_LocalScale.y - value: 0.13137001 + value: 0.99999416 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalScale.z - value: 0.13137 + value: 0.99999416 objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 1706183334153938, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_Name - value: Model_Platonic (3) + value: MeshButtonIcosa (8) objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 23982200976270074, guid: 068240e03cf11d043801dbf4530dfddc, + type: 2} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} + objectReference: {fileID: 2100000, guid: 522573f9741466f4f9eb698bce4a266a, type: 2} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.y + value: 0.99999404 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_ParentPrefab: {fileID: 100100000, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} m_IsPrefabParent: 0 ---- !u!4 &106511346 stripped +--- !u!4 &57729465 stripped Transform: - m_PrefabParentObject: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - m_PrefabInternal: {fileID: 106511345} ---- !u!1 &106511347 stripped -GameObject: - m_PrefabParentObject: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - m_PrefabInternal: {fileID: 106511345} ---- !u!114 &106511348 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 106511347} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} - m_Name: - m_EditorClassIdentifier: - ButtonState: 4 - ButtonPressFilter: 1 - RequireGaze: 1 - MainCollider: {fileID: 0} - MainRenderer: {fileID: 0} ---- !u!114 &106511349 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 106511347} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86772d5ca853e924ba484bc960537c04, type: 3} - m_Name: - m_EditorClassIdentifier: - Profile: {fileID: 11400000, guid: 313fc2556ab60d346bea344a4a4eda31, type: 2} - TargetTransform: {fileID: 0} - Renderer: {fileID: 106511350} ---- !u!23 &106511350 stripped -MeshRenderer: - m_PrefabParentObject: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, - type: 3} - m_PrefabInternal: {fileID: 106511345} ---- !u!135 &106511352 -SphereCollider: + m_PrefabParentObject: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, + type: 2} + m_PrefabInternal: {fileID: 57729464} +--- !u!1001 &69808648 +Prefab: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 106511347} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.77069926 - m_Center: {x: -0.0000030100348, y: -0.0000011324885, z: 0.00000756979} ---- !u!1001 &115234591 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.x + value: 0.22450095 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.y + value: -0.6643318 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.z + value: -0.5480531 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.y + value: 0.98116535 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.w + value: 0.19316979 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1518205972025162, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_Name + value: Model_Tetra (6) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &69808649 stripped +Transform: + m_PrefabParentObject: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, + type: 2} + m_PrefabInternal: {fileID: 69808648} +--- !u!1001 &87671488 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1813752216} + m_TransformParent: {fileID: 790477814} m_Modifications: - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalPosition.x - value: 0.6845652 + value: 0.19404785 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalPosition.y - value: 0.29708192 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalPosition.z - value: 0.9903095 + value: 0.215512 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalRotation.x - value: -0.11519664 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalRotation.y - value: 0.2956542 + value: 0.35836792 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalRotation.z - value: 0.0359401 + value: -0.000000044703484 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalRotation.w - value: 0.9476427 + value: 0.9335805 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_RootOrder - value: 18 + value: 4 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalScale.x - value: 0.13137002 + value: 0.099999994 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalScale.y - value: 0.13137001 + value: 0.099999994 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalScale.z - value: 0.13137 + value: 0.099999994 objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 1813968316392310, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_Name - value: Model_Platonic (6) + value: Base Wedge (4) objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_ParentPrefab: {fileID: 100100000, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} m_IsPrefabParent: 0 ---- !u!4 &115234592 stripped +--- !u!4 &102595616 stripped Transform: - m_PrefabParentObject: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - m_PrefabInternal: {fileID: 115234591} ---- !u!1 &115234593 stripped -GameObject: - m_PrefabParentObject: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} - m_PrefabInternal: {fileID: 115234591} ---- !u!114 &115234594 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 115234593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} - m_Name: - m_EditorClassIdentifier: - ButtonState: 4 - ButtonPressFilter: 1 - RequireGaze: 1 - MainCollider: {fileID: 0} - MainRenderer: {fileID: 0} ---- !u!114 &115234595 -MonoBehaviour: + m_PrefabParentObject: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, + type: 2} + m_PrefabInternal: {fileID: 1167993178} +--- !u!1001 &110282301 +Prefab: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 115234593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86772d5ca853e924ba484bc960537c04, type: 3} - m_Name: - m_EditorClassIdentifier: - Profile: {fileID: 11400000, guid: 313fc2556ab60d346bea344a4a4eda31, type: 2} - TargetTransform: {fileID: 0} - Renderer: {fileID: 115234596} ---- !u!23 &115234596 stripped -MeshRenderer: - m_PrefabParentObject: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, - type: 3} - m_PrefabInternal: {fileID: 115234591} ---- !u!135 &115234598 -SphereCollider: + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 790477814} + m_Modifications: + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalPosition.x + value: -0.1039267 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalPosition.z + value: 0.2707383 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalRotation.x + value: -0.0000001490116 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalRotation.y + value: -0.18223554 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalRotation.z + value: 0.000000014901159 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalRotation.w + value: 0.9832549 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalScale.x + value: 0.099999994 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalScale.y + value: 0.099999994 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalScale.z + value: 0.099999994 + objectReference: {fileID: 0} + - target: {fileID: 1813968316392310, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_Name + value: Base Wedge (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &112231045 +Prefab: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 115234593} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.7706991 - m_Center: {x: -0.000004440546, y: -0.0000008940698, z: 0.0000037550926} + m_Modification: + m_TransformParent: {fileID: 790477814} + m_Modifications: + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.x + value: 0.5821436 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.z + value: 0.646536 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.x + value: 0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.y + value: 0.35836795 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.z + value: -0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.w + value: 0.9335805 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalScale.x + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalScale.z + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 1728409514330748, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_Name + value: Outer Open Wedge (9) + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalScale.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 23277592836901628, guid: 86f526479c7b577418c7595dfe40655b, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 97b73006130d05b4c90034845c44e88d, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + m_IsPrefabParent: 0 --- !u!1 &115809085 GameObject: m_ObjectHideFlags: 0 @@ -437,49 +500,163 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 115809085} m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &175670128 stripped -Transform: - m_PrefabParentObject: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, - type: 2} - m_PrefabInternal: {fileID: 911809942} ---- !u!1001 &181000282 +--- !u!1001 &122468535 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1813752216} + m_TransformParent: {fileID: 790477814} m_Modifications: - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalPosition.x - value: 0.14527647 + value: 0.1039267 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalPosition.y - value: 0.2970819 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalPosition.z - value: 1.1950887 + value: 0.2707383 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalRotation.x - value: -0.120452255 + value: -0.0000001490116 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalRotation.y - value: 0.060005262 + value: 0.18223554 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalRotation.z + value: -0.000000014901159 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalRotation.w + value: 0.9832549 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1813968316392310, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_Name + value: Base Wedge (3) + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalScale.x + value: 0.099999994 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalScale.y + value: 0.099999994 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalScale.z + value: 0.099999994 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &123014296 stripped +Transform: + m_PrefabParentObject: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, + type: 2} + m_PrefabInternal: {fileID: 122468535} +--- !u!1001 &163406458 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.x + value: -0.29837453 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.y + value: 0.43106988 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.z + value: 0.71920186 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.y + value: -0.19536461 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.w + value: 0.98073065 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 1518205972025162, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_Name + value: Model_Tetra (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &163406459 stripped +Transform: + m_PrefabParentObject: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, + type: 2} + m_PrefabInternal: {fileID: 163406458} +--- !u!4 &175670128 stripped +Transform: + m_PrefabParentObject: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, + type: 2} + m_PrefabInternal: {fileID: 911809942} +--- !u!1001 &181000282 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.x + value: 0.71853244 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.y + value: 0.43106994 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.z + value: -0.29998296 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.y + value: 0.8322457 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.z - value: 0.007294315 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.w - value: 0.99087715 + value: 0.554407 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_RootOrder - value: 14 + value: 15 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalScale.x @@ -523,9 +700,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} m_Name: m_EditorClassIdentifier: - ButtonState: 4 - ButtonPressFilter: 1 - RequireGaze: 1 + buttonState: 4 + buttonPressFilter: 1 + requireGaze: 1 MainCollider: {fileID: 0} MainRenderer: {fileID: 0} --- !u!114 &181000286 @@ -607,7 +784,7 @@ Prefab: type: 2} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 726695862} + objectReference: {fileID: 280520055} - target: {fileID: 1619954670119144, guid: dc25f30298e5957498e67017b4d85807, type: 2} propertyPath: m_Name value: HolographicButton (2) @@ -647,6 +824,77 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: dc25f30298e5957498e67017b4d85807, type: 2} m_IsPrefabParent: 0 +--- !u!1 &198119357 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 198119358} + - component: {fileID: 198119360} + - component: {fileID: 198119359} + m_Layer: 0 + m_Name: Arrow (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &198119358 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 198119357} + m_LocalRotation: {x: -0.000000029802322, y: 0.78070706, z: -0.00000008940697, w: -0.6248973} + m_LocalPosition: {x: 0.19514467, y: 0, z: 0.043801345} + m_LocalScale: {x: 0.25, y: 0.5, z: 0.25} + m_Children: [] + m_Father: {fileID: 1313812361} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &198119359 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 198119357} + m_Mesh: {fileID: 4300000, guid: efa4a78ba3eb4644ca145ba484c33708, type: 3} +--- !u!23 &198119360 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 198119357} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: e7ea66e243c71c149872ec5116686524, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1001 &218976897 Prefab: m_ObjectHideFlags: 0 @@ -656,31 +904,31 @@ Prefab: m_Modifications: - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.x - value: -0.42736742 + value: 0.54653406 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.y - value: -0.29708195 + value: 0.6643319 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.z - value: 1.1254774 + value: -0.22817473 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.x - value: 0.11869183 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.y - value: -0.17913881 + value: 0.8322457 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.z - value: 0.021776343 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.w - value: 0.9763951 + value: 0.55440694 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_RootOrder @@ -713,6 +961,74 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} m_PrefabInternal: {fileID: 218976897} +--- !u!1001 &233672586 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.x + value: 0.7198676 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.y + value: -0.4310699 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.z + value: 0.2967648 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.y + value: 0.55626756 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.w + value: 0.83100325 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_RootOrder + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.x + value: 0.9999942 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.z + value: 0.9999942 + objectReference: {fileID: 0} + - target: {fileID: 1706183334153938, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_Name + value: MeshButtonIcosa (10) + objectReference: {fileID: 0} + - target: {fileID: 23982200976270074, guid: 068240e03cf11d043801dbf4530dfddc, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 522573f9741466f4f9eb698bce4a266a, type: 2} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.y + value: 0.99999404 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &233672587 stripped +Transform: + m_PrefabParentObject: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, + type: 2} + m_PrefabInternal: {fileID: 233672586} --- !u!1 &251071227 stripped GameObject: m_PrefabParentObject: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} @@ -751,9 +1067,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} m_Name: m_EditorClassIdentifier: - ButtonState: 4 - ButtonPressFilter: 1 - RequireGaze: 1 + buttonState: 4 + buttonPressFilter: 1 + requireGaze: 1 MainCollider: {fileID: 0} MainRenderer: {fileID: 0} --- !u!135 &251071233 @@ -773,71 +1089,203 @@ Transform: m_PrefabParentObject: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} m_PrefabInternal: {fileID: 1663133480} ---- !u!1 &284233491 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 284233492} - - component: {fileID: 284233493} - m_Layer: 0 - m_Name: MRTKLogo2 (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &284233492 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 284233491} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.2} - m_LocalScale: {x: 0.01876, y: 0.01876, z: 0.01876} - m_Children: [] - m_Father: {fileID: 859038169} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &284233493 -SpriteRenderer: +--- !u!21 &280520055 +Material: + serializedVersion: 6 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 284233491} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 61dfc6c9f1d00d846b15396d2ede8f2b, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Name: ButtonIconMaterial + m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT + _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_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: 2800000, guid: 30699e294936bf6489bb1984d770e07e, type: 3} + 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} + - _NormalMap: + 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: + - _AlbedoAlphaMode: 0 + - _BlendOp: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.1 + - _BorderWidth: 0.1 + - _BumpScale: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ColorWriteMask: 15 + - _Cull: 2 + - _CullMode: 2 + - _CustomMode: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableNormalMap: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _HoverLight: 0 + - _HoverLightOpaque: 0 + - _InnerGlow: 0 + - _Metallic: 0 + - _Mode: 1 + - _NearPlaneFade: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Reflections: 0 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 0.25 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _UseColor: 1 + - _UseMainTex: 1 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} +--- !u!1 &284233491 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 284233492} + - component: {fileID: 284233493} + m_Layer: 0 + m_Name: MRTKLogo2 (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &284233492 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 284233491} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 1.2} + m_LocalScale: {x: 0.01876, y: 0.01876, z: 0.01876} + m_Children: [] + m_Father: {fileID: 859038169} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &284233493 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 284233491} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 61dfc6c9f1d00d846b15396d2ede8f2b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -871,7 +1319,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} propertyPath: m_LocalRotation.y - value: 0.58509725 + value: 0.5850973 objectReference: {fileID: 0} - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} propertyPath: m_LocalRotation.z @@ -879,7 +1327,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} propertyPath: m_LocalRotation.w - value: 0.81096315 + value: 0.8109631 objectReference: {fileID: 0} - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} propertyPath: m_RootOrder @@ -993,6 +1441,77 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 321291458} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &327444366 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 327444367} + - component: {fileID: 327444369} + - component: {fileID: 327444368} + m_Layer: 0 + m_Name: Arrow (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &327444367 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 327444366} + m_LocalRotation: {x: 0.000000029802322, y: 0.97479415, z: -0.00000009685755, w: 0.22310641} + m_LocalPosition: {x: -0.08699311, y: 0, z: 0.18008941} + m_LocalScale: {x: 0.25, y: 0.5, z: 0.25} + m_Children: [] + m_Father: {fileID: 1313812361} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &327444368 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 327444366} + m_Mesh: {fileID: 4300000, guid: efa4a78ba3eb4644ca145ba484c33708, type: 3} +--- !u!23 &327444369 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 327444366} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: e7ea66e243c71c149872ec5116686524, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!4 &355681348 stripped Transform: m_PrefabParentObject: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, @@ -1100,29 +1619,146 @@ Transform: m_PrefabParentObject: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} m_PrefabInternal: {fileID: 542326540} ---- !u!4 &416189351 stripped -Transform: - m_PrefabParentObject: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, - type: 2} - m_PrefabInternal: {fileID: 522470361} ---- !u!1001 &457182375 +--- !u!1001 &414543770 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 1813752216} m_Modifications: - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.x - value: -0.928943 + value: 0.80965996 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.14929087 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.z + value: -0.33802816 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.y + value: 0.8322457 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.w + value: 0.554407 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_RootOrder + value: 31 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.x + value: 0.13137501 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.y + value: 0.131375 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.z + value: 0.13137501 + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_Name + value: Model_Platonic (13) + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &414543771 stripped +Transform: + m_PrefabParentObject: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 414543770} +--- !u!1 &414543772 stripped +GameObject: + m_PrefabParentObject: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 414543770} +--- !u!23 &414543773 stripped +MeshRenderer: + m_PrefabParentObject: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, + type: 3} + m_PrefabInternal: {fileID: 414543770} +--- !u!114 &414543774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 414543772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86772d5ca853e924ba484bc960537c04, type: 3} + m_Name: + m_EditorClassIdentifier: + Profile: {fileID: 11400000, guid: 313fc2556ab60d346bea344a4a4eda31, type: 2} + TargetTransform: {fileID: 0} + Renderer: {fileID: 414543773} +--- !u!114 &414543775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 414543772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} + m_Name: + m_EditorClassIdentifier: + buttonState: 4 + buttonPressFilter: 1 + requireGaze: 1 + MainCollider: {fileID: 0} + MainRenderer: {fileID: 0} +--- !u!135 &414543776 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 414543772} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.77069926 + m_Center: {x: -0.0000025331976, y: -0.0000013709068, z: 0.0000037550926} +--- !u!4 &416189351 stripped +Transform: + m_PrefabParentObject: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, + type: 2} + m_PrefabInternal: {fileID: 522470361} +--- !u!1001 &457182375 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.x + value: -0.22450095 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.y + value: 0.6643318 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.z - value: 0.82137996 + value: -0.5480531 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.x @@ -1130,7 +1766,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.y - value: -0.41085085 + value: 0.98116535 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.z @@ -1138,11 +1774,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.w - value: 0.9117026 + value: -0.19316979 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 23982200976270074, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} @@ -1166,35 +1802,35 @@ Prefab: m_Modifications: - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.x - value: 0.42736742 + value: -0.29515308 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.y - value: -0.29708195 + value: 0.43106988 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.z - value: 1.1254774 + value: -0.7205298 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.x - value: 0.11869183 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.y - value: 0.17913881 + value: 0.98116535 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.z - value: -0.021776343 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.w - value: 0.9763951 + value: -0.19316968 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalScale.x @@ -1238,9 +1874,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} m_Name: m_EditorClassIdentifier: - ButtonState: 4 - ButtonPressFilter: 1 - RequireGaze: 1 + buttonState: 4 + buttonPressFilter: 1 + requireGaze: 1 MainCollider: {fileID: 0} MainRenderer: {fileID: 0} --- !u!114 &462019580 @@ -1274,6 +1910,128 @@ SphereCollider: serializedVersion: 2 m_Radius: 0.7706991 m_Center: {x: -0.0000025331972, y: -0.0000016093255, z: 0.00000756979} +--- !u!4 &466926360 stripped +Transform: + m_PrefabParentObject: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, + type: 2} + m_PrefabInternal: {fileID: 1273908248} +--- !u!1001 &481573530 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.x + value: 0.54653406 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.y + value: -0.6643319 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.z + value: -0.22817473 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.y + value: 0.8322457 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.w + value: 0.55440694 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_RootOrder + value: 47 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.x + value: 0.13137497 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.y + value: 0.131375 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.z + value: 0.13137497 + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_Name + value: Model_Platonic (15) + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &481573531 stripped +Transform: + m_PrefabParentObject: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 481573530} +--- !u!1 &481573532 stripped +GameObject: + m_PrefabParentObject: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 481573530} +--- !u!23 &481573533 stripped +MeshRenderer: + m_PrefabParentObject: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, + type: 3} + m_PrefabInternal: {fileID: 481573530} +--- !u!114 &481573534 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 481573532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86772d5ca853e924ba484bc960537c04, type: 3} + m_Name: + m_EditorClassIdentifier: + Profile: {fileID: 11400000, guid: 313fc2556ab60d346bea344a4a4eda31, type: 2} + TargetTransform: {fileID: 0} + Renderer: {fileID: 481573533} +--- !u!114 &481573535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 481573532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} + m_Name: + m_EditorClassIdentifier: + buttonState: 4 + buttonPressFilter: 1 + requireGaze: 1 + MainCollider: {fileID: 0} + MainRenderer: {fileID: 0} +--- !u!135 &481573536 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 481573532} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.77069914 + m_Center: {x: -0.0000025331974, y: -0.0000016093255, z: 0.0000037550926} --- !u!1001 &489731274 Prefab: m_ObjectHideFlags: 0 @@ -1283,15 +2041,15 @@ Prefab: m_Modifications: - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.x - value: 0.70510054 + value: 0.33621576 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: 0.14929086 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.z - value: 1.0200163 + value: 0.8104142 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.x @@ -1299,7 +2057,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.y - value: 0.2978307 + value: 0.19536468 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.z @@ -1307,11 +2065,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.w - value: 0.95461875 + value: 0.98073065 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_RootOrder - value: 20 + value: 21 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalScale.x @@ -1386,7 +2144,7 @@ Prefab: type: 2} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 717337710} + objectReference: {fileID: 1593478363} - target: {fileID: 33078583375533282, guid: dc25f30298e5957498e67017b4d85807, type: 2} propertyPath: m_Mesh @@ -1477,7 +2235,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} propertyPath: m_LocalRotation.y - value: -0.3577466 + value: -0.35774666 objectReference: {fileID: 0} - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} propertyPath: m_LocalRotation.z @@ -1632,7 +2390,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} propertyPath: m_LocalRotation.y - value: -0.36627257 + value: -0.3662725 objectReference: {fileID: 0} - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} propertyPath: m_LocalRotation.z @@ -1743,76 +2501,193 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!1001 &554037451 +--- !u!1001 &551321876 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2001628445} + m_TransformParent: {fileID: 1813752216} m_Modifications: - - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.x - value: 0.0000000037252903 + value: 0.8111644 objectReference: {fileID: 0} - - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.y - value: -0.06 + value: -0.14929087 objectReference: {fileID: 0} - - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.3344017 objectReference: {fileID: 0} - - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0.5562677 objectReference: {fileID: 0} - - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.8310032 objectReference: {fileID: 0} - - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_RootOrder - value: 3 + value: 30 objectReference: {fileID: 0} - - target: {fileID: 114724965930856538, guid: dc25f30298e5957498e67017b4d85807, - type: 2} - propertyPath: instantiatedMaterial - value: + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.x + value: 0.13137501 objectReference: {fileID: 0} - - target: {fileID: 23553486774948722, guid: dc25f30298e5957498e67017b4d85807, - type: 2} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 943136230} - - target: {fileID: 1619954670119144, guid: dc25f30298e5957498e67017b4d85807, type: 2} - propertyPath: m_Name - value: HolographicButton (3) + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.y + value: 0.131375 objectReference: {fileID: 0} - - target: {fileID: 33078583375533282, guid: dc25f30298e5957498e67017b4d85807, - type: 2} - propertyPath: m_Mesh - value: - objectReference: {fileID: 4300010, guid: c68a88ae5c5b91f41b94c83aa4c4196e, type: 3} - - target: {fileID: 23553486774948722, guid: dc25f30298e5957498e67017b4d85807, - type: 2} - propertyPath: m_Enabled - value: 1 + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.z + value: 0.13137501 objectReference: {fileID: 0} - - target: {fileID: 114724965930856538, guid: dc25f30298e5957498e67017b4d85807, - type: 2} - propertyPath: iconName - value: ObjectCollectionPlane + - target: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_Name + value: Model_Platonic (12) objectReference: {fileID: 0} - - target: {fileID: 114724965930856538, guid: dc25f30298e5957498e67017b4d85807, - type: 2} + - target: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &551321877 stripped +Transform: + m_PrefabParentObject: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 551321876} +--- !u!1 &551321878 stripped +GameObject: + m_PrefabParentObject: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 551321876} +--- !u!23 &551321879 stripped +MeshRenderer: + m_PrefabParentObject: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, + type: 3} + m_PrefabInternal: {fileID: 551321876} +--- !u!114 &551321880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 551321878} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86772d5ca853e924ba484bc960537c04, type: 3} + m_Name: + m_EditorClassIdentifier: + Profile: {fileID: 11400000, guid: 313fc2556ab60d346bea344a4a4eda31, type: 2} + TargetTransform: {fileID: 0} + Renderer: {fileID: 551321879} +--- !u!114 &551321881 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 551321878} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} + m_Name: + m_EditorClassIdentifier: + buttonState: 4 + buttonPressFilter: 1 + requireGaze: 1 + MainCollider: {fileID: 0} + MainRenderer: {fileID: 0} +--- !u!135 &551321882 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 551321878} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.77069926 + m_Center: {x: -0.0000030100348, y: -0.0000011324885, z: 0.00000756979} +--- !u!1001 &554037451 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2001628445} + m_Modifications: + - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + propertyPath: m_LocalPosition.x + value: 0.0000000037252903 + objectReference: {fileID: 0} + - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + propertyPath: m_LocalPosition.y + value: -0.06 + objectReference: {fileID: 0} + - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 114724965930856538, guid: dc25f30298e5957498e67017b4d85807, + type: 2} + propertyPath: instantiatedMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 23553486774948722, guid: dc25f30298e5957498e67017b4d85807, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 679948655} + - target: {fileID: 1619954670119144, guid: dc25f30298e5957498e67017b4d85807, type: 2} + propertyPath: m_Name + value: HolographicButton (3) + objectReference: {fileID: 0} + - target: {fileID: 33078583375533282, guid: dc25f30298e5957498e67017b4d85807, + type: 2} + propertyPath: m_Mesh + value: + objectReference: {fileID: 4300010, guid: c68a88ae5c5b91f41b94c83aa4c4196e, type: 3} + - target: {fileID: 23553486774948722, guid: dc25f30298e5957498e67017b4d85807, + type: 2} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114724965930856538, guid: dc25f30298e5957498e67017b4d85807, + type: 2} + propertyPath: iconName + value: ObjectCollectionPlane + objectReference: {fileID: 0} + - target: {fileID: 114724965930856538, guid: dc25f30298e5957498e67017b4d85807, + type: 2} propertyPath: Profile value: objectReference: {fileID: 11400000, guid: a05b72560895bf146a8fcc7cdc391aae, @@ -1945,7 +2820,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} propertyPath: m_LocalRotation.y - value: 0.35774654 + value: 0.35774648 objectReference: {fileID: 0} - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} propertyPath: m_LocalRotation.z @@ -1953,7 +2828,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} propertyPath: m_LocalRotation.w - value: 0.9338187 + value: 0.93381876 objectReference: {fileID: 0} - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} propertyPath: m_RootOrder @@ -2068,13 +2943,17 @@ MonoBehaviour: transform: {fileID: 1183937286} SurfaceType: 1 SortType: 0 - OrientType: 1 + OrientType: 3 LayoutType: 0 IgnoreInactiveTransforms: 1 Radius: 0.05 - Rows: 5 - CellWidth: 0.085 + radialRange: 180 + rows: 3 + cellWidth: 0.5 CellHeight: 0.035 + HorizontalMargin: 0.2 + VerticalMargin: 0.2 + DepthMargin: 0.2 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &576672716 @@ -2095,6 +2974,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &584828619 stripped +Transform: + m_PrefabParentObject: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, + type: 2} + m_PrefabInternal: {fileID: 110282301} --- !u!1 &590312412 GameObject: m_ObjectHideFlags: 0 @@ -2257,262 +3141,425 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 596368488} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &651902764 stripped -Transform: - m_PrefabParentObject: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, - type: 2} - m_PrefabInternal: {fileID: 1971982849} ---- !u!4 &673068877 stripped +--- !u!1 &603132812 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 603132813} + - component: {fileID: 603132815} + - component: {fileID: 603132814} + m_Layer: 0 + m_Name: Arrow (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &603132813 Transform: - m_PrefabParentObject: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, - type: 2} - m_PrefabInternal: {fileID: 1154580481} ---- !u!1001 &676419260 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 603132812} + m_LocalRotation: {x: -0.00000011920929, y: -0.43117642, z: -0, w: 0.9022677} + m_LocalPosition: {x: 0.15561461, y: 0, z: -0.12563477} + m_LocalScale: {x: 0.25, y: 0.5, z: 0.25} + m_Children: [] + m_Father: {fileID: 1313812361} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &603132814 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 603132812} + m_Mesh: {fileID: 4300000, guid: efa4a78ba3eb4644ca145ba484c33708, type: 3} +--- !u!23 &603132815 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 603132812} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: e7ea66e243c71c149872ec5116686524, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1001 &614844822 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 576672716} + m_TransformParent: {fileID: 1813752216} m_Modifications: - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.33621576 objectReference: {fileID: 0} - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.y - value: 0.07 + value: -0.14929086 objectReference: {fileID: 0} - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.8104142 objectReference: {fileID: 0} - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0.19536468 objectReference: {fileID: 0} - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.98073065 objectReference: {fileID: 0} - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_RootOrder - value: 0 + value: 29 objectReference: {fileID: 0} - - target: {fileID: 1723860127229764, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.x + value: 0.13137501 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.y + value: 0.131375 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.z + value: 0.13137501 + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_Name - value: ButtonTraditional (1) + value: Model_Platonic (11) objectReference: {fileID: 0} - - target: {fileID: 23208368517671954, guid: f96fd98222a1e2243ba69ffd9b371279, - type: 2} + - target: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} - - target: {fileID: 114471478630299092, guid: f96fd98222a1e2243ba69ffd9b371279, - type: 2} - propertyPath: AnimActions.Array.data[0].InvalidParam - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114471478630299092, guid: f96fd98222a1e2243ba69ffd9b371279, - type: 2} - propertyPath: AnimActions.Array.data[1].InvalidParam - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114471478630299092, guid: f96fd98222a1e2243ba69ffd9b371279, - type: 2} - propertyPath: AnimActions.Array.data[2].InvalidParam - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114471478630299092, guid: f96fd98222a1e2243ba69ffd9b371279, - type: 2} - propertyPath: AnimActions.Array.data[3].InvalidParam - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114471478630299092, guid: f96fd98222a1e2243ba69ffd9b371279, - type: 2} - propertyPath: AnimActions.Array.data[4].InvalidParam - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114471478630299092, guid: f96fd98222a1e2243ba69ffd9b371279, - type: 2} - propertyPath: AnimActions.Array.data[5].InvalidParam - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} m_IsPrefabParent: 0 ---- !u!4 &699798862 stripped +--- !u!4 &614844823 stripped Transform: - m_PrefabParentObject: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, - type: 2} - m_PrefabInternal: {fileID: 676419260} ---- !u!224 &709040683 -RectTransform: + m_PrefabParentObject: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 614844822} +--- !u!1 &614844824 stripped +GameObject: + m_PrefabParentObject: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 614844822} +--- !u!23 &614844825 stripped +MeshRenderer: + m_PrefabParentObject: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, + type: 3} + m_PrefabInternal: {fileID: 614844822} +--- !u!114 &614844826 +MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224385282562073920, guid: 42b7699419297d24aa14535697918b4c, + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 614844824} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86772d5ca853e924ba484bc960537c04, type: 3} + m_Name: + m_EditorClassIdentifier: + Profile: {fileID: 11400000, guid: 313fc2556ab60d346bea344a4a4eda31, type: 2} + TargetTransform: {fileID: 0} + Renderer: {fileID: 614844825} +--- !u!114 &614844827 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 614844824} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} + m_Name: + m_EditorClassIdentifier: + buttonState: 4 + buttonPressFilter: 1 + requireGaze: 1 + MainCollider: {fileID: 0} + MainRenderer: {fileID: 0} +--- !u!135 &614844828 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 614844824} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.7706991 + m_Center: {x: -0.0000025331972, y: -0.0000016093255, z: 0.00000756979} +--- !u!1001 &632543499 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.x + value: 0.29837453 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.y + value: -0.43106988 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.z + value: 0.71920186 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.y + value: 0.19536461 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.w + value: 0.98073065 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_RootOrder + value: 37 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.x + value: 0.9999941 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.z + value: 0.9999941 + objectReference: {fileID: 0} + - target: {fileID: 1706183334153938, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_Name + value: MeshButtonIcosa (9) + objectReference: {fileID: 0} + - target: {fileID: 23982200976270074, guid: 068240e03cf11d043801dbf4530dfddc, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 522573f9741466f4f9eb698bce4a266a, type: 2} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.y + value: 0.99999404 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &632543500 stripped +Transform: + m_PrefabParentObject: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, + type: 2} + m_PrefabInternal: {fileID: 632543499} +--- !u!4 &651902764 stripped +Transform: + m_PrefabParentObject: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, + type: 2} + m_PrefabInternal: {fileID: 1971982849} +--- !u!4 &673068877 stripped +Transform: + m_PrefabParentObject: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} + m_PrefabInternal: {fileID: 1154580481} +--- !u!1 &676362497 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1801087361} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -1.3525823} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 590312413} - - {fileID: 527932450} - - {fileID: 371267951} - - {fileID: 1205988236} - - {fileID: 979419276} - - {fileID: 1742590020} - - {fileID: 928483035} - - {fileID: 1237488736} - m_Father: {fileID: 1966008302} - m_RootOrder: 0 + serializedVersion: 5 + m_Component: + - component: {fileID: 676362498} + - component: {fileID: 676362500} + - component: {fileID: 676362499} + m_Layer: 0 + m_Name: Arrow (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &676362498 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 676362497} + m_LocalRotation: {x: -0.00000008940697, y: 0.780707, z: 0.000000059604645, w: 0.62489724} + m_LocalPosition: {x: -0.19514467, y: 0, z: 0.043801345} + m_LocalScale: {x: 0.25, y: 0.5, z: 0.25} + m_Children: [] + m_Father: {fileID: 1313812361} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 512.5886, y: 323.03625} - m_SizeDelta: {x: 1025, y: 648} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!21 &717337710 -Material: - serializedVersion: 6 +--- !u!33 &676362499 +MeshFilter: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: ButtonIconMaterial - m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} - m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT - _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_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: 2800000, guid: e2d1418e284d6a84791331a768e88c69, type: 3} - 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} - - _NormalMap: - 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: - - _AlbedoAlphaMode: 0 - - _BlendOp: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.1 - - _BorderWidth: 0.1 - - _BumpScale: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 - - _CustomMode: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableNormalMap: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _HoverLight: 0 - - _HoverLightOpaque: 0 - - _InnerGlow: 0 - - _Metallic: 0 - - _Mode: 1 - - _NearPlaneFade: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Reflections: 0 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 0.25 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _UseColor: 1 - - _UseMainTex: 1 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} ---- !u!21 &726695862 + m_GameObject: {fileID: 676362497} + m_Mesh: {fileID: 4300000, guid: efa4a78ba3eb4644ca145ba484c33708, type: 3} +--- !u!23 &676362500 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 676362497} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: e7ea66e243c71c149872ec5116686524, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1001 &676419260 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 576672716} + m_Modifications: + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_LocalPosition.y + value: 0.07 + objectReference: {fileID: 0} + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1723860127229764, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_Name + value: ButtonTraditional (1) + objectReference: {fileID: 0} + - target: {fileID: 23208368517671954, guid: f96fd98222a1e2243ba69ffd9b371279, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} + - target: {fileID: 114471478630299092, guid: f96fd98222a1e2243ba69ffd9b371279, + type: 2} + propertyPath: AnimActions.Array.data[0].InvalidParam + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114471478630299092, guid: f96fd98222a1e2243ba69ffd9b371279, + type: 2} + propertyPath: AnimActions.Array.data[1].InvalidParam + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114471478630299092, guid: f96fd98222a1e2243ba69ffd9b371279, + type: 2} + propertyPath: AnimActions.Array.data[2].InvalidParam + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114471478630299092, guid: f96fd98222a1e2243ba69ffd9b371279, + type: 2} + propertyPath: AnimActions.Array.data[3].InvalidParam + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114471478630299092, guid: f96fd98222a1e2243ba69ffd9b371279, + type: 2} + propertyPath: AnimActions.Array.data[4].InvalidParam + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114471478630299092, guid: f96fd98222a1e2243ba69ffd9b371279, + type: 2} + propertyPath: AnimActions.Array.data[5].InvalidParam + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + m_IsPrefabParent: 0 +--- !u!21 &679948655 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -2553,7 +3600,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 30699e294936bf6489bb1984d770e07e, type: 3} + m_Texture: {fileID: 2800000, guid: fa5e3c121495d23458245aacbc4cc29b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -2644,6 +3691,141 @@ Material: - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} +--- !u!1001 &698491862 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.x + value: -0.8111644 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.y + value: 0.14929087 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.z + value: 0.3344017 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.y + value: -0.5562677 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.w + value: 0.8310032 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_RootOrder + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 1518205972025162, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_Name + value: Model_Tetra (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &698491863 stripped +Transform: + m_PrefabParentObject: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, + type: 2} + m_PrefabInternal: {fileID: 698491862} +--- !u!4 &699798862 stripped +Transform: + m_PrefabParentObject: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, + type: 2} + m_PrefabInternal: {fileID: 676419260} +--- !u!4 &707517713 stripped +Transform: + m_PrefabParentObject: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, + type: 2} + m_PrefabInternal: {fileID: 1191971580} +--- !u!224 &709040683 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 224385282562073920, guid: 42b7699419297d24aa14535697918b4c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1801087361} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1.3525823} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 590312413} + - {fileID: 527932450} + - {fileID: 371267951} + - {fileID: 1205988236} + - {fileID: 979419276} + - {fileID: 1742590020} + - {fileID: 928483035} + - {fileID: 1237488736} + m_Father: {fileID: 1966008302} + 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: 512.5886, y: 323.03625} + m_SizeDelta: {x: 1025, y: 648} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &710758705 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.x + value: -0.29837453 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.y + value: -0.43106988 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.z + value: 0.71920186 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.y + value: -0.19536461 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.w + value: 0.98073065 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_RootOrder + value: 36 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &710758706 stripped +Transform: + m_PrefabParentObject: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, + type: 2} + m_PrefabInternal: {fileID: 710758705} --- !u!4 &744910021 stripped Transform: m_PrefabParentObject: {fileID: 4400682673061142, guid: dc25f30298e5957498e67017b4d85807, @@ -2798,6 +3980,137 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 789324033} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &790477812 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 790477814} + - component: {fileID: 790477813} + m_Layer: 0 + m_Name: ObjectCollection_Radial + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &790477813 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 790477812} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 74154c01851d1174b89ac67209b1d140, type: 3} + m_Name: + m_EditorClassIdentifier: + NodeList: + - Name: Cube + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 2101567320} + - Name: Base Wedge (1) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 584828619} + - Name: Base Wedge (2) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 2110982719} + - Name: Base Wedge (3) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 123014296} + - Name: Base Wedge (4) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1196950155} + - Name: Open Wedge + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1538004340} + - Name: Open Wedge (1) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1963081379} + - Name: Open Wedge (2) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1957586992} + - Name: Open Wedge (3) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1011668960} + - Name: Open Wedge (4) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 466926360} + - Name: Open Wedge (5) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1651601072} + - Name: Open Wedge (6) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 707517713} + - Name: Open Wedge (7) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1853919336} + - Name: Open Wedge (8) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1654388684} + - Name: Open Wedge (9) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1548667665} + SurfaceType: 4 + SortType: 0 + OrientType: 1 + LayoutType: 1 + IgnoreInactiveTransforms: 1 + Radius: 0.87 + radialRange: 105 + rows: 3 + cellWidth: 0.3 + CellHeight: 0 + HorizontalMargin: 0 + VerticalMargin: 0 + DepthMargin: 0 + SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} + CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &790477814 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 790477812} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: -0.12, y: -1.797, z: 3.468} + m_LocalScale: {x: 4, y: 4, z: 4} + m_Children: + - {fileID: 2101567320} + - {fileID: 584828619} + - {fileID: 2110982719} + - {fileID: 123014296} + - {fileID: 1196950155} + - {fileID: 1957586992} + - {fileID: 1011668960} + - {fileID: 466926360} + - {fileID: 1963081379} + - {fileID: 1538004340} + - {fileID: 1651601072} + - {fileID: 707517713} + - {fileID: 1853919336} + - {fileID: 1654388684} + - {fileID: 1548667665} + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1 &798629335 GameObject: m_ObjectHideFlags: 0 @@ -2820,7 +4133,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 798629335} - m_LocalRotation: {x: -0, y: 0.40471452, z: -0, w: 0.9144431} + m_LocalRotation: {x: -0, y: 0.40471452, z: -0, w: 0.91444314} m_LocalPosition: {x: 0.8882122, y: 0, z: 0.8068948} m_LocalScale: {x: 0.01876, y: 0.01876, z: 0.01876} m_Children: [] @@ -2896,7 +4209,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} propertyPath: m_LocalRotation.y - value: 0.36627257 + value: 0.3662725 objectReference: {fileID: 0} - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} propertyPath: m_LocalRotation.z @@ -2964,138 +4277,6 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} m_IsPrefabParent: 0 ---- !u!21 &820929854 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: ButtonIconMaterial - m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} - m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT - _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_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: 2800000, guid: 844c611d8989e904cba0fd67b9536d11, type: 3} - 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} - - _NormalMap: - 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: - - _AlbedoAlphaMode: 0 - - _BlendOp: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.1 - - _BorderWidth: 0.1 - - _BumpScale: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 - - _CustomMode: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableNormalMap: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _HoverLight: 0 - - _HoverLightOpaque: 0 - - _InnerGlow: 0 - - _Metallic: 0 - - _Mode: 1 - - _NearPlaneFade: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Reflections: 0 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 0.25 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _UseColor: 1 - - _UseMainTex: 1 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} --- !u!1001 &821267486 Prefab: m_ObjectHideFlags: 0 @@ -3105,31 +4286,31 @@ Prefab: m_Modifications: - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.x - value: -0.6845652 + value: 0.29837453 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.y - value: 0.29708192 + value: 0.43106988 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.z - value: 0.9903095 + value: 0.71920186 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.x - value: -0.11519664 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.y - value: -0.2956542 + value: 0.19536461 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.z - value: -0.0359401 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.w - value: 0.9476427 + value: 0.98073065 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_RootOrder @@ -3184,7 +4365,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 823706539} - m_LocalRotation: {x: 0.12197889, y: -0.2052158, z: 0.025786415, w: 0.9707434} + m_LocalRotation: {x: 0.12197889, y: -0.20521581, z: 0.025786418, w: 0.9707434} m_LocalPosition: {x: -0.4705595, y: -0.29688472, z: 1.0632184} m_LocalScale: {x: 0.01876, y: 0.01876, z: 0.01876} m_Children: [] @@ -3330,9 +4511,13 @@ MonoBehaviour: LayoutType: 0 IgnoreInactiveTransforms: 1 Radius: 1.2 - Rows: 3 - CellWidth: 0.5 + radialRange: 180 + rows: 3 + cellWidth: 0.5 CellHeight: 0.3 + HorizontalMargin: 0.2 + VerticalMargin: 0.2 + DepthMargin: 0.2 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!212 &859038168 @@ -3416,35 +4601,35 @@ Prefab: m_Modifications: - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.x - value: -0.90188855 + value: -0.54653406 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.y - value: 0.29708192 + value: 0.6643319 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.z - value: 0.7974581 + value: -0.22817473 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.x - value: -0.11001782 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.y - value: -0.40784854 + value: -0.8322457 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.z - value: -0.04957858 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.w - value: 0.90504014 + value: 0.55440694 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalScale.x @@ -3465,6 +4650,77 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} m_IsPrefabParent: 0 +--- !u!1 &879977064 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 879977065} + - component: {fileID: 879977067} + - component: {fileID: 879977066} + m_Layer: 0 + m_Name: Arrow (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &879977065 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 879977064} + m_LocalRotation: {x: 0.00000011199154, y: 0.0042035775, z: -0, w: 0.9999912} + m_LocalPosition: {x: -0.0016814208, y: 0, z: -0.19999294} + m_LocalScale: {x: 0.25, y: 0.5, z: 0.25} + m_Children: [] + m_Father: {fileID: 1313812361} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &879977066 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 879977064} + m_Mesh: {fileID: 4300000, guid: efa4a78ba3eb4644ca145ba484c33708, type: 3} +--- !u!23 &879977067 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 879977064} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: e7ea66e243c71c149872ec5116686524, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1001 &889871187 Prefab: m_ObjectHideFlags: 0 @@ -3570,13 +4826,17 @@ MonoBehaviour: transform: {fileID: 1932732588} SurfaceType: 0 SortType: 0 - OrientType: 1 + OrientType: 7 LayoutType: 0 IgnoreInactiveTransforms: 1 Radius: 0.41 - Rows: 1 - CellWidth: 0.2 + radialRange: 180 + rows: 3 + cellWidth: 0.5 CellHeight: 0.2 + HorizontalMargin: 0.2 + VerticalMargin: 0.2 + DepthMargin: 0.2 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &907517898 @@ -3658,35 +4918,35 @@ Prefab: m_Modifications: - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.x - value: -0.6845652 + value: 0.22695123 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.y - value: -0.29708192 + value: 0.66433185 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.z - value: 0.9903095 + value: 0.5470432 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.x - value: 0.11519664 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.y - value: -0.2956542 + value: 0.19536453 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.z - value: 0.0359401 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.w - value: 0.9476427 + value: 0.9807307 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalScale.x @@ -3730,9 +4990,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} m_Name: m_EditorClassIdentifier: - ButtonState: 4 - ButtonPressFilter: 1 - RequireGaze: 1 + buttonState: 4 + buttonPressFilter: 1 + requireGaze: 1 MainCollider: {fileID: 0} MainRenderer: {fileID: 0} --- !u!114 &916144690 @@ -3766,6 +5026,123 @@ SphereCollider: serializedVersion: 2 m_Radius: 0.7706991 m_Center: {x: 0.00000032782577, y: -0.0000011324884, z: 0.00000756979} +--- !u!1001 &925815135 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.x + value: -0.80965996 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.y + value: -0.14929087 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.z + value: -0.33802816 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.y + value: -0.83224577 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.w + value: 0.55440694 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_RootOrder + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.x + value: 0.131375 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.y + value: 0.131375 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.z + value: 0.131375 + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_Name + value: Model_Platonic (9) + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &925815136 stripped +Transform: + m_PrefabParentObject: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 925815135} +--- !u!1 &925815137 stripped +GameObject: + m_PrefabParentObject: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 925815135} +--- !u!23 &925815138 stripped +MeshRenderer: + m_PrefabParentObject: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, + type: 3} + m_PrefabInternal: {fileID: 925815135} +--- !u!114 &925815139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 925815137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86772d5ca853e924ba484bc960537c04, type: 3} + m_Name: + m_EditorClassIdentifier: + Profile: {fileID: 11400000, guid: 313fc2556ab60d346bea344a4a4eda31, type: 2} + TargetTransform: {fileID: 0} + Renderer: {fileID: 925815138} +--- !u!114 &925815140 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 925815137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} + m_Name: + m_EditorClassIdentifier: + buttonState: 4 + buttonPressFilter: 1 + requireGaze: 1 + MainCollider: {fileID: 0} + MainRenderer: {fileID: 0} +--- !u!135 &925815141 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 925815137} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.7706991 + m_Center: {x: 0.00000032782577, y: -0.0000011324884, z: 0.00000756979} --- !u!1 &928483034 GameObject: m_ObjectHideFlags: 0 @@ -3866,7 +5243,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 928945898} - m_LocalRotation: {x: -0.12197889, y: 0.2052158, z: 0.025786415, w: 0.9707434} + m_LocalRotation: {x: -0.12197889, y: 0.20521581, z: 0.025786418, w: 0.9707434} m_LocalPosition: {x: 0.4705595, y: 0.29688472, z: 1.0632184} m_LocalScale: {x: 0.01876, y: 0.01876, z: 0.01876} m_Children: [] @@ -3917,138 +5294,72 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!21 &943136230 -Material: - serializedVersion: 6 +--- !u!1001 &942672948 +Prefab: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: ButtonIconMaterial - m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} - m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT - _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_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: 2800000, guid: fa5e3c121495d23458245aacbc4cc29b, type: 3} - 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} - - _NormalMap: - 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: - - _AlbedoAlphaMode: 0 - - _BlendOp: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.1 - - _BorderWidth: 0.1 - - _BumpScale: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 - - _CustomMode: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableNormalMap: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _HoverLight: 0 - - _HoverLightOpaque: 0 - - _InnerGlow: 0 - - _Metallic: 0 - - _Mode: 1 - - _NearPlaneFade: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Reflections: 0 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 0.25 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _UseColor: 1 - - _UseMainTex: 1 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.x + value: -0.71853244 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.y + value: -0.43106994 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.z + value: -0.29998296 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.y + value: -0.8322457 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.554407 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_RootOrder + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.x + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.y + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.z + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Name + value: Model_Octa (9) + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 72e18e0d02c99274e9e3b31c87729790, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &942672949 stripped +Transform: + m_PrefabParentObject: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_PrefabInternal: {fileID: 942672948} --- !u!1001 &947576497 Prefab: m_ObjectHideFlags: 0 @@ -4058,31 +5369,31 @@ Prefab: m_Modifications: - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.x - value: 0.14527647 + value: -0.7198676 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.y - value: -0.2970819 + value: 0.4310699 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.z - value: 1.1950887 + value: 0.2967648 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.x - value: 0.120452255 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.y - value: 0.060005262 + value: -0.55626756 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.z - value: -0.007294315 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.w - value: 0.99087715 + value: 0.83100325 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_RootOrder @@ -4306,6 +5617,82 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1006354737} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1011668960 stripped +Transform: + m_PrefabParentObject: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, + type: 2} + m_PrefabInternal: {fileID: 1319230879} +--- !u!1 &1019945565 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1019945566} + - component: {fileID: 1019945568} + - component: {fileID: 1019945567} + m_Layer: 0 + m_Name: Arrow (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1019945566 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1019945565} + m_LocalRotation: {x: -0, y: 0.97479415, z: 0.00000009685755, w: -0.22310641} + m_LocalPosition: {x: 0.08699311, y: 0, z: 0.18008941} + m_LocalScale: {x: 0.25, y: 0.5, z: 0.25} + m_Children: [] + m_Father: {fileID: 1313812361} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1019945567 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1019945565} + m_Mesh: {fileID: 4300000, guid: efa4a78ba3eb4644ca145ba484c33708, type: 3} +--- !u!23 &1019945568 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1019945565} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: e7ea66e243c71c149872ec5116686524, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &1020598829 GameObject: m_ObjectHideFlags: 0 @@ -4361,7 +5748,205 @@ SpriteRenderer: m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: a1962228316ea1b4093c3ed947bcca62, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 19.2, y: 10.8} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!1001 &1028478805 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.x + value: -0.33258575 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.y + value: -0.14929087 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.z + value: -0.8119106 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.y + value: 0.98116535 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.w + value: -0.19316977 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_RootOrder + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.x + value: 0.13136132 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.y + value: 0.13136134 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.z + value: 0.13136132 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} + - target: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_Name + value: Model_Platonic (8) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &1028478806 stripped +Transform: + m_PrefabParentObject: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 1028478805} +--- !u!1 &1028478807 stripped +GameObject: + m_PrefabParentObject: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 1028478805} +--- !u!23 &1028478808 stripped +MeshRenderer: + m_PrefabParentObject: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, + type: 3} + m_PrefabInternal: {fileID: 1028478805} +--- !u!114 &1028478809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1028478807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} + m_Name: + m_EditorClassIdentifier: + buttonState: 4 + buttonPressFilter: 1 + requireGaze: 1 + MainCollider: {fileID: 0} + MainRenderer: {fileID: 0} +--- !u!114 &1028478810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1028478807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86772d5ca853e924ba484bc960537c04, type: 3} + m_Name: + m_EditorClassIdentifier: + Profile: {fileID: 11400000, guid: 313fc2556ab60d346bea344a4a4eda31, type: 2} + TargetTransform: {fileID: 0} + Renderer: {fileID: 1028478808} +--- !u!135 &1028478811 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1028478807} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.7706993 + m_Center: {x: -0.0000025331974, y: -0.0000006556511, z: 0.0000037550926} +--- !u!1 &1043149236 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1043149237} + - component: {fileID: 1043149239} + - component: {fileID: 1043149238} + m_Layer: 0 + m_Name: Arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1043149237 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1043149236} + m_LocalRotation: {x: -0.00000011199154, y: -0.0042035775, z: -0, w: 0.9999912} + m_LocalPosition: {x: 0.0016814208, y: 0, z: -0.19999294} + m_LocalScale: {x: 0.25, y: 0.5, z: 0.25} + m_Children: [] + m_Father: {fileID: 1313812361} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1043149238 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1043149236} + m_Mesh: {fileID: 4300000, guid: efa4a78ba3eb4644ca145ba484c33708, type: 3} +--- !u!23 &1043149239 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1043149236} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: e7ea66e243c71c149872ec5116686524, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -4369,16 +5954,72 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: a1962228316ea1b4093c3ed947bcca62, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 19.2, y: 10.8} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 +--- !u!1001 &1078219824 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.x + value: -0.33621576 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.y + value: -0.14929086 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.z + value: 0.8104142 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.y + value: -0.19536468 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.98073065 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_RootOrder + value: 28 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.x + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.y + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.z + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Name + value: Model_Octa (8) + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 72e18e0d02c99274e9e3b31c87729790, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &1078219825 stripped +Transform: + m_PrefabParentObject: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_PrefabInternal: {fileID: 1078219824} --- !u!1 &1099254016 GameObject: m_ObjectHideFlags: 0 @@ -4401,7 +6042,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1099254016} - m_LocalRotation: {x: -0, y: -0.20682955, z: -0, w: 0.978377} + m_LocalRotation: {x: -0, y: -0.20682956, z: -0, w: 0.978377} m_LocalPosition: {x: -0.48565742, y: 0, z: 1.0973318} m_LocalScale: {x: 0.01876, y: 0.01876, z: 0.01876} m_Children: [] @@ -4461,35 +6102,35 @@ Prefab: m_Modifications: - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.x - value: 0.6845652 + value: -0.33621576 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.y - value: -0.29708192 + value: 0.14929086 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.z - value: 0.9903095 + value: 0.8104142 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.x - value: 0.11519664 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.y - value: 0.2956542 + value: -0.19536468 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.z - value: -0.0359401 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.w - value: 0.9476427 + value: 0.98073065 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_RootOrder - value: 19 + value: 20 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalScale.x @@ -4518,70 +6159,255 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} m_PrefabInternal: {fileID: 1100076585} ---- !u!1001 &1111778914 +--- !u!21 &1101480097 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: ButtonIconMaterial + m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT + _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_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: 2800000, guid: 844c611d8989e904cba0fd67b9536d11, type: 3} + 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} + - _NormalMap: + 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: + - _AlbedoAlphaMode: 0 + - _BlendOp: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.1 + - _BorderWidth: 0.1 + - _BumpScale: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ColorWriteMask: 15 + - _Cull: 2 + - _CullMode: 2 + - _CustomMode: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableNormalMap: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _HoverLight: 0 + - _HoverLightOpaque: 0 + - _InnerGlow: 0 + - _Metallic: 0 + - _Mode: 1 + - _NearPlaneFade: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Reflections: 0 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 0.25 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _UseColor: 1 + - _UseMainTex: 1 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} +--- !u!1001 &1130691646 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 1813752216} m_Modifications: - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.x - value: -0.44018745 + value: 0.33258575 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.14929087 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.z - value: 1.1592389 + value: -0.8119106 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.y - value: -0.18045755 + value: 0.98116535 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.w - value: 0.9835828 + value: 0.19316977 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_RootOrder - value: 6 + value: 32 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalScale.x - value: 1.0000005 + value: 0.131375 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.y + value: 0.131375 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalScale.z - value: 1.0000005 + value: 0.131375 objectReference: {fileID: 0} - - target: {fileID: 1706183334153938, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_Name - value: MeshButtonIcosa (2) + value: Model_Platonic (14) objectReference: {fileID: 0} - - target: {fileID: 23982200976270074, guid: 068240e03cf11d043801dbf4530dfddc, - type: 2} + - target: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 522573f9741466f4f9eb698bce4a266a, type: 2} + objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} m_IsPrefabParent: 0 ---- !u!4 &1111778915 stripped +--- !u!4 &1130691647 stripped Transform: - m_PrefabParentObject: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, - type: 2} - m_PrefabInternal: {fileID: 1111778914} + m_PrefabParentObject: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 1130691646} +--- !u!1 &1130691648 stripped +GameObject: + m_PrefabParentObject: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 1130691646} +--- !u!23 &1130691649 stripped +MeshRenderer: + m_PrefabParentObject: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, + type: 3} + m_PrefabInternal: {fileID: 1130691646} +--- !u!114 &1130691650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1130691648} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86772d5ca853e924ba484bc960537c04, type: 3} + m_Name: + m_EditorClassIdentifier: + Profile: {fileID: 11400000, guid: 313fc2556ab60d346bea344a4a4eda31, type: 2} + TargetTransform: {fileID: 0} + Renderer: {fileID: 1130691649} +--- !u!114 &1130691651 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1130691648} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} + m_Name: + m_EditorClassIdentifier: + buttonState: 4 + buttonPressFilter: 1 + requireGaze: 1 + MainCollider: {fileID: 0} + MainRenderer: {fileID: 0} +--- !u!135 &1130691652 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1130691648} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.7706991 + m_Center: {x: -0.000004440546, y: -0.0000008940698, z: 0.0000037550926} --- !u!1 &1147482679 GameObject: m_ObjectHideFlags: 0 @@ -4636,13 +6462,17 @@ MonoBehaviour: transform: {fileID: 2014013754} SurfaceType: 0 SortType: 0 - OrientType: 1 + OrientType: 7 LayoutType: 0 IgnoreInactiveTransforms: 1 Radius: 0.4 - Rows: 1 - CellWidth: 0.2 + radialRange: 180 + rows: 3 + cellWidth: 0.5 CellHeight: 0.2 + HorizontalMargin: 0.2 + VerticalMargin: 0.2 + DepthMargin: 0.2 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1147482681 @@ -4689,7 +6519,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} propertyPath: m_LocalRotation.y - value: 0.12467471 + value: 0.1246747 objectReference: {fileID: 0} - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} propertyPath: m_LocalRotation.z @@ -4757,6 +6587,183 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &1160383538 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 790477814} + m_Modifications: + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.x + value: -0.5821436 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.z + value: 0.646536 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.x + value: 0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.y + value: -0.35836795 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.z + value: 0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.w + value: 0.9335805 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 1728409514330748, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_Name + value: Outer Open Wedge (5) + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalScale.x + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalScale.z + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalScale.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 23277592836901628, guid: 86f526479c7b577418c7595dfe40655b, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 97b73006130d05b4c90034845c44e88d, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1161077468 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 790477814} + m_Modifications: + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.x + value: -0.3880957 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.z + value: 0.431024 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.y + value: -0.35836792 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.z + value: 0.000000014901161 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.w + value: 0.9335805 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1728409514330748, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_Name + value: Open Wedge(0) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1163072230 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.x + value: -0.54754955 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.y + value: -0.66433185 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.z + value: 0.22572683 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.y + value: -0.5562677 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.w + value: 0.8310032 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_RootOrder + value: 43 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.x + value: 0.9999942 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.z + value: 0.9999942 + objectReference: {fileID: 0} + - target: {fileID: 1706183334153938, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_Name + value: MeshButtonIcosa (13) + objectReference: {fileID: 0} + - target: {fileID: 23982200976270074, guid: 068240e03cf11d043801dbf4530dfddc, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 522573f9741466f4f9eb698bce4a266a, type: 2} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.y + value: 0.99999404 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1163072231 stripped +Transform: + m_PrefabParentObject: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, + type: 2} + m_PrefabInternal: {fileID: 1163072230} --- !u!4 &1164352954 stripped Transform: m_PrefabParentObject: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, @@ -4787,7 +6794,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} propertyPath: m_LocalRotation.y - value: -0.12164918 + value: -0.1216492 objectReference: {fileID: 0} - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} propertyPath: m_LocalRotation.z @@ -4830,11 +6837,140 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &1182537054 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.x + value: 0.22695123 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.y + value: -0.66433185 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.z + value: 0.5470432 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.y + value: 0.19536453 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9807307 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_RootOrder + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.x + value: 0.1289292 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.y + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.z + value: 0.1289292 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 522573f9741466f4f9eb698bce4a266a, type: 2} + - target: {fileID: 100002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Name + value: Model_Octa (15) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &1182537055 stripped +Transform: + m_PrefabParentObject: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_PrefabInternal: {fileID: 1182537054} --- !u!4 &1183937286 stripped Transform: m_PrefabParentObject: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} m_PrefabInternal: {fileID: 1541459136} +--- !u!1001 &1191971580 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 790477814} + m_Modifications: + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.x + value: -0.31178012 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.z + value: 0.812215 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.x + value: -0.000000059604645 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.y + value: -0.18223554 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.z + value: 0.000000007450581 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.w + value: 0.98325497 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 1728409514330748, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_Name + value: Outer Open Wedge (6) + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalScale.x + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalScale.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalScale.z + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 23277592836901628, guid: 86f526479c7b577418c7595dfe40655b, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 97b73006130d05b4c90034845c44e88d, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + m_IsPrefabParent: 0 --- !u!1001 &1193196452 Prefab: m_ObjectHideFlags: 0 @@ -4860,28 +6996,63 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} propertyPath: m_LocalRotation.y - value: -0.58509725 + value: -0.5850973 objectReference: {fileID: 0} - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} - propertyPath: m_LocalRotation.w - value: 0.81096315 + - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} + propertyPath: m_LocalRotation.w + value: 0.8109631 + objectReference: {fileID: 0} + - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 23949254248225916, guid: f423f561be8f30b4a855b22deccd77b1, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} + - target: {fileID: 114957046302647836, guid: f423f561be8f30b4a855b22deccd77b1, + type: 2} + propertyPath: AnimActions.Array.data[0].InvalidParam + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114957046302647836, guid: f423f561be8f30b4a855b22deccd77b1, + type: 2} + propertyPath: AnimActions.Array.data[1].InvalidParam + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114957046302647836, guid: f423f561be8f30b4a855b22deccd77b1, + type: 2} + propertyPath: AnimActions.Array.data[2].InvalidParam + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114957046302647836, guid: f423f561be8f30b4a855b22deccd77b1, + type: 2} + propertyPath: AnimActions.Array.data[3].InvalidParam + value: 1 objectReference: {fileID: 0} - - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} - propertyPath: m_RootOrder - value: 0 + - target: {fileID: 114957046302647836, guid: f423f561be8f30b4a855b22deccd77b1, + type: 2} + propertyPath: AnimActions.Array.data[4].InvalidParam + value: 1 objectReference: {fileID: 0} - - target: {fileID: 23949254248225916, guid: f423f561be8f30b4a855b22deccd77b1, + - target: {fileID: 114957046302647836, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} + propertyPath: AnimActions.Array.data[5].InvalidParam + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} m_IsPrefabParent: 0 +--- !u!4 &1196950155 stripped +Transform: + m_PrefabParentObject: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, + type: 2} + m_PrefabInternal: {fileID: 87671488} --- !u!1 &1205988235 GameObject: m_ObjectHideFlags: 0 @@ -4960,6 +7131,57 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1205988235} +--- !u!1001 &1216271952 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.x + value: -0.54653406 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.y + value: -0.6643319 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.z + value: -0.22817473 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.y + value: -0.8322457 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.w + value: 0.55440694 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_RootOrder + value: 42 + objectReference: {fileID: 0} + - target: {fileID: 1518205972025162, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_Name + value: Model_Tetra (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1216271953 stripped +Transform: + m_PrefabParentObject: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, + type: 2} + m_PrefabInternal: {fileID: 1216271952} --- !u!1 &1219307209 GameObject: m_ObjectHideFlags: 0 @@ -5067,7 +7289,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1221938818} - m_LocalRotation: {x: -0, y: 0.20682955, z: -0, w: 0.978377} + m_LocalRotation: {x: -0, y: 0.20682956, z: -0, w: 0.978377} m_LocalPosition: {x: 0.48565742, y: 0, z: 1.0973318} m_LocalScale: {x: 0.01876, y: 0.01876, z: 0.01876} m_Children: [] @@ -5127,35 +7349,35 @@ Prefab: m_Modifications: - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.x - value: -0.14527647 + value: -0.71853244 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.y - value: 0.2970819 + value: 0.43106994 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.z - value: 1.1950887 + value: -0.29998296 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.x - value: -0.120452255 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.y - value: -0.060005262 + value: -0.8322457 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.z - value: -0.007294315 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.w - value: 0.99087715 + value: 0.554407 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalScale.x @@ -5292,63 +7514,341 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 114742747811649402, guid: 3eddd1c29199313478dd3f912bfab2ab, + type: 2} + propertyPath: Cursor + value: + objectReference: {fileID: 408991239} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &1269269383 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1269269384} + - component: {fileID: 1269269385} + m_Layer: 0 + m_Name: MRTKLogo2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1269269384 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1269269383} + m_LocalRotation: {x: -0, y: -0.40471452, z: -0, w: 0.91444314} + m_LocalPosition: {x: -0.8882122, y: 0, z: 0.8068948} + m_LocalScale: {x: 0.018755898, y: 0.0187559, z: 0.0187559} + m_Children: [] + m_Father: {fileID: 859038169} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1269269385 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1269269383} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 61dfc6c9f1d00d846b15396d2ede8f2b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 19.2, y: 10.8} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!1001 &1273908248 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 790477814} + m_Modifications: + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.x + value: 0.3880957 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.z + value: 0.431024 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.y + value: 0.35836792 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.z + value: -0.000000014901161 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.w + value: 0.9335805 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1728409514330748, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_Name + value: Open Wedge (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1281891980 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.x + value: -0.33258575 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.y + value: 0.14929087 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.z + value: -0.8119106 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.y + value: 0.98116535 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.w + value: -0.19316977 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_RootOrder + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.x + value: 0.12893 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.y + value: 0.12893 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.z + value: 0.12893 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Name + value: Model_Octa (5) + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 72e18e0d02c99274e9e3b31c87729790, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &1281891981 stripped +Transform: + m_PrefabParentObject: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_PrefabInternal: {fileID: 1281891980} +--- !u!1001 &1299594221 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 790477814} + m_Modifications: + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalPosition.x + value: -0.19404785 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalPosition.z + value: 0.215512 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalRotation.y + value: -0.35836792 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: 0.000000044703484 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalRotation.w - value: 1 + value: 0.9335805 objectReference: {fileID: 0} - - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_RootOrder - value: 9 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1813968316392310, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_Name + value: Base_Wedge objectReference: {fileID: 0} - - target: {fileID: 114742747811649402, guid: 3eddd1c29199313478dd3f912bfab2ab, - type: 2} - propertyPath: Cursor - value: - objectReference: {fileID: 408991239} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} m_IsPrefabParent: 0 ---- !u!1 &1269269383 +--- !u!1 &1313812358 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1269269384} - - component: {fileID: 1269269385} + - component: {fileID: 1313812361} + - component: {fileID: 1313812360} + - component: {fileID: 1313812359} m_Layer: 0 - m_Name: MRTKLogo2 + m_Name: ObjectCollection_Wrist m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1269269384 -Transform: +--- !u!114 &1313812359 +MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1269269383} - m_LocalRotation: {x: -0, y: -0.40471452, z: -0, w: 0.9144431} - m_LocalPosition: {x: -0.8882122, y: 0, z: 0.8068948} - m_LocalScale: {x: 0.018755898, y: 0.0187559, z: 0.0187559} - m_Children: [] - m_Father: {fileID: 859038169} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1269269385 + m_GameObject: {fileID: 1313812358} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 74154c01851d1174b89ac67209b1d140, type: 3} + m_Name: + m_EditorClassIdentifier: + NodeList: + - Name: Arrow + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1043149237} + - Name: Arrow (1) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1536244050} + - Name: Arrow (2) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 676362498} + - Name: Arrow (3) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 327444367} + - Name: Arrow (4) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1019945566} + - Name: Arrow (5) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 198119358} + - Name: Arrow (6) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 603132813} + - Name: Arrow (7) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 879977065} + SurfaceType: 0 + SortType: 0 + OrientType: 8 + LayoutType: 0 + IgnoreInactiveTransforms: 1 + Radius: 0.2 + radialRange: 180 + rows: 3 + cellWidth: 0.5 + CellHeight: 0.3 + HorizontalMargin: 0 + VerticalMargin: 0 + DepthMargin: 0 + SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} + CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!212 &1313812360 SpriteRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1269269383} + m_GameObject: {fileID: 1313812358} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -5377,214 +7877,149 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 61dfc6c9f1d00d846b15396d2ede8f2b, type: 3} + m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 19.2, y: 10.8} + m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 ---- !u!1001 &1281891980 +--- !u!4 &1313812361 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1313812358} + m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} + m_LocalPosition: {x: 1.547, y: -0.745, z: 1.263} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1043149237} + - {fileID: 1536244050} + - {fileID: 676362498} + - {fileID: 327444367} + - {fileID: 1019945566} + - {fileID: 198119358} + - {fileID: 603132813} + - {fileID: 879977065} + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} +--- !u!1001 &1319230879 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1813752216} + m_TransformParent: {fileID: 790477814} m_Modifications: - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_LocalPosition.x - value: 0.42736742 + value: 0.2078534 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_LocalPosition.y - value: 0.29708195 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_LocalPosition.z - value: 1.1254774 + value: 0.5414766 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_LocalRotation.x - value: -0.11869183 + value: -0.0000001490116 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_LocalRotation.y - value: 0.17913881 + value: 0.18223552 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_LocalRotation.z - value: 0.021776343 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_LocalRotation.w - value: 0.9763951 + value: 0.9832549 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_RootOrder - value: 16 + value: 6 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_LocalScale.x - value: 0.12893 + - target: {fileID: 1728409514330748, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_Name + value: Open Wedge (3) objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1349804864 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_LocalScale.y - value: 0.12893 + propertyPath: m_LocalPosition.x + value: 0.71853244 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_LocalScale.z - value: 0.12893 + propertyPath: m_LocalPosition.y + value: -0.43106994 objectReference: {fileID: 0} - - target: {fileID: 100002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_Name - value: Model_Octa (5) + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.z + value: -0.29998296 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 72e18e0d02c99274e9e3b31c87729790, type: 2} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - m_IsPrefabParent: 0 ---- !u!4 &1281891981 stripped -Transform: - m_PrefabParentObject: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} - m_PrefabInternal: {fileID: 1281891980} ---- !u!21 &1294069445 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: ButtonIconMaterial - m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} - m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT - _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_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: 2800000, guid: fa5e3c121495d23458245aacbc4cc29b, type: 3} - 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} - - _NormalMap: - 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: - - _AlbedoAlphaMode: 0 - - _BlendOp: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.1 - - _BorderWidth: 0.1 - - _BumpScale: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 - - _CustomMode: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableNormalMap: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _HoverLight: 0 - - _HoverLightOpaque: 0 - - _InnerGlow: 0 - - _Metallic: 0 - - _Mode: 1 - - _NearPlaneFade: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Reflections: 0 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 0.25 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _UseColor: 1 - - _UseMainTex: 1 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.y + value: 0.8322457 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.554407 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_RootOrder + value: 39 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.x + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.y + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.z + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Name + value: Model_Octa (12) + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 72e18e0d02c99274e9e3b31c87729790, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &1349804865 stripped +Transform: + m_PrefabParentObject: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_PrefabInternal: {fileID: 1349804864} --- !u!1 &1353953882 GameObject: m_ObjectHideFlags: 0 @@ -5679,15 +8114,15 @@ Prefab: m_Modifications: - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.x - value: -0.70510054 + value: -0.22695123 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: 0.66433185 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.z - value: 1.0200163 + value: 0.5470432 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.x @@ -5695,7 +8130,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.y - value: -0.2978307 + value: -0.19536453 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.z @@ -5703,11 +8138,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.w - value: 0.95461875 + value: 0.9807307 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalScale.x @@ -5756,7 +8191,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1371835474} - m_LocalRotation: {x: 0.12197889, y: 0.2052158, z: -0.025786415, w: 0.9707434} + m_LocalRotation: {x: 0.12197889, y: 0.20521581, z: -0.025786418, w: 0.9707434} m_LocalPosition: {x: 0.4705595, y: -0.29688472, z: 1.0632184} m_LocalScale: {x: 0.01876, y: 0.01876, z: 0.01876} m_Children: [] @@ -5860,7 +8295,7 @@ Prefab: type: 2} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 1758738551} + objectReference: {fileID: 1801555337} - target: {fileID: 1619954670119144, guid: dc25f30298e5957498e67017b4d85807, type: 2} propertyPath: m_Name value: HolographicButton (1) @@ -5909,15 +8344,15 @@ Prefab: m_Modifications: - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.x - value: 0.44018745 + value: -0.80965996 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: 0.14929087 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.z - value: 1.1592389 + value: -0.33802816 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.x @@ -5925,7 +8360,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.y - value: 0.18045755 + value: -0.83224577 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.z @@ -5933,11 +8368,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.w - value: 0.9835828 + value: 0.55440694 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_RootOrder - value: 17 + value: 18 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalScale.x @@ -5986,7 +8421,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1426685992} - m_LocalRotation: {x: 0.11400792, y: 0.40155682, z: -0.050457668, w: 0.9073083} + m_LocalRotation: {x: 0.11400792, y: 0.40155682, z: -0.050457664, w: 0.9073083} m_LocalPosition: {x: 0.8605999, y: -0.29688472, z: 0.7818104} m_LocalScale: {x: 0.01876, y: 0.01876, z: 0.01876} m_Children: [] @@ -6046,35 +8481,35 @@ Prefab: m_Modifications: - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.x - value: 0.90188855 + value: 0.8111644 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.y - value: 0.29708192 + value: 0.14929087 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.z - value: 0.7974581 + value: 0.3344017 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.x - value: -0.11001782 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.y - value: 0.40784854 + value: 0.5562677 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.z - value: 0.04957858 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.w - value: 0.90504014 + value: 0.8310032 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_RootOrder - value: 21 + value: 22 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalScale.x @@ -6319,7 +8754,7 @@ Transform: m_Children: - {fileID: 1966008302} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1501864675 Prefab: @@ -6346,7 +8781,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} propertyPath: m_LocalRotation.y - value: -0.124674775 + value: -0.12467476 objectReference: {fileID: 0} - target: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} propertyPath: m_LocalRotation.z @@ -6406,7 +8841,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1502891956} - m_LocalRotation: {x: -0.12197889, y: -0.2052158, z: -0.025786415, w: 0.9707434} + m_LocalRotation: {x: -0.12197889, y: -0.20521581, z: -0.025786418, w: 0.9707434} m_LocalPosition: {x: -0.4705595, y: 0.29688472, z: 1.0632184} m_LocalScale: {x: 0.01876, y: 0.01876, z: 0.01876} m_Children: [] @@ -6457,57 +8892,467 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!1001 &1505778009 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.x + value: -0.7198676 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.y + value: -0.4310699 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.z + value: 0.2967648 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.y + value: -0.55626756 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.83100325 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_RootOrder + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.x + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.y + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.z + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Name + value: Model_Octa (10) + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 72e18e0d02c99274e9e3b31c87729790, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &1505778010 stripped +Transform: + m_PrefabParentObject: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_PrefabInternal: {fileID: 1505778009} +--- !u!1 &1536244049 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1536244050} + - component: {fileID: 1536244052} + - component: {fileID: 1536244051} + m_Layer: 0 + m_Name: Arrow (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1536244050 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1536244049} + m_LocalRotation: {x: 0.000000074505806, y: 0.4311764, z: -0.000000059604645, w: 0.9022677} + m_LocalPosition: {x: -0.15561461, y: 0, z: -0.12563477} + m_LocalScale: {x: 0.25, y: 0.5, z: 0.25} + m_Children: [] + m_Father: {fileID: 1313812361} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1536244051 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1536244049} + m_Mesh: {fileID: 4300000, guid: efa4a78ba3eb4644ca145ba484c33708, type: 3} +--- !u!23 &1536244052 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1536244049} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: e7ea66e243c71c149872ec5116686524, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!4 &1538004340 stripped +Transform: + m_PrefabParentObject: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, + type: 2} + m_PrefabInternal: {fileID: 1161077468} --- !u!1001 &1541459136 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 576672716} + m_TransformParent: {fileID: 576672716} + m_Modifications: + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_LocalPosition.y + value: -0.07 + objectReference: {fileID: 0} + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1723860127229764, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + propertyPath: m_Name + value: ButtonTraditional (5) + objectReference: {fileID: 0} + - target: {fileID: 23208368517671954, guid: f96fd98222a1e2243ba69ffd9b371279, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1548667665 stripped +Transform: + m_PrefabParentObject: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, + type: 2} + m_PrefabInternal: {fileID: 112231045} +--- !u!1001 &1556772209 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.x + value: 0.29515308 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.y + value: -0.43106988 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.z + value: -0.7205298 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.y + value: 0.98116535 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.w + value: 0.19316968 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_RootOrder + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.x + value: 0.99999416 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.z + value: 0.99999416 + objectReference: {fileID: 0} + - target: {fileID: 1706183334153938, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_Name + value: MeshButtonIcosa (11) + objectReference: {fileID: 0} + - target: {fileID: 23982200976270074, guid: 068240e03cf11d043801dbf4530dfddc, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 522573f9741466f4f9eb698bce4a266a, type: 2} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.y + value: 0.99999404 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1556772210 stripped +Transform: + m_PrefabParentObject: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, + type: 2} + m_PrefabInternal: {fileID: 1556772209} +--- !u!1001 &1562016285 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 790477814} m_Modifications: - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: 0.31178012 objectReference: {fileID: 0} - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_LocalPosition.y - value: -0.07 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_LocalPosition.z - value: 0 + value: 0.812215 objectReference: {fileID: 0} - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_LocalRotation.x - value: -0 + value: -0.000000059604645 objectReference: {fileID: 0} - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_LocalRotation.y - value: -0 + value: 0.18223554 objectReference: {fileID: 0} - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_LocalRotation.z - value: -0 + value: -0.000000007450581 objectReference: {fileID: 0} - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_LocalRotation.w - value: 1 + value: 0.98325497 objectReference: {fileID: 0} - - target: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_RootOrder - value: 4 + value: 13 objectReference: {fileID: 0} - - target: {fileID: 1723860127229764, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + - target: {fileID: 1728409514330748, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_Name - value: ButtonTraditional (5) + value: Outer Open Wedge (8) objectReference: {fileID: 0} - - target: {fileID: 23208368517671954, guid: f96fd98222a1e2243ba69ffd9b371279, + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalScale.x + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalScale.z + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalScale.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 23277592836901628, guid: 86f526479c7b577418c7595dfe40655b, type: 2} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} + objectReference: {fileID: 2100000, guid: 97b73006130d05b4c90034845c44e88d, type: 2} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 86f526479c7b577418c7595dfe40655b, type: 2} m_IsPrefabParent: 0 +--- !u!21 &1593478363 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: ButtonIconMaterial + m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT + _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_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: 2800000, guid: e2d1418e284d6a84791331a768e88c69, type: 3} + 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} + - _NormalMap: + 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: + - _AlbedoAlphaMode: 0 + - _BlendOp: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.1 + - _BorderWidth: 0.1 + - _BumpScale: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ColorWriteMask: 15 + - _Cull: 2 + - _CullMode: 2 + - _CustomMode: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableNormalMap: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _HoverLight: 0 + - _HoverLightOpaque: 0 + - _InnerGlow: 0 + - _Metallic: 0 + - _Mode: 1 + - _NearPlaneFade: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Reflections: 0 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 0.25 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _UseColor: 1 + - _UseMainTex: 1 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} --- !u!1001 &1606377935 Prefab: m_ObjectHideFlags: 0 @@ -6556,7 +9401,7 @@ Prefab: type: 2} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 1294069445} + objectReference: {fileID: 1740259996} - target: {fileID: 1619954670119144, guid: dc25f30298e5957498e67017b4d85807, type: 2} propertyPath: m_Name value: HolographicButton (4) @@ -6649,7 +9494,7 @@ Prefab: type: 2} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 820929854} + objectReference: {fileID: 1101480097} - target: {fileID: 1619954670119144, guid: dc25f30298e5957498e67017b4d85807, type: 2} propertyPath: m_Name value: HolographicButton (5) @@ -6731,6 +9576,16 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: dc25f30298e5957498e67017b4d85807, type: 2} m_IsPrefabParent: 0 +--- !u!4 &1651601072 stripped +Transform: + m_PrefabParentObject: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, + type: 2} + m_PrefabInternal: {fileID: 1160383538} +--- !u!4 &1654388684 stripped +Transform: + m_PrefabParentObject: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, + type: 2} + m_PrefabInternal: {fileID: 1562016285} --- !u!1001 &1663133480 Prefab: m_ObjectHideFlags: 0 @@ -6756,7 +9611,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} propertyPath: m_LocalRotation.y - value: 0.12164915 + value: 0.12164916 objectReference: {fileID: 0} - target: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} propertyPath: m_LocalRotation.z @@ -6881,35 +9736,35 @@ Prefab: m_Modifications: - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.x - value: 0.90188855 + value: 0.33258575 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.y - value: -0.29708192 + value: 0.14929087 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.z - value: 0.7974581 + value: -0.8119106 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.x - value: 0.11001782 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.y - value: 0.40784854 + value: 0.98116535 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.z - value: -0.04957858 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.w - value: 0.90504014 + value: 0.19316977 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_RootOrder - value: 23 + value: 24 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalScale.x @@ -6953,9 +9808,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} m_Name: m_EditorClassIdentifier: - ButtonState: 4 - ButtonPressFilter: 1 - RequireGaze: 1 + buttonState: 4 + buttonPressFilter: 1 + requireGaze: 1 MainCollider: {fileID: 0} MainRenderer: {fileID: 0} --- !u!114 &1699166042 @@ -7074,147 +9929,65 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1712880174} m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1742590019 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1857403430107600, guid: 42b7699419297d24aa14535697918b4c, - type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1742590020} - - component: {fileID: 1742590021} - m_Layer: 0 - m_Name: MRTK_Logo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1742590020 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 4905320192366726, guid: 42b7699419297d24aa14535697918b4c, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1742590019} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -512.9825, y: -322.609, z: 1.3330002} - m_LocalScale: {x: 0.013813125, y: 0.01381305, z: 0.008287894} - m_Children: [] - m_Father: {fileID: 709040683} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!212 &1742590021 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 212559292570936782, guid: 42b7699419297d24aa14535697918b4c, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1742590019} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 10 - m_Sprite: {fileID: 21300000, guid: f721996453d888a4db83f0f9f1a4eb7c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 20, y: 7.48} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 ---- !u!1001 &1748558557 +--- !u!1001 &1716562537 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1813752216} + m_TransformParent: {fileID: 790477814} m_Modifications: - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalPosition.x - value: -0.14963444 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalPosition.z - value: 1.2309384 + value: 0.29 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalRotation.y - value: -0.06044701 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalRotation.w - value: 0.99817145 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_RootOrder - value: 10 + value: 2 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalScale.x - value: 1.0000005 + value: 0.099999994 objectReference: {fileID: 0} - - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} + propertyPath: m_LocalScale.y + value: 0.099999994 + objectReference: {fileID: 0} + - target: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_LocalScale.z - value: 1.0000005 + value: 0.099999994 objectReference: {fileID: 0} - - target: {fileID: 1706183334153938, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + - target: {fileID: 1813968316392310, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} propertyPath: m_Name - value: MeshButtonIcosa (3) + value: Base Wedge (2) objectReference: {fileID: 0} - - target: {fileID: 23982200976270074, guid: 068240e03cf11d043801dbf4530dfddc, - type: 2} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 522573f9741466f4f9eb698bce4a266a, type: 2} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: e4e63db305487cc4da34b0d1678d4d5a, type: 2} m_IsPrefabParent: 0 ---- !u!4 &1748558558 stripped -Transform: - m_PrefabParentObject: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, - type: 2} - m_PrefabInternal: {fileID: 1748558557} ---- !u!21 &1758738551 +--- !u!21 &1740259996 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -7255,7 +10028,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 517a5268112b8854e8d807547081e670, type: 3} + m_Texture: {fileID: 2800000, guid: fa5e3c121495d23458245aacbc4cc29b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -7346,6 +10119,128 @@ Material: - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} +--- !u!1 &1742590019 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1857403430107600, guid: 42b7699419297d24aa14535697918b4c, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1742590020} + - component: {fileID: 1742590021} + m_Layer: 0 + m_Name: MRTK_Logo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1742590020 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4905320192366726, guid: 42b7699419297d24aa14535697918b4c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1742590019} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -512.9825, y: -322.609, z: 1.3330002} + m_LocalScale: {x: 0.013813125, y: 0.01381305, z: 0.008287894} + m_Children: [] + m_Father: {fileID: 709040683} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!212 &1742590021 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 212559292570936782, guid: 42b7699419297d24aa14535697918b4c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1742590019} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 10 + m_Sprite: {fileID: 21300000, guid: f721996453d888a4db83f0f9f1a4eb7c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 20, y: 7.48} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!1001 &1776117085 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 790477814} + m_Modifications: + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.z + value: 0.58 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.x + value: -0.00000008940697 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1728409514330748, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_Name + value: Open Wedge (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1785529721 GameObject: m_ObjectHideFlags: 0 @@ -7424,9 +10319,13 @@ MonoBehaviour: LayoutType: 0 IgnoreInactiveTransforms: 1 Radius: 0.18 - Rows: 1 - CellWidth: 0.1 + radialRange: 180 + rows: 3 + cellWidth: 0.5 CellHeight: 0.1 + HorizontalMargin: 0.2 + VerticalMargin: 0.2 + DepthMargin: 0.2 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1785529723 @@ -7532,6 +10431,138 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!21 &1801555337 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: ButtonIconMaterial + m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT + _SPECULAR_HIGHLIGHTS _USECOLOR_ON _USEMAINTEX_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: 2800000, guid: 517a5268112b8854e8d807547081e670, type: 3} + 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} + - _NormalMap: + 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: + - _AlbedoAlphaMode: 0 + - _BlendOp: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.1 + - _BorderWidth: 0.1 + - _BumpScale: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ColorWriteMask: 15 + - _Cull: 2 + - _CullMode: 2 + - _CustomMode: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableNormalMap: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _HoverLight: 0 + - _HoverLightOpaque: 0 + - _InnerGlow: 0 + - _Metallic: 0 + - _Mode: 1 + - _NearPlaneFade: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Reflections: 0 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 0.25 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _UseColor: 1 + - _UseMainTex: 1 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} --- !u!1001 &1809495677 Prefab: m_ObjectHideFlags: 0 @@ -7569,7 +10600,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} propertyPath: m_RootOrder - value: 10 + value: 12 objectReference: {fileID: 0} - target: {fileID: 114710303647202208, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} @@ -7618,22 +10649,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: NodeList: - - Name: Model_Platonic + - Name: ButtonMeshIcosa Offset: {x: 0, y: 0} Radius: 0 - transform: {fileID: 251071230} - - Name: MeshButtonIcosa + transform: {fileID: 457182376} + - Name: Model_Platonic Offset: {x: 0, y: 0} Radius: 0 - transform: {fileID: 457182376} + transform: {fileID: 251071230} - Name: Model_Octa Offset: {x: 0, y: 0} Radius: 0 transform: {fileID: 2007411280} - - Name: Model_Octa (1) - Offset: {x: 0, y: 0} - Radius: 0 - transform: {fileID: 821267487} - Name: MeshButtonIcosa (1) Offset: {x: 0, y: 0} Radius: 0 @@ -7646,26 +10673,38 @@ MonoBehaviour: Offset: {x: 0, y: 0} Radius: 0 transform: {fileID: 1833261822} - - Name: MeshButtonIcosa (2) - Offset: {x: 0, y: 0} - Radius: 0 - transform: {fileID: 1111778915} - Name: Model_Octa (2) Offset: {x: 0, y: 0} Radius: 0 transform: {fileID: 218976898} + - Name: Model_Tetra (5) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1947383296} + - Name: Model_Platonic (5) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 462019577} - Name: Model_Octa (3) Offset: {x: 0, y: 0} Radius: 0 transform: {fileID: 1229084924} - - Name: MeshButtonIcosa (3) + - Name: Model_Octa (4) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 947576498} + - Name: Model_Tetra (3) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 163406459} + - Name: Model_Octa (1) Offset: {x: 0, y: 0} Radius: 0 - transform: {fileID: 1748558558} - - Name: Model_Platonic (3) + transform: {fileID: 821267487} + - Name: Model_Tetra (4) Offset: {x: 0, y: 0} Radius: 0 - transform: {fileID: 106511346} + transform: {fileID: 1816595263} - Name: Model_Platonic (4) Offset: {x: 0, y: 0} Radius: 0 @@ -7674,10 +10713,6 @@ MonoBehaviour: Offset: {x: 0, y: 0} Radius: 0 transform: {fileID: 1836684382} - - Name: Model_Octa (4) - Offset: {x: 0, y: 0} - Radius: 0 - transform: {fileID: 947576498} - Name: Model_Octa (5) Offset: {x: 0, y: 0} Radius: 0 @@ -7686,22 +10721,18 @@ MonoBehaviour: Offset: {x: 0, y: 0} Radius: 0 transform: {fileID: 1424385599} - - Name: Model_Platonic (5) + - Name: Model_Tetra (2) Offset: {x: 0, y: 0} Radius: 0 - transform: {fileID: 462019577} - - Name: Model_Platonic (6) + transform: {fileID: 698491863} + - Name: Model_Octa (6) Offset: {x: 0, y: 0} Radius: 0 - transform: {fileID: 115234592} + transform: {fileID: 1100076586} - Name: MeshButtonIcosa (6) Offset: {x: 0, y: 0} Radius: 0 transform: {fileID: 489731275} - - Name: Model_Octa (6) - Offset: {x: 0, y: 0} - Radius: 0 - transform: {fileID: 1100076586} - Name: Model_Octa (7) Offset: {x: 0, y: 0} Radius: 0 @@ -7714,15 +10745,115 @@ MonoBehaviour: Offset: {x: 0, y: 0} Radius: 0 transform: {fileID: 1699166039} + - Name: Model_Platonic (8) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1028478806} + - Name: Model_Platonic (9) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 925815136} + - Name: Model_Platonic (10) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1941846558} + - Name: Model_Octa (8) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1078219825} + - Name: Model_Platonic (11) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 614844823} + - Name: Model_Platonic (12) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 551321877} + - Name: Model_Platonic (13) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 414543771} + - Name: Model_Platonic (14) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1130691647} + - Name: MeshButtonIcosa (8) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 57729465} + - Name: Model_Octa (9) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 942672949} + - Name: Model_Octa (10) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1505778010} + - Name: Model_Tetra + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 710758706} + - Name: MeshButtonIcosa (9) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 632543500} + - Name: MeshButtonIcosa (10) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 233672587} + - Name: Model_Octa (12) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1349804865} + - Name: MeshButtonIcosa (11) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1556772210} + - Name: Model_Octa (13) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 2059028894} + - Name: Model_Tetra (1) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1216271953} + - Name: MeshButtonIcosa (13) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1163072231} + - Name: Model_Octa (14) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 2014218136} + - Name: Model_Octa (15) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 1182537055} + - Name: MeshButtonIcosa (14) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 2130195909} + - Name: Model_Platonic (15) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 481573531} + - Name: Model_Tetra (6) + Offset: {x: 0, y: 0} + Radius: 0 + transform: {fileID: 69808649} SurfaceType: 2 SortType: 0 - OrientType: 1 - LayoutType: 0 + OrientType: 7 + LayoutType: 1 IgnoreInactiveTransforms: 1 - Radius: 1.24 - Rows: 3 - CellWidth: 0.3 + Radius: 0.89 + radialRange: 180 + rows: 3 + cellWidth: 0.5 CellHeight: 0.3 + HorizontalMargin: 0.3 + VerticalMargin: 0.5 + DepthMargin: 0.5 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1813752216 @@ -7735,33 +10866,108 @@ Transform: m_LocalPosition: {x: -1.431, y: -0.16299999, z: 0.851} m_LocalScale: {x: 0.7318744, y: 0.7318744, z: 0.7318744} m_Children: + - {fileID: 69808649} - {fileID: 457182376} - {fileID: 251071230} - {fileID: 2007411280} - {fileID: 1365612327} - {fileID: 916144687} - {fileID: 1833261822} - - {fileID: 1111778915} - {fileID: 218976898} + - {fileID: 1947383296} - {fileID: 462019577} - {fileID: 1229084924} - - {fileID: 1748558558} - {fileID: 947576498} - - {fileID: 106511346} + - {fileID: 163406459} - {fileID: 821267487} + - {fileID: 1816595263} - {fileID: 181000283} - {fileID: 1836684382} - {fileID: 1281891981} - {fileID: 1424385599} - - {fileID: 115234592} + - {fileID: 698491863} - {fileID: 1100076586} - {fileID: 489731275} - {fileID: 1442383467} - {fileID: 1851700599} - {fileID: 1699166039} + - {fileID: 1028478806} + - {fileID: 925815136} + - {fileID: 1941846558} + - {fileID: 1078219825} + - {fileID: 614844823} + - {fileID: 551321877} + - {fileID: 414543771} + - {fileID: 1130691647} + - {fileID: 57729465} + - {fileID: 942672949} + - {fileID: 1505778010} + - {fileID: 710758706} + - {fileID: 632543500} + - {fileID: 233672587} + - {fileID: 1349804865} + - {fileID: 1556772210} + - {fileID: 2059028894} + - {fileID: 1216271953} + - {fileID: 1163072231} + - {fileID: 2014218136} + - {fileID: 1182537055} + - {fileID: 2130195909} + - {fileID: 481573531} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1816595262 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.x + value: 0.7198676 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.y + value: 0.4310699 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.z + value: 0.2967648 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.y + value: 0.55626756 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.w + value: 0.83100325 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 1518205972025162, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_Name + value: Model_Tetra (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1816595263 stripped +Transform: + m_PrefabParentObject: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, + type: 2} + m_PrefabInternal: {fileID: 1816595262} --- !u!1001 &1833261821 Prefab: m_ObjectHideFlags: 0 @@ -7771,35 +10977,35 @@ Prefab: m_Modifications: - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.x - value: -0.42736742 + value: 0.54754955 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.y - value: 0.29708195 + value: 0.66433185 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalPosition.z - value: 1.1254774 + value: 0.22572683 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.x - value: -0.11869183 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.y - value: -0.17913881 + value: 0.5562677 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.z - value: -0.021776343 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalRotation.w - value: 0.9763951 + value: 0.8310032 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} propertyPath: m_LocalScale.x @@ -7843,9 +11049,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} m_Name: m_EditorClassIdentifier: - ButtonState: 4 - ButtonPressFilter: 1 - RequireGaze: 1 + buttonState: 4 + buttonPressFilter: 1 + requireGaze: 1 MainCollider: {fileID: 0} MainRenderer: {fileID: 0} --- !u!114 &1833261825 @@ -7888,15 +11094,15 @@ Prefab: m_Modifications: - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.x - value: 0.14963444 + value: 0.29515308 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: 0.43106988 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.z - value: 1.2309384 + value: -0.7205298 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.x @@ -7904,7 +11110,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.y - value: 0.06044701 + value: 0.98116535 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.z @@ -7912,11 +11118,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.w - value: 0.99817145 + value: 0.19316968 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_RootOrder - value: 15 + value: 16 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalScale.x @@ -8036,15 +11242,15 @@ Prefab: m_Modifications: - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.x - value: 0.928943 + value: 0.80965996 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: 0.14929087 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalPosition.z - value: 0.82137996 + value: -0.33802816 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.x @@ -8052,7 +11258,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.y - value: 0.41085085 + value: 0.8322457 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.z @@ -8060,11 +11266,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalRotation.w - value: 0.9117026 + value: 0.554407 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_RootOrder - value: 22 + value: 23 objectReference: {fileID: 0} - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} propertyPath: m_LocalScale.x @@ -8091,6 +11297,11 @@ Transform: m_PrefabParentObject: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} m_PrefabInternal: {fileID: 1851700598} +--- !u!4 &1853919336 stripped +Transform: + m_PrefabParentObject: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, + type: 2} + m_PrefabInternal: {fileID: 2044691128} --- !u!4 &1899434004 stripped Transform: m_PrefabParentObject: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, @@ -8230,7 +11441,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1924330193} - m_LocalRotation: {x: -0.124674745, y: -0, z: -0, w: 0.9921977} + m_LocalRotation: {x: -0.12467474, y: -0, z: -0, w: 0.9921977} m_LocalPosition: {x: 0, y: 0.29688475, z: 1.1626949} m_LocalScale: {x: 0.01876, y: 0.01876, z: 0.01876} m_Children: [] @@ -8283,9 +11494,187 @@ SpriteRenderer: m_MaskInteraction: 0 --- !u!4 &1932732588 stripped Transform: - m_PrefabParentObject: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, + m_PrefabParentObject: {fileID: 4292920337357262, guid: a32cc9bdd2d56574386df0cf52d0b802, + type: 2} + m_PrefabInternal: {fileID: 1458672178} +--- !u!1001 &1941846557 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.x + value: -0.8111644 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.y + value: -0.14929087 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalPosition.z + value: 0.3344017 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.y + value: -0.5562677 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalRotation.w + value: 0.8310032 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_RootOrder + value: 27 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.x + value: 0.13137501 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.y + value: 0.131375 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_LocalScale.z + value: 0.13137501 + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_Name + value: Model_Platonic (10) + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 360c90aa3bc85c9438a05d511deb80ae, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &1941846558 stripped +Transform: + m_PrefabParentObject: {fileID: 400000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 1941846557} +--- !u!1 &1941846559 stripped +GameObject: + m_PrefabParentObject: {fileID: 100000, guid: 5942fa356be284c4a8d1d231519a7581, type: 3} + m_PrefabInternal: {fileID: 1941846557} +--- !u!23 &1941846560 stripped +MeshRenderer: + m_PrefabParentObject: {fileID: 2300000, guid: 5942fa356be284c4a8d1d231519a7581, + type: 3} + m_PrefabInternal: {fileID: 1941846557} +--- !u!114 &1941846561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1941846559} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86772d5ca853e924ba484bc960537c04, type: 3} + m_Name: + m_EditorClassIdentifier: + Profile: {fileID: 11400000, guid: 313fc2556ab60d346bea344a4a4eda31, type: 2} + TargetTransform: {fileID: 0} + Renderer: {fileID: 1941846560} +--- !u!114 &1941846562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1941846559} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3} + m_Name: + m_EditorClassIdentifier: + buttonState: 4 + buttonPressFilter: 1 + requireGaze: 1 + MainCollider: {fileID: 0} + MainRenderer: {fileID: 0} +--- !u!135 &1941846563 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1941846559} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.7706991 + m_Center: {x: -0.000003963709, y: -0.0000011324884, z: 0.00000756979} +--- !u!1001 &1947383295 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.x + value: 0.22450095 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.y + value: 0.6643318 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalPosition.z + value: -0.5480531 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.y + value: 0.98116535 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_LocalRotation.w + value: 0.19316979 + objectReference: {fileID: 0} + - target: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1518205972025162, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + propertyPath: m_Name + value: Model_Tetra (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d6dab295f4a8f544c8689231666498f7, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1947383296 stripped +Transform: + m_PrefabParentObject: {fileID: 4479957502932928, guid: d6dab295f4a8f544c8689231666498f7, type: 2} - m_PrefabInternal: {fileID: 1458672178} + m_PrefabInternal: {fileID: 1947383295} +--- !u!4 &1957586992 stripped +Transform: + m_PrefabParentObject: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, + type: 2} + m_PrefabInternal: {fileID: 1776117085} +--- !u!4 &1963081379 stripped +Transform: + m_PrefabParentObject: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, + type: 2} + m_PrefabInternal: {fileID: 2080620488} --- !u!1 &1966008301 GameObject: m_ObjectHideFlags: 0 @@ -8458,13 +11847,17 @@ MonoBehaviour: transform: {fileID: 1449754722} SurfaceType: 1 SortType: 0 - OrientType: 1 + OrientType: 3 LayoutType: 0 IgnoreInactiveTransforms: 1 Radius: 0.71 - Rows: 2 - CellWidth: 0.12 + radialRange: 180 + rows: 3 + cellWidth: 0.5 CellHeight: 0.12 + HorizontalMargin: 0.2 + VerticalMargin: 0.2 + DepthMargin: 0.2 SphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} CylinderMesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &2001628445 @@ -8495,35 +11888,35 @@ Prefab: m_Modifications: - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.x - value: -0.90188855 + value: -0.54754955 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.y - value: -0.29708192 + value: 0.66433185 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalPosition.z - value: 0.7974581 + value: 0.22572683 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.x - value: 0.11001782 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.y - value: -0.40784854 + value: -0.5562677 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.z - value: 0.04957858 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalRotation.w - value: 0.90504014 + value: 0.8310032 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} propertyPath: m_LocalScale.x @@ -8558,6 +11951,201 @@ Transform: m_PrefabParentObject: {fileID: 4294092198019822, guid: f423f561be8f30b4a855b22deccd77b1, type: 2} m_PrefabInternal: {fileID: 296554615} +--- !u!1001 &2014218135 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.x + value: -0.22695123 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.y + value: -0.66433185 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.z + value: 0.5470432 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.y + value: -0.19536453 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9807307 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_RootOrder + value: 44 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.x + value: 0.1289292 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.y + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.z + value: 0.1289292 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Name + value: Model_Octa (14) + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 72e18e0d02c99274e9e3b31c87729790, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &2014218136 stripped +Transform: + m_PrefabParentObject: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_PrefabInternal: {fileID: 2014218135} +--- !u!1001 &2044691128 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 790477814} + m_Modifications: + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.z + value: 0.87 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.x + value: -0.00000008940697 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 1728409514330748, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_Name + value: Outer Open Wedge (7) + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalScale.x + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalScale.z + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalScale.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 23277592836901628, guid: 86f526479c7b577418c7595dfe40655b, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 97b73006130d05b4c90034845c44e88d, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &2059028893 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.x + value: -0.22450095 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.y + value: -0.6643318 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalPosition.z + value: -0.5480531 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.y + value: 0.98116535 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalRotation.w + value: -0.19316979 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_RootOrder + value: 41 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.x + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.y + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_LocalScale.z + value: 0.12892923 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Name + value: Model_Octa (13) + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 72e18e0d02c99274e9e3b31c87729790, type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &2059028894 stripped +Transform: + m_PrefabParentObject: {fileID: 400002, guid: 1e23ec24c22068b4cbf47737c35e277b, type: 3} + m_PrefabInternal: {fileID: 2059028893} --- !u!1001 &2076086480 Prefab: m_ObjectHideFlags: 0 @@ -8622,6 +12210,52 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: a32cc9bdd2d56574386df0cf52d0b802, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &2080620488 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 790477814} + m_Modifications: + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.x + value: -0.2078534 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalPosition.z + value: 0.5414766 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.x + value: -0.0000001490116 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.y + value: -0.18223552 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_LocalRotation.w + value: 0.9832549 + objectReference: {fileID: 0} + - target: {fileID: 4568522950744146, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1728409514330748, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + propertyPath: m_Name + value: Open Wedge (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 86f526479c7b577418c7595dfe40655b, type: 2} + m_IsPrefabParent: 0 --- !u!1001 &2084966440 Prefab: m_ObjectHideFlags: 0 @@ -8659,11 +12293,21 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4000011792100794, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2} propertyPath: m_RootOrder - value: 12 + value: 14 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2} m_IsPrefabParent: 0 +--- !u!4 &2101567320 stripped +Transform: + m_PrefabParentObject: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, + type: 2} + m_PrefabInternal: {fileID: 1299594221} +--- !u!4 &2110982719 stripped +Transform: + m_PrefabParentObject: {fileID: 4119857227660218, guid: e4e63db305487cc4da34b0d1678d4d5a, + type: 2} + m_PrefabInternal: {fileID: 1716562537} --- !u!1 &2111172463 GameObject: m_ObjectHideFlags: 0 @@ -8686,7 +12330,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2111172463} - m_LocalRotation: {x: -0.11400792, y: 0.40155682, z: 0.050457668, w: 0.9073083} + m_LocalRotation: {x: -0.11400792, y: 0.40155682, z: 0.050457664, w: 0.9073083} m_LocalPosition: {x: 0.8605999, y: 0.29688472, z: 0.7818104} m_LocalScale: {x: 0.01876, y: 0.01876, z: 0.01876} m_Children: [] @@ -8737,3 +12381,71 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!1001 &2130195908 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1813752216} + m_Modifications: + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.x + value: 0.54754955 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.y + value: -0.66433185 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalPosition.z + value: 0.22572683 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.y + value: 0.5562677 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalRotation.w + value: 0.8310032 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_RootOrder + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.x + value: 0.99999434 + objectReference: {fileID: 0} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.z + value: 0.99999434 + objectReference: {fileID: 0} + - target: {fileID: 1706183334153938, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_Name + value: MeshButtonIcosa (14) + objectReference: {fileID: 0} + - target: {fileID: 23982200976270074, guid: 068240e03cf11d043801dbf4530dfddc, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 522573f9741466f4f9eb698bce4a266a, type: 2} + - target: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + propertyPath: m_LocalScale.y + value: 0.99999404 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 068240e03cf11d043801dbf4530dfddc, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &2130195909 stripped +Transform: + m_PrefabParentObject: {fileID: 4531156204415774, guid: 068240e03cf11d043801dbf4530dfddc, + type: 2} + m_PrefabInternal: {fileID: 2130195908} diff --git a/Assets/HoloToolkit-Examples/UX/Scenes/TooltipExamples.unity b/Assets/HoloToolkit-Examples/UX/Scenes/TooltipExamples.unity index 7a09f4c73dc..fbcea392228 100644 --- a/Assets/HoloToolkit-Examples/UX/Scenes/TooltipExamples.unity +++ b/Assets/HoloToolkit-Examples/UX/Scenes/TooltipExamples.unity @@ -440,15 +440,15 @@ Prefab: m_Modifications: - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.x - value: -2.357 + value: -7.47 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.y - value: -1.645 + value: -2.69 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.z - value: 13.48 + value: 14.6 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalRotation.x @@ -473,17 +473,17 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.y - value: 0.030928891 + value: 0.09870203 objectReference: {fileID: 0} - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.z - value: 0.026119478 + value: -0.04651781 objectReference: {fileID: 0} - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: End.y - value: 0 + value: 0.063 objectReference: {fileID: 0} - target: {fileID: 1963181076315932, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_Name @@ -492,7 +492,7 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.x - value: -0.016004367 + value: 0.31559756 objectReference: {fileID: 0} - target: {fileID: 102388150973355850, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} @@ -506,15 +506,15 @@ Prefab: objectReference: {fileID: 2100000, guid: 151c96065fff785478dd7e3d33953d55, type: 2} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.x - value: -0.016004367 + value: 0.31559756 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.y - value: 0.030928891 + value: 0.09870203 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.z - value: 0.026119478 + value: -0.04651781 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalScale.x @@ -531,7 +531,7 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: End.z - value: 0 + value: -0.06440001 objectReference: {fileID: 0} - target: {fileID: 114969983881809412, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} @@ -579,7 +579,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 346301799} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.009, y: -2.5049999, z: 2.714} + m_LocalPosition: {x: -1.009, y: -3.183, z: 2.714} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 612997428} @@ -895,7 +895,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.y - value: 0.08096 + value: 0.08096003 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.z @@ -1325,7 +1325,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.y - value: 0.04580001 + value: 0.045799986 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.z @@ -2034,7 +2034,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.y - value: 0.034059998 + value: 0.034060024 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.z @@ -2437,12 +2437,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6eb034688bcf84b4bb52b3a3310868c3, type: 3} m_Name: m_EditorClassIdentifier: - hostTransform: {fileID: 0} + HostTransform: {fileID: 0} boundingBoxPrefab: {fileID: 114030465538688920, guid: 865a8ded6c47efd4285f04f3aebe99e9, type: 2} - manipulationMode: 2 - rotationConstraint: 0 - enableOneHandMovement: 1 + ManipulationMode: 4 + ConstraintOnRotation: 0 + OneHandMovement: 1 --- !u!65 &836834072 BoxCollider: m_ObjectHideFlags: 0 @@ -3071,15 +3071,15 @@ Prefab: m_Modifications: - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.x - value: -3.421 + value: -7.78 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.y - value: -1.045 + value: -2 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.z - value: 13.559 + value: 14.2 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalRotation.x @@ -3104,17 +3104,17 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.y - value: 0.011231284 + value: 0.0731675 objectReference: {fileID: 0} - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.z - value: 0.0017394761 + value: -0.039832357 objectReference: {fileID: 0} - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: End.y - value: -0.00000000773128 + value: 0.063 objectReference: {fileID: 0} - target: {fileID: 1963181076315932, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_Name @@ -3123,7 +3123,7 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.x - value: 0.039181337 + value: 0.32188284 objectReference: {fileID: 0} - target: {fileID: 102388150973355850, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} @@ -3137,15 +3137,15 @@ Prefab: objectReference: {fileID: 2100000, guid: 151c96065fff785478dd7e3d33953d55, type: 2} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.x - value: 0.039181337 + value: 0.32188284 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.y - value: 0.011231284 + value: 0.0731675 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.z - value: 0.0017394761 + value: -0.039832357 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalScale.x @@ -3162,7 +3162,7 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: End.z - value: 0 + value: -0.06440001 objectReference: {fileID: 0} - target: {fileID: 114969983881809412, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} @@ -3611,11 +3611,11 @@ Prefab: m_Modifications: - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.x - value: -3.87 + value: -8.08 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.y - value: -0.09 + value: -1.09 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.z @@ -3653,20 +3653,20 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: End.y - value: -0.000000009664101 + value: -0.0000000077312805 objectReference: {fileID: 0} - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.x - value: -0.03162781 + value: 0.24141046 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.x - value: -0.03162781 + value: 0.24141046 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.y - value: -0.038582888 + value: 0.026271796 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.z @@ -3675,18 +3675,13 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.y - value: -0.038582888 + value: 0.026271796 objectReference: {fileID: 0} - target: {fileID: 114560166902750794, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: target value: objectReference: {fileID: 959819892} - - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, - type: 2} - propertyPath: End.x - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} m_IsPrefabParent: 0 @@ -4497,7 +4492,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1595493450} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -3.59, z: 0} + m_LocalPosition: {x: 0, y: -4.27, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1605347205} @@ -4616,15 +4611,15 @@ Prefab: m_Modifications: - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.x - value: -1.691 + value: -6.303 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.y - value: -0.475 + value: -1.069 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.z - value: 13.528 + value: 14.1 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalRotation.x @@ -4649,17 +4644,17 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.y - value: -0.02351196 + value: 0.015011718 objectReference: {fileID: 0} - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.z - value: 0.013870781 + value: -0.023226125 objectReference: {fileID: 0} - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: End.y - value: 0.0000000057984595 + value: 0.062999986 objectReference: {fileID: 0} - target: {fileID: 1963181076315932, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_Name @@ -4668,7 +4663,7 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.x - value: -0.038809277 + value: 0.2603005 objectReference: {fileID: 0} - target: {fileID: 102388150973355850, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} @@ -4682,15 +4677,15 @@ Prefab: objectReference: {fileID: 2100000, guid: 151c96065fff785478dd7e3d33953d55, type: 2} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.x - value: -0.038809277 + value: 0.2603005 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.y - value: -0.02351196 + value: 0.015011718 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.z - value: 0.013870781 + value: -0.023226125 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalScale.x @@ -4707,7 +4702,7 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: End.z - value: 0 + value: -0.06440001 objectReference: {fileID: 0} - target: {fileID: 114969983881809412, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} @@ -5336,7 +5331,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2021116510} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.009, y: -1.6839998, z: 2.714} + m_LocalPosition: {x: -1.009, y: -2.362, z: 2.714} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2039496339} @@ -5808,15 +5803,15 @@ Prefab: m_Modifications: - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.x - value: -3.16 + value: -7.672 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.y - value: -0.263 + value: -0.987 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.z - value: 14.017 + value: 14.667 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalRotation.x @@ -5841,17 +5836,17 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.y - value: -0.02138939 + value: 0.025565393 objectReference: {fileID: 0} - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.z - value: -0.021298252 + value: -0.06345376 objectReference: {fileID: 0} - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: End.y - value: 0 + value: 0.063 objectReference: {fileID: 0} - target: {fileID: 1963181076315932, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_Name @@ -5860,7 +5855,7 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.x - value: 0.026984902 + value: 0.31960925 objectReference: {fileID: 0} - target: {fileID: 102388150973355850, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} @@ -5874,15 +5869,15 @@ Prefab: objectReference: {fileID: 2100000, guid: 151c96065fff785478dd7e3d33953d55, type: 2} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.x - value: 0.026984902 + value: 0.3196092 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.y - value: -0.02138939 + value: 0.025565393 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.z - value: -0.021298252 + value: -0.06345376 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalScale.x @@ -5899,7 +5894,7 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: End.z - value: 0 + value: -0.06440001 objectReference: {fileID: 0} - target: {fileID: 114560166902750794, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} @@ -5996,11 +5991,11 @@ Prefab: m_Modifications: - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.x - value: -5.71 + value: -9.929 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.y - value: -0.17 + value: -1.97 objectReference: {fileID: 0} - target: {fileID: 4958700347904618, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.z @@ -6029,7 +6024,7 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.y - value: -0.03608303 + value: 0.08065538 objectReference: {fileID: 0} - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} @@ -6039,7 +6034,7 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: End.y - value: -0.00000000483205 + value: 0.062999986 objectReference: {fileID: 0} - target: {fileID: 1963181076315932, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_Name @@ -6048,7 +6043,7 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: Start.x - value: 0.042064037 + value: 0.3156859 objectReference: {fileID: 0} - target: {fileID: 102388150973355850, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} @@ -6062,11 +6057,11 @@ Prefab: objectReference: {fileID: 2100000, guid: 151c96065fff785478dd7e3d33953d55, type: 2} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.x - value: 0.042064037 + value: 0.3156859 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.y - value: -0.03608303 + value: 0.08065538 objectReference: {fileID: 0} - target: {fileID: 4992329056269614, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: m_LocalPosition.z @@ -6087,12 +6082,12 @@ Prefab: - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: End.z - value: 0 + value: -0.06440001 objectReference: {fileID: 0} - target: {fileID: 114065498733854586, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} propertyPath: End.x - value: 0 + value: 0.28600004 objectReference: {fileID: 0} - target: {fileID: 114560166902750794, guid: 3b2729a90daf689408e97dcbcc8e8a4e, type: 2} diff --git a/Assets/HoloToolkit/UX/Scripts/Dialog/DialogEnums.cs b/Assets/HoloToolkit-Examples/UX/Scripts/DialogEnums.cs similarity index 100% rename from Assets/HoloToolkit/UX/Scripts/Dialog/DialogEnums.cs rename to Assets/HoloToolkit-Examples/UX/Scripts/DialogEnums.cs diff --git a/Assets/HoloToolkit/UX/Scripts/Dialog/DialogEnums.cs.meta b/Assets/HoloToolkit-Examples/UX/Scripts/DialogEnums.cs.meta similarity index 100% rename from Assets/HoloToolkit/UX/Scripts/Dialog/DialogEnums.cs.meta rename to Assets/HoloToolkit-Examples/UX/Scripts/DialogEnums.cs.meta diff --git a/Assets/HoloToolkit-Examples/UX/Scripts/DialogExampleLaunchButton.cs b/Assets/HoloToolkit-Examples/UX/Scripts/DialogExampleLaunchButton.cs index 8dbe5aa29ec..f26a0f7456e 100644 --- a/Assets/HoloToolkit-Examples/UX/Scripts/DialogExampleLaunchButton.cs +++ b/Assets/HoloToolkit-Examples/UX/Scripts/DialogExampleLaunchButton.cs @@ -14,7 +14,7 @@ namespace HoloToolkit.Examples.UX public class DialogExampleLaunchButton : MonoBehaviour { [SerializeField] - private Dialog dialogPrefab = null; + private Dialog dialogPrefab; [SerializeField] private bool isDialogLaunched; diff --git a/Assets/HoloToolkit-Preview.meta b/Assets/HoloToolkit-Preview.meta deleted file mode 100644 index c21dec768ad..00000000000 --- a/Assets/HoloToolkit-Preview.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 7a97437ee224c9a46979c543bfb52b1c -folderAsset: yes -timeCreated: 1527272658 -licenseType: Pro -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployTools.cs b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployTools.cs index 6daf50c9704..7d0e1e737f0 100644 --- a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployTools.cs +++ b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployTools.cs @@ -85,21 +85,12 @@ public static bool BuildSLN(string buildDirectory, bool showDialog = true) WSAUwpSdk = EditorUserBuildSettings.wsaUWPSDK, // Configure a post build action that will compile the generated solution -#if UNITY_2018_1_OR_NEWER - PostBuildAction = (innerBuildInfo, buildReport) => - { - if (buildReport.summary.result != UnityEditor.Build.Reporting.BuildResult.Succeeded) - { - EditorUtility.DisplayDialog(string.Format("{0} WindowsStoreApp Build {1}!", PlayerSettings.productName, buildReport.summary.result), "See console for details", "OK"); - } -#else PostBuildAction = (innerBuildInfo, buildError) => { if (!string.IsNullOrEmpty(buildError)) { - EditorUtility.DisplayDialog(string.Format("{0} WindowsStoreApp Build Failed!", PlayerSettings.productName), buildError, "OK"); + EditorUtility.DisplayDialog(PlayerSettings.productName + " WindowsStoreApp Build Failed!", buildError, "OK"); } -#endif else { if (showDialog) @@ -232,7 +223,7 @@ public static bool BuildAppxFromSLN(string productName, string msBuildVersion, b if (!File.Exists(msBuildPath)) { - Debug.LogErrorFormat("MSBuild.exe is missing or invalid:\n{0}.", msBuildPath); + Debug.LogErrorFormat("MSBuild.exe is missing or invalid (path={0}).", msBuildPath); EditorUtility.ClearProgressBar(); return false; } @@ -249,12 +240,13 @@ public static bool BuildAppxFromSLN(string productName, string msBuildVersion, b File.Copy(unity + @"\Data\PlaybackEngines\MetroSupport\Tools\project.json", storePath + "\\project.json"); } - string assemblyCSharp = string.Format("{0}/GeneratedProjects/UWP/Assembly-CSharp", storePath); - string assemblyCSharpFirstPass = string.Format("{0}/GeneratedProjects/UWP/Assembly-CSharp-firstpass", storePath); - bool restoreFirstPass = Directory.Exists(assemblyCSharpFirstPass); string nugetPath = Path.Combine(unity, @"Data\PlaybackEngines\MetroSupport\Tools\NuGet.exe"); + string assemblyCSharp = storePath + "/GeneratedProjects/UWP/Assembly-CSharp"; + string assemblyCSharpFirstPass = storePath + "/GeneratedProjects/UWP/Assembly-CSharp-firstpass"; + bool restoreFirstPass = Directory.Exists(assemblyCSharpFirstPass); - // Before building, need to run a nuget restore to generate a json.lock file. Failing to do this breaks the build in VS RTM + // Before building, need to run a nuget restore to generate a json.lock file. Failing to do + // this breaks the build in VS RTM if (PlayerSettings.GetScriptingBackend(BuildTargetGroup.WSA) == ScriptingImplementation.WinRTDotNET && (!RestoreNugetPackages(nugetPath, storePath) || !RestoreNugetPackages(nugetPath, storePath + "\\" + productName) || @@ -268,22 +260,18 @@ public static bool BuildAppxFromSLN(string productName, string msBuildVersion, b EditorUtility.DisplayProgressBar("Build AppX", "Building AppX Package...", 25); - // Ensure that the generated .appx version increments by modifying Package.appxmanifest - if (!SetPackageVersion(incrementVersion)) + // Ensure that the generated .appx version increments by modifying + // Package.appxmanifest + if (incrementVersion) { - Debug.LogError("Failed to increment package version!"); - EditorUtility.ClearProgressBar(); - return false; + IncrementPackageVersion(); } // Now do the actual build var pInfo = new ProcessStartInfo { FileName = msBuildPath, - CreateNoWindow = true, - UseShellExecute = false, - RedirectStandardOutput = true, - RedirectStandardError = true, + CreateNoWindow = false, Arguments = string.Format("\"{0}\" /t:{1} /p:Configuration={2} /p:Platform={3} /verbosity:m", solutionProjectPath, forceRebuildAppx ? "Rebuild" : "Build", @@ -291,69 +279,44 @@ public static bool BuildAppxFromSLN(string productName, string msBuildVersion, b buildPlatform) }; - var process = new Process - { - StartInfo = pInfo, - EnableRaisingEvents = true - }; + // Uncomment out to debug by copying into command window + //Debug.Log("\"" + vs + "\"" + " " + pInfo.Arguments); + + var process = new Process { StartInfo = pInfo }; try { - process.ErrorDataReceived += (sender, args) => - { - if (!string.IsNullOrEmpty(args.Data)) - { - Debug.LogError(args.Data); - } - }; - - process.OutputDataReceived += (sender, args) => - { - if (!string.IsNullOrEmpty(args.Data)) - { - Debug.Log(args.Data); - } - }; - if (!process.Start()) { - Debug.LogError("Failed to start process!"); + Debug.LogError("Failed to start Cmd process!"); EditorUtility.ClearProgressBar(); - process.Close(); - process.Dispose(); return false; } - process.BeginOutputReadLine(); - process.BeginErrorReadLine(); process.WaitForExit(); EditorUtility.ClearProgressBar(); - if (process.ExitCode == 0 && showDialog && + if (process.ExitCode == 0 && + showDialog && !EditorUtility.DisplayDialog("Build AppX", "AppX Build Successful!", "OK", "Open AppX Folder")) { - Process.Start("explorer.exe", string.Format("/f /open,{0}/{1}/AppPackages", Path.GetFullPath(BuildDeployPrefs.BuildDirectory), PlayerSettings.productName)); + Process.Start("explorer.exe", "/f /open," + Path.GetFullPath(BuildDeployPrefs.BuildDirectory + "/" + PlayerSettings.productName + "/AppPackages")); } if (process.ExitCode != 0) { - Debug.LogError(string.Format("MSBuild error (code = {0})", process.ExitCode)); - EditorUtility.ClearProgressBar(); + Debug.LogError("MSBuild error (code = " + process.ExitCode + ")"); EditorUtility.DisplayDialog(PlayerSettings.productName + " build Failed!", "Failed to build appx from solution. Error code: " + process.ExitCode, "OK"); - - process.Close(); - process.Dispose(); return false; } process.Close(); process.Dispose(); + } catch (Exception e) { - process.Close(); - process.Dispose(); Debug.LogError("Cmd Process EXCEPTION: " + e); EditorUtility.ClearProgressBar(); return false; @@ -362,15 +325,15 @@ public static bool BuildAppxFromSLN(string productName, string msBuildVersion, b return true; } - private static bool SetPackageVersion(bool increment) + private static void IncrementPackageVersion() { // Find the manifest, assume the one we want is the first one string[] manifests = Directory.GetFiles(BuildDeployPrefs.AbsoluteBuildDirectory, "Package.appxmanifest", SearchOption.AllDirectories); if (manifests.Length == 0) { - Debug.LogError(string.Format("Unable to find Package.appxmanifest file for build (in path - {0})", BuildDeployPrefs.AbsoluteBuildDirectory)); - return false; + Debug.LogError("Unable to find Package.appxmanifest file for build (in path - " + BuildDeployPrefs.AbsoluteBuildDirectory + ")"); + return; } string manifest = manifests[0]; @@ -379,8 +342,8 @@ private static bool SetPackageVersion(bool increment) if (identityNode == null) { - Debug.LogError(string.Format("Package.appxmanifest for build (in path - {0}) is missing an node", BuildDeployPrefs.AbsoluteBuildDirectory)); - return false; + Debug.LogError("Package.appxmanifest for build (in path - " + BuildDeployPrefs.AbsoluteBuildDirectory + ") is missing an node"); + return; } // We use XName.Get instead of string -> XName implicit conversion because @@ -390,8 +353,8 @@ private static bool SetPackageVersion(bool increment) if (versionAttr == null) { - Debug.LogError(string.Format("Package.appxmanifest for build (in path - {0}) is missing a version attribute in the node.", BuildDeployPrefs.AbsoluteBuildDirectory)); - return false; + Debug.LogError("Package.appxmanifest for build (in path - " + BuildDeployPrefs.AbsoluteBuildDirectory + ") is missing a version attribute in the node."); + return; } // Assume package version always has a '.' between each number. @@ -399,12 +362,11 @@ private static bool SetPackageVersion(bool increment) // Package versions are always of the form Major.Minor.Build.Revision. // Note: Revision number reserved for Windows Store, and a value other than 0 will fail WACK. var version = PlayerSettings.WSA.packageVersion; - var newVersion = new Version(version.Major, version.Minor, increment ? version.Build + 1 : version.Build, version.Revision); + var newVersion = new Version(version.Major, version.Minor, version.Build + 1, version.Revision); PlayerSettings.WSA.packageVersion = newVersion; versionAttr.Value = newVersion.ToString(); rootNode.Save(manifest); - return true; } } } diff --git a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs index b76e67dc23b..e76ae8d9a98 100644 --- a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs +++ b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs @@ -1,4 +1,5 @@ // Copyright (c) Microsoft Corporation. +// Copyright (c) Rafael Rivera. // Licensed under the MIT License. See LICENSE in the project root for license information. using System; @@ -23,7 +24,7 @@ public class BuildDeployWindow : EditorWindow private const string SdkVersion = #if UNITY_2017_2_OR_NEWER - "10.0.17134.0"; + "10.0.16299.0"; #else "10.0.15063.0"; #endif @@ -122,13 +123,7 @@ private static bool CanInstall { get { - bool canInstall = true; - if (EditorUserBuildSettings.wsaSubtarget == WSASubtarget.HoloLens) - { - canInstall = DevicePortalConnectionEnabled; - } - - return canInstall && Directory.Exists(BuildDeployPrefs.AbsoluteBuildDirectory); + return Directory.Exists(BuildDeployPrefs.AbsoluteBuildDirectory) && !string.IsNullOrEmpty(familyPackageName); } } @@ -231,7 +226,9 @@ private void OnGUI() // Build directory (and save setting, if it's changed) string curBuildDirectory = BuildDeployPrefs.BuildDirectory; EditorGUILayout.LabelField(buildDirectoryLabel, GUILayout.Width(96)); - string newBuildDirectory = EditorGUILayout.TextField(curBuildDirectory, GUILayout.Width(64), GUILayout.ExpandWidth(true)); + string newBuildDirectory = EditorGUILayout.TextField( + curBuildDirectory, + GUILayout.Width(64), GUILayout.ExpandWidth(true)); if (newBuildDirectory != curBuildDirectory) { @@ -264,19 +261,16 @@ private void OnGUI() EditorUserBuildSettings.wsaSubtarget = (WSASubtarget)EditorGUILayout.Popup((int)EditorUserBuildSettings.wsaSubtarget, deviceNames); - bool canInstall = CanInstall; - - if (EditorUserBuildSettings.wsaSubtarget == WSASubtarget.HoloLens && !IsHoloLensConnectedUsb) - { - canInstall = IsHoloLensConnectedUsb; - } - GUI.enabled = ShouldBuildSLNBeEnabled; + bool canInstall = CanInstall; // Build & Run button... - if (GUILayout.Button(CanInstall ? buildAllThenInstallLabel : buildAllLabel, GUILayout.Width(halfWidth - 20))) + if (GUILayout.Button(CanInstall + ? buildAllThenInstallLabel + : buildAllLabel, + GUILayout.Width(halfWidth - 20))) { - EditorApplication.delayCall += () => BuildAll(canInstall); + EditorApplication.delayCall += () => { BuildAll(canInstall); }; } GUI.enabled = true; @@ -286,11 +280,26 @@ private void OnGUI() EditorApplication.ExecuteMenuItem("Edit/Project Settings/Player"); } + // If Xbox Controller support is enabled and we're targeting the HoloLens device, + // Enable the HID capability. + if (EditorUserBuildSettings.wsaSubtarget == WSASubtarget.HoloLens) + { + PlayerSettings.WSA.SetCapability( + PlayerSettings.WSACapability.HumanInterfaceDevice, + EditorPrefsUtility.GetEditorPref("Enable Xbox Controller Support", false)); + + BuildDeployPrefs.BuildPlatform = BuildPlatformEnum.x86.ToString(); + } + else + { + PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.HumanInterfaceDevice, false); + } + EditorGUILayout.EndHorizontal(); GUILayout.EndVertical(); GUILayout.Space(10); - #endregion Quick Options + #endregion currentTab = (BuildDeployTab)GUILayout.Toolbar(SessionState.GetInt("_MRTK_BuildWindow_Tab", (int)currentTab), tabNames); SessionState.SetInt("_MRTK_BuildWindow_Tab", (int)currentTab); @@ -444,19 +453,6 @@ private void AppxBuildGUI() } var curScriptingBackend = PlayerSettings.GetScriptingBackend(BuildTargetGroup.WSA); - - if (curScriptingBackend == ScriptingImplementation.WinRTDotNET) - { -#if UNITY_2018_2_OR_NEWER - EditorGUILayout.HelpBox(".NET Scripting backend is deprecated, please use IL2CPP.", MessageType.Warning); -#else - EditorGUILayout.HelpBox(".NET Scripting backend will be deprecated in 2018.2, please consider using IL2CPP.", MessageType.Info); -#endif - GUILayout.EndHorizontal(); - GUILayout.BeginHorizontal(); - GUILayout.FlexibleSpace(); - } - var newScriptingBackend = (ScriptingImplementation)EditorGUILayout.IntPopup( "Scripting Backend", (int)curScriptingBackend, @@ -477,7 +473,6 @@ private void AppxBuildGUI() "Okay", "Cancel")) { Directory.Delete(BuildDeployPrefs.AbsoluteBuildDirectory, true); - canUpdate = true; } if (canUpdate) @@ -651,8 +646,7 @@ private void AppxBuildGUI() GUILayout.FlexibleSpace(); // Open AppX packages location - string appxDirectory = curScriptingBackend == ScriptingImplementation.IL2CPP ? "/AppPackages/" + PlayerSettings.productName : "/" + PlayerSettings.productName + "/AppPackages"; - string appxBuildPath = Path.GetFullPath(BuildDeployPrefs.BuildDirectory + appxDirectory); + string appxBuildPath = Path.GetFullPath(BuildDeployPrefs.BuildDirectory + "/" + PlayerSettings.productName + "/AppPackages"); GUI.enabled = builds.Count > 0 && !string.IsNullOrEmpty(appxBuildPath); if (GUILayout.Button("Open APPX Packages Location", GUILayout.Width(halfWidth))) @@ -1072,16 +1066,13 @@ private void UpdateBuilds() { builds.Clear(); - var curScriptingBackend = PlayerSettings.GetScriptingBackend(BuildTargetGroup.WSA); - string appxDirectory = curScriptingBackend == ScriptingImplementation.IL2CPP ? "AppPackages\\" + PlayerSettings.productName : PlayerSettings.productName + "\\AppPackages"; - try { appPackageDirectories.Clear(); string[] buildList = Directory.GetDirectories(BuildDeployPrefs.AbsoluteBuildDirectory, "*", SearchOption.AllDirectories); foreach (string appBuild in buildList) { - if (appBuild.Contains(appxDirectory) && !appBuild.Contains(appxDirectory + "\\")) + if (appBuild.Contains("AppPackages") && !appBuild.Contains("AppPackages\\")) { appPackageDirectories.AddRange(Directory.GetDirectories(appBuild)); } diff --git a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildInfo.cs b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildInfo.cs index 68203d11e16..e3660c90930 100644 --- a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildInfo.cs +++ b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildInfo.cs @@ -19,11 +19,7 @@ public class BuildInfo public Action PreBuildAction { get; set; } -#if UNITY_2018_1_OR_NEWER - public Action PostBuildAction { get; set; } -#else public Action PostBuildAction { get; set; } -#endif public BuildOptions BuildOptions { get; set; } diff --git a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildSLNUtilities.cs b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildSLNUtilities.cs index e562edb9ac6..d163b71976f 100644 --- a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildSLNUtilities.cs +++ b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildSLNUtilities.cs @@ -6,14 +6,11 @@ using System.Globalization; using System.IO; using System.Linq; +using System.Reflection; using System.Xml; using UnityEditor; using UnityEngine; -#if UNITY_2018_1_OR_NEWER -using UnityEditor.Build.Reporting; -#endif - namespace HoloToolkit.Unity { /// @@ -56,17 +53,10 @@ public static void RaiseOverrideBuildDefaults(ref BuildInfo toConfigure) /// public static event Action BuildStarted; -#if UNITY_2018_1_OR_NEWER - /// - /// Event triggered when a build completes. - /// - public static event Action BuildCompleted; -#else /// /// Event triggered when a build completes. /// public static event Action BuildCompleted; -#endif public static void PerformBuild(BuildInfo buildInfo) { @@ -136,46 +126,32 @@ public static void PerformBuild(BuildInfo buildInfo) PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTargetGroup, buildInfo.BuildSymbols); } - // For the WSA player, Unity builds into a target directory. - // For other players, the OutputPath parameter indicates the - // path to the target executable to build. - if (buildInfo.BuildTarget == BuildTarget.WSAPlayer) - { - Directory.CreateDirectory(buildInfo.OutputDirectory); - } - - OnPreProcessBuild(buildInfo); - - EditorUtility.DisplayProgressBar("Build Pipeline", "Gathering Build data...", 0.25f); - -#if UNITY_2018_1_OR_NEWER - BuildReport buildReport = default(BuildReport); -#else - string buildReport = "ERROR"; -#endif + string buildError = "Error"; try { - buildReport = BuildPipeline.BuildPlayer( + // For the WSA player, Unity builds into a target directory. + // For other players, the OutputPath parameter indicates the + // path to the target executable to build. + if (buildInfo.BuildTarget == BuildTarget.WSAPlayer) + { + Directory.CreateDirectory(buildInfo.OutputDirectory); + } + + OnPreProcessBuild(buildInfo); + buildError = BuildPipeline.BuildPlayer( buildInfo.Scenes.ToArray(), buildInfo.OutputDirectory, buildInfo.BuildTarget, - buildInfo.BuildOptions); + buildInfo.BuildOptions).ToString(); -#if UNITY_2018_1_OR_NEWER - if (buildReport.summary.result != BuildResult.Succeeded) - { - throw new Exception(string.Format("Build Result: {0}", buildReport.summary.result.ToString())); - } -#else - if (buildReport.StartsWith("Error")) + if (buildError.StartsWith("Error")) { - throw new Exception(buildReport); + throw new Exception(buildError); } -#endif } finally { - OnPostProcessBuild(buildInfo, buildReport); + OnPostProcessBuild(buildInfo, buildError); if (buildInfo.BuildTarget == BuildTarget.WSAPlayer && EditorUserBuildSettings.wsaGenerateReferenceProjects) { @@ -185,9 +161,13 @@ public static void PerformBuild(BuildInfo buildInfo) PlayerSettings.colorSpace = oldColorSpace; PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTargetGroup, oldBuildSymbols); - EditorUserBuildSettings.wsaUWPBuildType = oldWSAUWPBuildType.Value; + if (oldWSAUWPBuildType.HasValue) + { + EditorUserBuildSettings.wsaUWPBuildType = oldWSAUWPBuildType.Value; + } EditorUserBuildSettings.wsaGenerateReferenceProjects = oldWSAGenerateReferenceProjects; + EditorUserBuildSettings.SwitchActiveBuildTarget(oldBuildTargetGroup, oldBuildTarget); } } @@ -247,13 +227,9 @@ public static void PerformBuild_CommandLine() Scenes = EditorBuildSettings.scenes.Where(scene => scene.enabled).Select(scene => scene.path), // Configure a post build action to throw appropriate error code. - PostBuildAction = (innerBuildInfo, buildReport) => + PostBuildAction = (innerBuildInfo, buildError) => { -#if UNITY_2018_1_OR_NEWER - if (buildReport.summary.result != BuildResult.Succeeded) -#else - if (!string.IsNullOrEmpty(buildReport)) -#endif + if (!string.IsNullOrEmpty(buildError)) { EditorApplication.Exit(1); } @@ -261,7 +237,9 @@ public static void PerformBuild_CommandLine() }; RaiseOverrideBuildDefaults(ref buildInfo); + ParseBuildCommandLine(ref buildInfo); + PerformBuild(buildInfo); } @@ -447,21 +425,14 @@ private static void OnPreProcessBuild(BuildInfo buildInfo) } } - -#if UNITY_2018_1_OR_NEWER - private static void OnPostProcessBuild(BuildInfo buildInfo, BuildReport buildReport) - { - if (buildReport.summary.result == BuildResult.Succeeded) -#else - private static void OnPostProcessBuild(BuildInfo buildInfo, string buildReport) + private static void OnPostProcessBuild(BuildInfo buildInfo, string buildError) { - if (string.IsNullOrEmpty(buildReport)) -#endif + if (string.IsNullOrEmpty(buildError)) { - string outputProjectDirectoryPath = Path.Combine(GetProjectPath(), buildInfo.OutputDirectory); if (buildInfo.CopyDirectories != null) { string inputProjectDirectoryPath = GetProjectPath(); + string outputProjectDirectoryPath = Path.Combine(GetProjectPath(), buildInfo.OutputDirectory); foreach (var directory in buildInfo.CopyDirectories) { CopyDirectory(inputProjectDirectoryPath, outputProjectDirectoryPath, directory); @@ -470,12 +441,12 @@ private static void OnPostProcessBuild(BuildInfo buildInfo, string buildReport) } // Raise the global event for listeners - BuildCompleted.RaiseEvent(buildInfo, buildReport); + BuildCompleted.RaiseEvent(buildInfo, buildError); // Call the post-build action, if any if (buildInfo.PostBuildAction != null) { - buildInfo.PostBuildAction(buildInfo, buildReport); + buildInfo.PostBuildAction(buildInfo, buildError); } } diff --git a/Assets/HoloToolkit/BuildAndDeploy/Editor/XdeGuestLocator.cs b/Assets/HoloToolkit/BuildAndDeploy/Editor/XdeGuestLocator.cs new file mode 100644 index 00000000000..713e1bc526c --- /dev/null +++ b/Assets/HoloToolkit/BuildAndDeploy/Editor/XdeGuestLocator.cs @@ -0,0 +1,164 @@ +// Copyright (c) Microsoft Corporation. +// Copyright (c) Rafael Rivera. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using System; +using System.Linq; +using System.Net; +using System.Net.NetworkInformation; +using System.Net.Sockets; +using System.Runtime.InteropServices; +using System.Threading; + +namespace HoloToolkit.Unity +{ + /// + /// Emulator Utility Class + /// + public static class XdeGuestLocator + { + [StructLayout(LayoutKind.Sequential, Pack = 4)] + struct XdePeerHostIdentifier + { + public Guid GuestDiscoveryGUID; + [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)] + public byte[] GuestMACAddress; + public int PeerDiscoveryPort; + } + + [StructLayout(LayoutKind.Sequential, Pack = 4)] + struct XdePeerGuestIdentifier + { + public Guid GuestDiscoveryGUID; + public int GuestTcpPort; + public int GuestSvcVersion; + } + + public static bool IsSearching { get; private set; } + public static bool HasData { get; private set; } + public static IPAddress GuestIpAddress { get; private set; } + + static XdeGuestLocator() + { + HasData = false; + IsSearching = false; + } + + public static void FindGuestAddressAsync() + { + if (IsSearching) + { + return; + } + + ThreadPool.QueueUserWorkItem(FindGuestAddress); + } + + private static void FindGuestAddress(object state) + { + IsSearching = true; + HasData = false; + GuestIpAddress = IPAddress.None; + + UnicastIPAddressInformation internalSwitchAddressInfo = null; + try + { + internalSwitchAddressInfo = GetInternalSwitchAddressInfo(); + } + catch (Exception) + { + UnityEngine.Debug.LogError("Failed to locate internal switch adapter"); + } + + if (internalSwitchAddressInfo != null) + { + using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp)) + { + try + { + // Bind to next available UDP port for a listen operation + socket.Blocking = true; + socket.ReceiveTimeout = (int)TimeSpan.FromSeconds(5).TotalMilliseconds; + + socket.Bind(new IPEndPoint(internalSwitchAddressInfo.Address, 0)); + var localPort = (socket.LocalEndPoint as IPEndPoint).Port; + + // Send out a probe to 'devices' connected to the internal switch + // listening on port 3553 (Microsoft Device Emulator specific) + var broadcastAddress = GetBroadcastAddressForAddress(internalSwitchAddressInfo.Address, internalSwitchAddressInfo.IPv4Mask); + var broadcastTarget = new IPEndPoint(broadcastAddress, 3553); + + // + // WORKAROUND: We don't have easy access to WMI to go querying + // for virtual machine information so we just cover finding + // the first 255 potential candidates xx 00 - xx FF. + // + // It sounds like a lot but we're talking super tiny + // payloads on an internal interface. It's very fast. + // + for (int i = 0; i <= 0xFF; i++) + { + var probe = GenerateProbe(localPort, i); + socket.SendTo(probe, broadcastTarget); + } + + // Return the endpoint information for the first 'device' that replies + // (we don't necessarily care about the returned identifier info) + var responseBytes = new byte[Marshal.SizeOf(typeof(XdePeerGuestIdentifier))]; + + EndPoint guestEndpoint = new IPEndPoint(broadcastAddress, 0); + + socket.ReceiveFrom(responseBytes, ref guestEndpoint); + GuestIpAddress = (guestEndpoint as IPEndPoint).Address; + HasData = true; + } + catch (SocketException) + { + // Do nothing, our probe went unanswered or failed + } + } + } + + IsSearching = false; + } + + private static UnicastIPAddressInformation GetInternalSwitchAddressInfo() + { + var internalSwitch = GetInternalNetworkSwitchInterface(); + return internalSwitch.GetIPProperties().UnicastAddresses.Where(a => a.Address.AddressFamily == AddressFamily.InterNetwork).FirstOrDefault(); + } + + private static NetworkInterface GetInternalNetworkSwitchInterface() + { + return NetworkInterface.GetAllNetworkInterfaces().Where(i => i.Name.Contains("Windows Phone Emulator")).FirstOrDefault(); + } + + private static IPAddress GetBroadcastAddressForAddress(IPAddress address, IPAddress mask) + { + var addressInt = BitConverter.ToInt32(address.GetAddressBytes(), 0); + var maskInt = BitConverter.ToInt32(mask.GetAddressBytes(), 0); + return new IPAddress(BitConverter.GetBytes((addressInt | ~maskInt))); + } + + private static byte[] GenerateProbe(int port, int machineIndex) + { + var identifier = new XdePeerHostIdentifier(); + identifier.PeerDiscoveryPort = port; + identifier.GuestDiscoveryGUID = new Guid("{963ef858-2efe-4eb4-8d2d-fed5408e6441}"); + identifier.GuestMACAddress = new byte[] { 0x02, 0xDE, 0xDE, 0xDE, 0xDE, (byte)machineIndex }; + + return GetStructureBytes(identifier); + } + + private static byte[] GetStructureBytes(object obj) + { + var bytes = new byte[Marshal.SizeOf(obj)]; + + var handle = GCHandle.Alloc(bytes, GCHandleType.Pinned); + Marshal.StructureToPtr(obj, handle.AddrOfPinnedObject(), false); + handle.Free(); + + return bytes; + } + } +} diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/BaseControllerPointer.cs.meta b/Assets/HoloToolkit/BuildAndDeploy/Editor/XdeGuestLocator.cs.meta similarity index 70% rename from Assets/HoloToolkit/Input/Scripts/Utilities/BaseControllerPointer.cs.meta rename to Assets/HoloToolkit/BuildAndDeploy/Editor/XdeGuestLocator.cs.meta index 5b84cd0c3bc..ccb6283df77 100644 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/BaseControllerPointer.cs.meta +++ b/Assets/HoloToolkit/BuildAndDeploy/Editor/XdeGuestLocator.cs.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 8014ae724f8552b4b91da7104fc1769f -timeCreated: 1525892837 +guid: 05d1324a6d6a0d248848b4042ad6d6bf +timeCreated: 1471035499 licenseType: Pro MonoImporter: - externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/HoloToolkit/Common/Scripts/CrossPlatform/MetroHandleRef.cs b/Assets/HoloToolkit/Common/Scripts/CrossPlatform/MetroHandleRef.cs index 9674ecae276..4276553f1ef 100644 --- a/Assets/HoloToolkit/Common/Scripts/CrossPlatform/MetroHandleRef.cs +++ b/Assets/HoloToolkit/Common/Scripts/CrossPlatform/MetroHandleRef.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. -#if UNITY_WSA && !UNITY_EDITOR && !ENABLE_IL2CPP +#if UNITY_WSA && !UNITY_EDITOR using System; diff --git a/Assets/HoloToolkit/Common/Scripts/CrossPlatform/SystemException.cs b/Assets/HoloToolkit/Common/Scripts/CrossPlatform/SystemException.cs index 3d1d07ba86a..3755e98cfe2 100644 --- a/Assets/HoloToolkit/Common/Scripts/CrossPlatform/SystemException.cs +++ b/Assets/HoloToolkit/Common/Scripts/CrossPlatform/SystemException.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. -#if UNITY_WSA && !UNITY_EDITOR && !ENABLE_IL2CPP +#if UNITY_WSA && !UNITY_EDITOR namespace System { public class SystemException : Exception diff --git a/Assets/HoloToolkit/Common/Scripts/Enums.meta b/Assets/HoloToolkit/Common/Scripts/Enums.meta deleted file mode 100644 index ce847cf091f..00000000000 --- a/Assets/HoloToolkit/Common/Scripts/Enums.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: d5c1479ce975e4041b97c2311373b648 -folderAsset: yes -timeCreated: 1525974744 -licenseType: Pro -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/Common/Scripts/Enums/Handedness.cs b/Assets/HoloToolkit/Common/Scripts/Enums/Handedness.cs deleted file mode 100644 index 86e3e62778c..00000000000 --- a/Assets/HoloToolkit/Common/Scripts/Enums/Handedness.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using System; - -namespace HoloToolkit.Unity -{ - [Flags] - public enum Handedness - { - Unknown, - Left, - Right - } -} diff --git a/Assets/HoloToolkit/Common/Scripts/Enums/Handedness.cs.meta b/Assets/HoloToolkit/Common/Scripts/Enums/Handedness.cs.meta deleted file mode 100644 index 18474b88861..00000000000 --- a/Assets/HoloToolkit/Common/Scripts/Enums/Handedness.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 09a918e45dbacfb43abb0b812a5e524d -timeCreated: 1525974761 -licenseType: Pro -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/Input/Materials/LineMaterial.mat b/Assets/HoloToolkit/Input/Materials/LineMaterial.mat deleted file mode 100644 index 06092716ac6..00000000000 --- a/Assets/HoloToolkit/Input/Materials/LineMaterial.mat +++ /dev/null @@ -1,78 +0,0 @@ -%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: LineMaterial - m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - 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: 0} - 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: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _InvFade: 1 - - _Metallic: 0 - - _Mode: 0 - - _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} - - _TintColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/HoloToolkit/Input/Materials/LineMaterial.mat.meta b/Assets/HoloToolkit/Input/Materials/LineMaterial.mat.meta deleted file mode 100644 index a48577ab93e..00000000000 --- a/Assets/HoloToolkit/Input/Materials/LineMaterial.mat.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: d9f5efc2f1dfc6846a9ebeac2f029eff -timeCreated: 1526058862 -licenseType: Pro -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/Input/Prefabs/InputManager.prefab b/Assets/HoloToolkit/Input/Prefabs/InputManager.prefab index 48463b88f40..4ce3d574537 100644 --- a/Assets/HoloToolkit/Input/Prefabs/InputManager.prefab +++ b/Assets/HoloToolkit/Input/Prefabs/InputManager.prefab @@ -288,7 +288,6 @@ Camera: m_TargetEye: 3 m_HDR: 0 m_AllowMSAA: 0 - m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 0 m_StereoConvergence: 10 @@ -515,10 +514,7 @@ MonoBehaviour: m_EditorClassIdentifier: ControllerPointerStabilizer: {fileID: 114345042324023316} Cursor: {fileID: 0} - searchForCursorIfUnset: 1 - autoselectBestAvailable: 0 - linePointerPrefab: {fileID: 1071219928950220, guid: 7dd8661d4bacf2546a0237daef280291, - type: 2} + SearchForCursorIfUnset: 1 --- !u!114 &114749671304188880 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/HoloToolkit/Input/Prefabs/LinearControllerPointer.prefab b/Assets/HoloToolkit/Input/Prefabs/LinearControllerPointer.prefab deleted file mode 100644 index 08e019fa063..00000000000 --- a/Assets/HoloToolkit/Input/Prefabs/LinearControllerPointer.prefab +++ /dev/null @@ -1,326 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1071219928950220} - m_IsPrefabParent: 1 ---- !u!1 &1071219928950220 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4249092239764520} - - component: {fileID: 114864358960263782} - - component: {fileID: 114072886165955432} - - component: {fileID: 114599709742384530} - - component: {fileID: 114508479835528396} - m_Layer: 0 - m_Name: LinearControllerPointer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4249092239764520 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1071219928950220} - 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: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &114072886165955432 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1071219928950220} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: df317dc594e50444da58008aa4ee1475, type: 3} - m_Name: - m_EditorClassIdentifier: - element: 6 - handedness: 0 - SetChildrenInactiveWhenDetached: 1 - PositionOffset: {x: 0, y: 0, z: 0} - RotationOffset: {x: 0, y: 0, z: 0} - ScaleOffset: {x: 1, y: 1, z: 1} - SetScaleOnAttach: 0 - CurrentPointerOrientation: 0 - RaycastOrigin: {fileID: 0} - LineColorSelected: - serializedVersion: 2 - key0: {r: 0.52156866, g: 0.52156866, b: 0.52156866, a: 0} - key1: {r: 0.32156864, g: 0.32156864, b: 0.32156864, a: 1} - key2: {r: 0.15294118, g: 0.15294118, b: 0.15294118, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 33751 - ctime2: 65535 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 4981 - atime2: 60554 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 3 - m_NumAlphaKeys: 4 - LineColorValid: - serializedVersion: 2 - key0: {r: 0.52156866, g: 0.52156866, b: 0.52156866, a: 0} - key1: {r: 0.32156864, g: 0.32156864, b: 0.32156864, a: 1} - key2: {r: 0.15294118, g: 0.15294118, b: 0.15294118, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 33751 - ctime2: 65535 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 4981 - atime2: 60554 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 3 - m_NumAlphaKeys: 4 - LineColorNoTarget: - serializedVersion: 2 - key0: {r: 0.52156866, g: 0.52156866, b: 0.52156866, a: 0} - key1: {r: 0.32156864, g: 0.32156864, b: 0.32156864, a: 1} - key2: {r: 0.15294118, g: 0.15294118, b: 0.15294118, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 33751 - ctime2: 65535 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 4981 - atime2: 60554 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 3 - m_NumAlphaKeys: 4 - LineCastResolution: 25 - LineBase: {fileID: 0} - LineRenderers: [] ---- !u!114 &114508479835528396 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1071219928950220} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f9a4d6e2d0d55194788e9a2df9c0261f, type: 3} - m_Name: - m_EditorClassIdentifier: - source: {fileID: 114599709742384530} - LineColor: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - LineWidth: - serializedVersion: 2 - m_Curve: - - serializedVersion: 2 - time: 0 - value: 0.05 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - serializedVersion: 2 - time: 1 - value: 0.05 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - WidthMultiplier: 0.1 - ColorOffset: 0 - WidthOffset: 0 - RotationOffset: 0 - StepMode: 0 - NumLineSteps: 10 - InterpolationMode: 1 - StepLength: 0.05 - MaxLineSteps: 2048 - StepLengthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 2 - time: 0 - value: 1 - inSlope: 0 - outSlope: -0.5 - tangentMode: 0 - - serializedVersion: 2 - time: 1 - value: 0.5 - inSlope: -0.5 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - LineMaterial: {fileID: 2100000, guid: d9f5efc2f1dfc6846a9ebeac2f029eff, type: 2} - RoundedEdges: 1 - RoundedCaps: 1 - lineRenderer: {fileID: 0} ---- !u!114 &114599709742384530 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1071219928950220} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bec4b46028f8fb94c9b03b88fca37bd6, type: 3} - m_Name: - m_EditorClassIdentifier: - LineStartClamp: 0 - LineEndClamp: 1 - RotationType: 1 - FlipUpVector: 0 - OriginOffset: {x: 0, y: 0, z: 0} - ManualUpVectorBlend: 0 - ManualUpVectors: - - {x: 0, y: 1, z: 0} - - {x: 0, y: 1, z: 0} - - {x: 0, y: 1, z: 0} - VelocitySearchRange: 0.02 - VelocityBlend: 0.5 - DistortionType: 0 - DistortionStrength: - serializedVersion: 2 - m_Curve: - - serializedVersion: 2 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - serializedVersion: 2 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - UniformDistortionStrength: 1 - distorters: [] - loops: 0 - Start: {x: 0, y: 0, z: 0} - End: {x: 1, y: 1, z: 1} ---- !u!114 &114864358960263782 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1071219928950220} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3be3fb966fbcc0f44add9a39d15cd3d0, type: 3} - m_Name: - m_EditorClassIdentifier: - distortOrder: 0 - distortStrength: 1 - LocalCenterOfGravity: {x: 0, y: 0, z: 0} - AxisStrength: {x: 1, y: 1, z: 1} - Radius: 0.5 - GravityStrength: - serializedVersion: 2 - m_Curve: - - serializedVersion: 2 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - serializedVersion: 2 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 diff --git a/Assets/HoloToolkit/Input/Prefabs/LinearControllerPointer.prefab.meta b/Assets/HoloToolkit/Input/Prefabs/LinearControllerPointer.prefab.meta deleted file mode 100644 index 210b4da0245..00000000000 --- a/Assets/HoloToolkit/Input/Prefabs/LinearControllerPointer.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 7dd8661d4bacf2546a0237daef280291 -timeCreated: 1525392173 -licenseType: Pro -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/Input/Scripts/Cursor/Cursor.cs b/Assets/HoloToolkit/Input/Scripts/Cursor/Cursor.cs index 70aa332f4b6..9408b908de4 100644 --- a/Assets/HoloToolkit/Input/Scripts/Cursor/Cursor.cs +++ b/Assets/HoloToolkit/Input/Scripts/Cursor/Cursor.cs @@ -20,24 +20,7 @@ public abstract class Cursor : MonoBehaviour, ICursor /// /// The pointer that this cursor should follow and process input from. /// - public IPointingSource Pointer - { - get { return pointer; } - set - { - // This value is used to determine the cursor's default distance. - // It is cached here to prevent repeated casting in the update loop. - pointerIsInputSourcePointer = value is InputSourcePointer; - pointer = value; - } - } - private IPointingSource pointer; - - /// - /// Cached value if the pointer is of type InputSourcePointer, - /// to prevent repeated casting in the update loop. - /// - private bool pointerIsInputSourcePointer = false; + public IPointingSource Pointer { get; set; } /// /// Minimum distance for cursor if nothing is hit @@ -127,12 +110,6 @@ public Vector3 LocalScale private Vector3 targetScale; private Quaternion targetRotation; - /// - /// Keeps track of the starting setting for DefaultCursorDistance, - /// to revert after a pointer overrides the value. - /// - private float originalDefaultCursorDistance; - /// /// Indicates if the cursor should be visible /// @@ -149,8 +126,6 @@ public bool IsVisible private void Awake() { - originalDefaultCursorDistance = DefaultCursorDistance; - // Use the setter to update visibility of the cursor at startup based on user preferences IsVisible = isVisible; SetVisibility(isVisible); @@ -204,10 +179,6 @@ private void OnDestroy() /// protected virtual void RegisterManagers() { - // This accounts for any input sources that were detected before we register as a global listener below. - visibleHandsCount = (uint)InputManager.Instance.DetectedInputSources.Count; - IsHandVisible = visibleHandsCount > 0; - // Register the cursor as a global listener, so that it can always get input events it cares about InputManager.Instance.AddGlobalListener(gameObject); @@ -327,21 +298,6 @@ protected virtual void UpdateCursorTransform() TargetedObject = null; TargetedCursorModifier = null; - if (pointerIsInputSourcePointer) - { - // This value get re-queried every update, in case the app has - // changed the pointing extent of the pointer for the current scenario. - float distance = FocusManager.Instance.GetPointingExtent(Pointer); - if (DefaultCursorDistance != distance) - { - DefaultCursorDistance = distance; - } - } - else if (DefaultCursorDistance != originalDefaultCursorDistance) - { - DefaultCursorDistance = originalDefaultCursorDistance; - } - targetPosition = RayStep.GetPointByDistance(Pointer.Rays, DefaultCursorDistance); lookForward = -RayStep.GetDirectionByDistance(Pointer.Rays, DefaultCursorDistance); targetRotation = lookForward.magnitude > 0 ? Quaternion.LookRotation(lookForward, Vector3.up) : transform.rotation; diff --git a/Assets/HoloToolkit/Input/Scripts/Focus/FocusManager.cs b/Assets/HoloToolkit/Input/Scripts/Focus/FocusManager.cs index 4ffdfeb96aa..da97e6fd77b 100644 --- a/Assets/HoloToolkit/Input/Scripts/Focus/FocusManager.cs +++ b/Assets/HoloToolkit/Input/Scripts/Focus/FocusManager.cs @@ -73,8 +73,6 @@ private void Update() [SerializeField] private float pointingExtent = 10f; - public float GlobalPointingExtent { get { return pointingExtent; } } - /// /// The LayerMasks, in prioritized order, that are used to determine the HitObject when raycasting. /// diff --git a/Assets/HoloToolkit/Input/Scripts/Focus/InputSourcePointer.cs b/Assets/HoloToolkit/Input/Scripts/Focus/InputSourcePointer.cs index 0019b1e9abb..84840c430b6 100644 --- a/Assets/HoloToolkit/Input/Scripts/Focus/InputSourcePointer.cs +++ b/Assets/HoloToolkit/Input/Scripts/Focus/InputSourcePointer.cs @@ -5,10 +5,6 @@ using UnityEngine; using UnityEngine.EventSystems; -#if UNITY_WSA && UNITY_2017_2_OR_NEWER -using UnityEngine.XR.WSA.Input; -#endif - namespace HoloToolkit.Unity.InputModule { /// @@ -52,12 +48,8 @@ public bool InteractionEnabled public bool FocusLocked { get; set; } - public PointerLine PointerRay { get; set; } - private RayStep[] rays = new RayStep[1] { new RayStep(Vector3.zero, Vector3.forward) }; - private bool selectPressed = false; - [Obsolete("Will be removed in a later version. Use OnPreRaycast / OnPostRaycast instead.")] public void UpdatePointer() { @@ -73,49 +65,11 @@ public virtual void OnPreRaycast() { Debug.Assert(InputSource.SupportsInputInfo(InputSourceId, SupportedInputInfo.Pointing), string.Format("{0} with id {1} does not support pointing!", InputSource, InputSourceId)); -#if UNITY_WSA && UNITY_2017_2_OR_NEWER - // For visualization with controllers, we don't want to use the event-based data the InputManager has. - // Instead, we query the source states manually here. - InteractionSourceState[] currentReading = InteractionManager.GetCurrentReading(); - for (int i = 0; i < currentReading.Length; i++) - { - InteractionSourceState sourceState = currentReading[i]; - - if (sourceState.source.id != InputSourceId) - { - continue; - } - - selectPressed = sourceState.selectPressed; - - Vector3 position; - Vector3 forward; - - if (!sourceState.sourcePose.TryGetPosition(out position)) - { - return; - } - - if (!sourceState.sourcePose.TryGetForward(out forward, InteractionSourceNode.Pointer)) - { - return; - } - - if (CameraCache.Main.transform.parent != null) - { - position = CameraCache.Main.transform.parent.TransformPoint(position); - forward = CameraCache.Main.transform.parent.TransformDirection(forward); - } - - rays[0].CopyRay(new Ray(position, forward), FocusManager.Instance.GetPointingExtent(this)); - } -#else Ray pointingRay; if (InputSource.TryGetPointingRay(InputSourceId, out pointingRay)) { rays[0].CopyRay(pointingRay, FocusManager.Instance.GetPointingExtent(this)); } -#endif } if (RayStabilizer != null) @@ -127,10 +81,7 @@ public virtual void OnPreRaycast() public virtual void OnPostRaycast() { - if (PointerRay != null) - { - PointerRay.UpdateRenderedLine(rays, Result, selectPressed, FocusManager.Instance.GetPointingExtent(this)); - } + // Nothing needed } public bool OwnsInput(BaseEventData eventData) diff --git a/Assets/HoloToolkit/Input/Scripts/Focus/SimpleSinglePointerSelector.cs b/Assets/HoloToolkit/Input/Scripts/Focus/SimpleSinglePointerSelector.cs index 9e9fecb54aa..3056e7bc56b 100644 --- a/Assets/HoloToolkit/Input/Scripts/Focus/SimpleSinglePointerSelector.cs +++ b/Assets/HoloToolkit/Input/Scripts/Focus/SimpleSinglePointerSelector.cs @@ -3,10 +3,6 @@ using UnityEngine; -#if UNITY_WSA && UNITY_2017_2_OR_NEWER -using UnityEngine.XR.WSA.Input; -#endif - namespace HoloToolkit.Unity.InputModule { /// @@ -30,17 +26,11 @@ public class SimpleSinglePointerSelector : MonoBehaviour, ISourceStateHandler, I private bool searchForCursorIfUnset = true; public bool SearchForCursorIfUnset { get { return searchForCursorIfUnset; } set { searchForCursorIfUnset = value; } } - [Tooltip("If true, always select the best pointer available (OS behavior does not auto-select).")] + [Tooltip("If true, always select the best pointer available (OS behaviour does not autoselect).")] [SerializeField] private bool autoselectBestAvailable = false; public bool AutoselectBestAvailable { get { return autoselectBestAvailable; } set { autoselectBestAvailable = value; } } - [Tooltip("The line pointer prefab to use, if any.")] - [SerializeField] - private GameObject linePointerPrefab = null; - - private PointerLine instantiatedPointerLine; - #endregion #region Data @@ -194,11 +184,6 @@ private void SetPointer(IPointingSource newPointer) } Debug.Assert(currentPointer != null, "No Pointer Set!"); - - if (IsGazePointerActive) - { - DetachInputSourcePointer(); - } } private void ConnectBestAvailablePointer() @@ -302,45 +287,6 @@ private void AttachInputSourcePointer(IInputSource inputSource, uint sourceId) inputSourcePointer.OwnAllInput = false; inputSourcePointer.ExtentOverride = null; inputSourcePointer.PrioritizedLayerMasksOverride = null; - - InteractionInputSource interactionInputSource = inputSource as InteractionInputSource; - - // If the InputSource is not an InteractionInputSource, we don't display any ray visualizations. - if (interactionInputSource == null) - { - return; - } - - // If no pointing ray prefab has been provided, we return early as there's nothing to display. - if (linePointerPrefab == null) - { - return; - } - - // If the pointer line hasn't already been instantiated, create it and store it here. - if (instantiatedPointerLine == null) - { - instantiatedPointerLine = Instantiate(linePointerPrefab).GetComponent(); - } - - inputSourcePointer.PointerRay = instantiatedPointerLine; - - Handedness handedness; - if (interactionInputSource.TryGetHandedness(sourceId, out handedness)) - { -#if UNITY_WSA && UNITY_2017_2_OR_NEWER - // This updates the handedness of the pointer line, allowing for re-use if it was already in the scene. - instantiatedPointerLine.ChangeHandedness((InteractionSourceHandedness)handedness); -#endif - } - } - - private void DetachInputSourcePointer() - { - if (instantiatedPointerLine != null) - { - Destroy(instantiatedPointerLine.gameObject); - } } private bool IsInputSourcePointerActive diff --git a/Assets/HoloToolkit/Input/Scripts/InputSources/DictationInputManager.cs b/Assets/HoloToolkit/Input/Scripts/InputSources/DictationInputManager.cs index 8fe97e3efb5..d8a2f98b33d 100644 --- a/Assets/HoloToolkit/Input/Scripts/InputSources/DictationInputManager.cs +++ b/Assets/HoloToolkit/Input/Scripts/InputSources/DictationInputManager.cs @@ -101,7 +101,6 @@ protected override void OnDestroy() #endregion // Unity Methods - /// /// Turns on the dictation recognizer and begins recording audio from the default microphone. /// @@ -168,14 +167,6 @@ public static IEnumerator StartRecording(GameObject listener = null, float initi /// public static IEnumerator StopRecording() { - yield return Instance.StopRecordingInternal(); - } - - /// - /// Ends the recording session. - /// - private IEnumerator StopRecordingInternal() - { #if UNITY_WSA || UNITY_STANDALONE_WIN if (!IsListening || isTransitioning) { @@ -199,14 +190,6 @@ private IEnumerator StopRecordingInternal() dictationRecognizer.Stop(); } - StartCoroutine(FinishStopRecording()); -#else - return null; -#endif - } - - private IEnumerator FinishStopRecording() - { while (dictationRecognizer.Status == SpeechSystemStatus.Running) { yield return null; @@ -214,6 +197,9 @@ private IEnumerator FinishStopRecording() PhraseRecognitionSystem.Restart(); isTransitioning = false; +#else + return null; +#endif } #region Dictation Recognizer Callbacks diff --git a/Assets/HoloToolkit/Input/Scripts/InputSources/InteractionInputSource.cs b/Assets/HoloToolkit/Input/Scripts/InputSources/InteractionInputSource.cs index b93dc8ff0b1..26b25b94f97 100644 --- a/Assets/HoloToolkit/Input/Scripts/InputSources/InteractionInputSource.cs +++ b/Assets/HoloToolkit/Input/Scripts/InputSources/InteractionInputSource.cs @@ -4,12 +4,12 @@ using UnityEngine; #if UNITY_WSA -using System.Collections.Generic; #if UNITY_2017_2_OR_NEWER using UnityEngine.XR.WSA.Input; #else using UnityEngine.VR.WSA.Input; #endif +using System.Collections.Generic; #endif namespace HoloToolkit.Unity.InputModule @@ -451,21 +451,6 @@ public void StopHaptics(uint sourceId) #endif } - public bool TryGetHandedness(uint sourceId, out Handedness handedness) - { -#if UNITY_WSA && UNITY_2017_2_OR_NEWER - SourceData sourceData; - if (sourceIdToData.TryGetValue(sourceId, out sourceData)) - { - handedness = (Handedness)sourceData.Handedness; - return true; - } -#endif - - handedness = default(Handedness); - return false; - } - #region BaseInputSource implementations public override SupportedInputInfo GetSupportedInputInfo(uint sourceId) @@ -682,6 +667,7 @@ private SupportedInputInfo GetSupportFlag(SourceCapability c #endregion #if UNITY_WSA + /// /// Gets the source data for the specified interaction source if it already exists, otherwise creates it. /// diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/AttachToController.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/AttachToController.cs index 91c8592ede5..242e7482d3d 100644 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/AttachToController.cs +++ b/Assets/HoloToolkit/Input/Scripts/Utilities/AttachToController.cs @@ -2,6 +2,12 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. using UnityEngine; +#if UNITY_2017_2_OR_NEWER +using UnityEngine.XR.WSA.Input; +#else +using UnityEngine.VR.WSA.Input; +#endif + namespace HoloToolkit.Unity.InputModule { @@ -33,7 +39,15 @@ protected override void OnEnable() { SetChildrenActive(false); - base.OnEnable(); +#if UNITY_WSA && UNITY_2017_2_OR_NEWER + // Look if the controller has loaded. + if (MotionControllerVisualizer.Instance.TryGetControllerModel(Handedness, out ControllerInfo)) + { + AddControllerTransform(ControllerInfo); + } + MotionControllerVisualizer.Instance.OnControllerModelLoaded += AddControllerTransform; + MotionControllerVisualizer.Instance.OnControllerModelUnloaded += RemoveControllerTransform; +#endif } protected override void AddControllerTransform(MotionControllerInfo newController) @@ -43,6 +57,8 @@ protected override void AddControllerTransform(MotionControllerInfo newControlle { base.AddControllerTransform(newController); + SetChildrenActive(true); + // Parent ourselves under the element and set our offsets transform.parent = ElementTransform; transform.localPosition = PositionOffset; @@ -53,8 +69,6 @@ protected override void AddControllerTransform(MotionControllerInfo newControlle transform.localScale = ScaleOffset; } - SetChildrenActive(true); - // Announce that we're attached OnAttachToController(); @@ -72,10 +86,10 @@ protected override void RemoveControllerTransform(MotionControllerInfo oldContro OnDetachFromController(); - SetChildrenActive(false); - transform.parent = null; + SetChildrenActive(false); + IsAttached = false; } #endif @@ -91,5 +105,14 @@ private void SetChildrenActive(bool isActive) } } } + + private void Reset() + { + // We want the default value of Handedness of Controller finders to be Unknown so it doesn't attach to random object. + // But we also want the Editor to start with a useful default, so we set a Left handedness on inspector reset. +#if UNITY_WSA && UNITY_2017_2_OR_NEWER + Handedness = InteractionSourceHandedness.Left; +#endif + } } } \ No newline at end of file diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/BaseControllerPointer.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/BaseControllerPointer.cs deleted file mode 100644 index 60be824e69d..00000000000 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/BaseControllerPointer.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using HoloToolkit.Unity.InputModule; -using UnityEngine; - -public abstract class BaseControllerPointer : AttachToController -{ - [SerializeField] - [Range(0f, 360f)] - protected float CurrentPointerOrientation; - - [SerializeField] - [Tooltip("Source transform for raycast origin - leave null to use default transform")] - protected Transform RaycastOrigin; - - /// - /// The Y orientation of the pointer target - used for touchpad rotation and navigation - /// - public virtual float PointerOrientation - { - get - { - return CurrentPointerOrientation + (RaycastOrigin != null ? RaycastOrigin.eulerAngles.y : transform.eulerAngles.y); - } - set - { - CurrentPointerOrientation = value; - } - } - - /// - /// The forward direction of the targeting ray - /// - public virtual Vector3 PointerDirection - { - get { return RaycastOrigin != null ? RaycastOrigin.forward : transform.forward; } - } -} diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/ControllerFinder.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/ControllerFinder.cs index 2e98566fc6f..d43dd326c35 100644 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/ControllerFinder.cs +++ b/Assets/HoloToolkit/Input/Scripts/Utilities/ControllerFinder.cs @@ -153,6 +153,18 @@ private void CheckModelAlreadyLoaded() { AddControllerTransform(newController); } +#endif + } + + protected virtual void RefreshControllerTransform() + { +#if UNITY_WSA && UNITY_2017_2_OR_NEWER + ControllerInfo = null; + ElementTransform = null; + if (MotionControllerVisualizer.Instance.TryGetControllerModel(handedness, out ControllerInfo)) + { + AddControllerTransform(ControllerInfo); + } #endif } } diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/MixedRealityTeleport.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/MixedRealityTeleport.cs index e9ae122c681..5817f9c3dbc 100644 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/MixedRealityTeleport.cs +++ b/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/MixedRealityTeleport.cs @@ -79,36 +79,26 @@ public class MixedRealityTeleport : Singleton, IController private void Start() { - // If we're on the HoloLens or no device is present, - // remove this component. + FadeManager.AssertIsInitialized(); + + fadeControl = FadeManager.Instance; + + // If our FadeManager is missing, or if we're on the HoloLens + // Remove this component. #if UNITY_2017_2_OR_NEWER - if (!XRDevice.isPresent + if (!XRDevice.isPresent || #if UNITY_WSA - || !HolographicSettings.IsDisplayOpaque + !HolographicSettings.IsDisplayOpaque || #endif - ) + fadeControl == null) #else - if (VRDevice.isPresent) + if (VRDevice.isPresent || fadeControl == null) #endif { Destroy(this); return; } - // FadeManager isn't checked unless we're in a - // setup where it might be supported. - FadeManager.AssertIsInitialized(); - - fadeControl = FadeManager.Instance; - - // If the FadeManager is missing, - // remove this component. - if (fadeControl == null) - { - Destroy(this); - return; - } - if (teleportMarker != null) { teleportMarker = Instantiate(teleportMarker); diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/PointerLine.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/PointerLine.cs deleted file mode 100644 index 49a2dd5c6d0..00000000000 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/PointerLine.cs +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using HoloToolkit.Unity.UX; -using UnityEngine; - -namespace HoloToolkit.Unity.InputModule -{ - [RequireComponent(typeof(DistorterGravity))] - [RequireComponent(typeof(LineBase))] - [RequireComponent(typeof(LineRendererBase))] - public class PointerLine : BaseControllerPointer - { - [Header("Colors")] - [SerializeField] - [GradientDefault(GradientDefaultAttribute.ColorEnum.Blue, GradientDefaultAttribute.ColorEnum.White, 1f, 0.25f)] - protected Gradient LineColorSelected; - - [SerializeField] - [GradientDefault(GradientDefaultAttribute.ColorEnum.Blue, GradientDefaultAttribute.ColorEnum.White, 1f, 0.5f)] - protected Gradient LineColorValid; - - [SerializeField] - [GradientDefault(GradientDefaultAttribute.ColorEnum.Gray, GradientDefaultAttribute.ColorEnum.White, 1f, 0.5f)] - protected Gradient LineColorNoTarget; - - [Range(5, 100)] - [SerializeField] - protected int LineCastResolution = 25; - - [SerializeField] - protected LineBase LineBase; - - [SerializeField] - [Tooltip("If no line renderers are specified, this array will be auto-populated on startup.")] - protected LineRendererBase[] LineRenderers; - - protected DistorterGravity DistorterGravity; - - /// - /// Line pointer stays inactive until it's attached to a controller. - /// - public bool InteractionEnabled - { - get - { -#if UNITY_WSA && UNITY_2017_2_OR_NEWER - return ControllerInfo != null; -#else - return false; -#endif - } - } - - protected override void OnEnable() - { - base.OnEnable(); - - LineBase = GetComponent(); - DistorterGravity = GetComponent(); - LineBase.AddDistorter(DistorterGravity); - if (LineRenderers == null || LineRenderers.Length == 0) - { - LineRenderers = LineBase.GetComponentsInChildren(); - } - - LineBase.enabled = false; - } - - public void UpdateRenderedLine(RayStep[] lines, PointerResult result, bool selectPressed, float extent) - { - if (LineBase == null) { return; } - - Gradient lineColor = LineColorNoTarget; - - if (InteractionEnabled) - { - LineBase.enabled = true; - - // If we hit something - if (result.End.Object != null) - { - lineColor = LineColorValid; - LineBase.LastPoint = result.End.Point; - } - else - { - LineBase.LastPoint = RayStep.GetPointByDistance(lines, extent); - } - - if (selectPressed) - { - lineColor = LineColorSelected; - } - } - else - { - LineBase.enabled = false; - } - - for (int i = 0; i < LineRenderers.Length; i++) - { - LineRenderers[i].LineColor = lineColor; - } - } - } -} diff --git a/Assets/HoloToolkit/MRTKVersion.txt b/Assets/HoloToolkit/MRTKVersion.txt index 76477f7a929..051b1ef9b6b 100644 --- a/Assets/HoloToolkit/MRTKVersion.txt +++ b/Assets/HoloToolkit/MRTKVersion.txt @@ -1 +1 @@ -2017.4.0.0 \ No newline at end of file +2017.2.1.4 \ No newline at end of file diff --git a/Assets/HoloToolkit/SpatialSound/Scripts/AudioLoFiEffect.cs b/Assets/HoloToolkit/SpatialSound/Scripts/AudioLoFiEffect.cs index 3a1e9ac7901..0f69072e557 100644 --- a/Assets/HoloToolkit/SpatialSound/Scripts/AudioLoFiEffect.cs +++ b/Assets/HoloToolkit/SpatialSound/Scripts/AudioLoFiEffect.cs @@ -133,7 +133,7 @@ public float HighPassCutoff /// /// High pass filter cutoff frequency. /// Low pass filter cutoff frequency. - public AudioLoFiFilterSettings(float highPassCutoff, float lowPassCutoff) : this() + public AudioLoFiFilterSettings(float highPassCutoff, float lowPassCutoff) { HighPassCutoff = highPassCutoff; LowPassCutoff = lowPassCutoff; diff --git a/Assets/HoloToolkit-Preview/SpectatorView.meta b/Assets/HoloToolkit/SpectatorView.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView.meta rename to Assets/HoloToolkit/SpectatorView.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Audio.meta b/Assets/HoloToolkit/SpectatorView/Audio.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Audio.meta rename to Assets/HoloToolkit/SpectatorView/Audio.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Audio/success.wav b/Assets/HoloToolkit/SpectatorView/Audio/success.wav similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Audio/success.wav rename to Assets/HoloToolkit/SpectatorView/Audio/success.wav diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Audio/success.wav.meta b/Assets/HoloToolkit/SpectatorView/Audio/success.wav.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Audio/success.wav.meta rename to Assets/HoloToolkit/SpectatorView/Audio/success.wav.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Images.meta b/Assets/HoloToolkit/SpectatorView/Images.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Images.meta rename to Assets/HoloToolkit/SpectatorView/Images.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Images/Marker.PNG b/Assets/HoloToolkit/SpectatorView/Images/Marker.PNG similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Images/Marker.PNG rename to Assets/HoloToolkit/SpectatorView/Images/Marker.PNG diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Images/Marker.PNG.meta b/Assets/HoloToolkit/SpectatorView/Images/Marker.PNG.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Images/Marker.PNG.meta rename to Assets/HoloToolkit/SpectatorView/Images/Marker.PNG.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Images/PlatformSwitcher.PNG b/Assets/HoloToolkit/SpectatorView/Images/PlatformSwitcher.PNG similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Images/PlatformSwitcher.PNG rename to Assets/HoloToolkit/SpectatorView/Images/PlatformSwitcher.PNG diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Images/PlatformSwitcher.PNG.meta b/Assets/HoloToolkit/SpectatorView/Images/PlatformSwitcher.PNG.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Images/PlatformSwitcher.PNG.meta rename to Assets/HoloToolkit/SpectatorView/Images/PlatformSwitcher.PNG.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Images/SpectatorViewNetworkDiscovery.PNG b/Assets/HoloToolkit/SpectatorView/Images/SpectatorViewNetworkDiscovery.PNG similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Images/SpectatorViewNetworkDiscovery.PNG rename to Assets/HoloToolkit/SpectatorView/Images/SpectatorViewNetworkDiscovery.PNG diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Images/SpectatorViewNetworkDiscovery.PNG.meta b/Assets/HoloToolkit/SpectatorView/Images/SpectatorViewNetworkDiscovery.PNG.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Images/SpectatorViewNetworkDiscovery.PNG.meta rename to Assets/HoloToolkit/SpectatorView/Images/SpectatorViewNetworkDiscovery.PNG.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Images/WorldRoot.PNG b/Assets/HoloToolkit/SpectatorView/Images/WorldRoot.PNG similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Images/WorldRoot.PNG rename to Assets/HoloToolkit/SpectatorView/Images/WorldRoot.PNG diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Images/WorldRoot.PNG.meta b/Assets/HoloToolkit/SpectatorView/Images/WorldRoot.PNG.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Images/WorldRoot.PNG.meta rename to Assets/HoloToolkit/SpectatorView/Images/WorldRoot.PNG.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Materials.meta b/Assets/HoloToolkit/SpectatorView/Materials.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Materials.meta rename to Assets/HoloToolkit/SpectatorView/Materials.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Materials/MarkerBlack.mat b/Assets/HoloToolkit/SpectatorView/Materials/MarkerBlack.mat similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Materials/MarkerBlack.mat rename to Assets/HoloToolkit/SpectatorView/Materials/MarkerBlack.mat diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Materials/MarkerBlack.mat.meta b/Assets/HoloToolkit/SpectatorView/Materials/MarkerBlack.mat.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Materials/MarkerBlack.mat.meta rename to Assets/HoloToolkit/SpectatorView/Materials/MarkerBlack.mat.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Materials/MarkerWhite.mat b/Assets/HoloToolkit/SpectatorView/Materials/MarkerWhite.mat similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Materials/MarkerWhite.mat rename to Assets/HoloToolkit/SpectatorView/Materials/MarkerWhite.mat diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Materials/MarkerWhite.mat.meta b/Assets/HoloToolkit/SpectatorView/Materials/MarkerWhite.mat.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Materials/MarkerWhite.mat.meta rename to Assets/HoloToolkit/SpectatorView/Materials/MarkerWhite.mat.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Materials/Plane.mat b/Assets/HoloToolkit/SpectatorView/Materials/Plane.mat similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Materials/Plane.mat rename to Assets/HoloToolkit/SpectatorView/Materials/Plane.mat diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Materials/Plane.mat.meta b/Assets/HoloToolkit/SpectatorView/Materials/Plane.mat.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Materials/Plane.mat.meta rename to Assets/HoloToolkit/SpectatorView/Materials/Plane.mat.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Prefabs.meta b/Assets/HoloToolkit/SpectatorView/Prefabs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Prefabs.meta rename to Assets/HoloToolkit/SpectatorView/Prefabs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Prefabs/HololensMarkerDetector.prefab b/Assets/HoloToolkit/SpectatorView/Prefabs/HololensMarkerDetector.prefab similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Prefabs/HololensMarkerDetector.prefab rename to Assets/HoloToolkit/SpectatorView/Prefabs/HololensMarkerDetector.prefab diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Prefabs/HololensMarkerDetector.prefab.meta b/Assets/HoloToolkit/SpectatorView/Prefabs/HololensMarkerDetector.prefab.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Prefabs/HololensMarkerDetector.prefab.meta rename to Assets/HoloToolkit/SpectatorView/Prefabs/HololensMarkerDetector.prefab.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Prefabs/PlayerPrefab.prefab b/Assets/HoloToolkit/SpectatorView/Prefabs/PlayerPrefab.prefab similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Prefabs/PlayerPrefab.prefab rename to Assets/HoloToolkit/SpectatorView/Prefabs/PlayerPrefab.prefab diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Prefabs/PlayerPrefab.prefab.meta b/Assets/HoloToolkit/SpectatorView/Prefabs/PlayerPrefab.prefab.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Prefabs/PlayerPrefab.prefab.meta rename to Assets/HoloToolkit/SpectatorView/Prefabs/PlayerPrefab.prefab.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Prefabs/SpectatorView.prefab b/Assets/HoloToolkit/SpectatorView/Prefabs/SpectatorView.prefab similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Prefabs/SpectatorView.prefab rename to Assets/HoloToolkit/SpectatorView/Prefabs/SpectatorView.prefab diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Prefabs/SpectatorView.prefab.meta b/Assets/HoloToolkit/SpectatorView/Prefabs/SpectatorView.prefab.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Prefabs/SpectatorView.prefab.meta rename to Assets/HoloToolkit/SpectatorView/Prefabs/SpectatorView.prefab.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Prefabs/SpectatorViewNetworking.prefab b/Assets/HoloToolkit/SpectatorView/Prefabs/SpectatorViewNetworking.prefab similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Prefabs/SpectatorViewNetworking.prefab rename to Assets/HoloToolkit/SpectatorView/Prefabs/SpectatorViewNetworking.prefab diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Prefabs/SpectatorViewNetworking.prefab.meta b/Assets/HoloToolkit/SpectatorView/Prefabs/SpectatorViewNetworking.prefab.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Prefabs/SpectatorViewNetworking.prefab.meta rename to Assets/HoloToolkit/SpectatorView/Prefabs/SpectatorViewNetworking.prefab.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/README.md b/Assets/HoloToolkit/SpectatorView/README.md similarity index 98% rename from Assets/HoloToolkit-Preview/SpectatorView/README.md rename to Assets/HoloToolkit/SpectatorView/README.md index dc3178a2c03..8d7f2e67cab 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/README.md +++ b/Assets/HoloToolkit/SpectatorView/README.md @@ -26,7 +26,7 @@ Licenses Requirements ------------ -- SpectatorView plugin and required OpenCV binaries, which can be found here: https://github.com/Microsoft/MixedRealityToolkit/tree/master/SpectatorViewPlugin, listed here: +- SpectatorView plugin and required OpenCV binaries, which can be found here: https://github.com/Microsoft/MixedRealityToolkit/SpectatorViewPlugin, listed here: - opencv_aruco341.dll - opencv_calib3d341.dll - opencv_core341.dll @@ -52,7 +52,7 @@ Requirements Building the SpectatorView Native Plugin ---------------------------------------- -- See: https://github.com/Microsoft/MixedRealityToolkit/blob/master/SpectatorViewPlugin/README.md +- See: https://github.com/Microsoft/MixedRealityToolkit/blob/master/SpectatorView/README.md Project Setup diff --git a/Assets/HoloToolkit-Preview/SpectatorView/README.md.meta b/Assets/HoloToolkit/SpectatorView/README.md.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/README.md.meta rename to Assets/HoloToolkit/SpectatorView/README.md.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts.meta b/Assets/HoloToolkit/SpectatorView/Scripts.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts.meta rename to Assets/HoloToolkit/SpectatorView/Scripts.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking.meta b/Assets/HoloToolkit/SpectatorView/Scripts/Networking.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/Networking.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking/NewDeviceDiscovery.cs b/Assets/HoloToolkit/SpectatorView/Scripts/Networking/NewDeviceDiscovery.cs similarity index 96% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking/NewDeviceDiscovery.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/Networking/NewDeviceDiscovery.cs index c8e5c0388ab..d6fdc12fc2c 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking/NewDeviceDiscovery.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/Networking/NewDeviceDiscovery.cs @@ -4,7 +4,11 @@ using UnityEngine; using UnityEngine.Networking; -namespace HoloToolkit.Unity.Preview.SpectatorView +#if NETFX_CORE +using System; +#endif + +namespace HoloToolkit.Unity.SpectatorView { /// /// In this instance the HoloLens will be listening to broadcasts from the mobile device to turn on the camera @@ -34,12 +38,12 @@ public MarkerDetectionHololens MarkerDetectionHololens private void Awake() { -#if WINDOWS_UWP +#if NETFX_CORE try { OpenCVUtils.CheckOpenCVWrapperHasLoaded(); } - catch (System.Exception e) + catch (Exception e) { Debug.LogError(e); gameObject.SetActive(false); diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking/NewDeviceDiscovery.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/Networking/NewDeviceDiscovery.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking/NewDeviceDiscovery.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/Networking/NewDeviceDiscovery.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking/SpectatorViewNetworkDiscovery.cs b/Assets/HoloToolkit/SpectatorView/Scripts/Networking/SpectatorViewNetworkDiscovery.cs similarity index 97% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking/SpectatorViewNetworkDiscovery.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/Networking/SpectatorViewNetworkDiscovery.cs index 9b0f2328d60..6ca23898ed6 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking/SpectatorViewNetworkDiscovery.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/Networking/SpectatorViewNetworkDiscovery.cs @@ -6,7 +6,11 @@ using UnityEngine; using UnityEngine.Networking; -namespace HoloToolkit.Unity.Preview.SpectatorView +#if NETFX_CORE +using System; +#endif + +namespace HoloToolkit.Unity.SpectatorView { /// /// @@ -107,12 +111,12 @@ public NewDeviceDiscovery NewDeviceDiscovery private void Awake() { -#if WINDOWS_UWP +#if NETFX_CORE try { OpenCVUtils.CheckOpenCVWrapperHasLoaded(); } - catch (System.Exception e) + catch (Exception e) { Debug.LogError(e); gameObject.SetActive(false); @@ -209,7 +213,7 @@ private IEnumerator ChangeBroadcastData(string newData) #region Client -#if !WINDOWS_UWP +#if !NETFX_CORE /// /// This method gets called whenever it receives a broadcast. It'll then strip out the message of the /// broadcast and decide whether it should connect to the sender of the broadcast or not @@ -233,7 +237,7 @@ public override void OnReceivedBroadcast(string fromAddress, string data) int parsedMarkerId; if (!int.TryParse(parsedData[0], out parsedMarkerId)) { - Debug.LogError("Error parsing broadcast data! "); + Debug.LogError("Error parsing broadcast data!"); return; } diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking/SpectatorViewNetworkDiscovery.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/Networking/SpectatorViewNetworkDiscovery.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking/SpectatorViewNetworkDiscovery.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/Networking/SpectatorViewNetworkDiscovery.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking/SpectatorViewNetworkManager.cs b/Assets/HoloToolkit/SpectatorView/Scripts/Networking/SpectatorViewNetworkManager.cs similarity index 98% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking/SpectatorViewNetworkManager.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/Networking/SpectatorViewNetworkManager.cs index 41431ec7d57..ea588c7c3e9 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking/SpectatorViewNetworkManager.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/Networking/SpectatorViewNetworkManager.cs @@ -5,7 +5,11 @@ using UnityEngine; using UnityEngine.Networking; -namespace HoloToolkit.Unity.Preview.SpectatorView +#if NETFX_CORE +using System; +#endif + +namespace HoloToolkit.Unity.SpectatorView { public class SpectatorViewNetworkManager : NetworkManager { @@ -106,12 +110,12 @@ public WorldSync WorldSync private void Start() { -#if WINDOWS_UWP +#if NETFX_CORE try { OpenCVUtils.CheckOpenCVWrapperHasLoaded(); } - catch (System.Exception e) + catch (Exception e) { Debug.LogError(e); gameObject.SetActive(false); diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking/SpectatorViewNetworkManager.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/Networking/SpectatorViewNetworkManager.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Networking/SpectatorViewNetworkManager.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/Networking/SpectatorViewNetworkManager.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Recording.meta b/Assets/HoloToolkit/SpectatorView/Scripts/Recording.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Recording.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/Recording.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Recording/ReplayKitRecorder.cs b/Assets/HoloToolkit/SpectatorView/Scripts/Recording/ReplayKitRecorder.cs similarity index 99% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Recording/ReplayKitRecorder.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/Recording/ReplayKitRecorder.cs index 7da6b286994..c3639b92fc2 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Recording/ReplayKitRecorder.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/Recording/ReplayKitRecorder.cs @@ -9,7 +9,7 @@ using UnityEngine.Apple.ReplayKit; #endif -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { /// /// Records and replays screencaptures recorded from the iPhone diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Recording/ReplayKitRecorder.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/Recording/ReplayKitRecorder.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Recording/ReplayKitRecorder.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/Recording/ReplayKitRecorder.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Recording/ShowRecordingControls.cs b/Assets/HoloToolkit/SpectatorView/Scripts/Recording/ShowRecordingControls.cs similarity index 98% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Recording/ShowRecordingControls.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/Recording/ShowRecordingControls.cs index df83f1b3c6f..5c5d93bfe48 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Recording/ShowRecordingControls.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/Recording/ShowRecordingControls.cs @@ -4,7 +4,7 @@ using HoloToolkit.Unity.InputModule; using UnityEngine; -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { /// /// Controls the display of the recording UI. diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Recording/ShowRecordingControls.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/Recording/ShowRecordingControls.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Recording/ShowRecordingControls.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/Recording/ShowRecordingControls.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync.meta b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/AnchorLocated.cs b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/AnchorLocated.cs similarity index 93% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/AnchorLocated.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/AnchorLocated.cs index 3ab188c9da1..4e7f8e45ca1 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/AnchorLocated.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/AnchorLocated.cs @@ -1,10 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. - using UnityEngine; using UnityEngine.XR.iOS; -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { /// /// Detects when an anchor has been located @@ -44,23 +43,18 @@ public SpectatorViewMarkerGenerator3D MarkerGenerator private void Start() { -#if UNITY_IOS || UNITY_EDITOR if (MarkerGenerator == null) { MarkerGenerator = FindObjectOfType(); } UnityARSessionNativeInterface.ARFrameUpdatedEvent += FrameUpdated; -#endif } private void OnDestroy() { -#if UNITY_IOS || UNITY_EDITOR UnityARSessionNativeInterface.ARFrameUpdatedEvent -= FrameUpdated; -#endif } -#if UNITY_IOS || UNITY_EDITOR /// /// Called by the API. It checks whether an anchor has been located and signals /// the marker generator so that it can create and show an AR marker @@ -78,6 +72,5 @@ private void FrameUpdated( UnityARCamera arCamera ) } } } -#endif } } diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/AnchorLocated.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/AnchorLocated.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/AnchorLocated.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/AnchorLocated.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/CameraCaptureHololens.cs b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/CameraCaptureHololens.cs similarity index 97% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/CameraCaptureHololens.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/CameraCaptureHololens.cs index 0305eeaecef..2c67b60c8e3 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/CameraCaptureHololens.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/CameraCaptureHololens.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using UnityEngine; -using System.Linq; -#if WINDOWS_UWP +#if NETFX_CORE +using System.Linq; #if UNITY_2017_2_OR_NEWER using UnityEngine.XR.WSA.WebCam; #else @@ -13,7 +13,7 @@ #endif #endif -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { /// /// Manages the camera capture on the HoloLens @@ -24,7 +24,7 @@ public class CameraCaptureHololens : MonoBehaviour public delegate void FrameCapturesDelegate(List frameData, int width, int height); public FrameCapturesDelegate OnFrameCapture; -#if WINDOWS_UWP +#if NETFX_CORE /// /// Manages the camera capture /// @@ -65,7 +65,7 @@ public class CameraCaptureHololens : MonoBehaviour /// public void StartCapture() { -#if WINDOWS_UWP +#if NETFX_CORE if(!capturing) { PhotoCapture.CreateAsync(false, OnPhotoCaptureCreated); @@ -81,7 +81,7 @@ public void StartCapture() /// public void StopCapture() { -#if WINDOWS_UWP +#if NETFX_CORE if(capturing) { photoCaptureObject.StopPhotoModeAsync(OnStoppedPhotoMode); @@ -92,7 +92,7 @@ public void StopCapture() #endif } -#if WINDOWS_UWP +#if NETFX_CORE /// /// Called when a capture object has been created, it configures the camera for the capture process diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/CameraCaptureHololens.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/CameraCaptureHololens.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/CameraCaptureHololens.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/CameraCaptureHololens.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerDetectionHololens.cs b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerDetectionHololens.cs similarity index 98% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerDetectionHololens.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerDetectionHololens.cs index 40ef4873201..0fd70e1af5f 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerDetectionHololens.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerDetectionHololens.cs @@ -1,11 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information.using UnityEngine; -using System; using System.Collections.Generic; using UnityEngine; -namespace HoloToolkit.Unity.Preview.SpectatorView +#if NETFX_CORE +using System; +#endif + +namespace HoloToolkit.Unity.SpectatorView { /// /// Manages the capture process on the HoloLens @@ -116,7 +119,7 @@ public float CaptureTimeout private void Start () { -#if WINDOWS_UWP +#if NETFX_CORE try { OpenCVUtils.CheckOpenCVWrapperHasLoaded(); @@ -157,7 +160,7 @@ private void Update() public void StartCapture() { currentCaptureTimeout = CaptureTimeout; -#if WINDOWS_UWP +#if NETFX_CORE if(!capturing) { holoLensCapture.StartCapture(); @@ -184,7 +187,7 @@ public void StopCapture() capturing = false; currentCaptureTimeout = 0; -#if WINDOWS_UWP +#if NETFX_CORE holoLensCapture.StopCapture(); #else Debug.LogWarning("Capturing is not supported on this platform"); @@ -200,7 +203,7 @@ public void StopCapture() /// Height of the image private void ProcessImage(List imageData, int imageWidth, int imageHeight) { -#if WINDOWS_UWP +#if NETFX_CORE detector.Detect(imageData, imageWidth, imageHeight, markerSize); Vector3 pos; Quaternion rot; @@ -227,7 +230,7 @@ private void ProcessImage(List imageData, int imageWidth, int imageHeight) private void OnDestroy() { -#if WINDOWS_UWP +#if NETFX_CORE detector.Terminate(); holoLensCapture.OnFrameCapture -= ProcessImage; #endif diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerDetectionHololens.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerDetectionHololens.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerDetectionHololens.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerDetectionHololens.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerDetector.cs b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerDetector.cs similarity index 99% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerDetector.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerDetector.cs index 94c6f1fae84..02096ca5efd 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerDetector.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerDetector.cs @@ -6,7 +6,7 @@ using System.Runtime.InteropServices; using UnityEngine; -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { /// /// Manages the OpenCV wrapper to detect a marker. diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerDetector.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerDetector.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerDetector.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerDetector.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D.meta b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/Editor.meta b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/Editor.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/Editor.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/Editor.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/Editor/MarkerGeneration3DEditor.cs b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/Editor/MarkerGeneration3DEditor.cs similarity index 92% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/Editor/MarkerGeneration3DEditor.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/Editor/MarkerGeneration3DEditor.cs index 20bb00eaa21..f8cf8d267fb 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/Editor/MarkerGeneration3DEditor.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/Editor/MarkerGeneration3DEditor.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEditor; -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { [CustomEditor(typeof(MarkerGeneration3D), true)] public class MarkerGeneration3DEditor : Editor diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/Editor/MarkerGeneration3DEditor.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/Editor/MarkerGeneration3DEditor.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/Editor/MarkerGeneration3DEditor.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/Editor/MarkerGeneration3DEditor.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/MarkerGeneration3D.cs b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/MarkerGeneration3D.cs similarity index 98% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/MarkerGeneration3D.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/MarkerGeneration3D.cs index 22530ce8c0a..98225653aa8 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/MarkerGeneration3D.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/MarkerGeneration3D.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using UnityEngine; -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { public class MarkerGeneration3D : MonoBehaviour { diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/MarkerGeneration3D.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/MarkerGeneration3D.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/MarkerGeneration3D.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/MarkerGeneration3D.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SimpleMarkerGeneration3D.cs b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SimpleMarkerGeneration3D.cs similarity index 97% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SimpleMarkerGeneration3D.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SimpleMarkerGeneration3D.cs index ad52175bafc..b2e2a92e4b6 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SimpleMarkerGeneration3D.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SimpleMarkerGeneration3D.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { public class SimpleMarkerGeneration3D : MarkerGeneration3D { diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SimpleMarkerGeneration3D.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SimpleMarkerGeneration3D.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SimpleMarkerGeneration3D.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SimpleMarkerGeneration3D.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SpectatorViewMarkerGenerator3D.cs b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SpectatorViewMarkerGenerator3D.cs similarity index 98% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SpectatorViewMarkerGenerator3D.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SpectatorViewMarkerGenerator3D.cs index 558643e9501..42120e53670 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SpectatorViewMarkerGenerator3D.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SpectatorViewMarkerGenerator3D.cs @@ -4,7 +4,7 @@ using System.Collections; using UnityEngine; -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { /// /// Controls the generation of AR markers from a pool. diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SpectatorViewMarkerGenerator3D.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SpectatorViewMarkerGenerator3D.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SpectatorViewMarkerGenerator3D.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/MarkerGeneration3D/SpectatorViewMarkerGenerator3D.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/Scale3DMarker.cs b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/Scale3DMarker.cs similarity index 97% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/Scale3DMarker.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/Scale3DMarker.cs index 6980874de1f..08cc19efad4 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/Scale3DMarker.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/Scale3DMarker.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { /// /// Manages the scale of the marker to fit in different screen sizes diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/Scale3DMarker.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/Scale3DMarker.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/Scale3DMarker.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/Scale3DMarker.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/WorldSync.cs b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/WorldSync.cs similarity index 98% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/WorldSync.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/WorldSync.cs index 2b426d724cc..15a2227b05d 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/WorldSync.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/WorldSync.cs @@ -8,7 +8,7 @@ using UnityEngine.Events; using UnityEngine.Networking; -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { /// /// Manages the sync of the world between the HoloLens and the mobile @@ -48,7 +48,7 @@ public class WorldSync : NetworkBehaviour /// [Tooltip("The offset from the marker position displayed on screen and the phones camera")] [SerializeField] - private Vector3 offsetBetweenMarkerAndCamera = Vector3.zero; + private Vector3 offsetBetweenMarkerAndCamera; /// /// Event fired after the marker position/rotation has been found diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/WorldSync.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/WorldSync.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/SpatialSync/WorldSync.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/SpatialSync/WorldSync.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities.meta b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/Utilities.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/ARMarkerController.cs b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/ARMarkerController.cs similarity index 97% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/ARMarkerController.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/Utilities/ARMarkerController.cs index 93efb49bc41..3721f74d8c8 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/ARMarkerController.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/ARMarkerController.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { /// /// Controls displaying of the AR marker on the mobile device @@ -87,9 +87,7 @@ private void OnDisable() /// public void OnCodeFound() { -#if UNITY_IOS Handheld.Vibrate(); -#endif TurnOffMarker(); } diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/ARMarkerController.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/ARMarkerController.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/ARMarkerController.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/Utilities/ARMarkerController.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/ConnectionStatusController.cs b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/ConnectionStatusController.cs similarity index 99% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/ConnectionStatusController.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/Utilities/ConnectionStatusController.cs index 942a12e6538..c41ffe3a384 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/ConnectionStatusController.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/ConnectionStatusController.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.UI; -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { /// /// Controls an on screen text field to display connection status to the user diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/ConnectionStatusController.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/ConnectionStatusController.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/ConnectionStatusController.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/Utilities/ConnectionStatusController.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/Editor.meta b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/Editor.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/Editor.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/Utilities/Editor.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/Editor/PlatformSwitcherEditor.cs b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/Editor/PlatformSwitcherEditor.cs similarity index 97% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/Editor/PlatformSwitcherEditor.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/Utilities/Editor/PlatformSwitcherEditor.cs index 28de0e6a602..f28fa8c9539 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/Editor/PlatformSwitcherEditor.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/Editor/PlatformSwitcherEditor.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEditor; -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { [CustomEditor(typeof(PlatformSwitcher))] public class PlatformSwitcherEditor : Editor diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/Editor/PlatformSwitcherEditor.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/Editor/PlatformSwitcherEditor.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/Editor/PlatformSwitcherEditor.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/Utilities/Editor/PlatformSwitcherEditor.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/OpenCVUtils.cs b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/OpenCVUtils.cs similarity index 80% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/OpenCVUtils.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/Utilities/OpenCVUtils.cs index 3493bd64b9d..d4ea5545627 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/OpenCVUtils.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/OpenCVUtils.cs @@ -2,8 +2,9 @@ // Licensed under the MIT License. See LICENSE in the project root for license information.using UnityEngine; using System.Runtime.InteropServices; +using UnityEngine; -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { /// /// Utility function to ensure the OpenCVWrapper has been successfully loaded @@ -13,7 +14,7 @@ public static class OpenCVUtils /// /// Utility function to ensure the OpenCVWrapper has been successfully loaded /// - [DllImport("SpectatorViewPlugin", EntryPoint="CheckLibraryHasLoaded")] + [DllImport("SpectatorViewPlugin", EntryPoint = "CheckLibraryHasLoaded")] public static extern void CheckOpenCVWrapperHasLoaded(); } } diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/OpenCVUtils.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/OpenCVUtils.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/OpenCVUtils.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/Utilities/OpenCVUtils.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/PlatformSwitcher.cs b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/PlatformSwitcher.cs similarity index 97% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/PlatformSwitcher.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/Utilities/PlatformSwitcher.cs index 13e7bfadbca..107590bfb54 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/PlatformSwitcher.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/PlatformSwitcher.cs @@ -8,7 +8,7 @@ using UnityEditor; #endif -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { /// /// Utility to switch scene state between HoloLens and mobile platforms diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/PlatformSwitcher.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/PlatformSwitcher.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/PlatformSwitcher.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/Utilities/PlatformSwitcher.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/TweenAlpha.cs b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/TweenAlpha.cs similarity index 96% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/TweenAlpha.cs rename to Assets/HoloToolkit/SpectatorView/Scripts/Utilities/TweenAlpha.cs index 80b5f31bcb1..98419398eb4 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/TweenAlpha.cs +++ b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/TweenAlpha.cs @@ -2,9 +2,10 @@ // Licensed under the MIT License. See LICENSE in the project root for license information.using UnityEngine; using System.Collections; +using System.Collections.Generic; using UnityEngine; -namespace HoloToolkit.Unity.Preview.SpectatorView +namespace HoloToolkit.Unity.SpectatorView { /// /// Utility for fading out marker diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/TweenAlpha.cs.meta b/Assets/HoloToolkit/SpectatorView/Scripts/Utilities/TweenAlpha.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Scripts/Utilities/TweenAlpha.cs.meta rename to Assets/HoloToolkit/SpectatorView/Scripts/Utilities/TweenAlpha.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Shaders.meta b/Assets/HoloToolkit/SpectatorView/Shaders.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Shaders.meta rename to Assets/HoloToolkit/SpectatorView/Shaders.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Shaders/MarkerScanning.shader b/Assets/HoloToolkit/SpectatorView/Shaders/MarkerScanning.shader similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Shaders/MarkerScanning.shader rename to Assets/HoloToolkit/SpectatorView/Shaders/MarkerScanning.shader diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Shaders/MarkerScanning.shader.meta b/Assets/HoloToolkit/SpectatorView/Shaders/MarkerScanning.shader.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Shaders/MarkerScanning.shader.meta rename to Assets/HoloToolkit/SpectatorView/Shaders/MarkerScanning.shader.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures.meta b/Assets/HoloToolkit/SpectatorView/Textures.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures.meta rename to Assets/HoloToolkit/SpectatorView/Textures.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_0.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_0.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_0.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_0.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_0.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_0.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_0.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_0.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_1.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_1.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_1.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_1.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_1.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_1.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_1.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_1.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_10.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_10.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_10.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_10.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_10.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_10.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_10.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_10.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_11.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_11.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_11.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_11.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_11.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_11.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_11.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_11.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_12.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_12.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_12.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_12.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_12.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_12.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_12.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_12.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_13.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_13.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_13.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_13.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_13.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_13.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_13.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_13.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_14.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_14.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_14.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_14.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_14.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_14.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_14.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_14.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_15.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_15.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_15.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_15.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_15.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_15.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_15.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_15.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_16.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_16.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_16.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_16.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_16.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_16.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_16.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_16.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_17.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_17.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_17.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_17.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_17.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_17.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_17.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_17.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_18.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_18.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_18.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_18.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_18.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_18.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_18.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_18.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_19.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_19.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_19.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_19.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_19.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_19.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_19.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_19.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_2.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_2.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_2.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_2.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_2.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_2.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_2.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_2.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_20.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_20.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_20.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_20.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_20.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_20.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_20.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_20.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_21.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_21.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_21.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_21.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_21.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_21.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_21.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_21.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_22.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_22.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_22.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_22.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_22.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_22.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_22.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_22.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_23.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_23.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_23.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_23.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_23.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_23.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_23.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_23.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_24.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_24.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_24.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_24.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_24.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_24.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_24.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_24.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_25.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_25.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_25.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_25.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_25.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_25.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_25.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_25.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_26.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_26.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_26.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_26.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_26.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_26.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_26.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_26.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_27.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_27.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_27.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_27.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_27.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_27.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_27.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_27.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_28.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_28.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_28.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_28.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_28.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_28.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_28.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_28.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_29.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_29.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_29.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_29.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_29.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_29.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_29.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_29.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_3.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_3.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_3.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_3.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_3.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_3.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_3.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_3.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_30.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_30.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_30.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_30.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_30.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_30.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_30.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_30.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_31.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_31.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_31.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_31.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_31.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_31.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_31.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_31.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_32.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_32.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_32.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_32.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_32.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_32.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_32.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_32.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_33.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_33.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_33.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_33.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_33.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_33.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_33.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_33.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_34.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_34.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_34.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_34.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_34.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_34.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_34.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_34.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_35.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_35.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_35.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_35.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_35.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_35.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_35.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_35.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_36.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_36.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_36.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_36.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_36.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_36.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_36.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_36.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_37.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_37.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_37.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_37.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_37.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_37.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_37.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_37.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_38.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_38.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_38.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_38.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_38.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_38.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_38.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_38.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_39.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_39.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_39.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_39.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_39.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_39.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_39.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_39.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_4.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_4.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_4.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_4.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_4.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_4.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_4.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_4.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_40.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_40.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_40.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_40.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_40.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_40.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_40.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_40.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_41.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_41.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_41.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_41.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_41.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_41.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_41.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_41.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_42.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_42.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_42.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_42.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_42.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_42.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_42.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_42.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_43.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_43.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_43.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_43.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_43.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_43.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_43.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_43.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_44.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_44.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_44.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_44.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_44.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_44.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_44.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_44.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_45.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_45.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_45.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_45.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_45.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_45.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_45.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_45.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_46.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_46.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_46.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_46.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_46.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_46.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_46.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_46.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_47.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_47.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_47.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_47.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_47.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_47.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_47.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_47.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_48.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_48.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_48.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_48.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_48.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_48.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_48.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_48.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_49.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_49.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_49.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_49.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_49.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_49.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_49.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_49.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_5.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_5.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_5.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_5.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_5.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_5.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_5.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_5.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_50.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_50.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_50.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_50.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_50.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_50.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_50.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_50.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_6.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_6.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_6.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_6.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_6.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_6.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_6.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_6.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_7.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_7.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_7.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_7.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_7.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_7.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_7.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_7.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_8.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_8.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_8.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_8.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_8.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_8.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_8.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_8.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_9.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_9.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_9.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_9.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_9.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_9.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Markers/Marker_9.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Markers/Marker_9.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Square.jpg b/Assets/HoloToolkit/SpectatorView/Textures/Square.jpg similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Square.jpg rename to Assets/HoloToolkit/SpectatorView/Textures/Square.jpg diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Square.jpg.meta b/Assets/HoloToolkit/SpectatorView/Textures/Square.jpg.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Square.jpg.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Square.jpg.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Square.png b/Assets/HoloToolkit/SpectatorView/Textures/Square.png similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Square.png rename to Assets/HoloToolkit/SpectatorView/Textures/Square.png diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/Square.png.meta b/Assets/HoloToolkit/SpectatorView/Textures/Square.png.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/Square.png.meta rename to Assets/HoloToolkit/SpectatorView/Textures/Square.png.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/button.png b/Assets/HoloToolkit/SpectatorView/Textures/button.png similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/button.png rename to Assets/HoloToolkit/SpectatorView/Textures/button.png diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/button.png.meta b/Assets/HoloToolkit/SpectatorView/Textures/button.png.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/button.png.meta rename to Assets/HoloToolkit/SpectatorView/Textures/button.png.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/grid.gif b/Assets/HoloToolkit/SpectatorView/Textures/grid.gif similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/grid.gif rename to Assets/HoloToolkit/SpectatorView/Textures/grid.gif diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/grid.gif.meta b/Assets/HoloToolkit/SpectatorView/Textures/grid.gif.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/grid.gif.meta rename to Assets/HoloToolkit/SpectatorView/Textures/grid.gif.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/perlin_noise.png b/Assets/HoloToolkit/SpectatorView/Textures/perlin_noise.png similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/perlin_noise.png rename to Assets/HoloToolkit/SpectatorView/Textures/perlin_noise.png diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/perlin_noise.png.meta b/Assets/HoloToolkit/SpectatorView/Textures/perlin_noise.png.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/perlin_noise.png.meta rename to Assets/HoloToolkit/SpectatorView/Textures/perlin_noise.png.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/play.png b/Assets/HoloToolkit/SpectatorView/Textures/play.png similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/play.png rename to Assets/HoloToolkit/SpectatorView/Textures/play.png diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/play.png.meta b/Assets/HoloToolkit/SpectatorView/Textures/play.png.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/play.png.meta rename to Assets/HoloToolkit/SpectatorView/Textures/play.png.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/record.png b/Assets/HoloToolkit/SpectatorView/Textures/record.png similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/record.png rename to Assets/HoloToolkit/SpectatorView/Textures/record.png diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/record.png.meta b/Assets/HoloToolkit/SpectatorView/Textures/record.png.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/record.png.meta rename to Assets/HoloToolkit/SpectatorView/Textures/record.png.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/stop.png b/Assets/HoloToolkit/SpectatorView/Textures/stop.png similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/stop.png rename to Assets/HoloToolkit/SpectatorView/Textures/stop.png diff --git a/Assets/HoloToolkit-Preview/SpectatorView/Textures/stop.png.meta b/Assets/HoloToolkit/SpectatorView/Textures/stop.png.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/Textures/stop.png.meta rename to Assets/HoloToolkit/SpectatorView/Textures/stop.png.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKITREMOTE.txt b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKITREMOTE.txt similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKITREMOTE.txt rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKITREMOTE.txt diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKITREMOTE.txt.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKITREMOTE.txt.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKITREMOTE.txt.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKITREMOTE.txt.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.cs similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.cs diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.prefab b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.prefab similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.prefab rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.prefab diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.prefab.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.prefab.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.prefab.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ARKitRemoteConnection.prefab.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectToEditor.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectToEditor.cs similarity index 98% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectToEditor.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectToEditor.cs index 218ad6ee357..8e28545fc32 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectToEditor.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectToEditor.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using UnityEngine; +using UnityEngine; using UnityEngine.Networking.PlayerConnection; using System.Text; using ARKit.Utils; @@ -140,4 +139,3 @@ public void DisconnectFromEditor() } } -#endif diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectToEditor.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectToEditor.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectToEditor.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectToEditor.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectionMessageIds.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectionMessageIds.cs similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectionMessageIds.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectionMessageIds.cs diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectionMessageIds.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectionMessageIds.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectionMessageIds.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ConnectionMessageIds.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorHitTest.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorHitTest.cs similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorHitTest.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorHitTest.cs diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorHitTest.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorHitTest.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorHitTest.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorHitTest.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorTestScene.unity b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorTestScene.unity similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorTestScene.unity rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorTestScene.unity diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorTestScene.unity.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorTestScene.unity.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorTestScene.unity.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/EditorTestScene.unity.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ObjectSerializationExtension.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ObjectSerializationExtension.cs similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ObjectSerializationExtension.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ObjectSerializationExtension.cs diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ObjectSerializationExtension.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ObjectSerializationExtension.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/ObjectSerializationExtension.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/ObjectSerializationExtension.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/SerializableObjects.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/SerializableObjects.cs similarity index 99% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/SerializableObjects.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/SerializableObjects.cs index 96847523326..ce46defd724 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/SerializableObjects.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/SerializableObjects.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; using UnityEngine; using UnityEngine.XR.iOS; using System.Text; @@ -319,5 +318,4 @@ public class serializableFromEditorMessage public serializableARKitInit arkitConfigMsg; }; -} -#endif +} \ No newline at end of file diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/SerializableObjects.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/SerializableObjects.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/SerializableObjects.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/SerializableObjects.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityARKitRemote.unity b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityARKitRemote.unity similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityARKitRemote.unity rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityARKitRemote.unity diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityARKitRemote.unity.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityARKitRemote.unity.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityARKitRemote.unity.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityARKitRemote.unity.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityRemoteVideo.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityRemoteVideo.cs similarity index 89% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityRemoteVideo.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityRemoteVideo.cs index ba21a6a24fd..0546b5533eb 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityRemoteVideo.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityRemoteVideo.cs @@ -8,35 +8,29 @@ namespace UnityEngine.XR.iOS public class UnityRemoteVideo : MonoBehaviour { -#if UNITY_IOS || UNITY_EDITOR public ConnectToEditor connectToEditor; private UnityARSessionNativeInterface m_Session; -#endif private bool bTexturesInitialized; private int currentFrameIndex; -#if !UNITY_EDITOR - private byte[] m_textureYBytes = null; - private byte[] m_textureUVBytes = null; - private byte[] m_textureYBytes2 = null; - private byte[] m_textureUVBytes2 = null; -#endif + private byte[] m_textureYBytes; + private byte[] m_textureUVBytes; + private byte[] m_textureYBytes2; + private byte[] m_textureUVBytes2; private GCHandle m_pinnedYArray; private GCHandle m_pinnedUVArray; -#if !UNITY_EDITOR + #if !UNITY_EDITOR + public void Start() { -#if UNITY_IOS m_Session = UnityARSessionNativeInterface.GetARSessionNativeInterface (); UnityARSessionNativeInterface.ARFrameUpdatedEvent += UpdateCamera; currentFrameIndex = 0; bTexturesInitialized = false; -#endif } -#if UNITY_IOS void UpdateCamera(UnityARCamera camera) { if (!bTexturesInitialized) { @@ -59,7 +53,6 @@ void InitializeTextures(UnityARCamera camera) m_pinnedUVArray = GCHandle.Alloc (m_textureUVBytes); bTexturesInitialized = true; } -#endif IntPtr PinByteArray(ref GCHandle handle, byte[] array) { @@ -83,7 +76,6 @@ byte [] UVByteArrayForFrame(int frame) return ByteArrayForFrame (frame, m_textureUVBytes, m_textureUVBytes2); } -#if UNITY_IOS || UNITY_EDITOR void OnDestroy() { m_Session.SetCapturePixelData (false, IntPtr.Zero, IntPtr.Zero); @@ -92,11 +84,9 @@ void OnDestroy() m_pinnedUVArray.Free (); } -#endif public void OnPreRender() { -#if UNITY_IOS || UNITY_EDITOR ARTextureHandles handles = m_Session.GetARVideoTextureHandles(); if (handles.textureY == System.IntPtr.Zero || handles.textureCbCr == System.IntPtr.Zero) { @@ -115,8 +105,8 @@ public void OnPreRender() connectToEditor.SendToEditor (ConnectionMessageIds.screenCaptureYMsgId, YByteArrayForFrame(1-currentFrameIndex)); connectToEditor.SendToEditor (ConnectionMessageIds.screenCaptureUVMsgId, UVByteArrayForFrame(1-currentFrameIndex)); -#endif + } -#endif + #endif } } diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityRemoteVideo.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityRemoteVideo.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityRemoteVideo.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/ARKitRemote/UnityRemoteVideo.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Examples.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Examples.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Examples.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Examples.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Examples/UnityARKitScene.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Examples/UnityARKitScene.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Examples/UnityARKitScene.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Examples/UnityARKitScene.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Examples/UnityARKitScene/UnityARKitScene.unity b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Examples/UnityARKitScene/UnityARKitScene.unity similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Examples/UnityARKitScene/UnityARKitScene.unity rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Examples/UnityARKitScene/UnityARKitScene.unity diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Examples/UnityARKitScene/UnityARKitScene.unity.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Examples/UnityARKitScene/UnityARKitScene.unity.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Examples/UnityARKitScene/UnityARKitScene.unity.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Examples/UnityARKitScene/UnityARKitScene.unity.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/LICENSE b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/LICENSE similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/LICENSE rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/LICENSE diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/LICENSE.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/LICENSE.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/LICENSE.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/LICENSE.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Editor.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Editor.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Editor.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Editor.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Editor/UnityARBuildPostprocessor.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Editor/UnityARBuildPostprocessor.cs similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Editor/UnityARBuildPostprocessor.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Editor/UnityARBuildPostprocessor.cs diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Editor/UnityARBuildPostprocessor.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Editor/UnityARBuildPostprocessor.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Editor/UnityARBuildPostprocessor.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Editor/UnityARBuildPostprocessor.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/AR3DOFCameraManager.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/AR3DOFCameraManager.cs similarity index 84% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/AR3DOFCameraManager.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/AR3DOFCameraManager.cs index 851a4c2c130..9c93caf14b2 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/AR3DOFCameraManager.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/AR3DOFCameraManager.cs @@ -7,15 +7,12 @@ public class AR3DOFCameraManager : MonoBehaviour { public Camera m_camera; -#if UNITY_IOS || UNITY_EDITOR private UnityARSessionNativeInterface m_session; -#endif private Material savedClearMaterial; // Use this for initialization - void Start () - { -#if !UNITY_EDITOR && UNITY_IOS + void Start () { +#if !UNITY_EDITOR Application.targetFrameRate = 60; m_session = UnityARSessionNativeInterface.GetARSessionNativeInterface(); ARKitSessionConfiguration config = new ARKitSessionConfiguration(); @@ -24,8 +21,7 @@ void Start () config.enableLightEstimation = true; m_session.RunWithConfig(config); - if (m_camera == null) - { + if (m_camera == null) { m_camera = Camera.main; } #endif @@ -33,11 +29,9 @@ void Start () public void SetCamera(Camera newCamera) { - if (m_camera != null) - { + if (m_camera != null) { UnityARVideo oldARVideo = m_camera.gameObject.GetComponent (); - if (oldARVideo != null) - { + if (oldARVideo != null) { savedClearMaterial = oldARVideo.m_ClearMaterial; Destroy (oldARVideo); } @@ -49,11 +43,9 @@ private void SetupNewCamera(Camera newCamera) { m_camera = newCamera; - if (m_camera != null) - { + if (m_camera != null) { UnityARVideo unityARVideo = m_camera.gameObject.GetComponent (); - if (unityARVideo != null) - { + if (unityARVideo != null) { savedClearMaterial = unityARVideo.m_ClearMaterial; Destroy (unityARVideo); } @@ -64,9 +56,9 @@ private void SetupNewCamera(Camera newCamera) // Update is called once per frame -#if !UNITY_EDITOR && UNITY_IOS - void Update () - { +#if !UNITY_EDITOR + void Update () { + if (m_camera != null) { // JUST WORKS! diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/AR3DOFCameraManager.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/AR3DOFCameraManager.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/AR3DOFCameraManager.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/AR3DOFCameraManager.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/ARPlaneAnchorGameObject.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/ARPlaneAnchorGameObject.cs similarity index 82% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/ARPlaneAnchorGameObject.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/ARPlaneAnchorGameObject.cs index 643249f2b60..56b14bc8779 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/ARPlaneAnchorGameObject.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/ARPlaneAnchorGameObject.cs @@ -5,9 +5,7 @@ namespace UnityEngine.XR.iOS public class ARPlaneAnchorGameObject { public GameObject gameObject; -#if UNITY_IOS || UNITY_EDITOR public ARPlaneAnchor planeAnchor; -#endif } } diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/ARPlaneAnchorGameObject.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/ARPlaneAnchorGameObject.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/ARPlaneAnchorGameObject.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/ARPlaneAnchorGameObject.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/DontDestroyOnLoad.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/DontDestroyOnLoad.cs similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/DontDestroyOnLoad.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/DontDestroyOnLoad.cs diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/DontDestroyOnLoad.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/DontDestroyOnLoad.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/DontDestroyOnLoad.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/DontDestroyOnLoad.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/PointCloudParticleExample.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/PointCloudParticleExample.cs similarity index 81% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/PointCloudParticleExample.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/PointCloudParticleExample.cs index 2afc7c132bb..967d398e8ee 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/PointCloudParticleExample.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/PointCloudParticleExample.cs @@ -3,64 +3,48 @@ using UnityEngine; using UnityEngine.XR.iOS; -public class PointCloudParticleExample : MonoBehaviour -{ +public class PointCloudParticleExample : MonoBehaviour { public ParticleSystem pointCloudParticlePrefab; public int maxPointsToShow; public float particleSize = 1.0f; private Vector3[] m_PointCloudData; -#if UNITY_IOS || UNITY_EDITOR private bool frameUpdated = false; -#endif private ParticleSystem currentPS; private ParticleSystem.Particle [] particles; // Use this for initialization - void Start () - { -#if UNITY_IOS || UNITY_EDITOR + void Start () { UnityARSessionNativeInterface.ARFrameUpdatedEvent += ARFrameUpdated; currentPS = Instantiate (pointCloudParticlePrefab); frameUpdated = false; -#endif } -#if UNITY_IOS || UNITY_EDITOR public void ARFrameUpdated(UnityARCamera camera) { m_PointCloudData = camera.pointCloudData; frameUpdated = true; } -#endif // Update is called once per frame - void Update () - { -#if UNITY_IOS || UNITY_EDITOR - if (frameUpdated) - { - if (m_PointCloudData != null && m_PointCloudData.Length > 0) - { + void Update () { + if (frameUpdated) { + if (m_PointCloudData != null && m_PointCloudData.Length > 0) { int numParticles = Mathf.Min (m_PointCloudData.Length, maxPointsToShow); ParticleSystem.Particle[] particles = new ParticleSystem.Particle[numParticles]; int index = 0; - foreach (Vector3 currentPoint in m_PointCloudData) - { + foreach (Vector3 currentPoint in m_PointCloudData) { particles [index].position = currentPoint; particles [index].startColor = new Color (1.0f, 1.0f, 1.0f); particles [index].startSize = particleSize; index++; } currentPS.SetParticles (particles, numParticles); - } - else - { + } else { ParticleSystem.Particle[] particles = new ParticleSystem.Particle[1]; particles [0].startSize = 0.0f; currentPS.SetParticles (particles, 1); } frameUpdated = false; } -#endif } } diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/PointCloudParticleExample.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/PointCloudParticleExample.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/PointCloudParticleExample.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/PointCloudParticleExample.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAmbient.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAmbient.cs similarity index 93% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAmbient.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAmbient.cs index c16056b4541..009154162ad 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAmbient.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAmbient.cs @@ -8,12 +8,12 @@ public class UnityARAmbient : MonoBehaviour private Light l; -#if UNITY_IOS || UNITY_EDITOR public void Start() { l = GetComponent(); UnityARSessionNativeInterface.ARFrameUpdatedEvent += UpdateLightEstimation; } + void UpdateLightEstimation(UnityARCamera camera) { // Convert ARKit intensity to Unity intensity @@ -27,11 +27,8 @@ void UpdateLightEstimation(UnityARCamera camera) l.colorTemperature = camera.lightEstimation.ambientColorTemperature; } - void OnDestroy() - { - + void OnDestroy() { UnityARSessionNativeInterface.ARFrameUpdatedEvent -= UpdateLightEstimation; } -#endif } } diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAmbient.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAmbient.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAmbient.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAmbient.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAnchorManager.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAnchorManager.cs similarity index 92% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAnchorManager.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAnchorManager.cs index ebac575b61f..c8470202ac0 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAnchorManager.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAnchorManager.cs @@ -8,20 +8,19 @@ public class UnityARAnchorManager { - private Dictionary planeAnchorMap = null; + private Dictionary planeAnchorMap; public UnityARAnchorManager () { -#if UNITY_IOS || UNITY_EDITOR planeAnchorMap = new Dictionary (); UnityARSessionNativeInterface.ARAnchorAddedEvent += AddAnchor; UnityARSessionNativeInterface.ARAnchorUpdatedEvent += UpdateAnchor; UnityARSessionNativeInterface.ARAnchorRemovedEvent += RemoveAnchor; -#endif + } -#if UNITY_IOS || UNITY_EDITOR + public void AddAnchor(ARPlaneAnchor arPlaneAnchor) { Debug.Log("Add anchor in manager"); @@ -32,11 +31,10 @@ public void AddAnchor(ARPlaneAnchor arPlaneAnchor) arpag.gameObject = go; planeAnchorMap.Add (arPlaneAnchor.identifier, arpag); } - public void RemoveAnchor(ARPlaneAnchor arPlaneAnchor) { - Debug.Log("Remove anchor in manager"); + Debug.Log("Remove anchor in manager"); if (planeAnchorMap.ContainsKey (arPlaneAnchor.identifier)) { ARPlaneAnchorGameObject arpag = planeAnchorMap [arPlaneAnchor.identifier]; @@ -47,7 +45,7 @@ public void RemoveAnchor(ARPlaneAnchor arPlaneAnchor) public void UpdateAnchor(ARPlaneAnchor arPlaneAnchor) { - Debug.Log("Update anchor in manager"); + Debug.Log("Update anchor in manager"); if (planeAnchorMap.ContainsKey (arPlaneAnchor.identifier)) { ARPlaneAnchorGameObject arpag = planeAnchorMap [arPlaneAnchor.identifier]; @@ -56,7 +54,7 @@ public void UpdateAnchor(ARPlaneAnchor arPlaneAnchor) planeAnchorMap [arPlaneAnchor.identifier] = arpag; } } -#endif + public void Destroy() { foreach (ARPlaneAnchorGameObject arpag in GetCurrentPlaneAnchors()) { diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAnchorManager.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAnchorManager.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAnchorManager.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARAnchorManager.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraManager.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraManager.cs similarity index 89% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraManager.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraManager.cs index 5b2ec60aef0..f22780f5907 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraManager.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraManager.cs @@ -3,29 +3,24 @@ using UnityEngine; using UnityEngine.XR.iOS; -public class UnityARCameraManager : MonoBehaviour -{ +public class UnityARCameraManager : MonoBehaviour { + public Camera m_camera; -#if UNITY_IOS || UNITY_EDITOR private UnityARSessionNativeInterface m_session; -#endif private Material savedClearMaterial; -#if UNITY_IOS || UNITY_EDITOR + [Header("AR Config Options")] public UnityARAlignment startAlignment = UnityARAlignment.UnityARAlignmentGravity; public UnityARPlaneDetection planeDetection = UnityARPlaneDetection.Horizontal; -#endif public bool getPointCloud = true; public bool enableLightEstimation = true; // Use this for initialization - void Start () - { -#if UNITY_IOS || UNITY_EDITOR + void Start () { + m_session = UnityARSessionNativeInterface.GetARSessionNativeInterface(); -#endif -#if !UNITY_EDITOR && UNITY_IOS +#if !UNITY_EDITOR Application.targetFrameRate = 60; ARKitWorldTrackingSessionConfiguration config = new ARKitWorldTrackingSessionConfiguration(); config.planeDetection = planeDetection; @@ -34,11 +29,10 @@ void Start () config.enableLightEstimation = enableLightEstimation; m_session.RunWithConfig(config); - if (m_camera == null) - { + if (m_camera == null) { m_camera = Camera.main; } -#elif UNITY_EDITOR +#else //put some defaults so that it doesnt complain UnityARCamera scamera = new UnityARCamera (); scamera.worldTransform = new UnityARMatrix4x4 (new Vector4 (1, 0, 0, 0), new Vector4 (0, 1, 0, 0), new Vector4 (0, 0, 1, 0), new Vector4 (0, 0, 0, 1)); @@ -79,9 +73,8 @@ private void SetupNewCamera(Camera newCamera) // Update is called once per frame -#if UNITY_IOS || UNITY_EDITOR - void Update () - { + void Update () { + if (m_camera != null) { // JUST WORKS! @@ -91,7 +84,7 @@ void Update () m_camera.projectionMatrix = m_session.GetCameraProjection (); } + } -#endif } diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraManager.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraManager.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraManager.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraManager.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraNearFar.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraNearFar.cs similarity index 93% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraNearFar.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraNearFar.cs index 3d0f1382ca8..63af66f63c5 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraNearFar.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraNearFar.cs @@ -10,10 +10,8 @@ public class UnityARCameraNearFar : MonoBehaviour { private float currentNearZ; private float currentFarZ; -#if UNITY_IOS || UNITY_EDITOR // Use this for initialization - void Start () - { + void Start () { attachedCamera = GetComponent (); UpdateCameraClipPlanes (); } @@ -31,5 +29,4 @@ void Update () { UpdateCameraClipPlanes (); } } -#endif } diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraNearFar.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraNearFar.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraNearFar.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARCameraNearFar.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARGeneratePlane.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARGeneratePlane.cs similarity index 96% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARGeneratePlane.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARGeneratePlane.cs index 35646d71c87..9e8e35ddd9f 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARGeneratePlane.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARGeneratePlane.cs @@ -6,7 +6,6 @@ namespace UnityEngine.XR.iOS public class UnityARGeneratePlane : MonoBehaviour { public GameObject planePrefab; -#if UNITY_IOS || UNITY_EDITOR private UnityARAnchorManager unityARAnchorManager; // Use this for initialization @@ -29,7 +28,6 @@ void OnGUI() GUI.Box(new Rect(100, 200, 800, 60), string.Format ("Extent: x:{0}, y:{1}, z:{2}", ap.extent.x, ap.extent.y, ap.extent.z)); } } -#endif } } diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARGeneratePlane.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARGeneratePlane.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARGeneratePlane.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARGeneratePlane.cs.meta diff --git a/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARHitTestExample.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARHitTestExample.cs new file mode 100644 index 00000000000..967dffb973f --- /dev/null +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARHitTestExample.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections.Generic; + +namespace UnityEngine.XR.iOS +{ + public class UnityARHitTestExample : MonoBehaviour + { + public Transform m_HitTransform; + + bool HitTestWithResultType (ARPoint point, ARHitTestResultType resultTypes) + { + List hitResults = UnityARSessionNativeInterface.GetARSessionNativeInterface ().HitTest (point, resultTypes); + if (hitResults.Count > 0) { + foreach (var hitResult in hitResults) { + Debug.Log ("Got hit!"); + m_HitTransform.position = UnityARMatrixOps.GetPosition (hitResult.worldTransform); + m_HitTransform.rotation = UnityARMatrixOps.GetRotation (hitResult.worldTransform); + Debug.Log (string.Format ("x:{0:0.######} y:{1:0.######} z:{2:0.######}", m_HitTransform.position.x, m_HitTransform.position.y, m_HitTransform.position.z)); + return true; + } + } + return false; + } + + // Update is called once per frame + void Update () { + if (Input.touchCount > 0 && m_HitTransform != null) + { + var touch = Input.GetTouch(0); + if (touch.phase == TouchPhase.Began || touch.phase == TouchPhase.Moved) + { + var screenPosition = Camera.main.ScreenToViewportPoint(touch.position); + ARPoint point = new ARPoint { + x = screenPosition.x, + y = screenPosition.y + }; + + // prioritize reults types + ARHitTestResultType[] resultTypes = { + ARHitTestResultType.ARHitTestResultTypeExistingPlaneUsingExtent, + // if you want to use infinite planes use this: + //ARHitTestResultType.ARHitTestResultTypeExistingPlane, + ARHitTestResultType.ARHitTestResultTypeHorizontalPlane, + ARHitTestResultType.ARHitTestResultTypeFeaturePoint + }; + + foreach (ARHitTestResultType resultType in resultTypes) + { + if (HitTestWithResultType (point, resultType)) + { + return; + } + } + } + } + } + + + } +} + diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/PointerLine.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARHitTestExample.cs.meta similarity index 64% rename from Assets/HoloToolkit/Input/Scripts/Utilities/PointerLine.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARHitTestExample.cs.meta index 28b48a2ce6b..cff304bab7b 100644 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/PointerLine.cs.meta +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARHitTestExample.cs.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: df317dc594e50444da58008aa4ee1475 -timeCreated: 1522092957 -licenseType: Pro +guid: 6941ec02ead994c9b848d640887441f1 +timeCreated: 1492806244 +licenseType: Store MonoImporter: - externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARKitControl.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARKitControl.cs similarity index 98% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARKitControl.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARKitControl.cs index 3f261dae756..c2ad872044c 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARKitControl.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARKitControl.cs @@ -5,10 +5,11 @@ namespace UnityEngine.XR.iOS { public class UnityARKitControl : MonoBehaviour { -#if UNITY_IOS || UNITY_EDITOR + UnityARSessionRunOption [] runOptions = new UnityARSessionRunOption[4]; UnityARAlignment [] alignmentOptions = new UnityARAlignment[3]; UnityARPlaneDetection [] planeOptions = new UnityARPlaneDetection[4]; + int currentOptionIndex = 0; int currentAlignmentIndex = 0; int currentPlaneIndex = 0; @@ -67,6 +68,5 @@ void OnGUI() currentPlaneIndex = (currentPlaneIndex + 1) % 2; } } -#endif } } diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARKitControl.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARKitControl.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARKitControl.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARKitControl.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARMatrixOps.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARMatrixOps.cs similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARMatrixOps.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARMatrixOps.cs diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARMatrixOps.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARMatrixOps.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARMatrixOps.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARMatrixOps.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUserAnchorComponent.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUserAnchorComponent.cs similarity index 91% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUserAnchorComponent.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUserAnchorComponent.cs index 81640cb4966..1d9f0a56ced 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUserAnchorComponent.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUserAnchorComponent.cs @@ -8,20 +8,17 @@ namespace UnityEngine.XR.iOS { public class UnityARUserAnchorComponent : MonoBehaviour { - private string m_AnchorId = string.Empty; + private string m_AnchorId; public string AnchorId { get { return m_AnchorId; } } -#if UNITY_IOS || UNITY_EDITOR void Awake() { UnityARSessionNativeInterface.ARUserAnchorUpdatedEvent += GameObjectAnchorUpdated; UnityARSessionNativeInterface.ARUserAnchorRemovedEvent += AnchorRemoved; this.m_AnchorId = UnityARSessionNativeInterface.GetARSessionNativeInterface ().AddUserAnchorFromGameObject(this.gameObject).identifierStr; } - - void Start () - { + void Start () { } @@ -33,7 +30,6 @@ public void AnchorRemoved(ARUserAnchor anchor) } } - void OnDestroy() { UnityARSessionNativeInterface.ARUserAnchorUpdatedEvent -= GameObjectAnchorUpdated; UnityARSessionNativeInterface.ARUserAnchorRemovedEvent -= AnchorRemoved; @@ -44,6 +40,5 @@ private void GameObjectAnchorUpdated(ARUserAnchor anchor) { } -#endif } } \ No newline at end of file diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUserAnchorComponent.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUserAnchorComponent.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUserAnchorComponent.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUserAnchorComponent.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUtility.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUtility.cs similarity index 98% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUtility.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUtility.cs index e5df755b3f1..e0b24c38f34 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUtility.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUtility.cs @@ -13,8 +13,7 @@ public static void InitializePlanePrefab(GameObject go) { planePrefab = go; } - -#if UNITY_IOS || UNITY_EDITOR + public static GameObject CreatePlaneInScene(ARPlaneAnchor arPlaneAnchor) { GameObject plane; @@ -50,7 +49,7 @@ public static GameObject UpdatePlaneWithAnchorTransform(GameObject plane, ARPlan return plane; } -#endif + } } diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUtility.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUtility.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUtility.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARUtility.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARVideo.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARVideo.cs similarity index 95% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARVideo.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARVideo.cs index 56fd0adcef0..940cd4b66f5 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARVideo.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARVideo.cs @@ -19,12 +19,10 @@ public class UnityARVideo : MonoBehaviour public void Start() { -#if UNITY_IOS || UNITY_EDITOR UnityARSessionNativeInterface.ARFrameUpdatedEvent += UpdateFrame; bCommandBufferInitialized = false; -#endif } -#if UNITY_IOS || UNITY_EDITOR + void UpdateFrame(UnityARCamera cam) { _displayTransform = new Matrix4x4(); @@ -49,9 +47,8 @@ void OnDestroy() UnityARSessionNativeInterface.ARFrameUpdatedEvent -= UpdateFrame; bCommandBufferInitialized = false; } -#endif -#if !UNITY_EDITOR && UNITY_IOS +#if !UNITY_EDITOR public void OnPreRender() { @@ -90,7 +87,7 @@ public void OnPreRender() m_ClearMaterial.SetMatrix("_DisplayTransform", _displayTransform); } -#elif UNITY_EDITOR +#else public void SetYTexure(Texture2D YTex) { @@ -105,8 +102,7 @@ public void SetUVTexure(Texture2D UVTex) public void OnPreRender() { - if (!bCommandBufferInitialized) - { + if (!bCommandBufferInitialized) { InitializeCommandBuffer (); } diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARVideo.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARVideo.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARVideo.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityARVideo.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityPointCloudExample.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityPointCloudExample.cs similarity index 92% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityPointCloudExample.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityPointCloudExample.cs index 63c28aeeae2..07243f02968 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityPointCloudExample.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityPointCloudExample.cs @@ -14,7 +14,6 @@ public class UnityPointCloudExample : MonoBehaviour public void Start() { -#if UNITY_IOS || UNITY_EDITOR UnityARSessionNativeInterface.ARFrameUpdatedEvent += ARFrameUpdated; if (PointCloudPrefab != null) { @@ -24,19 +23,15 @@ public void Start() pointCloudObjects.Add (Instantiate (PointCloudPrefab)); } } -#endif } -#if UNITY_IOS || UNITY_EDITOR public void ARFrameUpdated(UnityARCamera camera) { m_PointCloudData = camera.pointCloudData; } -#endif public void Update() { -#if UNITY_IOS || UNITY_EDITOR if (PointCloudPrefab != null && m_PointCloudData != null) { for (int count = 0; count < Math.Min (m_PointCloudData.Length, numPointsToShow); count++) @@ -46,6 +41,5 @@ public void Update() point.transform.position = new Vector3(vert.x, vert.y, vert.z); } } -#endif } } \ No newline at end of file diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityPointCloudExample.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityPointCloudExample.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityPointCloudExample.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Helpers/UnityPointCloudExample.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterial.mat b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterial.mat similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterial.mat rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterial.mat diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterial.mat.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterial.mat.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterial.mat.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterial.mat.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterialLinear.mat b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterialLinear.mat similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterialLinear.mat rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterialLinear.mat diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterialLinear.mat.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterialLinear.mat.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterialLinear.mat.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Materials/YUVMaterialLinear.mat.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARAnchor.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARAnchor.cs similarity index 83% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARAnchor.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARAnchor.cs index 41c6046af31..56f096f651a 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARAnchor.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARAnchor.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; namespace UnityEngine.XR.iOS { @@ -13,4 +12,4 @@ public struct ARAnchor public Matrix4x4 transform; } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARAnchor.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARAnchor.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARAnchor.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARAnchor.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARCamera.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARCamera.cs similarity index 96% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARCamera.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARCamera.cs index 8d9edfc6f82..eb7006d1763 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARCamera.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARCamera.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System.Collections; +using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -49,4 +48,3 @@ The origin is at the center of the upper-left pixel. } } -#endif diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARCamera.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARCamera.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARCamera.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARCamera.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARErrorCode.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARErrorCode.cs similarity index 90% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARErrorCode.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARErrorCode.cs index 3c735947da5..349ebae1896 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARErrorCode.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARErrorCode.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; namespace UnityEngine.XR.iOS { @@ -19,4 +18,4 @@ public enum ARErrorCode : long } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARErrorCode.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARErrorCode.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARErrorCode.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARErrorCode.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARFrame.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARFrame.cs similarity index 93% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARFrame.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARFrame.cs index 7a43199bea8..b8e0cd9c0ef 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARFrame.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARFrame.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; namespace UnityEngine.XR.iOS { @@ -34,4 +33,4 @@ A light estimate representing the light in the scene. } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARFrame.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARFrame.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARFrame.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARFrame.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResult.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResult.cs similarity index 94% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResult.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResult.cs index c2df4889194..5a122764520 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResult.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResult.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; namespace UnityEngine.XR.iOS { @@ -38,4 +37,4 @@ The anchor that the hit-test intersected. public bool isValid; } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResult.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResult.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResult.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResult.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResultType.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResultType.cs similarity index 93% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResultType.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResultType.cs index 017f91340e1..eafc325597b 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResultType.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResultType.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; namespace UnityEngine.XR.iOS { @@ -23,4 +22,4 @@ public enum ARHitTestResultType : long } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResultType.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResultType.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResultType.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARHitTestResultType.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARLightEstimate.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARLightEstimate.cs similarity index 68% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARLightEstimate.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARLightEstimate.cs index 4428aff275c..63585c2ce84 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARLightEstimate.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARLightEstimate.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; namespace UnityEngine.XR.iOS { @@ -8,4 +7,4 @@ public struct ARLightEstimate public double ambientIntensity; } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARLightEstimate.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARLightEstimate.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARLightEstimate.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARLightEstimate.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchor.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchor.cs similarity index 92% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchor.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchor.cs index 8f6aacba9a9..2ca2f341aa2 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchor.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchor.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; namespace UnityEngine.XR.iOS { @@ -33,4 +32,4 @@ The extent of the plane in the anchor’s coordinate space. } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchor.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchor.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchor.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchor.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchorAlignment.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchorAlignment.cs similarity index 78% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchorAlignment.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchorAlignment.cs index 008dccba472..b4b5668b5e2 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchorAlignment.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchorAlignment.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; namespace UnityEngine.XR.iOS { @@ -9,4 +8,4 @@ public enum ARPlaneAnchorAlignment : long ARPlaneAnchorAlignmentHorizontal } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchorAlignment.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchorAlignment.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchorAlignment.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPlaneAnchorAlignment.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPoint.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPoint.cs similarity index 69% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPoint.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPoint.cs index 12394d16c95..44ad04c4f87 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPoint.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPoint.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; namespace UnityEngine.XR.iOS { @@ -9,4 +8,4 @@ public struct ARPoint public double y; } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPoint.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPoint.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPoint.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARPoint.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARRect.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARRect.cs similarity index 70% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARRect.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARRect.cs index 3fd054cb5a3..be88dc30ead 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARRect.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARRect.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; namespace UnityEngine.XR.iOS { @@ -9,4 +8,4 @@ public struct ARRect public ARSize size; } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARRect.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARRect.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARRect.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARRect.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSessionNative.mm b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSessionNative.mm similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSessionNative.mm rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSessionNative.mm diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSessionNative.mm.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSessionNative.mm.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSessionNative.mm.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSessionNative.mm.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSize.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSize.cs similarity index 70% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSize.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSize.cs index e94885b9fa5..09a61860e6f 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSize.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSize.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; namespace UnityEngine.XR.iOS { @@ -9,4 +8,4 @@ public struct ARSize public double height; } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSize.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSize.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSize.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARSize.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTextureHandles.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTextureHandles.cs similarity index 80% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTextureHandles.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTextureHandles.cs index 5cdabdc9642..802ee6422ae 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTextureHandles.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTextureHandles.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; namespace UnityEngine.XR.iOS { @@ -10,4 +9,4 @@ public struct ARTextureHandles public IntPtr textureCbCr; } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTextureHandles.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTextureHandles.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTextureHandles.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTextureHandles.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingQuality.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingQuality.cs similarity index 89% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingQuality.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingQuality.cs index ca64eaaedf4..45936c9d848 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingQuality.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingQuality.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; namespace UnityEngine.XR.iOS { @@ -19,4 +18,4 @@ public enum ARTrackingQuality : long } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingQuality.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingQuality.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingQuality.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingQuality.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingState.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingState.cs similarity index 85% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingState.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingState.cs index 29beca99649..d1b309e6be4 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingState.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingState.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; namespace UnityEngine.XR.iOS { @@ -15,4 +14,4 @@ public enum ARTrackingState ARTrackingStateNormal, } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingState.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingState.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingState.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingState.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingStateReason.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingStateReason.cs similarity index 90% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingStateReason.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingStateReason.cs index 1a9a683be6c..98eeabfeba5 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingStateReason.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingStateReason.cs @@ -1,5 +1,4 @@ -#if UNITY_IOS || UNITY_EDITOR -using System; +using System; namespace UnityEngine.XR.iOS { @@ -18,4 +17,4 @@ public enum ARTrackingStateReason ARTrackingStateReasonInsufficientFeatures, } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingStateReason.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingStateReason.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingStateReason.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARTrackingStateReason.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARUserAnchor.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARUserAnchor.cs similarity index 89% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARUserAnchor.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARUserAnchor.cs index 16ced849761..f287a921448 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARUserAnchor.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARUserAnchor.cs @@ -1,4 +1,3 @@ -#if UNITY_IOS || UNITY_EDITOR using System; namespace UnityEngine.XR.iOS @@ -14,4 +13,4 @@ public struct ARUserAnchor public Matrix4x4 transform; } } -#endif + diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARUserAnchor.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARUserAnchor.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARUserAnchor.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/ARUserAnchor.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/UnityARSessionNativeInterface.cs b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/UnityARSessionNativeInterface.cs similarity index 99% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/UnityARSessionNativeInterface.cs rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/UnityARSessionNativeInterface.cs index ebc71f728a1..9cef7593014 100644 --- a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/UnityARSessionNativeInterface.cs +++ b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/UnityARSessionNativeInterface.cs @@ -1,4 +1,3 @@ -#if UNITY_IOS || UNITY_EDITOR using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -796,4 +795,3 @@ public void RemoveUserAnchor(string anchorIdentifier) } } } -#endif \ No newline at end of file diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/UnityARSessionNativeInterface.cs.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/UnityARSessionNativeInterface.cs.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/UnityARSessionNativeInterface.cs.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/NativeInterface/UnityARSessionNativeInterface.cs.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShader.shader b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShader.shader similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShader.shader rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShader.shader diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShader.shader.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShader.shader.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShader.shader.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShader.shader.meta diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShaderLinear.shader b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShaderLinear.shader similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShaderLinear.shader rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShaderLinear.shader diff --git a/Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShaderLinear.shader.meta b/Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShaderLinear.shader.meta similarity index 100% rename from Assets/HoloToolkit-Preview/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShaderLinear.shader.meta rename to Assets/HoloToolkit/SpectatorView/UnityARKitPlugin/Plugins/iOS/UnityARKit/Shaders/YUVShaderLinear.shader.meta diff --git a/Assets/HoloToolkit/UX/Scripts/AppBar/AppBar.cs b/Assets/HoloToolkit/UX/Scripts/AppBar/AppBar.cs index b1afb15a917..f148ee8cd1f 100644 --- a/Assets/HoloToolkit/UX/Scripts/AppBar/AppBar.cs +++ b/Assets/HoloToolkit/UX/Scripts/AppBar/AppBar.cs @@ -35,24 +35,6 @@ public class AppBar : InteractionReceiver /// public float HoverOffsetZ = 0f; - private bool useTightFollow = false; - - /// - /// Uses an alternate follow style that works better for very oblong objects - /// - public bool UseTightFollow - { - get - { - return useTightFollow; - } - - set - { - useTightFollow = value; - } - } - /// /// Class used for building toolbar buttons /// (not yet in use) @@ -126,24 +108,6 @@ public BoundingBox BoundingBox } } - private BoundingBoxRig boundingRig; - - /// - /// a reference to the boundingBoxRig that the appbar turns on and off - /// - public BoundingBoxRig BoundingRig - { - get - { - return boundingRig; - } - - set - { - boundingRig = value; - } - } - public GameObject SquareButtonPrefab; public int NumDefaultButtons @@ -187,7 +151,6 @@ public ButtonTemplate[] DefaultButtons } public AppBarDisplayTypeEnum DisplayType = AppBarDisplayTypeEnum.Manipulation; - public AppBarStateEnum State = AppBarStateEnum.Default; /// @@ -200,13 +163,13 @@ public ButtonTemplate[] DefaultButtons private ButtonTemplate[] buttons = new ButtonTemplate[MaxCustomButtons]; [SerializeField] - private Transform buttonParent = null; + private Transform buttonParent; [SerializeField] - private GameObject baseRenderer = null; + private GameObject baseRenderer; [SerializeField] - private GameObject backgroundBar = null; + private GameObject backgroundBar; [SerializeField] private BoundingBox boundingBox; @@ -219,7 +182,6 @@ public ButtonTemplate[] DefaultButtons private int numDefaultButtons; private int numHiddenButtons; private int numManipulationButtons; - private BoundingBoxHelper helper; public void Reset() { @@ -231,7 +193,6 @@ public void Reset() public void Start() { State = AppBarStateEnum.Default; - if (interactables.Count == 0) { RefreshTemplates(); @@ -245,8 +206,6 @@ public void Start() CreateButton(buttons[i], CustomButtonIconProfile); } } - - helper = new BoundingBoxHelper(); } protected override void InputClicked(GameObject obj, InputClickedEventData eventData) @@ -361,25 +320,43 @@ private void FollowBoundingBox(bool smooth) } // Show our buttons - baseRenderer.SetActive(true); - - //calculate best follow position for AppBar + baseRenderer.SetActive(true); + + // Get positions for each side of the bounding box + // Choose the one that's closest to us + forwards[0] = boundingBox.transform.forward; + forwards[1] = boundingBox.transform.right; + forwards[2] = -boundingBox.transform.forward; + forwards[3] = -boundingBox.transform.right; + Vector3 scale = boundingBox.TargetBoundsLocalScale; + float maxXYScale = Mathf.Max(scale.x, scale.y); + float closestSoFar = Mathf.Infinity; Vector3 finalPosition = Vector3.zero; + Vector3 finalForward = Vector3.zero; Vector3 headPosition = Camera.main.transform.position; - LayerMask ignoreLayers = new LayerMask(); - List boundsPoints = new List(); - if (boundingBox != null) + + for (int i = 0; i < forwards.Length; i++) { - helper.UpdateNonAABoundingBoxCornerPositions(boundingBox.Target, boundsPoints, ignoreLayers); - int followingFaceIndex = helper.GetIndexOfForwardFace(headPosition); - Vector3 faceNormal = helper.GetFaceNormal(followingFaceIndex); + Vector3 nextPosition = boundingBox.transform.position + + (forwards[i] * -maxXYScale) + + (Vector3.up * (-scale.y * HoverOffsetYScale)); - //finally we have new position - finalPosition = helper.GetFaceBottomCentroid(followingFaceIndex) + (faceNormal * HoverOffsetZ); + float distance = Vector3.Distance(nextPosition, headPosition); + if (distance < closestSoFar) + { + closestSoFar = distance; + finalPosition = nextPosition; + finalForward = forwards[i]; + } } + // Apply hover offset + finalPosition += (finalForward * -HoverOffsetZ); + // Follow our bounding box - transform.position = smooth ? Vector3.Lerp(transform.position, finalPosition, 0.5f) : finalPosition; + transform.position = smooth ? + Vector3.Lerp(transform.position, finalPosition, 0.5f) : + finalPosition; // Rotate on the y axis Vector3 eulerAngles = Quaternion.LookRotation((boundingBox.transform.position - finalPosition).normalized, Vector3.up).eulerAngles; diff --git a/Assets/HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBox.cs b/Assets/HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBox.cs index 10e102bc425..5e0f5af3eff 100644 --- a/Assets/HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBox.cs +++ b/Assets/HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBox.cs @@ -572,19 +572,6 @@ public static void GetRenderBoundsPoints(GameObject target, List bounds } } - public static Bounds GetRenderBounds(GameObject target) - { - Bounds bounds = new Bounds(); - Renderer[] renderers = target.GetComponentsInChildren(); - for (int i = 0; i < renderers.Length; ++i) - { - var rendererObj = renderers[i]; - bounds.ExpandToContain(rendererObj.bounds); - } - - return bounds; - } - /// /// GetMeshFilterBoundsPoints - gets boundingbox points using MeshFilter method. /// @@ -614,26 +601,6 @@ public static void GetMeshFilterBoundsPoints(GameObject target, List bo } } - public static void GetNonAxisAlignedBB_Corners(GameObject target, List boundsPoints) - { - LayerMask mask = new LayerMask(); - - GameObject clone = GameObject.Instantiate(target); - clone.transform.localRotation = Quaternion.identity; - clone.transform.position = Vector3.zero; - clone.transform.localScale = Vector3.one; - BoundingBox.GetMeshFilterBoundsPoints(clone, boundsPoints, mask); - Vector3 centroid = target.transform.position; - GameObject.Destroy(clone); - -#if UNITY_2017_1_OR_NEWER - for (int i = 0; i < boundsPoints.Count; ++i) - { - boundsPoints[i] = target.transform.localToWorldMatrix.MultiplyPoint(boundsPoints[i]); - } -#endif // UNITY_2017_1_OR_NEWER - } - private static Vector3[] corners = null; private static Vector3[] rectTransformCorners = new Vector3[4]; #endregion diff --git a/Assets/HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBoxRig.cs b/Assets/HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBoxRig.cs index f5385c55597..0f2fcb75d13 100644 --- a/Assets/HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBoxRig.cs +++ b/Assets/HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBoxRig.cs @@ -15,7 +15,7 @@ public class BoundingBoxRig : MonoBehaviour [Header("Flattening")] [SerializeField] [Tooltip("Choose this option if Rig is to be applied to a 2D object.")] - private BoundingBox.FlattenModeEnum flattenedAxis = default(BoundingBox.FlattenModeEnum); + private BoundingBox.FlattenModeEnum flattenedAxis; [Header("Customization Settings")] [SerializeField] @@ -31,9 +31,6 @@ public class BoundingBoxRig : MonoBehaviour [SerializeField] private float scaleRate = 1.0f; - [SerializeField] - private float appBarHoverOffsetZ = 0.05f; - [SerializeField] [Tooltip("This is the maximum scale that one grab can accomplish.")] private float maxScale = 2.0f; @@ -51,7 +48,7 @@ public class BoundingBoxRig : MonoBehaviour [SerializeField] [Tooltip("AppBar prefab.")] - private AppBar appBarPrefab = null; + private AppBar appBarPrefab; private BoundingBox boxInstance; @@ -182,7 +179,6 @@ private void Start() appBarInstance = Instantiate(appBarPrefab) as AppBar; appBarInstance.BoundingBox = boxInstance; - appBarInstance.HoverOffsetZ = appBarHoverOffsetZ; boxInstance.IsVisible = false; } @@ -480,7 +476,9 @@ private bool ShowRig } } - public List GetBounds() + + + private List GetBounds() { if (objectToBound != null) { diff --git a/Assets/HoloToolkit/UX/Scripts/Collections/CollectionEnums/OrientTypeEnum.cs b/Assets/HoloToolkit/UX/Scripts/Collections/CollectionEnums/OrientTypeEnum.cs index e6cf7ec00b8..a9f655a27d4 100644 --- a/Assets/HoloToolkit/UX/Scripts/Collections/CollectionEnums/OrientTypeEnum.cs +++ b/Assets/HoloToolkit/UX/Scripts/Collections/CollectionEnums/OrientTypeEnum.cs @@ -11,7 +11,12 @@ public enum OrientTypeEnum None, // Don't rotate at all FaceOrigin, // Rotate towards the origin FaceOriginReversed, // Rotate towards the origin + 180 degrees - FaceFoward, // Zero rotation + FaceFoward, // Zero rotation. FaceForwardReversed, // Zero rotation + 180 degrees + FaceParentUp, // Parent Relative Up + FaceParentDown, // Parent Relative Down + FaceCenterAxis, // Lay flat on the surface, facing in + FaceCenterAxisReversed, // Lay flat on the surface, facing out + } } diff --git a/Assets/HoloToolkit/UX/Scripts/Collections/CollectionEnums/SurfaceTypeEnum.cs b/Assets/HoloToolkit/UX/Scripts/Collections/CollectionEnums/SurfaceTypeEnum.cs index 9a27d0906f5..61c7aa65c87 100644 --- a/Assets/HoloToolkit/UX/Scripts/Collections/CollectionEnums/SurfaceTypeEnum.cs +++ b/Assets/HoloToolkit/UX/Scripts/Collections/CollectionEnums/SurfaceTypeEnum.cs @@ -12,5 +12,6 @@ public enum SurfaceTypeEnum Plane, Sphere, Scatter, + Radial } } diff --git a/Assets/HoloToolkit/UX/Scripts/Collections/ObjectCollection.cs b/Assets/HoloToolkit/UX/Scripts/Collections/ObjectCollection.cs index 9d8919fd7a4..fe4b1bd184c 100644 --- a/Assets/HoloToolkit/UX/Scripts/Collections/ObjectCollection.cs +++ b/Assets/HoloToolkit/UX/Scripts/Collections/ObjectCollection.cs @@ -62,6 +62,13 @@ public class ObjectCollection : MonoBehaviour [Tooltip("Radius for the sphere or cylinder")] public float Radius = 2f; + /// + /// This is the radial range for creating a radial fan layout. + /// + [Range(5f, 360f)] + [Tooltip("Radial range for radial layout")] + public float RadialRange = 180f; + /// /// Number of rows per column, column number is automatically determined /// @@ -80,6 +87,24 @@ public class ObjectCollection : MonoBehaviour [Tooltip("Height of cell per object")] public float CellHeight = 0.5f; + /// + /// Margin between objects horizontally. + /// + [Tooltip("Margin between objects horizontally")] + public float HorizontalMargin = 0.2f; + + /// + /// Margin between objects vertically. + /// + [Tooltip("Margin between objects vertically")] + public float VerticalMargin = 0.2f; + + /// + /// Margin between objects in depth. + /// + [Tooltip("Margin between objects in depth")] + public float DepthMargin = 0.2f; + /// /// Reference mesh to use for rendering the sphere layout /// @@ -99,6 +124,7 @@ public class ObjectCollection : MonoBehaviour private float _width; private float _height; private float _circumference; + private float _radialCellAngle; private Vector2 _halfCell; #endregion @@ -181,6 +207,7 @@ public void UpdateCollection() _height = Rows * CellHeight; _halfCell = new Vector2(CellWidth / 2f, CellHeight / 2f); _circumference = 2f * Mathf.PI * Radius; + _radialCellAngle = RadialRange / _columns; LayoutChildren(); @@ -201,7 +228,6 @@ private void LayoutChildren() { Vector3[] nodeGrid = new Vector3[NodeList.Count]; Vector3 newPos = Vector3.zero; - Vector3 newRot = Vector3.zero; // Now lets lay out the grid startOffsetX = (_columns * 0.5f) * CellWidth; @@ -249,61 +275,15 @@ private void LayoutChildren() { { newPos = nodeGrid[i]; NodeList[i].transform.localPosition = newPos; - switch (OrientType) - { - case OrientTypeEnum.FaceOrigin: - case OrientTypeEnum.FaceFoward: - NodeList[i].transform.forward = transform.forward; - break; - - case OrientTypeEnum.FaceOriginReversed: - case OrientTypeEnum.FaceForwardReversed: - newRot = Vector3.zero; - NodeList[i].transform.forward = transform.forward; - NodeList[i].transform.Rotate(0f, 180f, 0f); - break; - - case OrientTypeEnum.None: - break; - - default: - throw new ArgumentOutOfRangeException(); - } + UpdateNodeFacing(NodeList[i], OrientType, newPos); } break; case SurfaceTypeEnum.Cylinder: for (int i = 0; i < NodeList.Count; i++) { newPos = CylindricalMapping(nodeGrid[i], Radius); - switch (OrientType) - { - case OrientTypeEnum.FaceOrigin: - newRot = new Vector3(newPos.x, 0.0f, newPos.z); - NodeList[i].transform.rotation = Quaternion.LookRotation(newRot); - break; - - case OrientTypeEnum.FaceOriginReversed: - newRot = new Vector3(newPos.x, 0f, newPos.z); - NodeList[i].transform.rotation = Quaternion.LookRotation(newRot); - NodeList[i].transform.Rotate(0f, 180f, 0f); - break; - - case OrientTypeEnum.FaceFoward: - NodeList[i].transform.forward = transform.forward; - break; - - case OrientTypeEnum.FaceForwardReversed: - NodeList[i].transform.forward = transform.forward; - NodeList[i].transform.Rotate(0f, 180f, 0f); - break; - - case OrientTypeEnum.None: - break; - - default: - throw new ArgumentOutOfRangeException(); - } NodeList[i].transform.localPosition = newPos; + UpdateNodeFacing(NodeList[i], OrientType, newPos); } break; case SurfaceTypeEnum.Sphere: @@ -311,38 +291,31 @@ private void LayoutChildren() { for (int i = 0; i < NodeList.Count; i++) { newPos = SphericalMapping(nodeGrid[i], Radius); - switch (OrientType) + NodeList[i].transform.localPosition = newPos; + UpdateNodeFacing(NodeList[i], OrientType, newPos); + } + break; + case SurfaceTypeEnum.Radial: + int curColumn = 0; + int curRow = 1; + + for (int i = 0; i < NodeList.Count; i++) + { + newPos = RadialMapping(nodeGrid[i], Radius, curRow, curColumn); + if (curColumn == (_columns - 1)) { - case OrientTypeEnum.FaceOrigin: - newRot = newPos; - NodeList[i].transform.rotation = Quaternion.LookRotation(newRot); - break; - - case OrientTypeEnum.FaceOriginReversed: - newRot = newPos; - NodeList[i].transform.rotation = Quaternion.LookRotation(newRot); - NodeList[i].transform.Rotate(0f, 180f, 0f); - break; - - case OrientTypeEnum.FaceFoward: - NodeList[i].transform.forward = transform.forward; - break; - - case OrientTypeEnum.FaceForwardReversed: - NodeList[i].transform.forward = transform.forward; - NodeList[i].transform.Rotate(0f, 180f, 0f); - break; - - case OrientTypeEnum.None: - break; - - default: - throw new ArgumentOutOfRangeException(); + curColumn = 0; + ++curRow; } + else + { + ++curColumn; + } + NodeList[i].transform.localPosition = newPos; + UpdateNodeFacing(NodeList[i], OrientType, newPos); } break; - case SurfaceTypeEnum.Scatter: // Get randomized planar mapping // Calculate radius of each node while we're here @@ -364,25 +337,7 @@ private void LayoutChildren() { NodeList[i].Radius = 1f; } NodeList[i].transform.localPosition = newPos; - switch (OrientType) - { - case OrientTypeEnum.FaceOrigin: - case OrientTypeEnum.FaceFoward: - NodeList[i].transform.rotation = Quaternion.LookRotation(newRot); - break; - - case OrientTypeEnum.FaceOriginReversed: - case OrientTypeEnum.FaceForwardReversed: - NodeList[i].transform.rotation = Quaternion.LookRotation(newRot); - NodeList[i].transform.Rotate(0f, 180f, 0f); - break; - - case OrientTypeEnum.None: - break; - - default: - throw new ArgumentOutOfRangeException(); - } + UpdateNodeFacing(NodeList[i], OrientType, newPos); } // Iterate [x] times @@ -395,6 +350,65 @@ private void LayoutChildren() { } } + /// + /// Update the facing of a node given the nodes new position for facing orign with node and orientation type + /// + /// + /// + /// + private void UpdateNodeFacing(CollectionNode node, OrientTypeEnum orientType, Vector3 newPos = new Vector3()) + { + Vector3 centerAxis; + Vector3 pointOnAxisNearestNode; + switch (OrientType) + { + case OrientTypeEnum.FaceOrigin: + node.transform.rotation = Quaternion.LookRotation(node.transform.position - this.transform.position, this.transform.up); + break; + + case OrientTypeEnum.FaceOriginReversed: + node.transform.rotation = Quaternion.LookRotation(this.transform.position - node.transform.position, this.transform.up); + break; + + case OrientTypeEnum.FaceCenterAxis: + centerAxis = Vector3.Project(node.transform.position - this.transform.position, this.transform.up); + pointOnAxisNearestNode = this.transform.position + centerAxis; + node.transform.rotation = Quaternion.LookRotation(node.transform.position - pointOnAxisNearestNode, this.transform.up); + + break; + + case OrientTypeEnum.FaceCenterAxisReversed: + centerAxis = Vector3.Project(node.transform.position - this.transform.position, this.transform.up); + pointOnAxisNearestNode = this.transform.position + centerAxis; + node.transform.rotation = Quaternion.LookRotation(pointOnAxisNearestNode - node.transform.position, this.transform.up); + + break; + + case OrientTypeEnum.FaceFoward: + node.transform.forward = transform.rotation * Vector3.forward; + break; + + case OrientTypeEnum.FaceForwardReversed: + node.transform.forward = transform.rotation * Vector3.back; + break; + + case OrientTypeEnum.FaceParentUp: + node.transform.forward = transform.rotation * Vector3.up; + break; + + case OrientTypeEnum.FaceParentDown: + node.transform.forward = transform.rotation * Vector3.down; + break; + + case OrientTypeEnum.None: + break; + + default: + throw new ArgumentOutOfRangeException(); + } + } + + /// /// Internal function for getting the relative mapping based on a source Vec3 and a radius for spherical mapping. /// @@ -434,6 +448,27 @@ private Vector3 CylindricalMapping(Vector3 source, float radius) return newPos; } + /// + /// Internal function for getting the relative mapping based on a source Vec3 and a radius for cylinder mapping. + /// + /// The source to be mapped to cylinder + /// This is a for the radius of the cylinder + /// This is a for the radius of the cylinder + /// This is a for the radius of the cylinder + /// + private Vector3 RadialMapping(Vector3 source, float radius, int row, int column) + { + Radius = radius >= 0 ? Radius : radius; + + Vector3 newPos = new Vector3(0f, 0f, (Radius/Rows) * row); + float yAngle = _radialCellAngle * (column - (_columns / 2f)) + (_radialCellAngle*.5f); + + Quaternion rot = Quaternion.Euler(0.0f, yAngle, 0.0f); + newPos = rot * newPos; + + return newPos; + } + /// /// Internal function to check if a node exists in the NodeList. /// diff --git a/Assets/HoloToolkit/UX/Scripts/Dialog/DialogShell.cs b/Assets/HoloToolkit/UX/Scripts/Dialog/DialogShell.cs index 2cb80279553..519d224241f 100644 --- a/Assets/HoloToolkit/UX/Scripts/Dialog/DialogShell.cs +++ b/Assets/HoloToolkit/UX/Scripts/Dialog/DialogShell.cs @@ -15,7 +15,7 @@ namespace HoloToolkit.UX.Dialog { /// - /// Dialog that approximates the look of a HoloLens shell dialog + /// Dialog that approximates the look of a Hololens shell dialog /// public class DialogShell : Dialog { @@ -28,6 +28,9 @@ public class DialogShell : Dialog [SerializeField] private TextMesh messageText; + [SerializeField] + private GameObject[] oneButtonSet; + [SerializeField] private GameObject[] twoButtonSet; @@ -100,6 +103,7 @@ protected override void GenerateButtons() } } + oneButtonSet = new GameObject[1]; twoButtonSet = new GameObject[2]; //Find all buttons on dialog... @@ -120,7 +124,7 @@ protected override void GenerateButtons() buttonsOnDialog[i + step].ButtonTypeEnum = buttonTypes[i]; } } - } + } private void SetButtonsActiveStates(List buttons, int count) { @@ -128,9 +132,9 @@ private void SetButtonsActiveStates(List buttons, int count) for (int i = 0; i < buttons.Count; ++i) { var flag1 = (count == 1) && (i == 0); - var flag2 = (count == 2) && (i > 0); + var flag2 = (count == 2) && (i > 0) ? true : false; buttons[i].ParentDialog = this; - buttons[i].gameObject.SetActive(flag1 || flag2); + buttons[i].gameObject.SetActive(flag1 ? true : flag2); } } @@ -170,7 +174,7 @@ protected override void SetTitleAndMessage() { titleText = child.GetComponent(); } - else if (child != null && child.name == "TitleMessage") + else if( child != null && child.name == "TitleMessage") { messageText = child.GetComponent(); } @@ -203,10 +207,10 @@ public static string WordWrap(string text, int maxCharsPerLine) { return text; } - + for (pos = 0; pos < text.Length; pos = next) { - int endOfLine = text.IndexOf(Environment.NewLine, pos, StringComparison.Ordinal); + int endOfLine = text.IndexOf(System.Environment.NewLine, pos); if (endOfLine == -1) { @@ -214,7 +218,7 @@ public static string WordWrap(string text, int maxCharsPerLine) } else { - next = endOfLine + Environment.NewLine.Length; + next = endOfLine + System.Environment.NewLine.Length; } if (endOfLine > pos) @@ -227,7 +231,7 @@ public static string WordWrap(string text, int maxCharsPerLine) len = BreakLine(text, pos, maxCharsPerLine); stringBuilder.Append(text, pos, len); - stringBuilder.Append(Environment.NewLine); + stringBuilder.Append(System.Environment.NewLine); pos += len; @@ -246,7 +250,7 @@ public static string WordWrap(string text, int maxCharsPerLine) return stringBuilder.ToString(); } - + /// /// Method to linebreak text /// diff --git a/Assets/HoloToolkit/UX/Scripts/Keyboard.cs b/Assets/HoloToolkit/UX/Scripts/Keyboard.cs index 63f6a5924b1..26aeab31cd1 100644 --- a/Assets/HoloToolkit/UX/Scripts/Keyboard.cs +++ b/Assets/HoloToolkit/UX/Scripts/Keyboard.cs @@ -251,10 +251,6 @@ protected override void Awake() } } - // Setting the keyboardType to an undefined TouchScreenKeyboardType, - // which prevents the MRTK keyboard from triggering the system keyboard itself. - InputField.keyboardType = (TouchScreenKeyboardType)(-1); - // Keep keyboard deactivated until needed gameObject.SetActive(false); } @@ -326,10 +322,6 @@ public void OnDictationHypothesis(DictationEventData eventData) /// Dictation event data public void OnDictationResult(DictationEventData eventData) { - if (eventData.used) - { - return; - } var text = eventData.DictationResult; ResetClosingTime(); if (text != null) @@ -340,7 +332,6 @@ public void OnDictationResult(DictationEventData eventData) m_CaretPosition += text.Length; UpdateCaretPosition(m_CaretPosition); - eventData.Use(); } } diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/LineUnity.cs b/Assets/HoloToolkit/UX/Scripts/Lines/LineUnity.cs index fdc336b88e6..0174e3d34ac 100644 --- a/Assets/HoloToolkit/UX/Scripts/Lines/LineUnity.cs +++ b/Assets/HoloToolkit/UX/Scripts/Lines/LineUnity.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. +using HoloToolkit.Unity; using System.Collections; using UnityEngine; diff --git a/Assets/HoloToolkit/UX/Scripts/Progress/FadeObject.cs b/Assets/HoloToolkit/UX/Scripts/Progress/FadeObject.cs index 61db65fe8e0..a9e076b5eac 100644 --- a/Assets/HoloToolkit/UX/Scripts/Progress/FadeObject.cs +++ b/Assets/HoloToolkit/UX/Scripts/Progress/FadeObject.cs @@ -52,6 +52,7 @@ public bool AutoFadeIn private float fadeCounter = 0; private Color cachedColor; private bool fadingIn = true; + private bool isFading = false; //cache material to prevent memory leak private Material cachedMaterial; diff --git a/Assets/HoloToolkit/UX/Scripts/Progress/ProgressIndicator.cs b/Assets/HoloToolkit/UX/Scripts/Progress/ProgressIndicator.cs index ec04400d9c0..b19af834bf6 100644 --- a/Assets/HoloToolkit/UX/Scripts/Progress/ProgressIndicator.cs +++ b/Assets/HoloToolkit/UX/Scripts/Progress/ProgressIndicator.cs @@ -29,42 +29,42 @@ public bool IsLoading private IndicatorStyleEnum defaultIndicatorStyle = IndicatorStyleEnum.AnimatedOrbs; [SerializeField] private ProgressStyleEnum defaultProgressStyle = ProgressStyleEnum.Percentage; - //[SerializeField] - //private ProgressMessageStyleEnum defaultMessageStyle = ProgressMessageStyleEnum.Visible; + [SerializeField] + private ProgressMessageStyleEnum defaultMessageStyle = ProgressMessageStyleEnum.Visible; // The default prefab used by the 'Prefab' indicator style [SerializeField] - private GameObject defaultPrefab = null; + private GameObject defaultPrefab; // The default icon used by the 'StaticIcon' indicator style [SerializeField] - private GameObject defaultIconPrefab = null; + private GameObject defaultIconPrefab; [SerializeField] - private GameObject defaultOrbsPrefab = null; + private GameObject defaultOrbsPrefab; // The progress bar container object [SerializeField] - private GameObject progressBarContainer = null; + private GameObject progressBarContainer; // The animated progress bar object [SerializeField] - private Transform progressBar = null; + private Transform progressBar; // The message text used by the 'Visible' message style [SerializeField] - private TextMesh messageText = null; + private TextMesh messageText; // The progress text used by all non-'None' progress styles [SerializeField] - private TextMesh progressText = null; + private TextMesh progressText; [SerializeField] - private Animator animator = null; + private Animator animator; public float Progress { - get + get { return smoothProgress; } @@ -88,7 +88,7 @@ public float Progress /// /// /// - public void Open(IndicatorStyleEnum indicatorStyle, ProgressStyleEnum progressStyle, ProgressMessageStyleEnum messageStyle, string message = "", GameObject prefab = null) + public void Open (IndicatorStyleEnum indicatorStyle, ProgressStyleEnum progressStyle, ProgressMessageStyleEnum messageStyle, string message = "", GameObject prefab = null) { if (gameObject.activeSelf) { @@ -109,7 +109,7 @@ public void Open(IndicatorStyleEnum indicatorStyle, ProgressStyleEnum progressSt // Reset our loading progress smoothProgress = 0f; targetProgress = 0f; - + // Re-enable objects based on our style switch (indicatorStyle) { @@ -172,7 +172,7 @@ public void Open(IndicatorStyleEnum indicatorStyle, ProgressStyleEnum progressSt /// Opens the dialog with default settings for indicator and progress /// /// - public void Open(string message) + public void Open (string message) { Open(defaultIndicatorStyle, defaultProgressStyle, ProgressMessageStyleEnum.Visible, message, null); } @@ -194,7 +194,7 @@ public void SetMessage(string message) /// Has no effect until Open is called. /// /// - public void SetProgress(float progress) + public void SetProgress (float progress) { targetProgress = Mathf.Clamp01(progress) * 100; // If progress is 100, assume we want to snap to that value @@ -211,7 +211,7 @@ public void SetProgress(float progress) /// /// Initiates the process of closing the dialog. /// - public void Close() + public void Close () { if (!gameObject.activeSelf) { return; } @@ -228,7 +228,7 @@ private void Start() messageText.gameObject.SetActive(false); } - private void Update() + private void Update () { smoothProgress = Mathf.Lerp(smoothProgress, targetProgress, Time.deltaTime * SmoothProgressSpeed); progressBar.localScale = new Vector3(smoothProgress / 100, 1f, 1f); diff --git a/Assets/HoloToolkit/UX/Scripts/Progress/ProgressIndicatorOrbsRotator.cs b/Assets/HoloToolkit/UX/Scripts/Progress/ProgressIndicatorOrbsRotator.cs index 86c56ce42f0..ff6c64bf919 100644 --- a/Assets/HoloToolkit/UX/Scripts/Progress/ProgressIndicatorOrbsRotator.cs +++ b/Assets/HoloToolkit/UX/Scripts/Progress/ProgressIndicatorOrbsRotator.cs @@ -16,7 +16,7 @@ public class ProgressIndicatorOrbsRotator : MonoBehaviour public GameObject[] orbs; [SerializeField] - private Material orbMaterial = null; + private Material orbMaterial; public float RotationSpeedRawDegrees; public float SpacingDegrees; diff --git a/Assets/HoloToolkit/UX/Scripts/Tooltip/ToolTipBackgroundBlob.cs b/Assets/HoloToolkit/UX/Scripts/Tooltip/ToolTipBackgroundBlob.cs index 4de40990b08..5c407a96d01 100644 --- a/Assets/HoloToolkit/UX/Scripts/Tooltip/ToolTipBackgroundBlob.cs +++ b/Assets/HoloToolkit/UX/Scripts/Tooltip/ToolTipBackgroundBlob.cs @@ -18,16 +18,16 @@ public class ToolTipBackgroundBlob : ToolTipBackground /// [Header("Transform targets")] [SerializeField] - private Transform positionTarget = null; + private Transform positionTarget; [SerializeField] - private Transform rotationTarget = null; + private Transform rotationTarget; [SerializeField] - private Transform distortionTarget = null; + private Transform distortionTarget; [SerializeField] - private Transform attachPointOffset = null; + private Transform attachPointOffset; [Header("Blob settings")] [SerializeField] diff --git a/Assets/HoloToolkit/UX/Scripts/Tooltip/ToolTipBackgroundCorners.cs b/Assets/HoloToolkit/UX/Scripts/Tooltip/ToolTipBackgroundCorners.cs index 47422c0e2a3..bf12b0629f0 100644 --- a/Assets/HoloToolkit/UX/Scripts/Tooltip/ToolTipBackgroundCorners.cs +++ b/Assets/HoloToolkit/UX/Scripts/Tooltip/ToolTipBackgroundCorners.cs @@ -18,13 +18,13 @@ private enum ScaleModeEnum } [SerializeField] - private Transform cornerTopLeft = null; + private Transform cornerTopLeft; [SerializeField] - private Transform cornerTopRight = null; + private Transform cornerTopRight; [SerializeField] - private Transform cornerBotRight = null; + private Transform cornerBotRight; [SerializeField] - private Transform cornerBotLeft = null; + private Transform cornerBotLeft; [SerializeField] [Range(0.01f, 2f)] private float cornerScale = 1f; diff --git a/Assets/HoloToolkit/UX/Scripts/Tooltip/ToolTipSpawner.cs b/Assets/HoloToolkit/UX/Scripts/Tooltip/ToolTipSpawner.cs index 1d9f60960db..3cff3341175 100644 --- a/Assets/HoloToolkit/UX/Scripts/Tooltip/ToolTipSpawner.cs +++ b/Assets/HoloToolkit/UX/Scripts/Tooltip/ToolTipSpawner.cs @@ -65,7 +65,7 @@ public enum RemainType private float lifetime = 1.0f; [SerializeField] - private GameObject toolTipPrefab = null; + private GameObject toolTipPrefab; [SerializeField] private ConnectorFollowType followType = ConnectorFollowType.AnchorOnly; @@ -85,17 +85,15 @@ public enum RemainType [SerializeField] private Vector3 manualPivotLocalPosition = Vector3.up; -#if UNITY_EDITOR [SerializeField] [Range(0f, 1f)] private float pivotDistance = 0.25f; -#endif [SerializeField] private string ToolTipText = "New Tooltip"; [SerializeField] - private Transform Anchor = null; + private Transform Anchor; private float focusEnterTime = 0f; diff --git a/Assets/HoloToolkit/Utilities/Scripts/ApplicationViewManager.cs b/Assets/HoloToolkit/Utilities/Scripts/ApplicationViewManager.cs index 01f3b7cc053..4e3325f3456 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/ApplicationViewManager.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/ApplicationViewManager.cs @@ -1,11 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. - using System; using System.Collections; using UnityEngine; - -#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0) +#if !UNITY_EDITOR && UNITY_WSA using System.Threading.Tasks; using Windows.ApplicationModel.Core; using Windows.UI.Core; @@ -27,7 +25,7 @@ public class ApplicationViewManager : MonoBehaviour { private void Start() { -#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0) +#if !UNITY_EDITOR && UNITY_WSA UnityEngine.WSA.Application.InvokeOnUIThread( () => { @@ -36,7 +34,7 @@ private void Start() #endif } -#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0) +#if !UNITY_EDITOR && UNITY_WSA static int Full3DViewId { get; set; } static System.Collections.Concurrent.ConcurrentDictionary> CallbackDictionary = new System.Collections.Concurrent.ConcurrentDictionary>(); @@ -46,7 +44,7 @@ static System.Collections.Concurrent.ConcurrentDictionary> C /// Call this method with Application View Dispatcher， or in Application View Thread, will return to Full3D View and close Application View /// /// The return value of the XAML View Execution -#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0) +#if !UNITY_EDITOR && UNITY_WSA public static async void CallbackReturnValue(object returnValue) { var viewId = ApplicationView.GetForCurrentView().Id; @@ -80,7 +78,7 @@ public static void CallbackReturnValue(object returnValue) public IEnumerator OnLaunchXamlView(string xamlPageName, Action callback, object pageNavigateParameter = null) { bool isCompleted = false; -#if !UNITY_EDITOR && UNITY_WSA && (!ENABLE_IL2CPP && NET_STANDARD_2_0) +#if !UNITY_EDITOR && UNITY_WSA object returnValue = null; CoreApplicationView newView = CoreApplication.CreateNewView(); int newViewId = 0; diff --git a/Assets/HoloToolkit/Utilities/Scripts/Solvers/SolverRadialView.cs b/Assets/HoloToolkit/Utilities/Scripts/Solvers/SolverRadialView.cs index a01d9c47025..c8ccb483721 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/Solvers/SolverRadialView.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/Solvers/SolverRadialView.cs @@ -179,6 +179,7 @@ private void GetDesiredOrientation(ref Vector3 desiredPos) Vector3 elementDelta = elementPoint - refPoint; float elementDist = elementDelta.magnitude; Vector3 elementDir = elementDist > 0 ? elementDelta / elementDist : Vector3.one; + float flip = Vector3.Dot(elementDelta, refDir); // Generate basis: First get axis perp to refDir pointing toward element Vector3 elementDirPerp = (elementDir - refDir); @@ -197,7 +198,11 @@ private void GetDesiredOrientation(ref Vector3 desiredPos) float clampedDistance = IgnoreDistanceClamp ? elementDist : Mathf.Clamp(elementDist, MinDistance, MaxDistance); // If the angle was clamped, do some special update stuff - if (angDegree != angDegreeClamped) + if (flip < 0) + { + desiredPos = refPoint + refDir; + } + else if (angDegree != angDegreeClamped) { float angRad = angDegreeClamped * Mathf.Deg2Rad; diff --git a/External/ReadMeImages/MRTK_BuildingBlocks.png b/External/ReadMeImages/MRTK_BuildingBlocks.png deleted file mode 100644 index e719f32d15a..00000000000 Binary files a/External/ReadMeImages/MRTK_BuildingBlocks.png and /dev/null differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 50bc7a80531..a232b0669ed 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -127,7 +127,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 2017.4.0.0 + bundleVersion: 2017.2.0.0 preloadedAssets: [] metroInputSource: 0 m_HolographicPauseOnTrackingLoss: 0 @@ -619,7 +619,7 @@ PlayerSettings: m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: MixedRealityToolkit-Unity - metroPackageVersion: 2017.4.0.0 + metroPackageVersion: 2017.2.0.0 metroCertificatePath: Assets/WSATestCertificate.pfx metroCertificatePassword: metroCertificateSubject: Microsoft diff --git a/README.md b/README.md index ff5cfb898cf..bf80eee6f64 100644 --- a/README.md +++ b/README.md @@ -71,9 +71,6 @@ To get up and going as quickly as possible, here are some guides to help you get Check out the [Examples](/Assets/HoloToolkit-Examples) folder for more details. -Check out the article ["Open-Source Building Blocks for Windows Mixed Reality Experiences"](https://medium.com/@dongyoonpark/open-source-building-blocks-for-windows-mixed-reality-experiences-hololens-mixedrealitytoolkit-28a0a16ebb61) -[![MRTK Building Blocks](/External/ReadMeImages/MRTK_BuildingBlocks.png)](https://medium.com/@dongyoonpark/open-source-building-blocks-for-windows-mixed-reality-experiences-hololens-mixedrealitytoolkit-28a0a16ebb61) - **External\How To** docs folder is meant to help everyone with migrating forward or any simple doubts they might have about the process. Please feel free to grow all these sections. We can't wait to see your additions! diff --git a/UpgradeGuide.md b/UpgradeGuide.md index 3e20590175b..a9262d7f9e1 100644 --- a/UpgradeGuide.md +++ b/UpgradeGuide.md @@ -1,29 +1,37 @@ -# General Release Information - -This release is targeted for the Unity 2017.x products -- The recommended Unity version is [2017.4](https://unity3d.com/unity/qa/lts-releases?_ga=2.10765437.818138280.1527115303-289721018.1521153098) - - The recommended **minimum** Unity version is 2017.1 - - We will investigate reported issues on Unity 5.6, please file them in [GitHub](https://github.com/Microsoft/MixedRealityToolkit-Unity/issues) and tag them with "Unity 5.6 -- Unity 2017.2 and newer is required for Immersive headset support - - Unity 2017.1 can be used for HoloLens projects -- Windows SDK 10.0.16299 is required for Unity 2017.2 and newer -- Visual Studio 2017 (15.3 or newer) is required. -- Windows 10 Fall Creators Update (1709) or newer is required. - - Windows 10 April 2018 Update (1803) is recommended - -``` -Note: When upgrading the toolkit in your project, delete the following before importing the new package. -- Assets\HoloToolkit -- Assets\HoloToolkit-Examples (if present) -``` - -# Testing notes - -The Mixed Reality Toolkit team tests on the recommended and the recommended minimum Unity versions. -- A small amount of testing is performed on other Unity releases -- HoloToolkit-Examples scenes are used for the majority of testing -- Compile testing is performed in the Master configuration for: - - .NET Scripting - - IL2CPP - -Please see each the [release notes](https://github.com/Microsoft/MixedRealityToolkit-Unity/releases/latest) for information regarding new features, fixes, breaking changes and known issues. \ No newline at end of file +# General Release Guidelines + +When updating the Mixed Reality Toolkit for Unity in your project always be sure to completely remove all the folders and assets of the toolkit before importing the unity package. Unity does not handle assets that have been deleted, removed, or renamed. + +General releases will list [breaking changes](/BreakingChanges.md) in their descriptions. + +## 2017.2 Upgrade Guide for Window Mixed Reality + +### What you'll need + +- [Unity Editor 2017.2.0p1 MRTP4](http://beta.unity3d.com/download/b1565bfe4a0c/download.html) or later +- Running the Windows Fall Creator's Update Build 1709 or later +- Visual Studio 2017 build 15.3 or later +- Window 10 SDK 10.0.16299.0 or later + +### List of breaking changes +- None to date. See [Unity's upgrade guide](https://docs.unity3d.com/Manual/UpgradeGuide20172.html) for Unity Specific changes. + +## 2017.1 Upgrade Guide + +### What you'll need + +- [Unity Editor 2017.1.2f1](https://unity3d.com/unity/whats-new/unity-2017.1.2) or later +- Window Build 1603 or later +- Visual Studio 2015 or later +- Windows 10 SDKs 10.0.10240.0 though 10.0.15063.0 + +### List of breaking changes +- `TryGetPosition` is now `TryGetPointerPosition` +- `TryGetOrientation` is now `TryGetPointerRotation` +- `SpeechKeywordRecognizedEventData` is now `SpeechEventData` +- All other changes should throw `Obsolete` warnings with suggested updates. +- Renamed feature folders +- Merged Test and Example folders +- Removed `MicStream` scripts and libraries until they pass WACK +- `GameObjects` that utilize the `WorldAnchorStore` need to have unique names. +- `SetGlobalListeners` now registers/unregisters during OnEnable/OnDisable.