From c4692e58a2af6cf9babc36828710c66751a1948d Mon Sep 17 00:00:00 2001 From: Paulius Dervinis Date: Tue, 19 Nov 2024 12:24:29 +0200 Subject: [PATCH 1/2] Changed default font and scaled rect UI by 25% --- Assets/Samples/Visualizers/GamepadVis.prefab | 245 ++++++++++-------- .../Visualizers/GamepadVisualizer.unity | 103 ++------ Assets/Samples/Visualizers/InputVisualizer.cs | 1 + Assets/Samples/Visualizers/MouseVis.prefab | 80 +++--- .../Samples/Visualizers/MouseVisualizer.unity | 60 +++-- Assets/Samples/Visualizers/PenVis.prefab | 160 +++++++----- .../Samples/Visualizers/PenVisualizer.unity | 60 +++-- .../Visualizers/SimpleControlsVis.prefab | 52 ++-- .../SimpleControlsVisualizer.unity | 73 +++--- 9 files changed, 423 insertions(+), 411 deletions(-) diff --git a/Assets/Samples/Visualizers/GamepadVis.prefab b/Assets/Samples/Visualizers/GamepadVis.prefab index b7f5192691..239ad5cffe 100644 --- a/Assets/Samples/Visualizers/GamepadVis.prefab +++ b/Assets/Samples/Visualizers/GamepadVis.prefab @@ -24,12 +24,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831073950378571} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831073950378564 MonoBehaviour: @@ -48,10 +49,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 550 - y: 50 - width: 25 - height: 25 + x: 687.5 + y: 62.5 + width: 31.25 + height: 31.25 m_Visualization: 1 m_ControlPath: /buttonNorth m_ControlIndex: 0 @@ -79,12 +80,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831074071876625} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831074071876626 MonoBehaviour: @@ -103,10 +105,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 575 - y: 150 - width: 50 - height: 25 + x: 718.75 + y: 187.5 + width: 62.5 + height: 31.25 m_Visualization: 1 m_ControlPath: /select m_ControlIndex: 0 @@ -134,12 +136,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831074153646138} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831074153646139 MonoBehaviour: @@ -158,10 +161,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 50 - y: 50 - width: 200 - height: 50 + x: 62.5 + y: 62.5 + width: 250 + height: 62.5 m_Visualization: 1 m_ControlPath: /leftTrigger m_ControlIndex: 0 @@ -189,12 +192,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831074316365813} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831074316365814 MonoBehaviour: @@ -213,10 +217,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 100 - y: 125 - width: 150 - height: 50 + x: 125 + y: 156.25 + width: 187.5 + height: 62.5 m_Visualization: 1 m_ControlPath: /leftShoulder m_ControlIndex: 0 @@ -244,12 +248,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831074333637589} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831074333637590 MonoBehaviour: @@ -268,10 +273,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 20 - y: 375 - width: 700 - height: 70 + x: 25 + y: 468.75 + width: 875 + height: 87.5 m_Visualization: 4 m_ControlPath: m_ControlIndex: 0 @@ -299,12 +304,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831074406035309} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831074406035310 MonoBehaviour: @@ -323,10 +329,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 525 - y: 225 - width: 25 - height: 25 + x: 656.25 + y: 281.25 + width: 31.25 + height: 31.25 m_Visualization: 1 m_ControlPath: /dpad/up m_ControlIndex: 0 @@ -354,12 +360,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831074569589721} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831074569589722 MonoBehaviour: @@ -378,10 +385,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 50 - y: 200 - width: 25 - height: 50 + x: 62.5 + y: 250 + width: 31.25 + height: 62.5 m_Visualization: 1 m_ControlPath: /leftStickPress m_ControlIndex: 0 @@ -409,12 +416,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831074657706042} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831074657706043 MonoBehaviour: @@ -433,10 +441,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 275 - y: 125 - width: 150 - height: 50 + x: 343.75 + y: 156.25 + width: 187.5 + height: 62.5 m_Visualization: 1 m_ControlPath: /rightShoulder m_ControlIndex: 0 @@ -464,12 +472,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831074722065633} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831074722065634 MonoBehaviour: @@ -488,10 +497,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 600 - y: 200 - width: 150 - height: 150 + x: 750 + y: 250 + width: 187.5 + height: 187.5 m_Visualization: 1 m_ControlPath: /dpad m_ControlIndex: 0 @@ -519,12 +528,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831074890777055} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831074890777048 MonoBehaviour: @@ -543,10 +553,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 525 - y: 75 - width: 25 - height: 25 + x: 656.25 + y: 93.75 + width: 31.25 + height: 31.25 m_Visualization: 1 m_ControlPath: /buttonWest m_ControlIndex: 0 @@ -574,12 +584,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831074908778958} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831074908778959 MonoBehaviour: @@ -598,10 +609,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 575 - y: 75 - width: 25 - height: 25 + x: 718.75 + y: 93.75 + width: 31.25 + height: 31.25 m_Visualization: 1 m_ControlPath: /buttonEast m_ControlIndex: 0 @@ -629,12 +640,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831074960731593} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831074960731594 MonoBehaviour: @@ -653,10 +665,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 525 - y: 275 - width: 25 - height: 25 + x: 656.25 + y: 343.75 + width: 31.25 + height: 31.25 m_Visualization: 1 m_ControlPath: /dpad/down m_ControlIndex: 0 @@ -684,12 +696,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831075105443482} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831075105443483 MonoBehaviour: @@ -708,10 +721,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 500 - y: 250 - width: 25 - height: 25 + x: 625 + y: 312.5 + width: 31.25 + height: 31.25 m_Visualization: 1 m_ControlPath: /dpad/left m_ControlIndex: 0 @@ -739,12 +752,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831075159756557} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831075159756558 MonoBehaviour: @@ -763,10 +777,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 500 - y: 150 - width: 50 - height: 25 + x: 625 + y: 187.5 + width: 62.5 + height: 31.25 m_Visualization: 1 m_ControlPath: /start m_ControlIndex: 0 @@ -794,12 +808,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831075192722347} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831075192722340 MonoBehaviour: @@ -818,10 +833,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 275 - y: 200 - width: 150 - height: 150 + x: 343.75 + y: 250 + width: 187.5 + height: 187.5 m_Visualization: 1 m_ControlPath: /rightStick m_ControlIndex: 0 @@ -849,12 +864,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831075336578712} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831075336578713 MonoBehaviour: @@ -873,10 +889,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 550 - y: 250 - width: 25 - height: 25 + x: 687.5 + y: 312.5 + width: 31.25 + height: 31.25 m_Visualization: 1 m_ControlPath: /dpad/right m_ControlIndex: 0 @@ -904,9 +920,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831075476541849} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 955.3655, y: 464.9797, z: -160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5430831075516136792} - {fileID: 5430831075192722341} @@ -931,7 +949,6 @@ Transform: - {fileID: 5430831075888579013} - {fileID: 5430831075640135792} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831075476541850 MonoBehaviour: @@ -981,12 +998,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831075516136798} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831075516136799 MonoBehaviour: @@ -1005,10 +1023,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 100 - y: 200 - width: 150 - height: 150 + x: 125 + y: 250 + width: 187.5 + height: 187.5 m_Visualization: 1 m_ControlPath: /leftStick m_ControlIndex: 0 @@ -1036,12 +1054,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831075640135799} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831075640135793 MonoBehaviour: @@ -1060,10 +1079,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 20 - y: 550 - width: 700 - height: 70 + x: 25 + y: 687.5 + width: 875 + height: 87.5 m_Visualization: 7 m_ControlPath: m_ControlIndex: 0 @@ -1091,12 +1110,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831075882524473} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831075882524474 MonoBehaviour: @@ -1115,10 +1135,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 450 - y: 200 - width: 25 - height: 50 + x: 562.5 + y: 250 + width: 31.25 + height: 62.5 m_Visualization: 1 m_ControlPath: /rightStickPress m_ControlIndex: 0 @@ -1146,12 +1166,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831075888579012} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831075888579014 MonoBehaviour: @@ -1170,10 +1191,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 20 - y: 460 - width: 700 - height: 70 + x: 25 + y: 575 + width: 875 + height: 87.5 m_Visualization: 6 m_ControlPath: m_ControlIndex: 0 @@ -1201,12 +1222,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831075958221744} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831075958221745 MonoBehaviour: @@ -1225,10 +1247,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 275 - y: 50 - width: 200 - height: 50 + x: 343.75 + y: 62.5 + width: 250 + height: 62.5 m_Visualization: 1 m_ControlPath: /rightTrigger m_ControlIndex: 0 @@ -1256,12 +1278,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430831075990510035} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5430831075476541851} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5430831075990510060 MonoBehaviour: @@ -1280,10 +1303,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 550 - y: 100 - width: 25 - height: 25 + x: 687.5 + y: 125 + width: 31.25 + height: 31.25 m_Visualization: 1 m_ControlPath: /buttonSouth m_ControlIndex: 0 diff --git a/Assets/Samples/Visualizers/GamepadVisualizer.unity b/Assets/Samples/Visualizers/GamepadVisualizer.unity index 5775ededa7..5db7272668 100644 --- a/Assets/Samples/Visualizers/GamepadVisualizer.unity +++ b/Assets/Samples/Visualizers/GamepadVisualizer.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -207,20 +203,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 676010914} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &989925709 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5430831075476541851, guid: b8429651427a640919754290f3704312, - type: 3} - m_PrefabInstance: {fileID: 5430831075364511436} - m_PrefabAsset: {fileID: 0} --- !u!850595691 &1162315431 LightingSettings: m_ObjectHideFlags: 0 @@ -228,8 +218,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 6 - m_GIWorkflowMode: 1 + serializedVersion: 9 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_RealtimeEnvironmentLighting: 1 @@ -239,6 +228,8 @@ LightingSettings: m_UsingShadowmask: 1 m_BakeBackend: 1 m_LightmapMaxSize: 1024 + m_LightmapSizeFixed: 0 + m_UseMipmapLimits: 1 m_BakeResolution: 40 m_Padding: 2 m_LightmapCompression: 3 @@ -252,13 +243,11 @@ LightingSettings: m_FilterMode: 1 m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} m_ExportTrainingData: 0 + m_EnableWorkerProcessBaking: 1 m_TrainingDataDestination: TrainingData m_RealtimeResolution: 2 m_ForceWhiteAlbedo: 0 m_ForceUpdates: 0 - m_FinalGather: 0 - m_FinalGatherRayCount: 256 - m_FinalGatherFiltering: 1 m_PVRCulling: 1 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 @@ -282,64 +271,7 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_PVRTiledBaking: 0 - m_NumRaysToShootPerTexel: -1 ---- !u!1 &1615874397 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1615874398} - - component: {fileID: 1615874399} - m_Layer: 0 - m_Name: DeviceCurrent - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1615874398 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1615874397} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 989925709} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1615874399 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1615874397} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 50c7363fac4d24ae8a679e3e8f1fa838, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Label: Gamepad.current - m_HistorySamples: 0 - m_TimeWindow: 3 - m_Rect: - serializedVersion: 2 - x: 650 - y: 50 - width: 200 - height: 50 - m_Visualization: 8 - m_ControlPath: /buttonEast - m_ControlIndex: 0 + m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!1001 &5430831075364511436 PrefabInstance: m_ObjectHideFlags: 0 @@ -353,11 +285,6 @@ PrefabInstance: propertyPath: m_Name value: GamepadVis objectReference: {fileID: 0} - - target: {fileID: 5430831075476541851, guid: b8429651427a640919754290f3704312, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5430831075476541851, guid: b8429651427a640919754290f3704312, type: 3} propertyPath: m_LocalPosition.x @@ -410,10 +337,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 5430831075476541851, guid: b8429651427a640919754290f3704312, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1615874398} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8429651427a640919754290f3704312, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 676010918} + - {fileID: 5430831075364511436} diff --git a/Assets/Samples/Visualizers/InputVisualizer.cs b/Assets/Samples/Visualizers/InputVisualizer.cs index 210a701715..ae4671fbc6 100644 --- a/Assets/Samples/Visualizers/InputVisualizer.cs +++ b/Assets/Samples/Visualizers/InputVisualizer.cs @@ -46,6 +46,7 @@ protected void OnGUI() { s_LabelStyle = new GUIStyle(); s_LabelStyle.normal.textColor = Color.yellow; + s_LabelStyle.fontSize = 20; } ////FIXME: why does CalcSize not calculate the rect width correctly? diff --git a/Assets/Samples/Visualizers/MouseVis.prefab b/Assets/Samples/Visualizers/MouseVis.prefab index 15b19039f2..6f37ef1d9c 100644 --- a/Assets/Samples/Visualizers/MouseVis.prefab +++ b/Assets/Samples/Visualizers/MouseVis.prefab @@ -49,10 +49,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 350 + x: 437.5 y: 0 - width: 150 - height: 150 + width: 187.5 + height: 187.5 m_Visualization: 1 m_ControlPath: /scroll m_ControlIndex: 0 @@ -105,10 +105,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 85 - y: 175 - width: 50 - height: 50 + x: 106.25 + y: 218.75 + width: 62.5 + height: 62.5 m_Visualization: 1 m_ControlPath: /middleButton m_ControlIndex: 0 @@ -161,10 +161,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 25 - y: 175 - width: 50 - height: 50 + x: 31.25 + y: 218.75 + width: 62.5 + height: 62.5 m_Visualization: 1 m_ControlPath: /leftButton m_ControlIndex: 0 @@ -217,10 +217,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 20 - y: 375 - width: 700 - height: 70 + x: 25 + y: 468.75 + width: 875 + height: 87.5 m_Visualization: 4 m_ControlPath: m_ControlIndex: 0 @@ -273,10 +273,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 20 - y: 460 - width: 700 - height: 70 + x: 25 + y: 575 + width: 875 + height: 87.5 m_Visualization: 6 m_ControlPath: m_ControlIndex: 0 @@ -331,8 +331,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 150 - height: 150 + width: 187.5 + height: 187.5 m_Visualization: 1 m_ControlPath: /position m_ControlIndex: 0 @@ -452,10 +452,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 175 + x: 218.75 y: 0 - width: 150 - height: 150 + width: 187.5 + height: 187.5 m_Visualization: 1 m_ControlPath: /delta m_ControlIndex: 0 @@ -508,10 +508,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 145 - y: 175 - width: 50 - height: 50 + x: 181.25 + y: 218.75 + width: 62.5 + height: 62.5 m_Visualization: 1 m_ControlPath: /rightButton m_ControlIndex: 0 @@ -564,10 +564,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 20 - y: 550 - width: 700 - height: 70 + x: 25 + y: 687.5 + width: 875 + height: 87.5 m_Visualization: 7 m_ControlPath: m_ControlIndex: 0 @@ -620,10 +620,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 265 - y: 175 - width: 50 - height: 50 + x: 331.25 + y: 218.75 + width: 62.5 + height: 62.5 m_Visualization: 1 m_ControlPath: /backButton m_ControlIndex: 0 @@ -676,10 +676,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 205 - y: 175 - width: 50 - height: 50 + x: 256.25 + y: 218.75 + width: 62.5 + height: 62.5 m_Visualization: 1 m_ControlPath: /forwardButton m_ControlIndex: 0 diff --git a/Assets/Samples/Visualizers/MouseVisualizer.unity b/Assets/Samples/Visualizers/MouseVisualizer.unity index b06bffe97d..97dc0c9c25 100644 --- a/Assets/Samples/Visualizers/MouseVisualizer.unity +++ b/Assets/Samples/Visualizers/MouseVisualizer.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -94,16 +90,18 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 37931c9961b7ded4c914f75e1c05cec0, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -116,7 +114,9 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -160,9 +160,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -196,18 +204,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 676010914} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2680667830097201012 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2680667830796240929, guid: 76c62aa07f01945d4b9afdb34d7a3396, @@ -230,6 +240,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -160.45508 objectReference: {fileID: 0} + - target: {fileID: 2680667830796240931, guid: 76c62aa07f01945d4b9afdb34d7a3396, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2680667830796240931, guid: 76c62aa07f01945d4b9afdb34d7a3396, type: 3} propertyPath: m_LocalRotation.x @@ -245,16 +260,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2680667830796240931, guid: 76c62aa07f01945d4b9afdb34d7a3396, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2680667830796240931, guid: 76c62aa07f01945d4b9afdb34d7a3396, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2680667830796240931, guid: 76c62aa07f01945d4b9afdb34d7a3396, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -271,4 +276,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 76c62aa07f01945d4b9afdb34d7a3396, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 676010918} + - {fileID: 2680667830097201012} diff --git a/Assets/Samples/Visualizers/PenVis.prefab b/Assets/Samples/Visualizers/PenVis.prefab index 5031eddbdf..b303fc0582 100644 --- a/Assets/Samples/Visualizers/PenVis.prefab +++ b/Assets/Samples/Visualizers/PenVis.prefab @@ -24,12 +24,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677240532848139} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3520677241453528550} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677240532848141 MonoBehaviour: @@ -48,10 +49,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 375 - y: 175 - width: 50 - height: 50 + x: 468.75 + y: 218.75 + width: 62.5 + height: 62.5 m_Visualization: 1 m_ControlPath: /eraser m_ControlIndex: 0 @@ -79,12 +80,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677240764781865} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3520677241453528550} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677240764781867 MonoBehaviour: @@ -103,10 +105,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 250 - y: 250 - width: 150 - height: 50 + x: 312.5 + y: 312.5 + width: 187.5 + height: 62.5 m_Visualization: 1 m_ControlPath: /twist m_ControlIndex: 0 @@ -134,12 +136,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677241026549177} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3520677241453528550} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677241026549179 MonoBehaviour: @@ -158,10 +161,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 20 - y: 460 - width: 700 - height: 70 + x: 25 + y: 575 + width: 875 + height: 87.5 m_Visualization: 6 m_ControlPath: m_ControlIndex: 0 @@ -189,12 +192,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677241337048307} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3520677241453528550} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677241337048309 MonoBehaviour: @@ -213,10 +217,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 145 - y: 175 - width: 50 - height: 50 + x: 181.25 + y: 218.75 + width: 62.5 + height: 62.5 m_Visualization: 1 m_ControlPath: /barrel2 m_ControlIndex: 0 @@ -244,12 +248,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677241357042698} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3520677241453528550} - m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677241357042700 MonoBehaviour: @@ -268,10 +273,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 20 - y: 550 - width: 700 - height: 70 + x: 25 + y: 687.5 + width: 875 + height: 87.5 m_Visualization: 7 m_ControlPath: m_ControlIndex: 0 @@ -299,12 +304,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677241370664185} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3520677241453528550} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677241370664187 MonoBehaviour: @@ -323,10 +329,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 175 + x: 218.75 y: 0 - width: 150 - height: 150 + width: 187.5 + height: 187.5 m_Visualization: 1 m_ControlPath: /delta m_ControlIndex: 0 @@ -354,9 +360,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677241453528548} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 955.3655, y: 464.9797, z: -160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3520677241460091173} - {fileID: 3520677241370664184} @@ -374,7 +382,6 @@ Transform: - {fileID: 3520677241026549176} - {fileID: 3520677241357042701} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677241453528551 MonoBehaviour: @@ -424,12 +431,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677241460091171} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3520677241453528550} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677241460091170 MonoBehaviour: @@ -450,8 +458,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 150 - height: 150 + width: 187.5 + height: 187.5 m_Visualization: 1 m_ControlPath: /position m_ControlIndex: 0 @@ -479,12 +487,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677241631212989} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3520677241453528550} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677241631212991 MonoBehaviour: @@ -503,10 +512,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 25 - y: 175 - width: 50 - height: 50 + x: 31.25 + y: 218.75 + width: 62.5 + height: 62.5 m_Visualization: 1 m_ControlPath: /tip m_ControlIndex: 0 @@ -534,12 +543,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677241652670376} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3520677241453528550} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677241652670379 MonoBehaviour: @@ -558,10 +568,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 20 - y: 375 - width: 700 - height: 70 + x: 25 + y: 468.75 + width: 875 + height: 87.5 m_Visualization: 4 m_ControlPath: m_ControlIndex: 0 @@ -589,12 +599,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677241761661965} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3520677241453528550} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677241761661967 MonoBehaviour: @@ -613,10 +624,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 350 + x: 437.5 y: 0 - width: 150 - height: 150 + width: 187.5 + height: 187.5 m_Visualization: 1 m_ControlPath: /tilt m_ControlIndex: 0 @@ -644,12 +655,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677241827783031} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3520677241453528550} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677241827783033 MonoBehaviour: @@ -668,10 +680,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 85 - y: 175 - width: 50 - height: 50 + x: 106.25 + y: 218.75 + width: 62.5 + height: 62.5 m_Visualization: 1 m_ControlPath: /barrel1 m_ControlIndex: 0 @@ -699,12 +711,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677241919970685} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3520677241453528550} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677241919970687 MonoBehaviour: @@ -723,10 +736,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 25 - y: 250 - width: 200 - height: 50 + x: 31.25 + y: 312.5 + width: 250 + height: 62.5 m_Visualization: 1 m_ControlPath: /pressure m_ControlIndex: 0 @@ -754,12 +767,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677242061452016} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3520677241453528550} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677242061452018 MonoBehaviour: @@ -778,10 +792,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 435 - y: 175 - width: 50 - height: 50 + x: 543.75 + y: 218.75 + width: 80 + height: 62.5 m_Visualization: 1 m_ControlPath: /inRange m_ControlIndex: 0 @@ -809,12 +823,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677242357097671} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3520677241453528550} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677242357097673 MonoBehaviour: @@ -833,10 +848,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 265 - y: 175 - width: 50 - height: 50 + x: 331.25 + y: 218.75 + width: 62.5 + height: 62.5 m_Visualization: 1 m_ControlPath: /barrel4 m_ControlIndex: 0 @@ -864,12 +879,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3520677242431053808} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3520677241453528550} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3520677242431053810 MonoBehaviour: @@ -888,10 +904,10 @@ MonoBehaviour: m_TimeWindow: 3 m_Rect: serializedVersion: 2 - x: 205 - y: 175 - width: 50 - height: 50 + x: 256.25 + y: 218.75 + width: 62.5 + height: 62.5 m_Visualization: 1 m_ControlPath: /barrel3 m_ControlIndex: 0 diff --git a/Assets/Samples/Visualizers/PenVisualizer.unity b/Assets/Samples/Visualizers/PenVisualizer.unity index 1ab0ef16f4..fab73780e7 100644 --- a/Assets/Samples/Visualizers/PenVisualizer.unity +++ b/Assets/Samples/Visualizers/PenVisualizer.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -94,16 +90,18 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: f24b0532bf4887e419c28633580a1b0e, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -116,7 +114,9 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -160,9 +160,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -196,18 +204,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 676010914} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3520677240537631409 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3520677241453528548, guid: 15e76881a88c849388ecd62eb8a05750, @@ -230,6 +240,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -160.45508 objectReference: {fileID: 0} + - target: {fileID: 3520677241453528550, guid: 15e76881a88c849388ecd62eb8a05750, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3520677241453528550, guid: 15e76881a88c849388ecd62eb8a05750, type: 3} propertyPath: m_LocalRotation.x @@ -245,16 +260,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3520677241453528550, guid: 15e76881a88c849388ecd62eb8a05750, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3520677241453528550, guid: 15e76881a88c849388ecd62eb8a05750, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3520677241453528550, guid: 15e76881a88c849388ecd62eb8a05750, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -271,4 +276,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15e76881a88c849388ecd62eb8a05750, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 676010918} + - {fileID: 3520677240537631409} diff --git a/Assets/Samples/Visualizers/SimpleControlsVis.prefab b/Assets/Samples/Visualizers/SimpleControlsVis.prefab index 4fe052a083..ce4e1804d0 100644 --- a/Assets/Samples/Visualizers/SimpleControlsVis.prefab +++ b/Assets/Samples/Visualizers/SimpleControlsVis.prefab @@ -24,12 +24,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1309930466035750405} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1309930466712146553} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1309930466035750407 MonoBehaviour: @@ -48,14 +49,13 @@ MonoBehaviour: m_TimeWindow: 4 m_Rect: serializedVersion: 2 - x: 225 - y: 125 - width: 150 - height: 150 + x: 281.25 + y: 156.25 + width: 187.5 + height: 187.5 m_Visualization: 1 m_ActionReference: {fileID: 0} m_ActionName: move - m_PlayerIndex: 0 m_ShowControlName: 1 --- !u!1 &1309930466250040071 GameObject: @@ -81,12 +81,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1309930466250040071} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1309930466712146553} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1309930466250040121 MonoBehaviour: @@ -105,14 +106,13 @@ MonoBehaviour: m_TimeWindow: 4 m_Rect: serializedVersion: 2 - x: 50 - y: 50 - width: 50 - height: 50 + x: 62.5 + y: 62.5 + width: 62.5 + height: 62.5 m_Visualization: 1 m_ActionReference: {fileID: 0} m_ActionName: fire - m_PlayerIndex: 0 m_ShowControlName: 1 --- !u!1 &1309930466712146503 GameObject: @@ -138,16 +138,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1309930466712146503} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 955.3655, y: 464.9797, z: -160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1309930466250040120} - {fileID: 1309930467610566051} - {fileID: 1309930467894820737} - {fileID: 1309930466035750406} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1309930466712146552 MonoBehaviour: @@ -173,7 +174,6 @@ MonoBehaviour: m_Visualization: 0 m_ActionReference: {fileID: 0} m_ActionName: - m_PlayerIndex: 0 m_ShowControlName: 0 --- !u!1 &1309930467610566049 GameObject: @@ -199,12 +199,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1309930467610566049} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1309930466712146553} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1309930467610566050 MonoBehaviour: @@ -223,14 +224,13 @@ MonoBehaviour: m_TimeWindow: 4 m_Rect: serializedVersion: 2 - x: 110 - y: 50 - width: 200 - height: 50 + x: 137.5 + y: 62.5 + width: 250 + height: 62.5 m_Visualization: 2 m_ActionReference: {fileID: 0} m_ActionName: fire - m_PlayerIndex: 0 m_ShowControlName: 0 --- !u!1 &1309930467894820736 GameObject: @@ -256,12 +256,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1309930467894820736} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1309930466712146553} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1309930467894820738 MonoBehaviour: @@ -280,12 +281,11 @@ MonoBehaviour: m_TimeWindow: 4 m_Rect: serializedVersion: 2 - x: 50 - y: 125 - width: 150 - height: 150 + x: 62.5 + y: 156.25 + width: 187.5 + height: 187.5 m_Visualization: 1 m_ActionReference: {fileID: 0} m_ActionName: look - m_PlayerIndex: 0 m_ShowControlName: 1 diff --git a/Assets/Samples/Visualizers/SimpleControlsVisualizer.unity b/Assets/Samples/Visualizers/SimpleControlsVisualizer.unity index e2de791b9a..ebe3a53ee3 100644 --- a/Assets/Samples/Visualizers/SimpleControlsVisualizer.unity +++ b/Assets/Samples/Visualizers/SimpleControlsVisualizer.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -94,16 +90,18 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: ac45b7ccdbae2aa4383585ed412d5c86, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -116,7 +114,9 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -144,12 +144,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 524695744} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 955.3655, y: 464.9797, z: -160.45508} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &524695746 MonoBehaviour: @@ -170,15 +171,14 @@ MonoBehaviour: m_DeviceLostEvent: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.InputSystem.PlayerInput.PlayerInput+DeviceLostEvent, Unity.InputSystem, - Version=0.9.1.0, Culture=neutral, PublicKeyToken=null m_DeviceRegainedEvent: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.InputSystem.PlayerInput.PlayerInput+DeviceRegainedEvent, - Unity.InputSystem, Version=0.9.1.0, Culture=neutral, PublicKeyToken=null + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] m_ActionEvents: [] - m_AutoSwitchControlScheme: 0 + m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: m_DefaultActionMap: 265c38f5-dd18-4d34-b198-aec58e1627ff m_SplitScreenIndex: -1 @@ -223,9 +223,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -259,18 +267,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 676010914} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1309930466053861656 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1309930466712146503, guid: cd3e0c715b35445fbb238f50ba9c9332, @@ -293,6 +303,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -160.45508 objectReference: {fileID: 0} + - target: {fileID: 1309930466712146553, guid: cd3e0c715b35445fbb238f50ba9c9332, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1309930466712146553, guid: cd3e0c715b35445fbb238f50ba9c9332, type: 3} propertyPath: m_LocalRotation.x @@ -308,16 +323,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1309930466712146553, guid: cd3e0c715b35445fbb238f50ba9c9332, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1309930466712146553, guid: cd3e0c715b35445fbb238f50ba9c9332, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 1309930466712146553, guid: cd3e0c715b35445fbb238f50ba9c9332, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -334,4 +339,14 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd3e0c715b35445fbb238f50ba9c9332, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 676010918} + - {fileID: 524695745} + - {fileID: 1309930466053861656} From b4df7c58b0ac1a484532bd51657b251324f6aea5 Mon Sep 17 00:00:00 2001 From: Paulius Dervinis Date: Tue, 19 Nov 2024 12:35:56 +0200 Subject: [PATCH 2/2] Add touchbar to gamepad visualiser --- Assets/Samples/Visualizers/GamepadVis.prefab | 57 ++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/Assets/Samples/Visualizers/GamepadVis.prefab b/Assets/Samples/Visualizers/GamepadVis.prefab index 239ad5cffe..749cf01d85 100644 --- a/Assets/Samples/Visualizers/GamepadVis.prefab +++ b/Assets/Samples/Visualizers/GamepadVis.prefab @@ -1,5 +1,61 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &4692361954689130598 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7286017728639314418} + - component: {fileID: 6586345530156004295} + m_Layer: 0 + m_Name: TouchPad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7286017728639314418 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4692361954689130598} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5430831075476541851} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6586345530156004295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4692361954689130598} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50c7363fac4d24ae8a679e3e8f1fa838, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Label: TouchPad + m_HistorySamples: 100 + m_TimeWindow: 3 + m_Rect: + serializedVersion: 2 + x: 814.2 + y: 156.25 + width: 187.5 + height: 62.5 + m_Visualization: 1 + m_ControlPath: /touchpadButton + m_ControlIndex: 0 --- !u!1 &5430831073950378571 GameObject: m_ObjectHideFlags: 0 @@ -930,6 +986,7 @@ Transform: - {fileID: 5430831075192722341} - {fileID: 5430831074316365815} - {fileID: 5430831074657706036} + - {fileID: 7286017728639314418} - {fileID: 5430831074153646132} - {fileID: 5430831075958221746} - {fileID: 5430831074569589723}