diff --git a/Assets/HoloToolkit/Input/Prefabs/Cursor/CursorWithFeedback.prefab b/Assets/HoloToolkit/Input/Prefabs/Cursor/CursorWithFeedback.prefab index 3aa7da63124..b672bdf5a4d 100644 --- a/Assets/HoloToolkit/Input/Prefabs/Cursor/CursorWithFeedback.prefab +++ b/Assets/HoloToolkit/Input/Prefabs/Cursor/CursorWithFeedback.prefab @@ -44,36 +44,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1000010322050210 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4000011066195266} - m_Layer: 2 - m_Name: cursor_sizeNorthSouth_ring - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1000010715023990 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4000011695305602} - m_Layer: 2 - m_Name: cursor_cross_root - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1000011258900396 GameObject: m_ObjectHideFlags: 1 @@ -83,7 +53,7 @@ GameObject: m_Component: - component: {fileID: 4000013324006586} m_Layer: 2 - m_Name: HandDetectedFeedback + m_Name: HandPressedFeedback m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -99,278 +69,259 @@ GameObject: - component: {fileID: 4000011699401982} - component: {fileID: 114000010331726594} m_Layer: 2 - m_Name: FeedbackParent + m_Name: PressedFeedbackParent m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1000012125673284 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4000012320641616} - - component: {fileID: 33000014094570260} - - component: {fileID: 23000010103078400} - - component: {fileID: 114744643079280608} - m_Layer: 2 - m_Name: CursorVisual - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1000012742806780 +--- !u!1 &1188644988713234 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4000010087820484} + - component: {fileID: 4135496477122634} + - component: {fileID: 33212422615190240} + - component: {fileID: 23787470340576556} m_Layer: 2 - m_Name: cursor_sizeNorthSouth_ring_press_scale + m_Name: cursor_sizeNorthSouth_ring_interaction m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1000012762340454 +--- !u!1 &1365520034809534 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4000010452078394} + - component: {fileID: 4655523389939946} m_Layer: 2 - m_Name: Cursor_Ring + m_Name: HandDetectedFeedback m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1000013020990872 +--- !u!1 &1692019640059370 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4000013622417028} + - component: {fileID: 4175304816852270} + - component: {fileID: 33593290910560480} + - component: {fileID: 23766520316925226} + - component: {fileID: 114076802276583352} m_Layer: 2 - m_Name: cursor_sizeNorthSouth_ring_interaction_root + m_Name: CursorOnHolograms m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1000013805455168 +--- !u!1 &1744576705019378 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4000013060984414} + - component: {fileID: 4675138956891490} + - component: {fileID: 108642872807273942} m_Layer: 2 - m_Name: ring_observation_scale + m_Name: CursorOffHolograms m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1000014030841020 +--- !u!1 &1879782099030682 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4000010841534134} + - component: {fileID: 4014551101990556} + - component: {fileID: 114290255652871954} m_Layer: 2 - m_Name: Cursor_SizeNorthSouth + m_Name: DetectedFeedbackParent m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4000010087820484 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000012742806780} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0.004} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4000011066195266} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4000010452078394 +--- !u!4 &4000011699401982 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000012762340454} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1000011704672682} + 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: 4000013060984414} - m_Father: {fileID: 4000013324006586} - m_RootOrder: 0 + - {fileID: 4000013324006586} + m_Father: {fileID: 4000013243965410} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4000010841534134 +--- !u!4 &4000012440933642 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000014030841020} - 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: 4000011695305602} - - {fileID: 4000011066195266} + m_GameObject: {fileID: 1000010093781024} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.0017081683, y: 0.001378314, z: 0.0027336478} + m_LocalScale: {x: 0.028533882, y: 0.025535915, z: 0.03006477} + m_Children: [] m_Father: {fileID: 4000013324006586} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4000011066195266 +--- !u!4 &4000013243965410 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000010322050210} + m_GameObject: {fileID: 1000010024638574} 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: 4000013622417028} - - {fileID: 4000010087820484} - m_Father: {fileID: 4000010841534134} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4000011695305602 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000010715023990} - 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: 4000010841534134} + - {fileID: 4175304816852270} + - {fileID: 4675138956891490} + - {fileID: 4014551101990556} + - {fileID: 4000011699401982} + m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4000011699401982 +--- !u!4 &4000013324006586 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000011704672682} + m_GameObject: {fileID: 1000011258900396} 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_LocalPosition: {x: 0, y: 0, z: -0.01} + m_LocalScale: {x: 1.5, y: 1.5, z: 1} m_Children: - - {fileID: 4000013324006586} - m_Father: {fileID: 4000013243965410} + - {fileID: 4000012440933642} + m_Father: {fileID: 4000011699401982} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4000012320641616 +--- !u!4 &4014551101990556 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000012125673284} + m_GameObject: {fileID: 1879782099030682} 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_Children: + - {fileID: 4655523389939946} m_Father: {fileID: 4000013243965410} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4000012440933642 +--- !u!4 &4135496477122634 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000010093781024} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.0017081683, y: 0.0013783139, z: -0.0012663525} - m_LocalScale: {x: 0.02853388, y: 0.025535913, z: 0.03006477} + m_GameObject: {fileID: 1188644988713234} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.0017081683, y: 0.001378314, z: 0.0027336478} + m_LocalScale: {x: 0.028533882, y: 0.025535915, z: 0.03006477} m_Children: [] - m_Father: {fileID: 4000013622417028} + m_Father: {fileID: 4655523389939946} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4000013060984414 +--- !u!4 &4175304816852270 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000013805455168} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0.002} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 1692019640059370} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.15, y: 1.15, z: 2.5} m_Children: [] - m_Father: {fileID: 4000010452078394} + m_Father: {fileID: 4000013243965410} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4000013243965410 +--- !u!4 &4655523389939946 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000010024638574} + m_GameObject: {fileID: 1365520034809534} 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_LocalPosition: {x: 0, y: 0, z: -0.01} + m_LocalScale: {x: 1.5, y: 1.5, z: 1} m_Children: - - {fileID: 4000011699401982} - - {fileID: 4000012320641616} - m_Father: {fileID: 0} + - {fileID: 4135496477122634} + m_Father: {fileID: 4014551101990556} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4000013324006586 +--- !u!4 &4675138956891490 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000011258900396} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.01} - m_LocalScale: {x: 1.5, y: 1.5, z: 1} - m_Children: - - {fileID: 4000010452078394} - - {fileID: 4000010841534134} - m_Father: {fileID: 4000011699401982} - m_RootOrder: 0 + m_GameObject: {fileID: 1744576705019378} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.005, y: 0.005, z: 0.005} + m_Children: [] + m_Father: {fileID: 4000013243965410} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4000013622417028 -Transform: +--- !u!23 &23000011644528258 +MeshRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000013020990872} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0.004} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4000012440933642} - m_Father: {fileID: 4000011066195266} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23000010103078400 + m_GameObject: {fileID: 1000010093781024} + 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: a4af844808c503d4dbe22d7d215745b1, 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!23 &23766520316925226 MeshRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000012125673284} + m_GameObject: {fileID: 1692019640059370} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -399,12 +350,12 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!23 &23000011644528258 +--- !u!23 &23787470340576556 MeshRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000010093781024} + m_GameObject: {fileID: 1188644988713234} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -440,13 +391,56 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000010093781024} m_Mesh: {fileID: 4300000, guid: 20553dcf305b52a4e84f5e4f56e5afdc, type: 3} ---- !u!33 &33000014094570260 +--- !u!33 &33212422615190240 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1188644988713234} + m_Mesh: {fileID: 4300000, guid: 20553dcf305b52a4e84f5e4f56e5afdc, type: 3} +--- !u!33 &33593290910560480 MeshFilter: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000012125673284} + m_GameObject: {fileID: 1692019640059370} m_Mesh: {fileID: 4300000, guid: c1000081192be7347a0ad0c380ed6171, type: 3} +--- !u!108 &108642872807273942 +Light: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1744576705019378} + m_Enabled: 1 + serializedVersion: 8 + m_Type: 2 + m_Color: {r: 0.8039216, g: 0.6431373, b: 0.9529412, a: 1} + m_Intensity: 1 + m_Range: 0.05 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_Cookie: {fileID: 0} + m_DrawHalo: 1 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 4 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 0 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 --- !u!114 &114000010331726594 MonoBehaviour: m_ObjectHideFlags: 1 @@ -458,8 +452,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac8d5b128a1d8204fb76c86f47b75912, type: 3} m_Name: m_EditorClassIdentifier: - PivotAxis: 0 - TargetTransform: {fileID: 0} + pivotAxis: 0 --- !u!114 &114000011803902180 MonoBehaviour: m_ObjectHideFlags: 1 @@ -482,26 +475,44 @@ MonoBehaviour: LookRotationBlend: 0.5 PrimaryCursorVisual: {fileID: 0} CursorStateData: - - Name: Over Object No Hands + - Name: On Hologram No Hands CursorState: 1 - CursorObject: {fileID: 1000012125673284} - - Name: Hands Visible - CursorState: 2 - CursorObject: {fileID: 1000011704672682} - - Name: Over Object With Hands + CursorObject: {fileID: 1692019640059370} + - Name: On Hologram With Hands CursorState: 3 + CursorObject: {fileID: 1879782099030682} + - Name: Off Hologram No Hands + CursorState: 0 + CursorObject: {fileID: 1744576705019378} + - Name: Off Hologram With Hands + CursorState: 2 + CursorObject: {fileID: 1879782099030682} + - Name: Select Pressed + CursorState: 4 CursorObject: {fileID: 1000011704672682} ParentTransform: {fileID: 0} ---- !u!114 &114744643079280608 +--- !u!114 &114076802276583352 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000012125673284} + m_GameObject: {fileID: 1692019640059370} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bfa899d3f9dc64e41871228531b59783, type: 3} m_Name: m_EditorClassIdentifier: - radius: 0.15 + radius: 0.05 color: {r: 0.3, g: 0.3, b: 0.3, a: 1} +--- !u!114 &114290255652871954 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1879782099030682} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac8d5b128a1d8204fb76c86f47b75912, type: 3} + m_Name: + m_EditorClassIdentifier: + pivotAxis: 0