From 5f7c074e495f1d360c1c7ae3cb74c1f17e032165 Mon Sep 17 00:00:00 2001 From: David Goedicke Date: Thu, 12 Oct 2023 10:13:56 -0400 Subject: [PATCH 01/23] ud --- .../.idea/workspace.xml | 9 +- .../Windows/StartServerClientGUI.cs | 20 +- Assets/Components/StrangeTown.zip.meta | 7 + .../1.2.1/HandVisualizer/.sample.json | 5 - ...y.XR.Hands.Samples.VisualizerSample.asmdef | 18 - .../XR Hands/{1.2.1.meta => 1.3.0.meta} | 2 +- .../{1.2.1 => 1.3.0}/HandVisualizer.meta | 2 +- .../1.3.0/HandVisualizer/.sample.json | 4 + .../HandVisualizer/HandVisualizer.unity | 293 +--- .../HandVisualizer/HandVisualizer.unity.meta | 0 .../HandVisualizer/Materials.meta | 0 .../HandVisualizer/Materials/Blue.mat | 0 .../HandVisualizer/Materials/Blue.mat.meta | 0 .../HandVisualizer/Materials/Green.mat | 0 .../HandVisualizer/Materials/Green.mat.meta | 0 .../Materials/HandsDefaultMaterial.mat | 12 +- .../Materials/HandsDefaultMaterial.mat.meta | 0 .../HandVisualizer/Materials/Red.mat | 0 .../HandVisualizer/Materials/Red.mat.meta | 0 .../HandVisualizer/Materials/White.mat | 0 .../HandVisualizer/Materials/White.mat.meta | 0 .../HandVisualizer/Models.meta | 0 .../HandVisualizer/Models/LeftHand.fbx | Bin .../HandVisualizer/Models/LeftHand.fbx.meta | 0 .../HandVisualizer/Models/RightHand.fbx | Bin .../HandVisualizer/Models/RightHand.fbx.meta | 0 .../HandVisualizer/Prefabs.meta | 0 .../HandVisualizer/Prefabs/Joint.prefab | 0 .../HandVisualizer/Prefabs/Joint.prefab.meta | 0 .../Prefabs/Left Hand Tracking.prefab | 0 .../Prefabs/Left Hand Tracking.prefab.meta | 0 .../Prefabs/Right Hand Tracking.prefab | 0 .../Prefabs/Right Hand Tracking.prefab.meta | 0 .../Prefabs/VelocityPrefab.prefab | 0 .../Prefabs/VelocityPrefab.prefab.meta | 0 .../{1.2.1 => 1.3.0}/HandVisualizer/README.md | 0 .../HandVisualizer/README.md.meta | 0 .../HandVisualizer/Scripts.meta | 0 .../HandVisualizer/Scripts/HandProcessor.cs | 180 ++- .../Scripts/HandProcessor.cs.meta | 2 +- .../HandVisualizer/Scripts/HandVisualizer.cs | 384 +++-- .../Scripts/HandVisualizer.cs.meta | 0 ....XR.Hands.Samples.VisualizerSample.asmdef} | 5 +- ...Hands.Samples.VisualizerSample.asmdef.meta | 0 .../Prefabs/UI_2D/Interactive Controls.prefab | 703 --------- .../Prefabs/XR Interaction Setup.prefab | 272 ---- .../Prefabs/UI_3D.meta => 2.5.1.meta} | 2 +- .../{2.4.3 => 2.5.1}/Starter Assets.meta | 2 +- .../Starter Assets/.sample.json | 0 .../Starter Assets/DemoScene.unity | 278 +++- .../Starter Assets/DemoScene.unity.meta | 0 .../Starter Assets/DemoSceneAssets.meta} | 2 +- .../DemoSceneAssets}/AffordanceThemes.meta | 0 .../InteractionColorAffordanceTheme.asset | 0 ...InteractionColorAffordanceTheme.asset.meta | 0 .../DemoSceneAssets}/Audio.meta | 0 .../DemoSceneAssets}/Audio/Button Pop.wav | Bin .../Audio/Button Pop.wav.meta | 5 +- .../DemoSceneAssets/Models.meta | 8 + .../Models/Primitive_Pyramid.fbx | Bin .../Models/Primitive_Pyramid.fbx.meta | 8 +- .../Models/Primitive_Torus.fbx | Bin .../Models/Primitive_Torus.fbx.meta | 8 +- .../DemoSceneAssets}/Models/PushButton.fbx | Bin .../Models/PushButton.fbx.meta | 8 +- .../DemoSceneAssets/Prefabs.meta | 8 + .../DemoSceneAssets}/Prefabs/Climb.meta | 0 .../Prefabs/Climb}/Climb Sample.prefab | 15 +- .../Prefabs/Climb}/Climb Sample.prefab.meta | 0 .../Prefabs/Climb/Climbing Wall.prefab | 129 ++ .../Prefabs/Climb/Climbing Wall.prefab.meta | 0 .../Prefabs/Climb/Ladder.prefab | 4 +- .../Prefabs/Climb/Ladder.prefab.meta | 0 .../Prefabs/Interactables Sample.prefab | 15 +- .../Prefabs/Interactables Sample.prefab.meta | 0 .../Prefabs/Interactables.meta | 0 .../Interactable Instant Pyramid.prefab | 93 +- .../Interactable Instant Pyramid.prefab.meta | 0 .../Interactable Kinematic Torus.prefab | 119 +- .../Interactable Kinematic Torus.prefab.meta | 0 .../Interactable Simple Cube.prefab | 89 +- .../Interactable Simple Cube.prefab.meta | 0 ...Interactable Velocity Tracked Wedge.prefab | 95 +- ...actable Velocity Tracked Wedge.prefab.meta | 0 .../Interaction Affordance.prefab | 4 +- .../Interaction Affordance.prefab.meta | 0 .../Prefabs/Interactables}/Push Button.prefab | 22 +- .../Interactables}/Push Button.prefab.meta | 0 .../DemoSceneAssets/Prefabs/Teleport.meta | 8 + .../Teleport/Snapping Teleport Anchor.prefab | 21 +- .../Snapping Teleport Anchor.prefab.meta | 0 .../Prefabs/Teleport/Teleport Anchor.prefab | 160 +- .../Teleport/Teleport Anchor.prefab.meta | 0 .../Prefabs/Teleport/Teleport Area.prefab | 16 + .../Teleport/Teleport Area.prefab.meta | 0 .../Prefabs/Teleportation Environment.prefab | 3 + .../Teleportation Environment.prefab.meta | 0 .../DemoSceneAssets}/Prefabs/UI Sample.prefab | 283 ++-- .../Prefabs/UI Sample.prefab.meta | 0 .../DemoSceneAssets/Prefabs/UI.meta} | 0 .../Prefabs/UI}/Dropdown.prefab | 14 +- .../Prefabs/UI}/Dropdown.prefab.meta | 0 .../Prefabs/UI/Icon Button.prefab | 383 +++++ .../Prefabs/UI/Icon Button.prefab.meta | 7 + .../Prefabs/UI/Icon Toggle.prefab | 426 +++++ .../Prefabs/UI/Icon Toggle.prefab.meta | 7 + .../Prefabs/UI/Interactive Controls.prefab | 1367 +++++++++++++++++ .../UI}/Interactive Controls.prefab.meta | 0 .../Prefabs/UI}/MinMaxSlider.prefab | 6 +- .../Prefabs/UI}/MinMaxSlider.prefab.meta | 0 .../Prefabs/UI}/ModalSingleButton.prefab | 105 +- .../Prefabs/UI}/ModalSingleButton.prefab.meta | 0 .../Prefabs/UI}/Scroll UI Sample.prefab | 39 +- .../Prefabs/UI}/Scroll UI Sample.prefab.meta | 0 .../Prefabs/UI/Text Toggle.prefab | 507 ++++++ .../Prefabs/UI/Text Toggle.prefab.meta | 7 + .../Prefabs/UI}/TextButton.prefab | 132 +- .../Prefabs/UI}/TextButton.prefab.meta | 0 .../DemoSceneAssets/Scripts.meta | 8 + .../Scripts}/IncrementUIText.cs | 0 .../Scripts}/IncrementUIText.cs.meta | 0 .../DemoSceneAssets/Sprites.meta | 8 + .../DemoSceneAssets/Sprites/Asset.png | Bin 0 -> 1419 bytes .../DemoSceneAssets/Sprites/Asset.png.meta | 140 ++ .../DemoSceneAssets/Sprites/Checkmark.png | Bin 0 -> 690 bytes .../Sprites/Checkmark.png.meta | 140 ++ .../Sprites/Circle_60x60_Horizontal.png | Bin 0 -> 3286 bytes .../Sprites/Circle_60x60_Horizontal.png.meta | 140 ++ .../DemoSceneAssets/Sprites/Forward.png | Bin 0 -> 589 bytes .../DemoSceneAssets/Sprites/Forward.png.meta | 140 ++ .../Sprites/Round Radius 4 Outline.png | Bin 0 -> 908 bytes .../Sprites/Round Radius 4 Outline.png.meta | 153 ++ .../Sprites/Round Radius 4.png | Bin 0 -> 829 bytes .../Sprites/Round Radius 4.png.meta | 153 ++ .../Starter Assets/Editor.meta | 2 +- .../Starter Assets/Editor/Scripts.meta | 0 .../StarterAssetsSampleProjectValidation.cs | 0 ...arterAssetsSampleProjectValidation.cs.meta | 0 ...oolkit.Samples.StarterAssets.Editor.asmdef | 0 ...t.Samples.StarterAssets.Editor.asmdef.meta | 0 .../Starter Assets/Models.meta | 0 .../Models/Primitive_Cylinder.fbx | Bin .../Models/Primitive_Cylinder.fbx.meta | 8 +- .../Starter Assets/Models/Primitive_Wedge.fbx | Bin .../Models/Primitive_Wedge.fbx.meta | 8 +- .../Starter Assets/Models/Reticle_Torus.fbx | Bin 0 -> 33056 bytes .../Models/Reticle_Torus.fbx.meta | 109 ++ .../Models/XRControllerLeft.fbx | Bin .../Models/XRControllerLeft.fbx.meta | 8 +- .../Models/XRControllerRight.fbx | Bin .../Models/XRControllerRight.fbx.meta | 8 +- .../Starter Assets/Prefabs.meta | 0 .../Starter Assets/Prefabs/Controllers.meta | 0 .../Controllers/XR Controller Left.prefab | 42 +- .../XR Controller Left.prefab.meta | 0 .../Controllers/XR Controller Right.prefab | 42 +- .../XR Controller Right.prefab.meta | 0 .../Starter Assets/Prefabs/Interactors.meta | 0 .../Interactors/Direct Interactor.prefab | 2 +- .../Interactors/Direct Interactor.prefab.meta | 0 .../Interactors/Gaze Interactor.prefab | 51 +- .../Interactors/Gaze Interactor.prefab.meta | 0 .../Interactors/Poke Interactor.prefab | 17 +- .../Interactors/Poke Interactor.prefab.meta | 0 .../Prefabs/Interactors/Ray Interactor.prefab | 19 +- .../Interactors/Ray Interactor.prefab.meta | 0 .../Interactors/Teleport Interactor.prefab | 17 +- .../Teleport Interactor.prefab.meta | 0 .../Starter Assets/Prefabs/Teleport.meta | 0 .../Teleport/Blocking Teleport Reticle.prefab | 25 +- .../Blocking Teleport Reticle.prefab.meta | 0 .../Directional Teleport Reticle.prefab | 69 +- .../Directional Teleport Reticle.prefab.meta | 0 .../Prefabs/XR Interaction Setup.prefab | 591 +++++++ .../Prefabs/XR Interaction Setup.prefab.meta | 0 .../Prefabs/XR Origin (XR Rig).prefab | 290 +++- .../Prefabs/XR Origin (XR Rig).prefab.meta | 0 .../2.5.1/Starter Assets/Presets.meta | 8 + .../XRI Default Continuous Move.preset | 0 .../XRI Default Continuous Move.preset.meta | 0 .../XRI Default Continuous Turn.preset | 0 .../XRI Default Continuous Turn.preset.meta | 0 .../XRI Default Gaze Controller.preset | 40 + .../XRI Default Gaze Controller.preset.meta | 0 ...t Left ActionBasedControllerManager.preset | 0 ...t ActionBasedControllerManager.preset.meta | 0 .../XRI Default Left Controller.preset | 82 +- .../XRI Default Left Controller.preset.meta | 0 .../XRI Default Left Grab Move.preset | 0 .../XRI Default Left Grab Move.preset.meta | 0 ... Right ActionBasedControllerManager.preset | 0 ...t ActionBasedControllerManager.preset.meta | 0 .../XRI Default Right Controller.preset | 82 +- .../XRI Default Right Controller.preset.meta | 0 .../XRI Default Right Grab Move.preset | 0 .../XRI Default Right Grab Move.preset.meta | 0 .../Presets}/XRI Default Snap Turn.preset | 0 .../XRI Default Snap Turn.preset.meta | 0 ... Default XR Screen Space Controller.preset | 435 ++++++ ...ult XR Screen Space Controller.preset.meta | 8 + .../XRI Default XR UI Input Module.preset | 8 + ...XRI Default XR UI Input Module.preset.meta | 0 .../Starter Assets/Scripts.meta | 0 .../Scripts/ActionBasedControllerManager.cs | 11 + .../ActionBasedControllerManager.cs.meta | 0 .../Starter Assets/Scripts/DestroySelf.cs | 29 + .../Scripts/DestroySelf.cs.meta | 11 + .../Scripts/DynamicMoveProvider.cs | 0 .../Scripts/DynamicMoveProvider.cs.meta | 0 .../Scripts/GazeInputManager.cs | 0 .../Scripts/GazeInputManager.cs.meta | 0 .../Starter Assets/Scripts/ObjectSpawner.cs | 237 +++ .../Scripts/ObjectSpawner.cs.meta | 11 + .../Scripts/XRPokeFollowAffordance.cs | 0 .../Scripts/XRPokeFollowAffordance.cs.meta | 0 .../Starter Assets/Tunneling Vignette.meta | 8 + .../Tunneling Vignette/TunnelingVignette.mat | 172 +++ .../TunnelingVignette.mat.meta | 8 + .../TunnelingVignette.prefab | 132 ++ .../TunnelingVignette.prefab.meta | 7 + .../TunnelingVignette.shader | 78 + .../TunnelingVignette.shader.meta | 9 + .../TunnelingVignetteHemisphere.fbx | Bin 0 -> 55932 bytes .../TunnelingVignetteHemisphere.fbx.meta | 109 ++ .../TunnelingVignetteSG.shadergraph | 315 ++++ .../TunnelingVignetteSG.shadergraph.meta | 10 + ...ction.Toolkit.Samples.StarterAssets.asmdef | 19 + ....Toolkit.Samples.StarterAssets.asmdef.meta | 0 .../XRI Default Input Actions.inputactions | 475 +++++- ...RI Default Input Actions.inputactions.meta | 0 .../Resources/InteractionLayerSettings.asset | 2 +- Packages/manifest.json | 1 + Packages/packages-lock.json | 27 + ProjectSettings/ShaderGraphSettings.asset | 16 + 234 files changed, 8665 insertions(+), 2198 deletions(-) create mode 100644 Assets/Components/StrangeTown.zip.meta delete mode 100644 Assets/Samples/XR Hands/1.2.1/HandVisualizer/.sample.json delete mode 100644 Assets/Samples/XR Hands/1.2.1/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef rename Assets/Samples/XR Hands/{1.2.1.meta => 1.3.0.meta} (77%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer.meta (77%) create mode 100644 Assets/Samples/XR Hands/1.3.0/HandVisualizer/.sample.json rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/HandVisualizer.unity (74%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/HandVisualizer.unity.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Materials.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Materials/Blue.mat (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Materials/Blue.mat.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Materials/Green.mat (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Materials/Green.mat.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Materials/HandsDefaultMaterial.mat (88%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Materials/HandsDefaultMaterial.mat.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Materials/Red.mat (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Materials/Red.mat.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Materials/White.mat (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Materials/White.mat.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Models.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Models/LeftHand.fbx (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Models/LeftHand.fbx.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Models/RightHand.fbx (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Models/RightHand.fbx.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Prefabs.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Prefabs/Joint.prefab (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Prefabs/Joint.prefab.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Prefabs/Left Hand Tracking.prefab (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Prefabs/Left Hand Tracking.prefab.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Prefabs/Right Hand Tracking.prefab (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Prefabs/Right Hand Tracking.prefab.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Prefabs/VelocityPrefab.prefab (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Prefabs/VelocityPrefab.prefab.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/README.md (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/README.md.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Scripts.meta (100%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Scripts/HandProcessor.cs (51%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Scripts/HandProcessor.cs.meta (83%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Scripts/HandVisualizer.cs (65%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Scripts/HandVisualizer.cs.meta (100%) rename Assets/Samples/{XR Interaction Toolkit/2.4.3/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef => XR Hands/1.3.0/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef} (72%) rename Assets/Samples/XR Hands/{1.2.1 => 1.3.0}/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef.meta (100%) delete mode 100644 Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Interactive Controls.prefab delete mode 100644 Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/XR Interaction Setup.prefab rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs/UI_3D.meta => 2.5.1.meta} (77%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets.meta (77%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/.sample.json (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/DemoScene.unity (96%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/DemoScene.unity.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Scripts/PokeStation.meta => 2.5.1/Starter Assets/DemoSceneAssets.meta} (77%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/AffordanceThemes.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/AffordanceThemes/InteractionColorAffordanceTheme.asset (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/AffordanceThemes/InteractionColorAffordanceTheme.asset.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Audio.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Audio/Button Pop.wav (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Audio/Button Pop.wav.meta (85%) create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models.meta rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Models/Primitive_Pyramid.fbx (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Models/Primitive_Pyramid.fbx.meta (92%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Models/Primitive_Torus.fbx (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Models/Primitive_Torus.fbx.meta (92%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Models/PushButton.fbx (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Models/PushButton.fbx.meta (92%) create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs.meta rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Climb.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb}/Climb Sample.prefab (96%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb}/Climb Sample.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Climb/Climbing Wall.prefab (98%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Climb/Climbing Wall.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Climb/Ladder.prefab (99%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Climb/Ladder.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Interactables Sample.prefab (96%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Interactables Sample.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Interactables.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Interactables/Interactable Instant Pyramid.prefab (84%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Interactables/Interactable Instant Pyramid.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Interactables/Interactable Kinematic Torus.prefab (84%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Interactables/Interactable Kinematic Torus.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Interactables/Interactable Simple Cube.prefab (82%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Interactables/Interactable Simple Cube.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab (84%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Interactables/Interaction Affordance.prefab (99%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Interactables/Interaction Affordance.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs/UI_3D => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables}/Push Button.prefab (96%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs/UI_3D => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables}/Push Button.prefab.meta (100%) create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport.meta rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Teleport/Snapping Teleport Anchor.prefab (94%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Teleport/Snapping Teleport Anchor.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Teleport/Teleport Anchor.prefab (77%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Teleport/Teleport Anchor.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Teleport/Teleport Area.prefab (94%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Teleport/Teleport Area.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Teleportation Environment.prefab (99%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/Teleportation Environment.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/UI Sample.prefab (85%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/DemoSceneAssets}/Prefabs/UI Sample.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs/UI_2D.meta => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI.meta} (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs/UI_2D => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI}/Dropdown.prefab (98%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs/UI_2D => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI}/Dropdown.prefab.meta (100%) create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab.meta create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab.meta create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Interactive Controls.prefab rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs/UI_2D => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI}/Interactive Controls.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs/UI_2D => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI}/MinMaxSlider.prefab (98%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs/UI_2D => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI}/MinMaxSlider.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs/UI_2D => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI}/ModalSingleButton.prefab (84%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs/UI_2D => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI}/ModalSingleButton.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs/UI_2D => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI}/Scroll UI Sample.prefab (98%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs/UI_2D => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI}/Scroll UI Sample.prefab.meta (100%) create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab.meta rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs/UI_2D => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI}/TextButton.prefab (76%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Prefabs/UI_2D => 2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI}/TextButton.prefab.meta (100%) create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Scripts.meta rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Scripts/PokeStation => 2.5.1/Starter Assets/DemoSceneAssets/Scripts}/IncrementUIText.cs (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets/Scripts/PokeStation => 2.5.1/Starter Assets/DemoSceneAssets/Scripts}/IncrementUIText.cs.meta (100%) create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites.meta create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Asset.png create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Asset.png.meta create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png.meta create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png.meta create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Forward.png create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Forward.png.meta create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png.meta create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png.meta rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Editor.meta (77%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Editor/Scripts.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Models.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Models/Primitive_Cylinder.fbx (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Models/Primitive_Cylinder.fbx.meta (92%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Models/Primitive_Wedge.fbx (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Models/Primitive_Wedge.fbx.meta (92%) create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models/Reticle_Torus.fbx create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models/Reticle_Torus.fbx.meta rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Models/XRControllerLeft.fbx (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Models/XRControllerLeft.fbx.meta (92%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Models/XRControllerRight.fbx (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Models/XRControllerRight.fbx.meta (92%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Controllers.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab (96%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab (96%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Interactors.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Interactors/Direct Interactor.prefab (99%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Interactors/Direct Interactor.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Interactors/Gaze Interactor.prefab (91%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Interactors/Gaze Interactor.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Interactors/Poke Interactor.prefab (95%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Interactors/Poke Interactor.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab (95%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab (96%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Teleport.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Teleport/Blocking Teleport Reticle.prefab (92%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Teleport/Blocking Teleport Reticle.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Teleport/Directional Teleport Reticle.prefab (73%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/Teleport/Directional Teleport Reticle.prefab.meta (100%) create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Prefabs/XR Interaction Setup.prefab rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/XR Interaction Setup.prefab.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/XR Origin (XR Rig).prefab (94%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Prefabs/XR Origin (XR Rig).prefab.meta (100%) create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Presets.meta rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Continuous Move.preset (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Continuous Move.preset.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Continuous Turn.preset (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Continuous Turn.preset.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Gaze Controller.preset (94%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Gaze Controller.preset.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Left ActionBasedControllerManager.preset (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Left ActionBasedControllerManager.preset.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Left Controller.preset (89%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Left Controller.preset.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Left Grab Move.preset (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Left Grab Move.preset.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Right ActionBasedControllerManager.preset (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Right ActionBasedControllerManager.preset.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Right Controller.preset (88%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Right Controller.preset.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Right Grab Move.preset (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Right Grab Move.preset.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Snap Turn.preset (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default Snap Turn.preset.meta (100%) create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Presets/XRI Default XR Screen Space Controller.preset create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Presets/XRI Default XR Screen Space Controller.preset.meta rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default XR UI Input Module.preset (94%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3/Starter Assets => 2.5.1/Starter Assets/Presets}/XRI Default XR UI Input Module.preset.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Scripts.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Scripts/ActionBasedControllerManager.cs (97%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Scripts/ActionBasedControllerManager.cs.meta (100%) create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/DestroySelf.cs create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/DestroySelf.cs.meta rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Scripts/DynamicMoveProvider.cs (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Scripts/DynamicMoveProvider.cs.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Scripts/GazeInputManager.cs (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Scripts/GazeInputManager.cs.meta (100%) create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/ObjectSpawner.cs create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/ObjectSpawner.cs.meta rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Scripts/XRPokeFollowAffordance.cs (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Scripts/XRPokeFollowAffordance.cs.meta (100%) create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette.meta create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.mat create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.mat.meta create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab.meta create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.shader create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.shader.meta create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx.meta create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph.meta create mode 100644 Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef.meta (100%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/XRI Default Input Actions.inputactions (82%) rename Assets/Samples/XR Interaction Toolkit/{2.4.3 => 2.5.1}/Starter Assets/XRI Default Input Actions.inputactions.meta (100%) create mode 100644 ProjectSettings/ShaderGraphSettings.asset diff --git a/.idea/.idea.CrossCulturalDriving/.idea/workspace.xml b/.idea/.idea.CrossCulturalDriving/.idea/workspace.xml index 602f88755..0c8a50f3a 100644 --- a/.idea/.idea.CrossCulturalDriving/.idea/workspace.xml +++ b/.idea/.idea.CrossCulturalDriving/.idea/workspace.xml @@ -10,13 +10,8 @@ - - - + - - - @@ -169,6 +164,8 @@ + + diff --git a/Assets/Component_Core/Scripts/PlatformSpecific/Windows/StartServerClientGUI.cs b/Assets/Component_Core/Scripts/PlatformSpecific/Windows/StartServerClientGUI.cs index ccd0922b0..3dc5e0c87 100644 --- a/Assets/Component_Core/Scripts/PlatformSpecific/Windows/StartServerClientGUI.cs +++ b/Assets/Component_Core/Scripts/PlatformSpecific/Windows/StartServerClientGUI.cs @@ -149,12 +149,20 @@ private void ResponseDelegate(ConnectionAndSpawning.ClienConnectionResponse resp public static string LocalIPAddress() { IPHostEntry host; var localIP = "0.0.0.0"; - host = Dns.GetHostEntry(Dns.GetHostName()); - foreach (var ip in host.AddressList) - if (ip.AddressFamily == AddressFamily.InterNetwork) { - localIP = ip.ToString(); - break; - } + try + { + host = Dns.GetHostEntry(Dns.GetHostName()); + foreach (var ip in host.AddressList) + if (ip.AddressFamily == AddressFamily.InterNetwork) { + localIP = ip.ToString(); + break; + } + } + catch (Exception e) + { + Debug.Log($"Could not get ip Address have alook at the error here{e}"); + } + return localIP; } diff --git a/Assets/Components/StrangeTown.zip.meta b/Assets/Components/StrangeTown.zip.meta new file mode 100644 index 000000000..28d6742db --- /dev/null +++ b/Assets/Components/StrangeTown.zip.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5e9bc22cf84f10142b0e47bb8c5b7c9e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/.sample.json b/Assets/Samples/XR Hands/1.2.1/HandVisualizer/.sample.json deleted file mode 100644 index 92bd12812..000000000 --- a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/.sample.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "displayName": "HandVisualizer", - "description": "Basic sample showing how to visualize and pre-process hands.", - "createSeparatePackage": false -} diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef b/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef deleted file mode 100644 index ddc08907d..000000000 --- a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "Unity.XR.Hands.Samples.VisualizerSample", - "rootNamespace": "", - "references": [ - "GUID:75469ad4d38634e559750d17036d5f7c", - "GUID:dc960734dc080426fa6612f1c5fe95f3", - "GUID:ce522b6ed64c8be4c989a1d26d0e3275" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/Samples/XR Hands/1.2.1.meta b/Assets/Samples/XR Hands/1.3.0.meta similarity index 77% rename from Assets/Samples/XR Hands/1.2.1.meta rename to Assets/Samples/XR Hands/1.3.0.meta index b3c6df596..3d92f5948 100644 --- a/Assets/Samples/XR Hands/1.2.1.meta +++ b/Assets/Samples/XR Hands/1.3.0.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 080022e47f55d4743bc81593c4de57d4 +guid: b56d030b9d588c24d8824b275142358e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer.meta similarity index 77% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer.meta index b82e363fc..1a4e9fa0c 100644 --- a/Assets/Samples/XR Hands/1.2.1/HandVisualizer.meta +++ b/Assets/Samples/XR Hands/1.3.0/HandVisualizer.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5005520a592c043469ce60cd53a05524 +guid: 6e0c735c28bf4cc4e8faaf2c040f0a99 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/XR Hands/1.3.0/HandVisualizer/.sample.json b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/.sample.json new file mode 100644 index 000000000..a128f18b8 --- /dev/null +++ b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/.sample.json @@ -0,0 +1,4 @@ +{ + "displayName": "HandVisualizer", + "description": "Basic sample showing how visualize hands." +} diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/HandVisualizer.unity b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/HandVisualizer.unity similarity index 74% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/HandVisualizer.unity rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/HandVisualizer.unity index f9f8f4935..d18519778 100644 --- a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/HandVisualizer.unity +++ b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/HandVisualizer.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 3 + serializedVersion: 2 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - buildHeightMesh: 0 + accuratePlacement: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -130,7 +130,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - serializedVersion: 6 + serializedVersion: 3 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 @@ -143,7 +143,7 @@ LightingSettings: m_LightmapMaxSize: 1024 m_BakeResolution: 40 m_Padding: 2 - m_LightmapCompression: 2 + m_TextureCompression: 1 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -169,8 +169,8 @@ LightingSettings: m_PVREnvironmentReferencePointCount: 2048 m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 - m_PVRMinBounces: 2 - m_PVREnvironmentImportanceSampling: 1 + m_PVRMinBounces: 1 + m_PVREnvironmentMIS: 1 m_PVRFilteringMode: 1 m_PVRDenoiserTypeDirect: 1 m_PVRDenoiserTypeIndirect: 1 @@ -184,9 +184,6 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_PVRTiledBaking: 0 - m_NumRaysToShootPerTexel: -1 - m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!1 &92641028 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3133494152545806682, guid: 3f7511fbc40ae7a4b89c3298a3de199d, type: 3} @@ -224,13 +221,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 215855080} - 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: 944581975} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &215855082 MonoBehaviour: @@ -272,17 +268,9 @@ 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 @@ -416,7 +404,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 944581975} m_Modifications: - target: {fileID: 2321527512367231968, guid: 3f7511fbc40ae7a4b89c3298a3de199d, type: 3} @@ -468,117 +455,7 @@ PrefabInstance: value: Right Hand Tracking objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 2321527512367231968, guid: 3f7511fbc40ae7a4b89c3298a3de199d, type: 3} - insertIndex: -1 - addedObject: {fileID: 1886183404} - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3f7511fbc40ae7a4b89c3298a3de199d, type: 3} ---- !u!4 &402783664 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3288495761867447508, guid: 3f7511fbc40ae7a4b89c3298a3de199d, type: 3} - m_PrefabInstance: {fileID: 402783663} - m_PrefabAsset: {fileID: 0} ---- !u!1 &558794424 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 558794425} - - component: {fileID: 558794426} - m_Layer: 0 - m_Name: LeftPoke - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &558794425 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 558794424} - 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: 1048441850} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &558794426 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 558794424} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0924bcaa9eb50df458a783ae0e2b59f5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1085439598} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_InteractionLayers: - m_Bits: 4294967295 - m_AttachTransform: {fileID: 1048441852} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_PokeDepth: 0.1 - m_PokeWidth: 0.0075 - m_PokeSelectWidth: 0.015 - m_PokeHoverRadius: 0.015 - m_PokeInteractionOffset: 0.005 - m_PhysicsLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_PhysicsTriggerInteraction: 1 - m_RequirePokeFilter: 1 - m_EnableUIInteraction: 1 - m_DebugVisualizationsEnabled: 0 - m_UIHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_UIHoverExited: - m_PersistentCalls: - m_Calls: [] --- !u!1 &935940900 GameObject: m_ObjectHideFlags: 0 @@ -604,13 +481,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 935940900} - 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: 944581975} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &935940902 MonoBehaviour: @@ -625,12 +501,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_UseOptimizedControls: 0 + m_Origin: {fileID: 1085439596} m_LeftHandMesh: {fileID: 1048441851} m_RightHandMesh: {fileID: 92641028} m_HandMeshMaterial: {fileID: 2100000, guid: 613690cd962241049a0ec289a6ff835e, type: 2} m_DrawMeshes: 1 m_DebugDrawPrefab: {fileID: 6507399986997092475, guid: 254b742d65a15d14b9df756ae77de868, type: 3} - m_DebugDrawJoints: 0 + m_DebugDrawJoints: 1 m_VelocityPrefab: {fileID: 8538602047018081646, guid: 629fd7882ec6bfc499a5fcf20035282b, type: 3} m_VelocityType: 2 --- !u!114 &935940903 @@ -645,9 +522,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dd65cb8a4b261f34a969e4b0a69791a1, type: 3} m_Name: m_EditorClassIdentifier: - m_ProcessorExampleMode: 1 - m_LeftHandSmoothingFactor: 16 - m_RightHandSmoothingFactor: 16 --- !u!1 &944581974 GameObject: m_ObjectHideFlags: 0 @@ -671,30 +545,24 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 944581974} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 215855081} - {fileID: 935940901} - {fileID: 1048441850} - {fileID: 92641029} m_Father: {fileID: 1085439597} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1048441849 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 944581975} m_Modifications: - - target: {fileID: 639686448, guid: b3ed8a0a703ebd34a9e44ed3d9f1fcf6, type: 3} - propertyPath: m_Handedness - value: 2 - objectReference: {fileID: 0} - target: {fileID: 141466980049140221, guid: b3ed8a0a703ebd34a9e44ed3d9f1fcf6, type: 3} propertyPath: m_RootOrder value: 2 @@ -744,12 +612,6 @@ PrefabInstance: value: Left Hand Tracking objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 141466980049140221, guid: b3ed8a0a703ebd34a9e44ed3d9f1fcf6, type: 3} - insertIndex: -1 - addedObject: {fileID: 558794425} - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3ed8a0a703ebd34a9e44ed3d9f1fcf6, type: 3} --- !u!4 &1048441850 stripped Transform: @@ -761,11 +623,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 773853689519989575, guid: b3ed8a0a703ebd34a9e44ed3d9f1fcf6, type: 3} m_PrefabInstance: {fileID: 1048441849} m_PrefabAsset: {fileID: 0} ---- !u!4 &1048441852 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7683948867115331237, guid: b3ed8a0a703ebd34a9e44ed3d9f1fcf6, type: 3} - m_PrefabInstance: {fileID: 1048441849} - m_PrefabAsset: {fileID: 0} --- !u!1 &1085439595 GameObject: m_ObjectHideFlags: 0 @@ -776,7 +633,6 @@ GameObject: m_Component: - component: {fileID: 1085439597} - component: {fileID: 1085439596} - - component: {fileID: 1085439598} m_Layer: 0 m_Name: XR Origin m_TagString: Untagged @@ -808,29 +664,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1085439595} - 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: - {fileID: 944581975} m_Father: {fileID: 0} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1085439598 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1085439595} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] --- !u!1 &1517268251 GameObject: m_ObjectHideFlags: 0 @@ -917,116 +758,10 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1517268251} - serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1886183403 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1886183404} - - component: {fileID: 1886183405} - m_Layer: 0 - m_Name: RightPoke - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1886183404 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1886183403} - 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: 92641029} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1886183405 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1886183403} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0924bcaa9eb50df458a783ae0e2b59f5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1085439598} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_InteractionLayers: - m_Bits: 4294967295 - m_AttachTransform: {fileID: 402783664} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_PokeDepth: 0.1 - m_PokeWidth: 0.0075 - m_PokeSelectWidth: 0.015 - m_PokeHoverRadius: 0.015 - m_PokeInteractionOffset: 0.005 - m_PhysicsLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_PhysicsTriggerInteraction: 1 - m_RequirePokeFilter: 1 - m_EnableUIInteraction: 1 - m_DebugVisualizationsEnabled: 0 - m_UIHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_UIHoverExited: - m_PersistentCalls: - m_Calls: [] ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 1517268253} - - {fileID: 1085439597} diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/HandVisualizer.unity.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/HandVisualizer.unity.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/HandVisualizer.unity.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/HandVisualizer.unity.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/Blue.mat b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Blue.mat similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/Blue.mat rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Blue.mat diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/Blue.mat.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Blue.mat.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/Blue.mat.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Blue.mat.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/Green.mat b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Green.mat similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/Green.mat rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Green.mat diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/Green.mat.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Green.mat.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/Green.mat.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Green.mat.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/HandsDefaultMaterial.mat b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/HandsDefaultMaterial.mat similarity index 88% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/HandsDefaultMaterial.mat rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/HandsDefaultMaterial.mat index 6766dc649..04b02ad74 100644 --- a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/HandsDefaultMaterial.mat +++ b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/HandsDefaultMaterial.mat @@ -2,18 +2,14 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: HandsDefaultMaterial m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHABLEND_ON - m_InvalidKeywords: [] + m_ShaderKeywords: _ALPHABLEND_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -21,7 +17,6 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -61,7 +56,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -80,6 +74,6 @@ Material: - _UVSec: 0 - _ZWrite: 0 m_Colors: - - _Color: {r: 0.66518503, g: 0.66518503, b: 0.66518503, a: 1} + - _Color: {r: 0.66518503, g: 0.66518503, b: 0.66518503, a: 0.64705884} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/HandsDefaultMaterial.mat.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/HandsDefaultMaterial.mat.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/HandsDefaultMaterial.mat.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/HandsDefaultMaterial.mat.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/Red.mat b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Red.mat similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/Red.mat rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Red.mat diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/Red.mat.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Red.mat.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/Red.mat.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Red.mat.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/White.mat b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/White.mat similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/White.mat rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/White.mat diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/White.mat.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/White.mat.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Materials/White.mat.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/White.mat.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Models.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Models.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Models.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Models.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Models/LeftHand.fbx b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Models/LeftHand.fbx similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Models/LeftHand.fbx rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Models/LeftHand.fbx diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Models/LeftHand.fbx.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Models/LeftHand.fbx.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Models/LeftHand.fbx.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Models/LeftHand.fbx.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Models/RightHand.fbx b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Models/RightHand.fbx similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Models/RightHand.fbx rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Models/RightHand.fbx diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Models/RightHand.fbx.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Models/RightHand.fbx.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Models/RightHand.fbx.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Models/RightHand.fbx.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/Joint.prefab b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/Joint.prefab similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/Joint.prefab rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/Joint.prefab diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/Joint.prefab.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/Joint.prefab.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/Joint.prefab.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/Joint.prefab.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/Left Hand Tracking.prefab b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/Left Hand Tracking.prefab similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/Left Hand Tracking.prefab rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/Left Hand Tracking.prefab diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/Left Hand Tracking.prefab.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/Left Hand Tracking.prefab.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/Left Hand Tracking.prefab.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/Left Hand Tracking.prefab.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/Right Hand Tracking.prefab b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/Right Hand Tracking.prefab similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/Right Hand Tracking.prefab rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/Right Hand Tracking.prefab diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/Right Hand Tracking.prefab.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/Right Hand Tracking.prefab.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/Right Hand Tracking.prefab.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/Right Hand Tracking.prefab.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/VelocityPrefab.prefab b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/VelocityPrefab.prefab similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/VelocityPrefab.prefab rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/VelocityPrefab.prefab diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/VelocityPrefab.prefab.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/VelocityPrefab.prefab.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Prefabs/VelocityPrefab.prefab.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Prefabs/VelocityPrefab.prefab.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/README.md b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/README.md similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/README.md rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/README.md diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/README.md.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/README.md.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/README.md.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/README.md.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Scripts.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Scripts.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Scripts.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Scripts.meta diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Scripts/HandProcessor.cs b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Scripts/HandProcessor.cs similarity index 51% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Scripts/HandProcessor.cs rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Scripts/HandProcessor.cs index 98937f821..d22da74ba 100644 --- a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Scripts/HandProcessor.cs +++ b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Scripts/HandProcessor.cs @@ -1,76 +1,77 @@ using System.Collections.Generic; using UnityEngine.XR.Hands.Processing; -namespace UnityEngine.XR.Hands.Samples.VisualizerSample { - // Example hand processor that applies transformations on the root poses to - // modify the hands skeleton. Note it is possible to modify the bones - // directly for more advanced use cases that are not shown here. - public class HandProcessor : MonoBehaviour, IXRHandProcessor { - public enum ProcessorExampleMode { +namespace UnityEngine.XR.Hands.Samples.VisualizerSample +{ + /// + /// Example hand processor that applies transformations on the root poses to + /// modify the hands skeleton. Note it is possible to modify the bones + /// directly for more advanced use cases that are not shown here. + /// + public class HandProcessor : MonoBehaviour, IXRHandProcessor + { + /// + public int callbackOrder => 0; + + /// + /// The mode to use for the sample processor. + /// + public enum ProcessorExampleMode + { + /// + /// No processing is applied. + /// None, + + /// + /// Smooths the hand root pose of the left and right hands with interpolated positions + /// Smoothing, + + /// + /// Inverts the left and right hands. + /// Invert } - private static readonly List s_SubsystemsReuse = new(); - - [SerializeField] [Tooltip("The mode to use for the sample processor.")] - private ProcessorExampleMode m_ProcessorExampleMode = ProcessorExampleMode.Smoothing; - - // Smoothing factors for the left and right hands. - [Header("Smoothing parameters")] - [SerializeField] - [Tooltip( - "The smoothing factor to use when smoothing the root of the left hand in the sample processor. Use 0 for no smoothing.")] - private float m_LeftHandSmoothingFactor = 16f; - - [SerializeField] - [Tooltip( - "The smoothing factor to use when smoothing the root of the right hand in the sample processor. Use 0 for no smoothing.")] - private float m_RightHandSmoothingFactor = 16f; - // Variables used for smoothing hand movements. - private readonly bool m_FirstFrame = false; - private Vector3 m_LastLeftHandPosition; - private ProcessorExampleMode m_LastProcessorExampleMode = ProcessorExampleMode.None; - private Vector3 m_LastRightHandPosition; - private Pose m_LeftHandPose = Pose.identity; - private Pose m_RightHandPose = Pose.identity; + bool m_FirstFrame = false; + Vector3 m_LastLeftHandPosition; + Vector3 m_LastRightHandPosition; + Pose m_LeftHandPose = Pose.identity; + Pose m_RightHandPose = Pose.identity; - private XRHandSubsystem m_Subsystem; - - public ProcessorExampleMode processorExampleMode { + [SerializeField] + [Tooltip("The mode to use for the sample processor.")] + ProcessorExampleMode m_ProcessorExampleMode = ProcessorExampleMode.Smoothing; + ProcessorExampleMode m_LastProcessorExampleMode = ProcessorExampleMode.None; + + /// + /// The to use for the sample processor. + /// + public ProcessorExampleMode processorExampleMode + { get => m_ProcessorExampleMode; set => m_ProcessorExampleMode = value; } - private void Update() { - if (m_Subsystem != null) - return; - - SubsystemManager.GetSubsystems(s_SubsystemsReuse); - if (s_SubsystemsReuse.Count == 0) - return; - - m_Subsystem = s_SubsystemsReuse[0]; - m_Subsystem.RegisterProcessor(this); - } - - private void OnDisable() { - if (m_Subsystem != null) { - m_Subsystem.UnregisterProcessor(this); - m_Subsystem = null; - } - } - - public int callbackOrder => 0; + // Smoothing factors for the left and right hands. + [Header("Smoothing parameters")] + [SerializeField] + [Tooltip("The smoothing factor to use when smoothing the root of the left hand in the sample processor. Use 0 for no smoothing.")] + float m_LeftHandSmoothingFactor = 16f; - public void ProcessJoints(XRHandSubsystem subsystem, XRHandSubsystem.UpdateSuccessFlags successFlags, - XRHandSubsystem.UpdateType updateType) { - switch (m_ProcessorExampleMode) { + [SerializeField] + [Tooltip("The smoothing factor to use when smoothing the root of the right hand in the sample processor. Use 0 for no smoothing.")] + float m_RightHandSmoothingFactor = 16f; + + /// + public void ProcessJoints(XRHandSubsystem subsystem, XRHandSubsystem.UpdateSuccessFlags successFlags, XRHandSubsystem.UpdateType updateType) + { + switch (m_ProcessorExampleMode) + { case ProcessorExampleMode.Smoothing: - SmoothHandsExample(subsystem, successFlags, updateType, - m_LastProcessorExampleMode != m_ProcessorExampleMode); + SmoothHandsExample(subsystem, successFlags, updateType, m_LastProcessorExampleMode != m_ProcessorExampleMode); break; case ProcessorExampleMode.Invert: @@ -83,55 +84,57 @@ public void ProcessJoints(XRHandSubsystem subsystem, XRHandSubsystem.UpdateSucce // Smooths the hand movements of an XRHandSubsystem by updating the root // pose of the left and right hands with interpolated positions. - private void SmoothHandsExample(XRHandSubsystem subsystem, XRHandSubsystem.UpdateSuccessFlags successFlags, - XRHandSubsystem.UpdateType updateType, bool modeChanged) { + void SmoothHandsExample(XRHandSubsystem subsystem, XRHandSubsystem.UpdateSuccessFlags successFlags, XRHandSubsystem.UpdateType updateType, bool modeChanged) + { var leftHand = subsystem.leftHand; var rightHand = subsystem.rightHand; - if (leftHand.isTracked && m_LeftHandSmoothingFactor > 0) { + if (leftHand.isTracked && m_LeftHandSmoothingFactor > 0) + { var leftPose = leftHand.rootPose; var currentLeftHandPosition = leftPose.position; - if (!m_FirstFrame && !modeChanged) { - var tweenAmt = Time.deltaTime * m_LeftHandSmoothingFactor; + if (!m_FirstFrame && !modeChanged) + { + float tweenAmt = Time.deltaTime * m_LeftHandSmoothingFactor; currentLeftHandPosition = Vector3.Lerp(m_LastLeftHandPosition, currentLeftHandPosition, tweenAmt); m_LeftHandPose.position = currentLeftHandPosition; m_LeftHandPose.rotation = leftPose.rotation; - + leftHand.SetRootPose(m_LeftHandPose); subsystem.SetCorrespondingHand(leftHand); } - m_LastLeftHandPosition = currentLeftHandPosition; } - if (rightHand.isTracked && m_RightHandSmoothingFactor > 0) { + if (rightHand.isTracked && m_RightHandSmoothingFactor > 0) + { var rightPose = rightHand.rootPose; var currentRightHandPosition = rightPose.position; - if (!m_FirstFrame && !modeChanged) { - var tweenAmt = Time.deltaTime * m_RightHandSmoothingFactor; - currentRightHandPosition = - Vector3.Lerp(m_LastRightHandPosition, currentRightHandPosition, tweenAmt); + if (!m_FirstFrame && !modeChanged) + { + float tweenAmt = Time.deltaTime * m_RightHandSmoothingFactor; + currentRightHandPosition = Vector3.Lerp(m_LastRightHandPosition, currentRightHandPosition, tweenAmt); m_RightHandPose.position = currentRightHandPosition; m_RightHandPose.rotation = rightPose.rotation; - + rightHand.SetRootPose(m_RightHandPose); subsystem.SetCorrespondingHand(rightHand); } - m_LastRightHandPosition = currentRightHandPosition; } } // Call this from process joints to try inverting the user's hands. - private void InvertHandsExample(XRHandSubsystem subsystem, XRHandSubsystem.UpdateSuccessFlags successFlags, - XRHandSubsystem.UpdateType updateType) { + void InvertHandsExample(XRHandSubsystem subsystem, XRHandSubsystem.UpdateSuccessFlags successFlags, XRHandSubsystem.UpdateType updateType) + { var leftHand = subsystem.leftHand; var leftHandPose = leftHand.rootPose; - + var rightHand = subsystem.rightHand; var rightHandPose = rightHand.rootPose; - if (leftHand.isTracked) { + if (leftHand.isTracked) + { leftHand.SetRootPose(rightHandPose); subsystem.SetCorrespondingHand(leftHand); @@ -139,5 +142,30 @@ private void InvertHandsExample(XRHandSubsystem subsystem, XRHandSubsystem.Updat subsystem.SetCorrespondingHand(rightHand); } } + + void Update() + { + if (m_Subsystem != null) + return; + + SubsystemManager.GetSubsystems(s_SubsystemsReuse); + if (s_SubsystemsReuse.Count == 0) + return; + + m_Subsystem = s_SubsystemsReuse[0]; + m_Subsystem.RegisterProcessor(this); + } + + void OnDisable() + { + if (m_Subsystem != null) + { + m_Subsystem.UnregisterProcessor(this); + m_Subsystem = null; + } + } + + XRHandSubsystem m_Subsystem; + static List s_SubsystemsReuse = new List(); } -} \ No newline at end of file +} diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Scripts/HandProcessor.cs.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Scripts/HandProcessor.cs.meta similarity index 83% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Scripts/HandProcessor.cs.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Scripts/HandProcessor.cs.meta index 2fc28aa25..748484b02 100644 --- a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Scripts/HandProcessor.cs.meta +++ b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Scripts/HandProcessor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dd65cb8a4b261f34a969e4b0a69791a1 +guid: ac5903b776721d74786a2e43f00b949a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Scripts/HandVisualizer.cs b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Scripts/HandVisualizer.cs similarity index 65% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Scripts/HandVisualizer.cs rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Scripts/HandVisualizer.cs index e965654b2..5ecd3aacb 100644 --- a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Scripts/HandVisualizer.cs +++ b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Scripts/HandVisualizer.cs @@ -1,82 +1,180 @@ +using System; using System.Collections.Generic; -namespace UnityEngine.XR.Hands.Samples.VisualizerSample { - public class HandVisualizer : MonoBehaviour { - public enum VelocityType { +namespace UnityEngine.XR.Hands.Samples.VisualizerSample +{ + /// + /// This component visualizes the hand joints and mesh for the left and right hands. + /// + public class HandVisualizer : MonoBehaviour + { + /// + /// The type of velocity to visualize. + /// + public enum VelocityType + { + /// + /// Visualize the linear velocity of the joint. + /// Linear, + + /// + /// Visualize the angular velocity of the joint. + /// Angular, - None - } - private static readonly List s_SubsystemsReuse = new(); + /// + /// Do not visualize velocity. + /// + None, + } [SerializeField] - [Tooltip( - "If this is enabled, this component will enable the Input System internal feature flag 'USE_OPTIMIZED_CONTROLS'. You must have at least version 1.5.0 of the Input System and have its backend enabled for this to take effect.")] - private bool m_UseOptimizedControls; + [Tooltip("If this is enabled, this component will enable the Input System internal feature flag 'USE_OPTIMIZED_CONTROLS'. You must have at least version 1.5.0 of the Input System and have its backend enabled for this to take effect.")] + bool m_UseOptimizedControls; [SerializeField] - [Tooltip( - "References either a prefab or a GameObject in the scene that will be used to visualize the left hand.")] - private GameObject m_LeftHandMesh; + [Tooltip("References either a prefab or a GameObject in the scene that will be used to visualize the left hand.")] + GameObject m_LeftHandMesh; [SerializeField] - [Tooltip( - "References either a prefab or a GameObject in the scene that will be used to visualize the right hand.")] - private GameObject m_RightHandMesh; - - [SerializeField] [Tooltip("(Optional) If this is set, the hand meshes will be assigned this material.")] - private Material m_HandMeshMaterial; - - [SerializeField] private bool m_DrawMeshes; - - [SerializeField] private GameObject m_DebugDrawPrefab; - - [SerializeField] private bool m_DebugDrawJoints; - - [SerializeField] private GameObject m_VelocityPrefab; - - [SerializeField] private VelocityType m_VelocityType; - - private HandGameObjects m_LeftHandGameObjects; - private bool m_PreviousDebugDrawJoints; - private bool m_PreviousDrawMeshes; - private VelocityType m_PreviousVelocityType; - private HandGameObjects m_RightHandGameObjects; + [Tooltip("References either a prefab or a GameObject in the scene that will be used to visualize the right hand.")] + GameObject m_RightHandMesh; - private XRHandSubsystem m_Subsystem; + [SerializeField] + [Tooltip("(Optional) If this is set, the hand meshes will be assigned this material.")] + Material m_HandMeshMaterial; - public bool drawMeshes { + [SerializeField] + [Tooltip("Tells the Hand Visualizer to draw the meshes for the hands.")] + bool m_DrawMeshes; + bool m_PreviousDrawMeshes; + + /// + /// Tells the Hand Visualizer to draw the meshes for the hands. + /// + public bool drawMeshes + { get => m_DrawMeshes; set => m_DrawMeshes = value; } - public bool debugDrawJoints { + [SerializeField] + [Tooltip("The prefab that will be used to visualize the joints for debugging.")] + GameObject m_DebugDrawPrefab; + + [SerializeField] + [Tooltip("Tells the Hand Visualizer to draw the debug joints for the hands.")] + bool m_DebugDrawJoints; + bool m_PreviousDebugDrawJoints; + + /// + /// Tells the Hand Visualizer to draw the debug joints for the hands. + /// + public bool debugDrawJoints + { get => m_DebugDrawJoints; set => m_DebugDrawJoints = value; } - public VelocityType velocityType { + [SerializeField] + [Tooltip("Prefab to use for visualizing the velocity.")] + GameObject m_VelocityPrefab; + + [SerializeField] + [Tooltip("The type of velocity to visualize.")] + VelocityType m_VelocityType; + VelocityType m_PreviousVelocityType; + + /// + /// The type of velocity to visualize. + /// + public VelocityType velocityType + { get => m_VelocityType; set => m_VelocityType = value; } - protected void Awake() { + + XRHandSubsystem m_Subsystem; + HandGameObjects m_LeftHandGameObjects; + HandGameObjects m_RightHandGameObjects; + + static readonly List s_SubsystemsReuse = new List(); + + /// + /// See . + /// + protected void Awake() + { #if ENABLE_INPUT_SYSTEM if (m_UseOptimizedControls) InputSystem.InputSystem.settings.SetInternalFeatureFlag("USE_OPTIMIZED_CONTROLS", true); #endif // ENABLE_INPUT_SYSTEM } - protected void Update() { + /// + /// See . + /// + protected void OnEnable() + { + if (m_Subsystem == null) + return; + + UpdateRenderingVisibility(m_LeftHandGameObjects, m_Subsystem.leftHand.isTracked); + UpdateRenderingVisibility(m_RightHandGameObjects, m_Subsystem.rightHand.isTracked); + } + + /// + /// See . + /// + protected void OnDisable() + { + if (m_Subsystem != null) + { + m_Subsystem.trackingAcquired -= OnTrackingAcquired; + m_Subsystem.trackingLost -= OnTrackingLost; + m_Subsystem.updatedHands -= OnUpdatedHands; + m_Subsystem = null; + } + + UpdateRenderingVisibility(m_LeftHandGameObjects, false); + UpdateRenderingVisibility(m_RightHandGameObjects, false); + } + + /// + /// See . + /// + protected void OnDestroy() + { + if (m_LeftHandGameObjects != null) + { + m_LeftHandGameObjects.OnDestroy(); + m_LeftHandGameObjects = null; + } + + if (m_RightHandGameObjects != null) + { + m_RightHandGameObjects.OnDestroy(); + m_RightHandGameObjects = null; + } + } + + /// + /// See . + /// + protected void Update() + { if (m_Subsystem != null && m_Subsystem.running) return; SubsystemManager.GetSubsystems(s_SubsystemsReuse); var foundRunningHandSubsystem = false; - for (var i = 0; i < s_SubsystemsReuse.Count; ++i) { + for (var i = 0; i < s_SubsystemsReuse.Count; ++i) + { var handSubsystem = s_SubsystemsReuse[i]; - if (handSubsystem.running) { + if (handSubsystem.running) + { UnsubscribeHandSubsystem(); m_Subsystem = handSubsystem; foundRunningHandSubsystem = true; @@ -88,6 +186,7 @@ protected void Update() { return; if (m_LeftHandGameObjects == null) + { m_LeftHandGameObjects = new HandGameObjects( Handedness.Left, transform, @@ -95,8 +194,10 @@ protected void Update() { m_HandMeshMaterial, m_DebugDrawPrefab, m_VelocityPrefab); + } if (m_RightHandGameObjects == null) + { m_RightHandGameObjects = new HandGameObjects( Handedness.Right, transform, @@ -104,6 +205,7 @@ protected void Update() { m_HandMeshMaterial, m_DebugDrawPrefab, m_VelocityPrefab); + } UpdateRenderingVisibility(m_LeftHandGameObjects, m_Subsystem.leftHand.isTracked); UpdateRenderingVisibility(m_RightHandGameObjects, m_Subsystem.rightHand.isTracked); @@ -115,39 +217,8 @@ protected void Update() { SubscribeHandSubsystem(); } - protected void OnEnable() { - if (m_Subsystem == null) - return; - - UpdateRenderingVisibility(m_LeftHandGameObjects, m_Subsystem.leftHand.isTracked); - UpdateRenderingVisibility(m_RightHandGameObjects, m_Subsystem.rightHand.isTracked); - } - - protected void OnDisable() { - if (m_Subsystem != null) { - m_Subsystem.trackingAcquired -= OnTrackingAcquired; - m_Subsystem.trackingLost -= OnTrackingLost; - m_Subsystem.updatedHands -= OnUpdatedHands; - m_Subsystem = null; - } - - UpdateRenderingVisibility(m_LeftHandGameObjects, false); - UpdateRenderingVisibility(m_RightHandGameObjects, false); - } - - protected void OnDestroy() { - if (m_LeftHandGameObjects != null) { - m_LeftHandGameObjects.OnDestroy(); - m_LeftHandGameObjects = null; - } - - if (m_RightHandGameObjects != null) { - m_RightHandGameObjects.OnDestroy(); - m_RightHandGameObjects = null; - } - } - - private void SubscribeHandSubsystem() { + void SubscribeHandSubsystem() + { if (m_Subsystem == null) return; @@ -156,7 +227,8 @@ private void SubscribeHandSubsystem() { m_Subsystem.updatedHands += OnUpdatedHands; } - private void UnsubscribeHandSubsystem() { + void UnsubscribeHandSubsystem() + { if (m_Subsystem == null) return; @@ -165,7 +237,8 @@ private void UnsubscribeHandSubsystem() { m_Subsystem.updatedHands -= OnUpdatedHands; } - private void UpdateRenderingVisibility(HandGameObjects handGameObjects, bool isTracked) { + void UpdateRenderingVisibility(HandGameObjects handGameObjects, bool isTracked) + { if (handGameObjects == null) return; @@ -174,8 +247,10 @@ private void UpdateRenderingVisibility(HandGameObjects handGameObjects, bool isT handGameObjects.SetVelocityType(isTracked ? m_VelocityType : VelocityType.None); } - private void OnTrackingAcquired(XRHand hand) { - switch (hand.handedness) { + void OnTrackingAcquired(XRHand hand) + { + switch (hand.handedness) + { case Handedness.Left: UpdateRenderingVisibility(m_LeftHandGameObjects, true); break; @@ -186,8 +261,10 @@ private void OnTrackingAcquired(XRHand hand) { } } - private void OnTrackingLost(XRHand hand) { - switch (hand.handedness) { + void OnTrackingLost(XRHand hand) + { + switch (hand.handedness) + { case Handedness.Left: UpdateRenderingVisibility(m_LeftHandGameObjects, false); break; @@ -198,30 +275,33 @@ private void OnTrackingLost(XRHand hand) { } } - private void OnUpdatedHands(XRHandSubsystem subsystem, XRHandSubsystem.UpdateSuccessFlags updateSuccessFlags, - XRHandSubsystem.UpdateType updateType) { + void OnUpdatedHands(XRHandSubsystem subsystem, XRHandSubsystem.UpdateSuccessFlags updateSuccessFlags, XRHandSubsystem.UpdateType updateType) + { // We have no game logic depending on the Transforms, so early out here // (add game logic before this return here, directly querying from // subsystem.leftHand and subsystem.rightHand using GetJoint on each hand) if (updateType == XRHandSubsystem.UpdateType.Dynamic) return; - var leftHandTracked = subsystem.leftHand.isTracked; - var rightHandTracked = subsystem.rightHand.isTracked; + bool leftHandTracked = subsystem.leftHand.isTracked; + bool rightHandTracked = subsystem.rightHand.isTracked; - if (m_PreviousDrawMeshes != m_DrawMeshes) { + if (m_PreviousDrawMeshes != m_DrawMeshes) + { m_LeftHandGameObjects.ToggleDrawMesh(m_DrawMeshes); m_RightHandGameObjects.ToggleDrawMesh(m_DrawMeshes); m_PreviousDrawMeshes = m_DrawMeshes; } - if (m_PreviousDebugDrawJoints != m_DebugDrawJoints) { + if (m_PreviousDebugDrawJoints != m_DebugDrawJoints) + { m_LeftHandGameObjects.ToggleDebugDrawJoints(m_DebugDrawJoints && leftHandTracked); m_RightHandGameObjects.ToggleDebugDrawJoints(m_DebugDrawJoints && rightHandTracked); m_PreviousDebugDrawJoints = m_DebugDrawJoints; } - if (m_PreviousVelocityType != m_VelocityType) { + if (m_PreviousVelocityType != m_VelocityType) + { m_LeftHandGameObjects.SetVelocityType(leftHandTracked ? m_VelocityType : VelocityType.None); m_RightHandGameObjects.SetVelocityType(rightHandTracked ? m_VelocityType : VelocityType.None); m_PreviousVelocityType = m_VelocityType; @@ -240,17 +320,18 @@ private void OnUpdatedHands(XRHandSubsystem subsystem, XRHandSubsystem.UpdateSuc m_VelocityType); } - private class HandGameObjects { - private const float k_LineWidth = 0.005f; + class HandGameObjects + { + GameObject m_HandRoot; + GameObject m_DrawJointsParent; - private static readonly Vector3[] s_LinePointsReuse = new Vector3[2]; + GameObject[] m_DrawJoints = new GameObject[XRHandJointID.EndMarker.ToIndex()]; + GameObject[] m_VelocityParents = new GameObject[XRHandJointID.EndMarker.ToIndex()]; + LineRenderer[] m_Lines = new LineRenderer[XRHandJointID.EndMarker.ToIndex()]; - private readonly GameObject[] m_DrawJoints = new GameObject[XRHandJointID.EndMarker.ToIndex()]; - private GameObject m_DrawJointsParent; - private GameObject m_HandRoot; - private readonly LineRenderer[] m_Lines = new LineRenderer[XRHandJointID.EndMarker.ToIndex()]; - private readonly XRHandMeshController m_MeshController; - private readonly GameObject[] m_VelocityParents = new GameObject[XRHandJointID.EndMarker.ToIndex()]; + static Vector3[] s_LinePointsReuse = new Vector3[2]; + XRHandMeshController m_MeshController; + const float k_LineWidth = 0.005f; public HandGameObjects( Handedness handedness, @@ -258,11 +339,13 @@ public HandGameObjects( GameObject meshPrefab, Material meshMaterial, GameObject debugDrawPrefab, - GameObject velocityPrefab) { + GameObject velocityPrefab) + { void AssignJoint( XRHandJointID jointId, Transform jointDrivenTransform, - Transform drawJointsParent) { + Transform drawJointsParent) + { var jointIndex = jointId.ToIndex(); m_DrawJoints[jointIndex] = Instantiate(debugDrawPrefab); m_DrawJoints[jointIndex].transform.parent = drawJointsParent; @@ -279,23 +362,25 @@ void AssignJoint( var isSceneObject = meshPrefab.scene.IsValid(); m_HandRoot = isSceneObject ? meshPrefab : Instantiate(meshPrefab, parent); - m_HandRoot.SetActive( - false); // Deactivate so that added components do not run OnEnable before they are finished being set up + m_HandRoot.SetActive(false); // Deactivate so that added components do not run OnEnable before they are finished being set up m_HandRoot.transform.localPosition = Vector3.zero; m_HandRoot.transform.localRotation = Quaternion.identity; var handEvents = m_HandRoot.GetComponent(); - if (handEvents == null) { + if (handEvents == null) + { handEvents = m_HandRoot.AddComponent(); handEvents.updateType = XRHandTrackingEvents.UpdateTypes.Dynamic; handEvents.handedness = handedness; } m_MeshController = m_HandRoot.GetComponent(); - if (m_MeshController == null) { + if (m_MeshController == null) + { m_MeshController = m_HandRoot.AddComponent(); - for (var childIndex = 0; childIndex < m_HandRoot.transform.childCount; ++childIndex) { + for (var childIndex = 0; childIndex < m_HandRoot.transform.childCount; ++childIndex) + { var childTransform = m_HandRoot.transform.GetChild(childIndex); if (childTransform.TryGetComponent(out var renderer)) m_MeshController.handMeshRenderer = renderer; @@ -304,14 +389,19 @@ void AssignJoint( m_MeshController.handTrackingEvents = handEvents; } - if (meshMaterial != null) m_MeshController.handMeshRenderer.sharedMaterial = meshMaterial; + if (meshMaterial != null) + { + m_MeshController.handMeshRenderer.sharedMaterial = meshMaterial; + } var skeletonDriver = m_HandRoot.GetComponent(); - if (skeletonDriver == null) { + if (skeletonDriver == null) + { skeletonDriver = m_HandRoot.AddComponent(); skeletonDriver.jointTransformReferences = new List(); Transform root = null; - for (var childIndex = 0; childIndex < m_HandRoot.transform.childCount; ++childIndex) { + for (var childIndex = 0; childIndex < m_HandRoot.transform.childCount; ++childIndex) + { var child = m_HandRoot.transform.GetChild(childIndex); if (child.gameObject.name.EndsWith(XRHandJointID.Wrist.ToString())) root = child; @@ -329,7 +419,8 @@ void AssignJoint( m_DrawJointsParent.transform.localRotation = Quaternion.identity; m_DrawJointsParent.name = handedness + "HandDebugDrawJoints"; - for (var i = 0; i < skeletonDriver.jointTransformReferences.Count; i++) { + for (var i = 0; i < skeletonDriver.jointTransformReferences.Count; i++) + { var jointTransformReference = skeletonDriver.jointTransformReferences[i]; var jointTransform = jointTransformReference.jointTransform; var jointID = jointTransformReference.xrHandJointID; @@ -339,16 +430,19 @@ void AssignJoint( m_HandRoot.SetActive(true); } - public void OnDestroy() { + public void OnDestroy() + { Destroy(m_HandRoot); m_HandRoot = null; - for (var jointIndex = 0; jointIndex < m_DrawJoints.Length; ++jointIndex) { + for (var jointIndex = 0; jointIndex < m_DrawJoints.Length; ++jointIndex) + { Destroy(m_DrawJoints[jointIndex]); m_DrawJoints[jointIndex] = null; } - for (var jointIndex = 0; jointIndex < m_VelocityParents.Length; ++jointIndex) { + for (var jointIndex = 0; jointIndex < m_VelocityParents.Length; ++jointIndex) + { Destroy(m_VelocityParents[jointIndex]); m_VelocityParents[jointIndex] = null; } @@ -357,14 +451,17 @@ public void OnDestroy() { m_DrawJointsParent = null; } - public void ToggleDrawMesh(bool drawMesh) { + public void ToggleDrawMesh(bool drawMesh) + { m_MeshController.enabled = drawMesh; if (!drawMesh) m_MeshController.handMeshRenderer.enabled = false; } - public void ToggleDebugDrawJoints(bool debugDrawJoints) { - for (var jointIndex = 0; jointIndex < m_DrawJoints.Length; ++jointIndex) { + public void ToggleDebugDrawJoints(bool debugDrawJoints) + { + for (int jointIndex = 0; jointIndex < m_DrawJoints.Length; ++jointIndex) + { ToggleRenderers(debugDrawJoints, m_DrawJoints[jointIndex].transform); m_Lines[jointIndex].enabled = debugDrawJoints; } @@ -372,50 +469,52 @@ public void ToggleDebugDrawJoints(bool debugDrawJoints) { m_Lines[0].enabled = false; } - public void SetVelocityType(VelocityType velocityType) { - for (var jointIndex = 0; jointIndex < m_VelocityParents.Length; ++jointIndex) - ToggleRenderers(velocityType != VelocityType.None, - m_VelocityParents[jointIndex].transform); + public void SetVelocityType(VelocityType velocityType) + { + for (int jointIndex = 0; jointIndex < m_VelocityParents.Length; ++jointIndex) + ToggleRenderers(velocityType != VelocityType.None, m_VelocityParents[jointIndex].transform); } public void UpdateJoints( XRHand hand, bool areJointsTracked, bool debugDrawJoints, - VelocityType velocityType) { + VelocityType velocityType) + { if (!areJointsTracked) return; var wristPose = Pose.identity; var parentIndex = XRHandJointID.Wrist.ToIndex(); - UpdateJoint(debugDrawJoints, velocityType, hand.GetJoint(XRHandJointID.Wrist), ref wristPose, - ref parentIndex); - UpdateJoint(debugDrawJoints, velocityType, hand.GetJoint(XRHandJointID.Palm), ref wristPose, - ref parentIndex, false); + UpdateJoint(debugDrawJoints, velocityType, hand.GetJoint(XRHandJointID.Wrist), ref wristPose, ref parentIndex); + UpdateJoint(debugDrawJoints, velocityType, hand.GetJoint(XRHandJointID.Palm), ref wristPose, ref parentIndex, false); for (var fingerIndex = (int)XRHandFingerID.Thumb; - fingerIndex <= (int)XRHandFingerID.Little; - ++fingerIndex) { + fingerIndex <= (int)XRHandFingerID.Little; + ++fingerIndex) + { var parentPose = wristPose; var fingerId = (XRHandFingerID)fingerIndex; parentIndex = XRHandJointID.Wrist.ToIndex(); var jointIndexBack = fingerId.GetBackJointID().ToIndex(); for (var jointIndex = fingerId.GetFrontJointID().ToIndex(); - jointIndex <= jointIndexBack; - ++jointIndex) - UpdateJoint(debugDrawJoints, velocityType, - hand.GetJoint(XRHandJointIDUtility.FromIndex(jointIndex)), ref parentPose, ref parentIndex); + jointIndex <= jointIndexBack; + ++jointIndex) + { + UpdateJoint(debugDrawJoints, velocityType, hand.GetJoint(XRHandJointIDUtility.FromIndex(jointIndex)), ref parentPose, ref parentIndex); + } } } - private void UpdateJoint( + void UpdateJoint( bool debugDrawJoints, VelocityType velocityType, XRHandJoint joint, ref Pose parentPose, ref int parentIndex, - bool cacheParentPose = true) { + bool cacheParentPose = true) + { if (joint.id == XRHandJointID.Invalid) return; @@ -426,28 +525,32 @@ private void UpdateJoint( m_DrawJoints[jointIndex].transform.localPosition = pose.position; m_DrawJoints[jointIndex].transform.localRotation = pose.rotation; - if (debugDrawJoints && joint.id != XRHandJointID.Wrist) { + if (debugDrawJoints && joint.id != XRHandJointID.Wrist) + { s_LinePointsReuse[0] = m_DrawJoints[parentIndex].transform.position; s_LinePointsReuse[1] = m_DrawJoints[jointIndex].transform.position; m_Lines[jointIndex].SetPositions(s_LinePointsReuse); } - if (cacheParentPose) { + if (cacheParentPose) + { parentPose = pose; parentIndex = jointIndex; } - if (velocityType != VelocityType.None && - m_VelocityParents[jointIndex].TryGetComponent(out var renderer)) { + if (velocityType != VelocityType.None && m_VelocityParents[jointIndex].TryGetComponent(out var renderer)) + { m_VelocityParents[jointIndex].transform.localPosition = Vector3.zero; m_VelocityParents[jointIndex].transform.localRotation = Quaternion.identity; s_LinePointsReuse[0] = s_LinePointsReuse[1] = m_VelocityParents[jointIndex].transform.position; - if (velocityType == VelocityType.Linear) { + if (velocityType == VelocityType.Linear) + { if (joint.TryGetLinearVelocity(out var velocity)) s_LinePointsReuse[1] += velocity; } - else if (velocityType == VelocityType.Angular) { + else if (velocityType == VelocityType.Angular) + { if (joint.TryGetAngularVelocity(out var velocity)) s_LinePointsReuse[1] += 0.05f * velocity.normalized; } @@ -456,8 +559,9 @@ private void UpdateJoint( } } - private static void ToggleRenderers(bool toggle, Transform rendererTransform) - where TRenderer : Renderer { + static void ToggleRenderers(bool toggle, Transform rendererTransform) + where TRenderer : Renderer + { if (rendererTransform.TryGetComponent(out var renderer)) renderer.enabled = toggle; @@ -466,4 +570,4 @@ private static void ToggleRenderers(bool toggle, Transform rendererTr } } } -} \ No newline at end of file +} diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Scripts/HandVisualizer.cs.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Scripts/HandVisualizer.cs.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Scripts/HandVisualizer.cs.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Scripts/HandVisualizer.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef similarity index 72% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef index 593fb334e..a0cf31649 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef +++ b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef @@ -1,11 +1,10 @@ { - "name": "Unity.XR.Interaction.Toolkit.Samples.StarterAssets", + "name": "Unity.XR.Hands.Samples.VisualizerSample", "rootNamespace": "", "references": [ "GUID:75469ad4d38634e559750d17036d5f7c", "GUID:dc960734dc080426fa6612f1c5fe95f3", - "GUID:fe685ec1767f73d42b749ea8045bfe43", - "GUID:d8b63aba1907145bea998dd612889d6b" + "GUID:ce522b6ed64c8be4c989a1d26d0e3275" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Samples/XR Hands/1.2.1/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef.meta b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef.meta similarity index 100% rename from Assets/Samples/XR Hands/1.2.1/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef.meta rename to Assets/Samples/XR Hands/1.3.0/HandVisualizer/Unity.XR.Hands.Samples.VisualizerSample.asmdef.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Interactive Controls.prefab b/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Interactive Controls.prefab deleted file mode 100644 index daf790122..000000000 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Interactive Controls.prefab +++ /dev/null @@ -1,703 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2737545590463307466 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6362904755243167639} - - component: {fileID: 517074805151515692} - - component: {fileID: 7191271935418851654} - - component: {fileID: 7083281397116298145} - m_Layer: 5 - m_Name: Modal Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6362904755243167639 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2737545590463307466} - 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: 3667051746007278424} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 150, y: 0} - m_SizeDelta: {x: 65, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &517074805151515692 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2737545590463307466} - m_CullTransparentMesh: 0 ---- !u!114 &7191271935418851654 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2737545590463307466} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &7083281397116298145 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2737545590463307466} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Dropdown ---- !u!1 &3667051745010976280 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3667051745010976283} - - component: {fileID: 3667051745010976284} - - component: {fileID: 5638253712277498750} - m_Layer: 5 - m_Name: Header Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3667051745010976283 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051745010976280} - 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: 3667051746007278424} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 140, y: 33.5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3667051745010976284 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051745010976280} - m_CullTransparentMesh: 0 ---- !u!114 &5638253712277498750 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051745010976280} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Test Controls ---- !u!1 &3667051745489041133 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3667051745489041132} - - component: {fileID: 3667051745489041121} - - component: {fileID: 3667051745489041135} - - component: {fileID: 8367975821750483211} - m_Layer: 5 - m_Name: Modal Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3667051745489041132 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051745489041133} - 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: 3667051746007278424} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 150, y: 0} - m_SizeDelta: {x: 36, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3667051745489041121 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051745489041133} - m_CullTransparentMesh: 0 ---- !u!114 &3667051745489041135 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051745489041133} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &8367975821750483211 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051745489041133} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Slider ---- !u!1 &3667051746007278432 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3667051746007278424} - - component: {fileID: 3667051746007278425} - - component: {fileID: 3667051746007278438} - - component: {fileID: 3667051746007278439} - - component: {fileID: 3667051746007278437} - - component: {fileID: 3667051746007278434} - - component: {fileID: 3667051746007278435} - - component: {fileID: 7122483372802297286} - - component: {fileID: 6386679310321119225} - m_Layer: 5 - m_Name: Interactive Controls - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3667051746007278424 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051746007278432} - 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: - - {fileID: 3667051745010976283} - - {fileID: 3667051745489041132} - - {fileID: 6286078562336932208} - - {fileID: 6362904755243167639} - - {fileID: 7782198574890342273} - m_Father: {fileID: 0} - 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: 475, y: 0} - m_SizeDelta: {x: 300, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &3667051746007278425 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051746007278432} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &3667051746007278438 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051746007278432} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!114 &3667051746007278439 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051746007278432} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!222 &3667051746007278437 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051746007278432} - m_CullTransparentMesh: 0 ---- !u!114 &3667051746007278434 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051746007278432} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.7490196} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 8 ---- !u!114 &3667051746007278435 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051746007278432} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 16 - m_Right: 16 - m_Top: 12 - m_Bottom: 16 - m_ChildAlignment: 4 - m_Spacing: 10 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &7122483372802297286 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051746007278432} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 1 ---- !u!114 &6386679310321119225 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3667051746007278432} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7951c64acb0fa62458bf30a60089fe2d, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 0 - m_CheckFor2DOcclusion: 0 - m_CheckFor3DOcclusion: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 2147483647 - m_RaycastTriggerInteraction: 1 ---- !u!1001 &3002391033074314980 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 3667051746007278424} - m_Modifications: - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_SizeDelta.x - value: 260 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_SizeDelta.y - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_LocalPosition.z - value: 0.000014901161 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4779813318549682554, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - propertyPath: m_Name - value: Dropdown - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} ---- !u!224 &7782198574890342273 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} - m_PrefabInstance: {fileID: 3002391033074314980} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3118446809100046906 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 3667051746007278424} - m_Modifications: - - target: {fileID: 8969571751951368413, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571751951368413, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752320557268, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752320557268, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752320557268, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551113, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_Name - value: MinMaxSlider - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_SizeDelta.x - value: 260 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_SizeDelta.y - value: 48 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} ---- !u!224 &6286078562336932208 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} - m_PrefabInstance: {fileID: 3118446809100046906} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/XR Interaction Setup.prefab b/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/XR Interaction Setup.prefab deleted file mode 100644 index c9a815566..000000000 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/XR Interaction Setup.prefab +++ /dev/null @@ -1,272 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &3127728406573987378 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3127728406573987373} - - component: {fileID: 3127728406573987372} - - component: {fileID: 3127728406573987374} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3127728406573987373 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3127728406573987378} - 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: 4134505312059479865} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3127728406573987372 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3127728406573987378} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!114 &3127728406573987374 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3127728406573987378} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ab68ce6587aab0146b8dabefbd806791, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ClickSpeed: 0.3 - m_MoveDeadzone: 0.6 - m_RepeatDelay: 0.5 - m_RepeatRate: 0.1 - m_TrackedDeviceDragThresholdMultiplier: 2 - m_ActiveInputMode: 1 - m_MaxTrackedDeviceRaycastDistance: 1000 - m_EnableXRInput: 1 - m_EnableMouseInput: 1 - m_EnableTouchInput: 1 - m_PointAction: {fileID: 2869410428622933342, guid: c348712bda248c246b8c49b3db54643f, type: 3} - m_LeftClickAction: {fileID: 1855836014308820768, guid: c348712bda248c246b8c49b3db54643f, type: 3} - m_MiddleClickAction: {fileID: -6289560987278519447, guid: c348712bda248c246b8c49b3db54643f, type: 3} - m_RightClickAction: {fileID: -2562941478296515153, guid: c348712bda248c246b8c49b3db54643f, type: 3} - m_ScrollWheelAction: {fileID: 5825226938762934180, guid: c348712bda248c246b8c49b3db54643f, type: 3} - m_NavigateAction: {fileID: -7967456002180160679, guid: c348712bda248c246b8c49b3db54643f, type: 3} - m_SubmitAction: {fileID: 3994978066732806534, guid: c348712bda248c246b8c49b3db54643f, type: 3} - m_CancelAction: {fileID: 2387711382375263438, guid: c348712bda248c246b8c49b3db54643f, type: 3} - m_EnableBuiltinActionsAsFallback: 1 - m_EnableGamepadInput: 1 - m_EnableJoystickInput: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel ---- !u!1 &3127728407087826087 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3127728407087826081} - - component: {fileID: 3127728407087826080} - m_Layer: 0 - m_Name: XR Interaction Manager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3127728407087826081 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3127728407087826087} - 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: 4134505312059479865} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3127728407087826080 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3127728407087826087} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] ---- !u!1 &3127728408163665756 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3127728408163665758} - - component: {fileID: 3127728408163665757} - m_Layer: 0 - m_Name: Input Action Manager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3127728408163665758 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3127728408163665756} - 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: 4134505312059479865} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3127728408163665757 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3127728408163665756} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 017c5e3933235514c9520e1dace2a4b2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ActionAssets: - - {fileID: -944628639613478452, guid: c348712bda248c246b8c49b3db54643f, type: 3} ---- !u!1 &7313654230448209575 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4134505312059479865} - m_Layer: 0 - m_Name: XR Interaction Setup - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4134505312059479865 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7313654230448209575} - 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: 3127728408163665758} - - {fileID: 3127728407087826081} - - {fileID: 3127728406573987373} - - {fileID: 7696548424635294051} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &9014170785273859917 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4134505312059479865} - m_Modifications: - - target: {fileID: 1717954561962503725, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} - propertyPath: m_Name - value: XR Origin (XR Rig) - objectReference: {fileID: 0} - - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} ---- !u!4 &7696548424635294051 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} - m_PrefabInstance: {fileID: 9014170785273859917} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_3D.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1.meta similarity index 77% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_3D.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1.meta index 7c5b45b1f..80ecf4561 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_3D.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9e8d040e5e602e4429d8792c25d675fc +guid: d62395b34479c044fb849a31a27250eb folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets.meta similarity index 77% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets.meta index 040af2cf1..10b79a30f 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 53b26a2dbeb1d104d9a4032f334d79dd +guid: dbd6e93954aa56641a945aeb9e89d66d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/.sample.json b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/.sample.json similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/.sample.json rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/.sample.json diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/DemoScene.unity b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoScene.unity similarity index 96% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/DemoScene.unity rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoScene.unity index ae1cf4172..76e4e4734 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/DemoScene.unity +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoScene.unity @@ -367,7 +367,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1565887663814566041, guid: 3e07eccb5e6f459d886de95044adb1d9, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 1565887663814566041, guid: 3e07eccb5e6f459d886de95044adb1d9, type: 3} propertyPath: m_LocalPosition.x @@ -752,7 +752,7 @@ Transform: - {fileID: 4943412722798158840} - {fileID: 1209329928} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &564796391 GameObject: @@ -1275,6 +1275,102 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1465720397298211355, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1465720397298211355, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1465720398002813458, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1465720398002813458, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1465720398002813458, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1465720398059456908, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1465720398059456908, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1465720398059456908, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1465720398059456908, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1477547282043262312, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1477547282043262312, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1477547282043262312, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1477547282043262312, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1956391703820887915, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1956391703820887915, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1956391703820887915, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1956391703820887915, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1962376703435983919, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1962376703435983919, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1962376703435983919, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2923970395470667645, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2923970395470667645, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2923970395470667645, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2923970395470667645, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3322978173798649548, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1331,6 +1427,38 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3352765378411564996, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3352765378411564996, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3352765378411564996, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3352765378411564996, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3690213291364595752, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3690213291364595752, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3690213291364595752, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3690213291364595752, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4015128326712939850, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_Camera value: @@ -1345,7 +1473,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4015128326712939851, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_RootOrder - value: 4 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4015128326712939851, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_AnchorMax.x @@ -1365,7 +1493,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4015128326712939851, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_SizeDelta.x - value: 950 + value: 1000 objectReference: {fileID: 0} - target: {fileID: 4015128326712939851, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_SizeDelta.y @@ -1405,7 +1533,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4015128326712939851, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_AnchoredPosition.y - value: 1.1 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 4015128326712939851, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1425,23 +1553,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4220274215976610951, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4220274215976610951, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4220274215976610951, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_SizeDelta.x - value: 252 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4220274215976610951, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_AnchoredPosition.x - value: 126 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4220274215976610951, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_AnchoredPosition.y - value: -25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4422659089949380333, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_AnchorMax.y @@ -1473,15 +1601,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4422659090696076826, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_SizeDelta.x - value: 268 - objectReference: {fileID: 0} - - target: {fileID: 4422659090696076826, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} - propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - target: {fileID: 4422659090696076826, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_AnchoredPosition.x - value: 150 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4422659090696076826, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_AnchoredPosition.y @@ -1496,14 +1620,26 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 4422659091188657070, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} - propertyPath: m_SizeDelta.y + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 4422659091188657070, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4588051828473420344, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4588051828473420344, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4588051828473420344, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_AnchoredPosition.x - value: 150 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4422659091188657070, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + - target: {fileID: 4588051828473420344, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} @@ -1563,10 +1699,22 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 5684358024879033404, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5684358024879033404, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5849765079216124530, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5849765079944474460, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_Size + value: 0.9999997 + objectReference: {fileID: 0} - target: {fileID: 5849765080478431418, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1575,6 +1723,10 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5849765080478431418, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5849765080480587862, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1603,6 +1755,66 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 6546457552942104298, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6546457552942104298, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6546457552942104298, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180815008627773159, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180815008627773159, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180815008627773159, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180815008627773159, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180815009374535184, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180815009374535184, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180815009374535184, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180815009374535184, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180815009888545700, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180815009888545700, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180815009888545700, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8180815009888545700, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8575284107106180950, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1619,6 +1831,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8607500784391115102, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8607500784391115102, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8607500784391115102, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8607500784391115102, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fd28f23af44f73f4a95e33435872ad15, type: 3} --- !u!1001 &893438434 @@ -1874,7 +2102,7 @@ Transform: - {fileID: 1270176778} - {fileID: 1289056247} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1021619523 GameObject: @@ -2645,7 +2873,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2991896912978869755, guid: 6821e1b7f44d8c44b8a2ba02f37309d5, type: 3} propertyPath: m_RootOrder - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 2991896912978869755, guid: 6821e1b7f44d8c44b8a2ba02f37309d5, type: 3} propertyPath: m_LocalPosition.x @@ -3072,7 +3300,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4134505312059479865, guid: 895f6f3c2d334633b5800312285058d2, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4134505312059479865, guid: 895f6f3c2d334633b5800312285058d2, type: 3} propertyPath: m_LocalPosition.x @@ -3114,14 +3342,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6407207605730790461, guid: 895f6f3c2d334633b5800312285058d2, type: 3} - propertyPath: m_AutoDeselect - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6407207605730790461, guid: 895f6f3c2d334633b5800312285058d2, type: 3} - propertyPath: m_HoverToSelect - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7313654230448209575, guid: 895f6f3c2d334633b5800312285058d2, type: 3} propertyPath: m_Name value: XR Interaction Setup diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/DemoScene.unity.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoScene.unity.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/DemoScene.unity.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoScene.unity.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/PokeStation.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets.meta similarity index 77% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/PokeStation.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets.meta index 6ca804b3e..58db3f660 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/PokeStation.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 73fceb68998bec84496a6ef93dd7cf16 +guid: 42541a22bf6270741bd05ac5ca0fccd4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/AffordanceThemes.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/AffordanceThemes.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/AffordanceThemes.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/AffordanceThemes.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/AffordanceThemes/InteractionColorAffordanceTheme.asset b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/AffordanceThemes/InteractionColorAffordanceTheme.asset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/AffordanceThemes/InteractionColorAffordanceTheme.asset rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/AffordanceThemes/InteractionColorAffordanceTheme.asset diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/AffordanceThemes/InteractionColorAffordanceTheme.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/AffordanceThemes/InteractionColorAffordanceTheme.asset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/AffordanceThemes/InteractionColorAffordanceTheme.asset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/AffordanceThemes/InteractionColorAffordanceTheme.asset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Audio.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Audio.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Audio.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Audio.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Audio/Button Pop.wav b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Audio/Button Pop.wav rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Audio/Button Pop.wav.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav.meta similarity index 85% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Audio/Button Pop.wav.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav.meta index e65394b28..17b0347d1 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Audio/Button Pop.wav.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav.meta @@ -2,18 +2,19 @@ fileFormatVersion: 2 guid: 16fba6d30ed741d4a9fdd6e79ee2f3ac AudioImporter: externalObjects: {} - serializedVersion: 6 + serializedVersion: 7 defaultSettings: + serializedVersion: 2 loadType: 0 sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 quality: 1 conversionMode: 0 + preloadAudioData: 1 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 loadInBackground: 0 ambisonic: 0 3D: 1 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models.meta new file mode 100644 index 000000000..52c70d78a --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 90a5974969e85834f8306496fd3cda4c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Pyramid.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Pyramid.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Pyramid.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx.meta similarity index 92% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Pyramid.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx.meta index 88073bbfd..8d5e4092a 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Pyramid.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 63e02ddb08ce42da868504e1333d48ae ModelImporter: - serializedVersion: 20300 + serializedVersion: 22200 internalIDToNameTable: [] externalObjects: {} materials: @@ -14,6 +14,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -39,10 +40,12 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 @@ -54,6 +57,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -64,6 +68,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -96,6 +101,7 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Torus.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Torus.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Torus.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx.meta similarity index 92% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Torus.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx.meta index dae7ca777..a64f439ea 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Torus.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: f077c919501a44778a0c2edb6eb1a54a ModelImporter: - serializedVersion: 20300 + serializedVersion: 22200 internalIDToNameTable: [] externalObjects: {} materials: @@ -14,6 +14,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -39,10 +40,12 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 @@ -54,6 +57,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -64,6 +68,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -96,6 +101,7 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/PushButton.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models/PushButton.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/PushButton.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models/PushButton.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/PushButton.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models/PushButton.fbx.meta similarity index 92% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/PushButton.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models/PushButton.fbx.meta index f568a67b3..8220c9e49 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/PushButton.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Models/PushButton.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 7ab6f3b0fd1a6ba41b2a47766c16613f ModelImporter: - serializedVersion: 20300 + serializedVersion: 22200 internalIDToNameTable: [] externalObjects: {} materials: @@ -14,6 +14,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -39,10 +40,12 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 @@ -54,6 +57,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -64,6 +68,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -96,6 +101,7 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 0 + importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs.meta new file mode 100644 index 000000000..a728df7a3 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 91951de0742340f45a1e49a4735db517 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb Sample.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climb Sample.prefab similarity index 96% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb Sample.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climb Sample.prefab index 8dde97262..6b2ba6b6e 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb Sample.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climb Sample.prefab @@ -23,21 +23,23 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3953970342314940650} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -3.75, y: 0.125, z: 2.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 883283023377794228} - {fileID: 1002461780314896473} - {fileID: 3953970341132373934} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1001 &3953970341125123640 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3953970342314940649} m_Modifications: - target: {fileID: 4223635557334411916, guid: b3830b3b2f190ee46a9c88433e985221, type: 3} @@ -89,6 +91,9 @@ PrefabInstance: value: Ladder objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3830b3b2f190ee46a9c88433e985221, type: 3} --- !u!4 &883283023377794228 stripped Transform: @@ -100,6 +105,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3953970342314940649} m_Modifications: - target: {fileID: 2455711654808853570, guid: beb4e2871579447497fe41dfb108e2cd, type: 3} @@ -167,6 +173,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: beb4e2871579447497fe41dfb108e2cd, type: 3} --- !u!4 &1002461780314896473 stripped Transform: @@ -178,6 +187,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3953970342314940649} m_Modifications: - target: {fileID: 7585962579481558136, guid: a0ea40bd139aedc43b0e8374d6139437, type: 3} @@ -233,6 +243,9 @@ PrefabInstance: value: objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a0ea40bd139aedc43b0e8374d6139437, type: 3} --- !u!4 &3953970341132373934 stripped Transform: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb Sample.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climb Sample.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb Sample.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climb Sample.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb/Climbing Wall.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climbing Wall.prefab similarity index 98% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb/Climbing Wall.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climbing Wall.prefab index b07f0ddcb..8a6f7a9b3 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb/Climbing Wall.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climbing Wall.prefab @@ -28,6 +28,7 @@ Transform: 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: 7470654498106422027} m_RootOrder: 0 @@ -146,6 +147,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.872, y: 0.313, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5625531138379468532} m_Father: {fileID: 3274744151133089951} @@ -170,6 +172,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -242,6 +245,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.264, y: 0.955, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5647523953337836569} m_Father: {fileID: 4367827292347397237} @@ -266,6 +270,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -337,6 +342,7 @@ Transform: 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: 6038549972074828916} m_RootOrder: 0 @@ -454,6 +460,7 @@ Transform: 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: 3376253258083616447} m_RootOrder: 0 @@ -571,6 +578,7 @@ Transform: 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: 4354704120321791064} m_RootOrder: 0 @@ -688,6 +696,7 @@ Transform: 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: 5816804911528974429} m_RootOrder: 0 @@ -805,6 +814,7 @@ Transform: 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: 4595584359265667760} m_RootOrder: 0 @@ -922,6 +932,7 @@ Transform: 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: 1960236689651181916} m_RootOrder: 0 @@ -1039,6 +1050,7 @@ Transform: 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: 7980277895126731949} m_RootOrder: 0 @@ -1157,6 +1169,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.262, y: 0.39, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2283926903535392085} m_Father: {fileID: 6799453224723734497} @@ -1181,6 +1194,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1253,6 +1267,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.568, y: 0.882, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1031813166654868225} m_Father: {fileID: 6799453224723734497} @@ -1277,6 +1292,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1349,6 +1365,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.978, y: 0.683, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2048587996373869317} m_Father: {fileID: 3274744151133089951} @@ -1373,6 +1390,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1444,6 +1462,7 @@ Transform: 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: 7691836147598520973} m_RootOrder: 0 @@ -1561,6 +1580,7 @@ Transform: 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: 6492077355639612206} m_RootOrder: 0 @@ -1678,6 +1698,7 @@ Transform: 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: 5023194577319420311} m_RootOrder: 0 @@ -1796,6 +1817,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.264, y: 0.955, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 310539757113050359} m_Father: {fileID: 6799453224723734497} @@ -1820,6 +1842,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1892,6 +1915,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.244, y: 0.826, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1086285738516946031} m_Father: {fileID: 6799453224723734497} @@ -1916,6 +1940,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1985,6 +2010,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.8, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4169972166755958789} - {fileID: 5486126184005354786} @@ -2030,6 +2056,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.568, y: 0.882, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 348753758087915500} m_Father: {fileID: 3274744151133089951} @@ -2054,6 +2081,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2126,6 +2154,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.353, y: 0.445, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7107675020510922183} m_Father: {fileID: 6799453224723734497} @@ -2150,6 +2179,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2221,6 +2251,7 @@ Transform: 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: 7585962579358716694} m_RootOrder: 0 @@ -2339,6 +2370,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.37, y: 0.754, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8704684839175915126} m_Father: {fileID: 3274744151133089951} @@ -2363,6 +2395,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2435,6 +2468,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.781, y: 0.511, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1697531592720929251} m_Father: {fileID: 6799453224723734497} @@ -2459,6 +2493,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2531,6 +2566,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.039, y: 0.827, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1787317493179701138} m_Father: {fileID: 4367827292347397237} @@ -2555,6 +2591,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2626,6 +2663,7 @@ Transform: 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: 8037543016539790423} m_RootOrder: 0 @@ -2743,6 +2781,7 @@ Transform: 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: 7473920317060209263} m_RootOrder: 0 @@ -2860,6 +2899,7 @@ Transform: 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: 4438779832404853050} m_RootOrder: 0 @@ -2977,6 +3017,7 @@ Transform: 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: 2428510553631514553} m_RootOrder: 0 @@ -3095,6 +3136,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.264, y: 0.955, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8443044927161956435} m_Father: {fileID: 3274744151133089951} @@ -3119,6 +3161,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3191,6 +3234,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.791, y: 0.96, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4644335631303939418} m_Father: {fileID: 3274744151133089951} @@ -3215,6 +3259,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3287,6 +3332,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.353, y: 0.445, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 932582413512132944} m_Father: {fileID: 3274744151133089951} @@ -3311,6 +3357,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3382,6 +3429,7 @@ Transform: 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: 5422799826263334674} m_RootOrder: 0 @@ -3500,6 +3548,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.353, y: 0.445, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7496248237745259494} m_Father: {fileID: 4367827292347397237} @@ -3524,6 +3573,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3595,6 +3645,7 @@ Transform: 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: 4250800834070631180} m_RootOrder: 0 @@ -3712,6 +3763,7 @@ Transform: 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: 5266259993439318115} m_RootOrder: 0 @@ -3827,6 +3879,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.9, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3376253258083616447} - {fileID: 2611622575333548510} @@ -3871,6 +3924,7 @@ Transform: 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: 2567418658929649223} m_RootOrder: 0 @@ -3989,6 +4043,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.978, y: 0.683, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2667347675753284964} m_Father: {fileID: 6799453224723734497} @@ -4013,6 +4068,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4084,6 +4140,7 @@ Transform: 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: 2821717472793643862} m_RootOrder: 0 @@ -4201,6 +4258,7 @@ Transform: 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: 2904633665880556950} m_RootOrder: 0 @@ -4318,6 +4376,7 @@ Transform: 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: 5972590659264791304} m_RootOrder: 0 @@ -4436,6 +4495,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.262, y: 0.39, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3765322442004079464} m_Father: {fileID: 3274744151133089951} @@ -4460,6 +4520,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4532,6 +4593,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.791, y: 0.96, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 973658774361894060} m_Father: {fileID: 4367827292347397237} @@ -4556,6 +4618,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4627,6 +4690,7 @@ Transform: 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: 5960478174581927681} m_RootOrder: 0 @@ -4745,6 +4809,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.781, y: 0.511, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1454492841322775756} m_Father: {fileID: 4367827292347397237} @@ -4769,6 +4834,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4840,6 +4906,7 @@ Transform: 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: 6963722664931986504} m_RootOrder: 0 @@ -4957,6 +5024,7 @@ Transform: 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: 6330966684721107903} m_RootOrder: 0 @@ -5074,6 +5142,7 @@ Transform: 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: 5260239977363644798} m_RootOrder: 0 @@ -5192,6 +5261,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.978, y: 0.683, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 204533453615689689} m_Father: {fileID: 4367827292347397237} @@ -5216,6 +5286,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5288,6 +5359,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.205, y: 0.346, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4604595860783123788} m_Father: {fileID: 4367827292347397237} @@ -5312,6 +5384,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5384,6 +5457,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.872, y: 0.313, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1182558839748939124} m_Father: {fileID: 4367827292347397237} @@ -5408,6 +5482,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5479,6 +5554,7 @@ Transform: 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: 857468511645469604} m_RootOrder: 0 @@ -5596,6 +5672,7 @@ Transform: 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: 2213403759552526992} m_RootOrder: 0 @@ -5714,6 +5791,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.791, y: 0.96, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6644258907661498893} m_Father: {fileID: 6799453224723734497} @@ -5738,6 +5816,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5810,6 +5889,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.244, y: 0.826, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8280925439098765150} m_Father: {fileID: 3274744151133089951} @@ -5834,6 +5914,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5906,6 +5987,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.244, y: 0.826, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2704579486901885890} m_Father: {fileID: 4367827292347397237} @@ -5930,6 +6012,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6002,6 +6085,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.37, y: 0.754, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8812079473714787161} m_Father: {fileID: 4367827292347397237} @@ -6026,6 +6110,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6098,6 +6183,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.568, y: 0.882, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7622843386099842623} m_Father: {fileID: 4367827292347397237} @@ -6122,6 +6208,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6194,6 +6281,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.039, y: 0.827, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1176639359600982109} m_Father: {fileID: 6799453224723734497} @@ -6218,6 +6306,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6289,6 +6378,7 @@ Transform: 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: 8927631924966858428} m_RootOrder: 0 @@ -6407,6 +6497,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.205, y: 0.346, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8118731708026586165} m_Father: {fileID: 6799453224723734497} @@ -6431,6 +6522,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6500,6 +6592,7 @@ Transform: 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: - {fileID: 7585962579641756523} - {fileID: 7585962580643705475} @@ -6535,6 +6628,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.5, z: 0} m_LocalScale: {x: 3, y: 3, z: 0.4} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7585962579481558137} m_RootOrder: 0 @@ -6558,6 +6652,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6630,6 +6725,7 @@ Transform: 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: - {fileID: 6799453224723734497} - {fileID: 3274744151133089951} @@ -6658,6 +6754,7 @@ MonoBehaviour: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -6690,6 +6787,18 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] m_Activated: m_PersistentCalls: m_Calls: [] @@ -6769,6 +6878,7 @@ MonoBehaviour: m_InteractableSource: {fileID: 0} m_IgnoreHoverEvents: 0 m_IgnoreHoverPriorityEvents: 1 + m_IgnoreFocusEvents: 1 m_IgnoreSelectEvents: 0 m_IgnoreActivateEvents: 0 m_SelectClickAnimationMode: 1 @@ -6829,6 +6939,7 @@ Transform: 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: 4169972166755958789} m_RootOrder: 0 @@ -6947,6 +7058,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.205, y: 0.346, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6654345412576249371} m_Father: {fileID: 3274744151133089951} @@ -6971,6 +7083,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7042,6 +7155,7 @@ Transform: 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: 2611622575333548510} m_RootOrder: 0 @@ -7159,6 +7273,7 @@ Transform: 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: 5486126184005354786} m_RootOrder: 0 @@ -7276,6 +7391,7 @@ Transform: 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: 4056615195701887267} m_RootOrder: 0 @@ -7394,6 +7510,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.262, y: 0.39, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2272541096272905211} m_Father: {fileID: 4367827292347397237} @@ -7418,6 +7535,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7490,6 +7608,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.872, y: 0.313, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2893674514767305793} m_Father: {fileID: 6799453224723734497} @@ -7514,6 +7633,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7586,6 +7706,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.781, y: 0.511, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8594256920082277255} m_Father: {fileID: 3274744151133089951} @@ -7610,6 +7731,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7682,6 +7804,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.37, y: 0.754, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4918779976276591615} m_Father: {fileID: 6799453224723734497} @@ -7706,6 +7829,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7777,6 +7901,7 @@ Transform: 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: 7705157297883664653} m_RootOrder: 0 @@ -7892,6 +8017,7 @@ Transform: 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: - {fileID: 7585962579358716694} - {fileID: 6936027996146277676} @@ -7937,6 +8063,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.039, y: 0.827, z: 0.216} m_LocalScale: {x: 0.20000002, y: 0.2, z: 0.20000002} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3044085257035410558} m_Father: {fileID: 3274744151133089951} @@ -7961,6 +8088,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -8032,6 +8160,7 @@ Transform: 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: 6936027996146277676} m_RootOrder: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb/Climbing Wall.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climbing Wall.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb/Climbing Wall.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climbing Wall.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb/Ladder.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb/Ladder.prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb/Ladder.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb/Ladder.prefab index 8ea35646d..c8b9cbed1 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb/Ladder.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb/Ladder.prefab @@ -594,7 +594,7 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1.0000002, y: 1, z: 1} + m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1873464328522446777 GameObject: @@ -2157,7 +2157,7 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1.0000002, y: 1, z: 1} + m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &6209309998178532447 GameObject: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb/Ladder.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb/Ladder.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Climb/Ladder.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Climb/Ladder.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables Sample.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables Sample.prefab similarity index 96% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables Sample.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables Sample.prefab index 8dee00cae..3fa45f1b8 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables Sample.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables Sample.prefab @@ -23,21 +23,23 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1060243933316379515} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6559198441471240595} - {fileID: 5178052650083227069} - {fileID: 1084091470699946729} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &428719407853335821 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2991896912978869755} m_Modifications: - target: {fileID: 4769098102207602864, guid: 2ed984a58a974166bf92c82a74380454, type: 3} @@ -89,6 +91,9 @@ PrefabInstance: value: Interactable Instant Pyramid objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2ed984a58a974166bf92c82a74380454, type: 3} --- !u!4 &5178052650083227069 stripped Transform: @@ -100,6 +105,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2991896912978869755} m_Modifications: - target: {fileID: 7517549319329480229, guid: 521327bdbcb341f782d36f02cab76cb0, type: 3} @@ -151,6 +157,9 @@ PrefabInstance: value: Interactable Kinematic Torus objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 521327bdbcb341f782d36f02cab76cb0, type: 3} --- !u!4 &6559198441471240595 stripped Transform: @@ -162,6 +171,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2991896912978869755} m_Modifications: - target: {fileID: 4257412417454173056, guid: d5615d616019430d9c2e8727e71c97fb, type: 3} @@ -213,6 +223,9 @@ PrefabInstance: value: Interactable Velocity Tracked Wedge objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d5615d616019430d9c2e8727e71c97fb, type: 3} --- !u!4 &1084091470699946729 stripped Transform: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables Sample.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables Sample.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables Sample.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables Sample.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Instant Pyramid.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Instant Pyramid.prefab similarity index 84% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Instant Pyramid.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Instant Pyramid.prefab index 712fc3688..9ff9f44cf 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Instant Pyramid.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Instant Pyramid.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4769098102207602867 +--- !u!1 &3555266395154559664 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,53 +8,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4769098102207602864} - - component: {fileID: 4769098102207602869} - - component: {fileID: 4769098102207602868} - - component: {fileID: 8849130009450615980} - - component: {fileID: 4769098102207602870} - - component: {fileID: 4769098102207602865} + - component: {fileID: 3651312844796179671} + - component: {fileID: 5911828657079854996} + - component: {fileID: 3768215008265120455} + - component: {fileID: 5059739475841926635} m_Layer: 0 - m_Name: Interactable Instant Pyramid + m_Name: Visuals m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4769098102207602864 +--- !u!4 &3651312844796179671 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4769098102207602867} + m_GameObject: {fileID: 3555266395154559664} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} - m_Children: - - {fileID: 7346323618051603254} - m_Father: {fileID: 0} - m_RootOrder: 0 + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4769098102207602864} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4769098102207602869 +--- !u!33 &5911828657079854996 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4769098102207602867} + m_GameObject: {fileID: 3555266395154559664} m_Mesh: {fileID: -4957301927772954577, guid: 63e02ddb08ce42da868504e1333d48ae, type: 3} ---- !u!23 &4769098102207602868 +--- !u!23 &3768215008265120455 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4769098102207602867} + m_GameObject: {fileID: 3555266395154559664} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -85,13 +84,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &8849130009450615980 +--- !u!64 &5059739475841926635 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4769098102207602867} + m_GameObject: {fileID: 3555266395154559664} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 @@ -99,6 +98,41 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -4957301927772954577, guid: 63e02ddb08ce42da868504e1333d48ae, type: 3} +--- !u!1 &4769098102207602867 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4769098102207602864} + - component: {fileID: 4769098102207602870} + - component: {fileID: 4769098102207602865} + m_Layer: 0 + m_Name: Interactable Instant Pyramid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4769098102207602864 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4769098102207602867} + 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: + - {fileID: 7346323618051603254} + - {fileID: 3651312844796179671} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &4769098102207602870 Rigidbody: m_ObjectHideFlags: 0 @@ -136,6 +170,7 @@ MonoBehaviour: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -168,6 +203,18 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] m_Activated: m_PersistentCalls: m_Calls: [] @@ -225,6 +272,10 @@ MonoBehaviour: m_SmoothRotation: 0 m_SmoothRotationAmount: 5 m_TightenRotation: 0.5 + m_TrackScale: 1 + m_SmoothScale: 0 + m_SmoothScaleAmount: 8 + m_TightenScale: 0.1 m_ThrowOnDetach: 1 m_ThrowSmoothingDuration: 0.25 m_ThrowSmoothingCurve: @@ -308,7 +359,7 @@ PrefabInstance: - target: {fileID: 7396278978564332023, guid: eb9104ef66b7305468adb3697fdeed5e, type: 3} propertyPath: m_Renderer value: - objectReference: {fileID: 4769098102207602868} + objectReference: {fileID: 3768215008265120455} - target: {fileID: 8634317094661461186, guid: eb9104ef66b7305468adb3697fdeed5e, type: 3} propertyPath: m_InteractableSource value: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Instant Pyramid.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Instant Pyramid.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Instant Pyramid.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Instant Pyramid.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Kinematic Torus.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Kinematic Torus.prefab similarity index 84% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Kinematic Torus.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Kinematic Torus.prefab index 2d7a2e744..5d7c630c1 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Kinematic Torus.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Kinematic Torus.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7517549319329480230 +--- !u!1 &6354640239425093910 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,53 +8,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7517549319329480229} - - component: {fileID: 7517549319329480232} - - component: {fileID: 7517549319329480233} - - component: {fileID: 7517549319329480235} - - component: {fileID: 7517549319329480228} - - component: {fileID: 1144836882243552372} + - component: {fileID: 6369939804988844616} + - component: {fileID: 950121296977689675} + - component: {fileID: 8321842482108814056} + - component: {fileID: 1086821822815542845} m_Layer: 0 - m_Name: Interactable Kinematic Torus + m_Name: Visuals m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7517549319329480229 +--- !u!4 &6369939804988844616 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7517549319329480230} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 6354640239425093910} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} - m_Children: - - {fileID: 5017849197920860822} - m_Father: {fileID: 0} - m_RootOrder: 0 + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7517549319329480229} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7517549319329480232 +--- !u!33 &950121296977689675 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7517549319329480230} + m_GameObject: {fileID: 6354640239425093910} m_Mesh: {fileID: 1865056248366311061, guid: f077c919501a44778a0c2edb6eb1a54a, type: 3} ---- !u!23 &7517549319329480233 +--- !u!23 &8321842482108814056 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7517549319329480230} + m_GameObject: {fileID: 6354640239425093910} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -85,6 +84,55 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &1086821822815542845 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6354640239425093910} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 1865056248366311061, guid: f077c919501a44778a0c2edb6eb1a54a, type: 3} +--- !u!1 &7517549319329480230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7517549319329480229} + - component: {fileID: 7517549319329480235} + - component: {fileID: 7517549319329480228} + m_Layer: 0 + m_Name: Interactable Kinematic Torus + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7517549319329480229 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7517549319329480230} + 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: + - {fileID: 5017849197920860822} + - {fileID: 6369939804988844616} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &7517549319329480235 Rigidbody: m_ObjectHideFlags: 0 @@ -122,6 +170,7 @@ MonoBehaviour: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -154,6 +203,18 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] m_Activated: m_PersistentCalls: m_Calls: [] @@ -211,6 +272,10 @@ MonoBehaviour: m_SmoothRotation: 0 m_SmoothRotationAmount: 5 m_TightenRotation: 0.5 + m_TrackScale: 1 + m_SmoothScale: 0 + m_SmoothScaleAmount: 8 + m_TightenScale: 0.1 m_ThrowOnDetach: 1 m_ThrowSmoothingDuration: 0.25 m_ThrowSmoothingCurve: @@ -236,20 +301,6 @@ MonoBehaviour: m_StartingSingleGrabTransformers: [] m_StartingMultipleGrabTransformers: [] m_AddDefaultGrabTransformers: 1 ---- !u!64 &1144836882243552372 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7517549319329480230} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 1865056248366311061, guid: f077c919501a44778a0c2edb6eb1a54a, type: 3} --- !u!1001 &962542200794522557 PrefabInstance: m_ObjectHideFlags: 0 @@ -308,7 +359,7 @@ PrefabInstance: - target: {fileID: 7396278978564332023, guid: eb9104ef66b7305468adb3697fdeed5e, type: 3} propertyPath: m_Renderer value: - objectReference: {fileID: 7517549319329480233} + objectReference: {fileID: 8321842482108814056} - target: {fileID: 8634317094661461186, guid: eb9104ef66b7305468adb3697fdeed5e, type: 3} propertyPath: m_InteractableSource value: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Kinematic Torus.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Kinematic Torus.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Kinematic Torus.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Kinematic Torus.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Simple Cube.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Simple Cube.prefab similarity index 82% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Simple Cube.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Simple Cube.prefab index a3b570175..11946612d 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Simple Cube.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Simple Cube.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7733875955768408218 +--- !u!1 &7332752881101295348 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,52 +8,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4943412722579436017} - - component: {fileID: 4726882083269666036} - - component: {fileID: 8990637461496151731} - - component: {fileID: 1139231442126363708} - - component: {fileID: 2719188128838509712} + - component: {fileID: 5047852063796673096} + - component: {fileID: 7580164025122021560} + - component: {fileID: 5919239700121730515} + - component: {fileID: 3050971681733643590} m_Layer: 0 - m_Name: Interactable Simple Cube + m_Name: Visuals m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4943412722579436017 +--- !u!4 &5047852063796673096 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7733875955768408218} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 7332752881101295348} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} - m_Children: - - {fileID: 5150018147653810582} - m_Father: {fileID: 0} - m_RootOrder: 0 + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4943412722579436017} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4726882083269666036 +--- !u!33 &7580164025122021560 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7733875955768408218} + m_GameObject: {fileID: 7332752881101295348} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &8990637461496151731 +--- !u!23 &5919239700121730515 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7733875955768408218} + m_GameObject: {fileID: 7332752881101295348} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -84,13 +84,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &1139231442126363708 +--- !u!64 &3050971681733643590 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7733875955768408218} + m_GameObject: {fileID: 7332752881101295348} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 @@ -98,6 +98,40 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &7733875955768408218 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4943412722579436017} + - component: {fileID: 2719188128838509712} + m_Layer: 0 + m_Name: Interactable Simple Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4943412722579436017 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7733875955768408218} + 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: + - {fileID: 5150018147653810582} + - {fileID: 5047852063796673096} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2719188128838509712 MonoBehaviour: m_ObjectHideFlags: 0 @@ -119,6 +153,7 @@ MonoBehaviour: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -151,6 +186,18 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] m_Activated: m_PersistentCalls: m_Calls: [] @@ -245,7 +292,7 @@ PrefabInstance: - target: {fileID: 7396278978564332023, guid: eb9104ef66b7305468adb3697fdeed5e, type: 3} propertyPath: m_Renderer value: - objectReference: {fileID: 8990637461496151731} + objectReference: {fileID: 5919239700121730515} - target: {fileID: 8634317094661461186, guid: eb9104ef66b7305468adb3697fdeed5e, type: 3} propertyPath: m_InteractableSource value: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Simple Cube.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Simple Cube.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Simple Cube.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Simple Cube.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab similarity index 84% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab index 6f8eff991..00dae4ec0 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4257412417454173071 +--- !u!1 &621085603691566938 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,53 +8,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4257412417454173056} - - component: {fileID: 4257412417454173062} - - component: {fileID: 4257412417454173061} - - component: {fileID: 7734455002442979829} - - component: {fileID: 4257412417454173059} - - component: {fileID: 4257412417454173058} + - component: {fileID: 6058481881298704847} + - component: {fileID: 54538302038579918} + - component: {fileID: 261398194632122527} + - component: {fileID: 7576380246348283313} m_Layer: 0 - m_Name: Interactable Velocity Tracked Wedge + m_Name: Visuals m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4257412417454173056 +--- !u!4 &6058481881298704847 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4257412417454173071} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 621085603691566938} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} - m_Children: - - {fileID: 7448573029504399239} - m_Father: {fileID: 0} - m_RootOrder: 0 + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4257412417454173056} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4257412417454173062 +--- !u!33 &54538302038579918 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4257412417454173071} + m_GameObject: {fileID: 621085603691566938} m_Mesh: {fileID: 6788383922943872000, guid: ab3a79eba4de4be0ad5fead9fb858190, type: 3} ---- !u!23 &4257412417454173061 +--- !u!23 &261398194632122527 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4257412417454173071} + m_GameObject: {fileID: 621085603691566938} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -85,13 +84,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &7734455002442979829 +--- !u!64 &7576380246348283313 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4257412417454173071} + m_GameObject: {fileID: 621085603691566938} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 @@ -99,6 +98,41 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 6788383922943872000, guid: ab3a79eba4de4be0ad5fead9fb858190, type: 3} +--- !u!1 &4257412417454173071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4257412417454173056} + - component: {fileID: 4257412417454173059} + - component: {fileID: 4257412417454173058} + m_Layer: 0 + m_Name: Interactable Velocity Tracked Wedge + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4257412417454173056 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4257412417454173071} + 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: + - {fileID: 7448573029504399239} + - {fileID: 6058481881298704847} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &4257412417454173059 Rigidbody: m_ObjectHideFlags: 0 @@ -136,6 +170,7 @@ MonoBehaviour: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -168,6 +203,18 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] m_Activated: m_PersistentCalls: m_Calls: [] @@ -225,6 +272,10 @@ MonoBehaviour: m_SmoothRotation: 1 m_SmoothRotationAmount: 1.57 m_TightenRotation: 0.077 + m_TrackScale: 1 + m_SmoothScale: 0 + m_SmoothScaleAmount: 8 + m_TightenScale: 0.1 m_ThrowOnDetach: 1 m_ThrowSmoothingDuration: 0.25 m_ThrowSmoothingCurve: @@ -308,7 +359,7 @@ PrefabInstance: - target: {fileID: 7396278978564332023, guid: eb9104ef66b7305468adb3697fdeed5e, type: 3} propertyPath: m_Renderer value: - objectReference: {fileID: 4257412417454173061} + objectReference: {fileID: 261398194632122527} - target: {fileID: 8634317094661461186, guid: eb9104ef66b7305468adb3697fdeed5e, type: 3} propertyPath: m_InteractableSource value: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interaction Affordance.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interaction Affordance.prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interaction Affordance.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interaction Affordance.prefab index 8ac8cbc58..3dd2ad9ab 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interaction Affordance.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interaction Affordance.prefab @@ -24,6 +24,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3774509235512974894} + 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} @@ -31,7 +32,6 @@ Transform: m_Children: - {fileID: 1868228307608861978} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8634317094661461186 MonoBehaviour: @@ -107,13 +107,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4896237787779704601} + 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: 5258331117553129771} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7396278978564332023 MonoBehaviour: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interaction Affordance.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interaction Affordance.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Interactables/Interaction Affordance.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interaction Affordance.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_3D/Push Button.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Push Button.prefab similarity index 96% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_3D/Push Button.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Push Button.prefab index b14b285bf..b02e11d0d 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_3D/Push Button.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Push Button.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.1111, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1811122272821274886} m_RootOrder: 0 @@ -51,6 +52,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -110,6 +112,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.077700034, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3880192299337156673} m_RootOrder: 0 @@ -133,6 +136,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -194,6 +198,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.1365, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2677330625136097954} - {fileID: 3880192299337156673} @@ -211,7 +216,7 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 0.09545325, y: 0.103728384, z: 0.09477694} + m_Size: {x: 0.09545325, y: 0.1037284, z: 0.09477694} m_Center: {x: 0, y: -0.011566475, z: 0} --- !u!114 &5419331889293473514 MonoBehaviour: @@ -234,6 +239,7 @@ MonoBehaviour: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -266,6 +272,18 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] m_Activated: m_PersistentCalls: m_Calls: [] @@ -368,6 +386,7 @@ Transform: 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: - {fileID: 1055701170845606427} - {fileID: 1811122272821274886} @@ -400,6 +419,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.037999973, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8581603193832540159} m_Father: {fileID: 3880192299337156673} diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_3D/Push Button.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Push Button.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_3D/Push Button.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Push Button.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport.meta new file mode 100644 index 000000000..207d4a5c4 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66c6494bc1ad3b348b472a4d6d544e93 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleport/Snapping Teleport Anchor.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Snapping Teleport Anchor.prefab similarity index 94% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleport/Snapping Teleport Anchor.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Snapping Teleport Anchor.prefab index bf3f2f01f..f8add9752 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleport/Snapping Teleport Anchor.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Snapping Teleport Anchor.prefab @@ -28,9 +28,10 @@ Transform: 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: 6707876468356395517} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2373836240303917842 MonoBehaviour: @@ -60,8 +61,8 @@ BoxCollider: m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1.25, y: 2.335, z: 1.25} - m_Center: {x: 0, y: 1.1675, z: 0} + m_Size: {x: 1.25, y: 0.6, z: 1.25} + m_Center: {x: 0, y: 0.3, z: 0} --- !u!1001 &3195856363542219727 PrefabInstance: m_ObjectHideFlags: 0 @@ -69,6 +70,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2010540138765891666, guid: fad94b617f0540568dbf4c9c4011248c, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3449784919008568370, guid: fad94b617f0540568dbf4c9c4011248c, type: 3} propertyPath: m_Name value: Snapping Teleport Anchor @@ -119,11 +124,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fad94b617f0540568dbf4c9c4011248c, type: 3} ---- !u!4 &6707876468356395517 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8164705571879959090, guid: fad94b617f0540568dbf4c9c4011248c, type: 3} - m_PrefabInstance: {fileID: 3195856363542219727} - m_PrefabAsset: {fileID: 0} --- !u!114 &812628894447230767 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2818971628382573792, guid: fad94b617f0540568dbf4c9c4011248c, type: 3} @@ -135,3 +135,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7e2f4617667341945b5a7756e14b62d0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &6707876468356395517 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8164705571879959090, guid: fad94b617f0540568dbf4c9c4011248c, type: 3} + m_PrefabInstance: {fileID: 3195856363542219727} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleport/Snapping Teleport Anchor.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Snapping Teleport Anchor.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleport/Snapping Teleport Anchor.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Snapping Teleport Anchor.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleport/Teleport Anchor.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Anchor.prefab similarity index 77% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleport/Teleport Anchor.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Anchor.prefab index 1591a1d4d..6a9e13931 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleport/Teleport Anchor.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Anchor.prefab @@ -9,10 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8164705571879959090} - - component: {fileID: 9079946413650635260} - - component: {fileID: 620260781526629938} - component: {fileID: 2818971628382573792} - - component: {fileID: 6382560641716693759} m_Layer: 0 m_Name: Teleport Anchor m_TagString: Untagged @@ -29,61 +26,14 @@ Transform: m_GameObject: {fileID: 3449784919008568370} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 0.25, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1568835888838292402} + - {fileID: 2010540138765891666} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &9079946413650635260 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3449784919008568370} - m_Mesh: {fileID: 8321685774571456786, guid: 9e1dc1c14313460d872de39e35129b39, type: 3} ---- !u!23 &620260781526629938 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3449784919008568370} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 670224309865224971, guid: 11cd62256b1d470f922b2c8e6446cc77, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - 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 - m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &2818971628382573792 MonoBehaviour: m_ObjectHideFlags: 0 @@ -105,6 +55,7 @@ MonoBehaviour: m_Bits: 2147483648 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -137,6 +88,18 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] m_Activated: m_PersistentCalls: m_Calls: [] @@ -183,13 +146,97 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_TeleportAnchorTransform: {fileID: 1568835888838292402} ---- !u!64 &6382560641716693759 +--- !u!1 &4534037785371708399 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2010540138765891666} + - component: {fileID: 5073101188625905015} + - component: {fileID: 4368389211439169982} + - component: {fileID: 2942319403217337480} + m_Layer: 0 + m_Name: Visuals + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2010540138765891666 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4534037785371708399} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 0.25, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8164705571879959090} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5073101188625905015 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4534037785371708399} + m_Mesh: {fileID: 8321685774571456786, guid: 9e1dc1c14313460d872de39e35129b39, type: 3} +--- !u!23 &4368389211439169982 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4534037785371708399} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 670224309865224971, guid: 11cd62256b1d470f922b2c8e6446cc77, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &2942319403217337480 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3449784919008568370} + m_GameObject: {fileID: 4534037785371708399} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 @@ -221,8 +268,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6902949822820426289} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.2, z: 0} + m_LocalPosition: {x: 0, y: 0.05, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8164705571879959090} m_RootOrder: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleport/Teleport Anchor.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Anchor.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleport/Teleport Anchor.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Anchor.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleport/Teleport Area.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Area.prefab similarity index 94% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleport/Teleport Area.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Area.prefab index 55aabc39d..40d63f86c 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleport/Teleport Area.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Area.prefab @@ -27,6 +27,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2455711654808853570} m_Father: {fileID: 0} @@ -54,6 +55,7 @@ MonoBehaviour: m_Bits: 2147483648 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -86,6 +88,18 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] m_Activated: m_PersistentCalls: m_Calls: [] @@ -160,6 +174,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 10, y: 0.25, z: 5} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4266640295717640281} m_RootOrder: 0 @@ -183,6 +198,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleport/Teleport Area.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Area.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleport/Teleport Area.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Area.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleportation Environment.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleportation Environment.prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleportation Environment.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleportation Environment.prefab index 738319521..6239b306b 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleportation Environment.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleportation Environment.prefab @@ -26,6 +26,7 @@ Transform: 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: - {fileID: 1565887663999455727} - {fileID: 7274996739736408741} @@ -65,6 +66,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -2.5} m_LocalScale: {x: 10, y: 0.25, z: 5} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1565887663814566041} m_RootOrder: 5 @@ -88,6 +90,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleportation Environment.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleportation Environment.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/Teleportation Environment.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/Teleportation Environment.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI Sample.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI Sample.prefab similarity index 85% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI Sample.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI Sample.prefab index f09a78fe3..09d448b9b 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI Sample.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI Sample.prefab @@ -37,12 +37,11 @@ RectTransform: - {fileID: 8180815009888545700} - {fileID: 5849765080480587862} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 1.5} - m_SizeDelta: {x: 550, y: 200} + m_SizeDelta: {x: 950, y: 450} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &4015128326712939850 Canvas: @@ -61,7 +60,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -155,6 +156,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4015128326712939851} m_Modifications: - target: {fileID: 500849797049712309, guid: 0cbc0856f0fb8d84a81be5dea463c369, type: 3} @@ -201,9 +203,21 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8747907324888668265, guid: 0cbc0856f0fb8d84a81be5dea463c369, type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.00012971423 + objectReference: {fileID: 0} + - target: {fileID: 8747907324888668265, guid: 0cbc0856f0fb8d84a81be5dea463c369, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.000017763618 + objectReference: {fileID: 0} + - target: {fileID: 8747907325324488006, guid: 0cbc0856f0fb8d84a81be5dea463c369, type: 3} + propertyPath: m_Size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8747907325324488006, guid: 0cbc0856f0fb8d84a81be5dea463c369, type: 3} propertyPath: m_Value - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8747907325689103685, guid: 0cbc0856f0fb8d84a81be5dea463c369, type: 3} propertyPath: m_IsActive @@ -215,7 +229,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8747907325689103687, guid: 0cbc0856f0fb8d84a81be5dea463c369, type: 3} propertyPath: m_Value - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8747907326218408609, guid: 0cbc0856f0fb8d84a81be5dea463c369, type: 3} propertyPath: m_AnchorMax.x @@ -225,6 +239,10 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8747907326218408609, guid: 0cbc0856f0fb8d84a81be5dea463c369, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8747907326224632394, guid: 0cbc0856f0fb8d84a81be5dea463c369, type: 3} propertyPath: m_Name value: Scroll UI Sample @@ -326,6 +344,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0cbc0856f0fb8d84a81be5dea463c369, type: 3} --- !u!224 &5849765080480587862 stripped RectTransform: @@ -337,6 +358,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4015128326712939851} m_Modifications: - target: {fileID: 781630661673262082, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} @@ -347,10 +369,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 781630661673262082, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 781630661673262082, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -373,7 +391,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 781630661673262082, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 177.5 objectReference: {fileID: 0} - target: {fileID: 781630661673262082, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} propertyPath: m_LocalPosition.x @@ -405,7 +423,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 781630661673262082, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} propertyPath: m_AnchoredPosition.x - value: 156.36667 + value: 0 objectReference: {fileID: 0} - target: {fileID: 781630661673262082, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} propertyPath: m_AnchoredPosition.y @@ -427,128 +445,44 @@ PrefabInstance: propertyPath: m_Name value: ModalSingleButton objectReference: {fileID: 0} - - target: {fileID: 781630662526433601, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 781630662526433601, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 781630662526433601, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 781630662526433601, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_SizeDelta.y - value: 33.5 - objectReference: {fileID: 0} - - target: {fileID: 781630662526433601, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 781630662526433601, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 781630663273105846, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 781630663273105846, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 781630663273105846, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_SizeDelta.x - value: 262.1 - objectReference: {fileID: 0} - - target: {fileID: 781630663273105846, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 781630663273105846, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_AnchoredPosition.x - value: 147.05 - objectReference: {fileID: 0} - - target: {fileID: 781630663273105846, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4436940632021081990, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_Name - value: TextButton - objectReference: {fileID: 0} - - target: {fileID: 4436940632021081990, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4436940632021081991, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} +--- !u!224 &4422659091188657070 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 781630661673262082, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} + m_PrefabInstance: {fileID: 4015128327401846700} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4858235876002121980 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4015128326712939851} + m_Modifications: + - target: {fileID: 975326512693904576, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4436940632021081991, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} + - target: {fileID: 975326512693904576, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4436940632021081991, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4436940632021081991, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4436940632021081991, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4436940632021081991, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5905520615912367237, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} + - target: {fileID: 1851643275860194838, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5905520615912367237, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} + - target: {fileID: 1851643275860194838, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5905520615912367237, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5905520615912367237, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} + - target: {fileID: 1851643275860194838, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5905520615912367237, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6438304838094019420, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_PixelPerfect - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6438304838094019420, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - propertyPath: m_OverridePixelPerfect - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} ---- !u!224 &4422659091188657070 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 781630661673262082, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} - m_PrefabInstance: {fileID: 4015128327401846700} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &4858235876002121980 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4015128326712939851} - m_Modifications: - target: {fileID: 3667051745010976283, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -573,13 +507,9 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3667051745489041132, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3667051745489041132, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_AnchoredPosition.x - value: 150 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3667051745489041132, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_AnchoredPosition.y @@ -619,7 +549,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3667051746007278424, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 417.5 objectReference: {fileID: 0} - target: {fileID: 3667051746007278424, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_LocalPosition.x @@ -651,7 +581,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3667051746007278424, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_AnchoredPosition.x - value: 472.05 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3667051746007278424, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_AnchoredPosition.y @@ -673,6 +603,22 @@ PrefabInstance: propertyPath: m_Name value: Interactive Controls objectReference: {fileID: 0} + - target: {fileID: 3753776204871440802, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3753776204871440802, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3753776204871440802, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3753776204871440802, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6286078561579913959, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -709,6 +655,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6335059060917935508, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6335059060917935508, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6335059060917935508, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6335059060917935508, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6362904755243167639, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -723,12 +685,28 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6362904755243167639, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_AnchoredPosition.x - value: 150 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6362904755243167639, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6363631340497634515, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6363631340497634515, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6363631340497634515, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6386679310321119225, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_BlockingMask.m_Bits + value: 4294967295 + objectReference: {fileID: 0} - target: {fileID: 7782198574890342273, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -745,7 +723,60 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 7920848313456871224, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7920848313456871224, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7920848313456871224, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7920848313456871224, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8096819732283158740, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8096819732283158740, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8096819732283158740, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8096819732283158740, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8991404900652356292, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8991404900652356292, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8991404900652356292, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8991404900652356292, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 7122483372802297286, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + - {fileID: 3667051746007278438, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} --- !u!224 &8180815009888545700 stripped RectTransform: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI Sample.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI Sample.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI Sample.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI Sample.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Dropdown.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Dropdown.prefab similarity index 98% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Dropdown.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Dropdown.prefab index 0f0a84875..cd24bdbd1 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Dropdown.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Dropdown.prefab @@ -71,7 +71,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0b562dd0a8294f54a87c02b70b052759, type: 3} + m_Sprite: {fileID: 21300000, guid: affa059594145a843b81788037b4ee21, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -94,7 +94,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -306,7 +306,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -407,7 +407,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 746141cf5064bf74bbe882cec9bd662b, type: 3} + m_Sprite: {fileID: 21300000, guid: f8ecc54972abacc46a93f671b0602139, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -563,7 +563,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 124e4bf27f49c3e4d82277712c9fb8ab, type: 3} + m_Sprite: {fileID: 21300000, guid: db3e7b7c8db355e499429545071a0321, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -755,7 +755,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -1159,7 +1159,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cd0a7543817f3894f88cb282c643e0b5, type: 3} + m_Sprite: {fileID: 21300000, guid: b7bad1260586fa746a0b67e930892936, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Dropdown.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Dropdown.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Dropdown.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Dropdown.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab new file mode 100644 index 000000000..b526022c0 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab @@ -0,0 +1,383 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1004097911450439917 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1004097911450439916} + - component: {fileID: 1004097911450439893} + - component: {fileID: 1004097911450439891} + - component: {fileID: 1004097911450439918} + - component: {fileID: 5462666669398175258} + m_Layer: 5 + m_Name: Icon Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1004097911450439916 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004097911450439917} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 20} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1004097913474769433} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 169.99992, y: 70.00003} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1004097911450439893 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004097911450439917} + m_CullTransparentMesh: 0 +--- !u!114 &1004097911450439891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004097911450439917} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.18039216, g: 0.18039216, b: 0.18039216, a: 1} + m_HighlightedColor: {r: 0.13333334, g: 0.13333334, b: 0.13333334, a: 1} + m_PressedColor: {r: 0.38431373, g: 0.38431373, b: 0.38431373, a: 1} + m_SelectedColor: {r: 0.1254902, g: 0.5882353, b: 0.9529412, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1004097913474769435} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1004097911450439918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004097911450439917} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5462666669398175258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004097911450439917} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07b3638c2f5db5b479ff24c2859713d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PokeFollowTransform: {fileID: 1004097913474769433} + m_SmoothingSpeed: 16 + m_ReturnToInitialPosition: 1 + m_ApplyIfChildIsTarget: 1 + m_ClampToMaxDistance: 1 + m_MaxDistance: 20 +--- !u!1 &1004097911869307695 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1004097911869307694} + - component: {fileID: 1004097911869307664} + - component: {fileID: 1004097911869307665} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1004097911869307694 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004097911869307695} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0001296401} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1004097913474769433} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.000076293945, y: -0.000015258789} + m_SizeDelta: {x: 38, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1004097911869307664 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004097911869307695} + m_CullTransparentMesh: 0 +--- !u!114 &1004097911869307665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004097911869307695} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 17d565bb4a7744b41b7e4dc7e3a09e35, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1004097912527195993 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1004097912527195992} + - component: {fileID: 1004097912527195994} + - component: {fileID: 1004097912527195995} + m_Layer: 5 + m_Name: Outline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1004097912527195992 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004097912527195993} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0001296401} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1004097913474769433} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000076293945, y: -0.000015258789} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1004097912527195994 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004097912527195993} + m_CullTransparentMesh: 0 +--- !u!114 &1004097912527195995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004097912527195993} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.08235294, g: 0.08235294, b: 0.08235294, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b7bad1260586fa746a0b67e930892936, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!1 &1004097913474769430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1004097913474769433} + - component: {fileID: 1004097913474769434} + - component: {fileID: 1004097913474769435} + - component: {fileID: 1004097913474769432} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1004097913474769433 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004097913474769430} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -20} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1004097912527195992} + - {fileID: 1004097911869307694} + m_Father: {fileID: 1004097911450439916} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1004097913474769434 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004097913474769430} + m_CullTransparentMesh: 1 +--- !u!114 &1004097913474769435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004097913474769430} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: affa059594145a843b81788037b4ee21, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!114 &1004097913474769432 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004097913474769430} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab.meta new file mode 100644 index 000000000..ccaa2add0 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 56686f82f64b0af4688a89676403a500 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab new file mode 100644 index 000000000..2f564a9c1 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab @@ -0,0 +1,426 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5715416334889072034 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5715416334889072033} + - component: {fileID: 5715416334889072063} + - component: {fileID: 5715416334889072032} + m_Layer: 0 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5715416334889072033 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715416334889072034} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00005531311} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5715416335474355518} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5715416334889072063 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715416334889072034} + m_CullTransparentMesh: 1 +--- !u!114 &5715416334889072032 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715416334889072034} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: db3e7b7c8db355e499429545071a0321, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5715416335250216647 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5715416335250216646} + - component: {fileID: 5715416335250216645} + - component: {fileID: 5715416335250216642} + - component: {fileID: 5715416335250216643} + - component: {fileID: 6789707682852621109} + m_Layer: 0 + m_Name: Icon Toggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5715416335250216646 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715416335250216647} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 20} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5715416335474355518} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 170, y: -19.99998} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0, y: 1} +--- !u!114 &5715416335250216645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715416335250216647} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.1792453, g: 0.1792453, b: 0.1792453, a: 1} + m_HighlightedColor: {r: 0.09411766, g: 0.43921572, b: 0.7137255, a: 1} + m_PressedColor: {r: 0.34509805, g: 0.6901961, b: 0.96470594, a: 1} + m_SelectedColor: {r: 0.18039216, g: 0.18039216, b: 0.18039216, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5715416335971100667} + toggleTransition: 1 + graphic: {fileID: 5715416334889072032} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5715416336153000563} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_IsOn: 0 +--- !u!114 &5715416335250216642 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715416335250216647} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &5715416335250216643 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715416335250216647} + m_CullTransparentMesh: 1 +--- !u!114 &6789707682852621109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715416335250216647} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07b3638c2f5db5b479ff24c2859713d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PokeFollowTransform: {fileID: 5715416335474355518} + m_SmoothingSpeed: 16 + m_ReturnToInitialPosition: 1 + m_ApplyIfChildIsTarget: 1 + m_ClampToMaxDistance: 1 + m_MaxDistance: 20 +--- !u!1 &5715416335474355519 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5715416335474355518} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5715416335474355518 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715416335474355519} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -20} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5715416335971100668} + - {fileID: 5715416336153000562} + - {fileID: 5715416334889072033} + m_Father: {fileID: 5715416335250216646} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0, y: 1} +--- !u!1 &5715416335971100669 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5715416335971100668} + - component: {fileID: 5715416335971100666} + - component: {fileID: 5715416335971100667} + m_Layer: 0 + m_Name: Off Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5715416335971100668 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715416335971100669} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00005531311} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5715416335474355518} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000038146973, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5715416335971100666 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715416335971100669} + m_CullTransparentMesh: 1 +--- !u!114 &5715416335971100667 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715416335971100669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e45f8f823c093d941855bb23b53b9414, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5715416336153000563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5715416336153000562} + - component: {fileID: 5715416336153000560} + - component: {fileID: 5715416336153000561} + m_Layer: 0 + m_Name: On Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5715416336153000562 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715416336153000563} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00005531311} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5715416335474355518} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000038146973, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5715416336153000560 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715416336153000563} + m_CullTransparentMesh: 1 +--- !u!114 &5715416336153000561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715416336153000563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.1254902, g: 0.5882353, b: 0.9529412, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e45f8f823c093d941855bb23b53b9414, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab.meta new file mode 100644 index 000000000..3c8256bfd --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 541ed11e270c6994ca5910042c7e04da +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Interactive Controls.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Interactive Controls.prefab new file mode 100644 index 000000000..c80b7162a --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Interactive Controls.prefab @@ -0,0 +1,1367 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1205622979159415432 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8096819732283158740} + - component: {fileID: 1743886784116327006} + - component: {fileID: 8860023598738138591} + m_Layer: 5 + m_Name: Toggles + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8096819732283158740 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1205622979159415432} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.000014901157} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3667051746007278424} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 65, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1743886784116327006 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1205622979159415432} + m_CullTransparentMesh: 0 +--- !u!114 &8860023598738138591 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1205622979159415432} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Toggles +--- !u!1 &2516277204842499392 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6335059060917935508} + - component: {fileID: 4886919261217779930} + m_Layer: 5 + m_Name: Buttons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6335059060917935508 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2516277204842499392} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -20} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7920848313456871224} + - {fileID: 6363631340497634515} + m_Father: {fileID: 3667051746007278424} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 175, y: -275.75} + m_SizeDelta: {x: 260, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4886919261217779930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2516277204842499392} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 20 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &2737545590463307466 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6362904755243167639} + - component: {fileID: 517074805151515692} + - component: {fileID: 7083281397116298145} + m_Layer: 5 + m_Name: Modal Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6362904755243167639 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2737545590463307466} + 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: 3667051746007278424} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 65, y: 16} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &517074805151515692 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2737545590463307466} + m_CullTransparentMesh: 0 +--- !u!114 &7083281397116298145 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2737545590463307466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Dropdown +--- !u!1 &3667051745010976280 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3667051745010976283} + - component: {fileID: 3667051745010976284} + - component: {fileID: 5638253712277498750} + m_Layer: 5 + m_Name: Header Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3667051745010976283 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667051745010976280} + 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: 3667051746007278424} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 140, y: 33.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3667051745010976284 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667051745010976280} + m_CullTransparentMesh: 0 +--- !u!114 &5638253712277498750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667051745010976280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Test Controls +--- !u!1 &3667051745489041133 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3667051745489041132} + - component: {fileID: 3667051745489041121} + - component: {fileID: 8367975821750483211} + m_Layer: 5 + m_Name: Modal Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3667051745489041132 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667051745489041133} + 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: 3667051746007278424} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 36, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3667051745489041121 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667051745489041133} + m_CullTransparentMesh: 0 +--- !u!114 &8367975821750483211 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667051745489041133} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Slider +--- !u!1 &3667051746007278432 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3667051746007278424} + - component: {fileID: 3667051746007278425} + - component: {fileID: 3667051746007278438} + - component: {fileID: 3667051746007278439} + - component: {fileID: 3667051746007278437} + - component: {fileID: 3667051746007278434} + - component: {fileID: 3667051746007278435} + - component: {fileID: 7122483372802297286} + - component: {fileID: 6386679310321119225} + m_Layer: 5 + m_Name: Interactive Controls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3667051746007278424 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667051746007278432} + 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: + - {fileID: 3667051745010976283} + - {fileID: 3667051745489041132} + - {fileID: 6286078562336932208} + - {fileID: 6362904755243167639} + - {fileID: 7782198574890342273} + - {fileID: 3753776204871440802} + - {fileID: 6335059060917935508} + - {fileID: 8096819732283158740} + - {fileID: 8991404900652356292} + m_Father: {fileID: 0} + 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: 475, y: 0} + m_SizeDelta: {x: 300, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &3667051746007278425 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667051746007278432} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &3667051746007278438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667051746007278432} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &3667051746007278439 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667051746007278432} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!222 &3667051746007278437 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667051746007278432} + m_CullTransparentMesh: 0 +--- !u!114 &3667051746007278434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667051746007278432} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.7490196} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 8 +--- !u!114 &3667051746007278435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667051746007278432} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 16 + m_Right: 16 + m_Top: 12 + m_Bottom: 16 + m_ChildAlignment: 4 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &7122483372802297286 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667051746007278432} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 1 +--- !u!114 &6386679310321119225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667051746007278432} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7951c64acb0fa62458bf30a60089fe2d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 0 + m_CheckFor2DOcclusion: 0 + m_CheckFor3DOcclusion: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RaycastTriggerInteraction: 1 +--- !u!1 &5109620114014883440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3753776204871440802} + - component: {fileID: 7487677075601305571} + - component: {fileID: 602650485932712908} + m_Layer: 5 + m_Name: Buttons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3753776204871440802 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5109620114014883440} + 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: 3667051746007278424} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 65, y: 16} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7487677075601305571 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5109620114014883440} + m_CullTransparentMesh: 0 +--- !u!114 &602650485932712908 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5109620114014883440} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Buttons +--- !u!1 &5500222020134444911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8991404900652356292} + - component: {fileID: 3898996950938512090} + m_Layer: 5 + m_Name: Toggles + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8991404900652356292 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5500222020134444911} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -20} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 975326512693904576} + - {fileID: 1851643275860194838} + m_Father: {fileID: 3667051746007278424} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 175, y: -387.75} + m_SizeDelta: {x: 260, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3898996950938512090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5500222020134444911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 20 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1001 &1097887567364814926 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8991404900652356292} + m_Modifications: + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_SizeDelta.x + value: 170 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_LocalPosition.z + value: 19.999983 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 195190420563360911, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_Name + value: Text Toggle + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} +--- !u!224 &975326512693904576 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + m_PrefabInstance: {fileID: 1097887567364814926} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2633042498877384837 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6335059060917935508} + m_Modifications: + - target: {fileID: 5289182684458692540, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_Name + value: Text Button + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_SizeDelta.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_LocalPosition.z + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_AnchoredPosition.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e5db301629853dd4a99835fa70099d79, type: 3} +--- !u!224 &7920848313456871224 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} + m_PrefabInstance: {fileID: 2633042498877384837} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3002391033074314980 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3667051746007278424} + m_Modifications: + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_SizeDelta.x + value: 260 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_LocalPosition.z + value: 0.000014901161 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318549682554, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_Name + value: Dropdown + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} +--- !u!224 &7782198574890342273 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + m_PrefabInstance: {fileID: 3002391033074314980} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3118446809100046906 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3667051746007278424} + m_Modifications: + - target: {fileID: 8969571751951368413, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571751951368413, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752320557268, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752320557268, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752320557268, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551113, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_Name + value: MinMaxSlider + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_SizeDelta.x + value: 260 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_SizeDelta.y + value: 48 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} +--- !u!224 &6286078562336932208 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + m_PrefabInstance: {fileID: 3118446809100046906} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6178777369651745855 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6335059060917935508} + m_Modifications: + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_LocalPosition.z + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_AnchoredPosition.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1004097911450439917, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_Name + value: Icon Button + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 56686f82f64b0af4688a89676403a500, type: 3} +--- !u!224 &6363631340497634515 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} + m_PrefabInstance: {fileID: 6178777369651745855} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6260961567554068688 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8991404900652356292} + m_Modifications: + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_LocalPosition.z + value: 19.99998 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216647, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_Name + value: Icon Toggle + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} +--- !u!224 &1851643275860194838 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + m_PrefabInstance: {fileID: 6260961567554068688} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Interactive Controls.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Interactive Controls.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Interactive Controls.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Interactive Controls.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/MinMaxSlider.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/MinMaxSlider.prefab similarity index 98% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/MinMaxSlider.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/MinMaxSlider.prefab index fdc22513e..a7b464e7f 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/MinMaxSlider.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/MinMaxSlider.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cd0a7543817f3894f88cb282c643e0b5, type: 3} + m_Sprite: {fileID: 21300000, guid: b7bad1260586fa746a0b67e930892936, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -270,7 +270,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: affa059594145a843b81788037b4ee21, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -409,7 +409,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/MinMaxSlider.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/MinMaxSlider.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/MinMaxSlider.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/MinMaxSlider.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/ModalSingleButton.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/ModalSingleButton.prefab similarity index 84% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/ModalSingleButton.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/ModalSingleButton.prefab index 4b4c57f9b..b00d27b72 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/ModalSingleButton.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/ModalSingleButton.prefab @@ -10,12 +10,10 @@ GameObject: m_Component: - component: {fileID: 781630661673262082} - component: {fileID: 781630661673262083} - - component: {fileID: 781630661673262140} - component: {fileID: 781630661673262141} - component: {fileID: 781630661673262143} - component: {fileID: 781630661673262136} - component: {fileID: 781630661673262137} - - component: {fileID: 6549131284124938908} - component: {fileID: 6960627886175621283} m_Layer: 5 m_Name: ModalSingleButton @@ -34,6 +32,7 @@ RectTransform: 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: - {fileID: 781630662526433601} - {fileID: 781630663273105846} @@ -67,29 +66,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &781630661673262140 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 781630661673262138} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 --- !u!114 &781630661673262141 MonoBehaviour: m_ObjectHideFlags: 0 @@ -171,20 +147,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!114 &6549131284124938908 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 781630661673262138} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 1 --- !u!114 &6960627886175621283 MonoBehaviour: m_ObjectHideFlags: 0 @@ -202,7 +164,7 @@ MonoBehaviour: m_CheckFor3DOcclusion: 0 m_BlockingMask: serializedVersion: 2 - m_Bits: 2147483647 + m_Bits: 4294967295 m_RaycastTriggerInteraction: 1 --- !u!1 &781630662526433602 GameObject: @@ -232,6 +194,7 @@ RectTransform: 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: 781630661673262082} m_RootOrder: 0 @@ -239,7 +202,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 24.21} + m_SizeDelta: {x: 0, y: 33.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &781630662526433606 CanvasRenderer: @@ -282,7 +245,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Test Header Text + m_Text: Test Modal Window --- !u!1 &781630663273105847 GameObject: m_ObjectHideFlags: 0 @@ -293,7 +256,6 @@ GameObject: m_Component: - component: {fileID: 781630663273105846} - component: {fileID: 781630663273105851} - - component: {fileID: 781630663273105845} - component: {fileID: 5483714724633069137} m_Layer: 5 m_Name: Modal Text @@ -312,13 +274,14 @@ RectTransform: 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: 781630661673262082} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 147.05, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 147.05, y: -79.5} m_SizeDelta: {x: 262.1, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &781630663273105851 @@ -329,20 +292,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 781630663273105847} m_CullTransparentMesh: 0 ---- !u!114 &781630663273105845 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 781630663273105847} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 --- !u!114 &5483714724633069137 MonoBehaviour: m_ObjectHideFlags: 0 @@ -385,13 +334,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 781630661673262082} m_Modifications: + - target: {fileID: 2482363001952073328, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_LocalPosition.z + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 3356991306335605903, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_Text + value: Confirm + objectReference: {fileID: 0} - target: {fileID: 5289182684144184604, guid: e5db301629853dd4a99835fa70099d79, type: 3} propertyPath: m_text value: Text teisofidojsdfsf objectReference: {fileID: 0} - target: {fileID: 5289182684458692540, guid: e5db301629853dd4a99835fa70099d79, type: 3} propertyPath: m_Name - value: TextButton - Copy + value: TextButton objectReference: {fileID: 0} - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} propertyPath: m_Pivot.x @@ -479,34 +436,8 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e5db301629853dd4a99835fa70099d79, type: 3} ---- !u!1 &4436940632021081990 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5289182684458692540, guid: e5db301629853dd4a99835fa70099d79, type: 3} - m_PrefabInstance: {fileID: 8427886781161254970} - m_PrefabAsset: {fileID: 0} --- !u!224 &4436940632021081991 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} m_PrefabInstance: {fileID: 8427886781161254970} m_PrefabAsset: {fileID: 0} ---- !u!223 &6438304838094019420 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4436940632021081990} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/ModalSingleButton.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/ModalSingleButton.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/ModalSingleButton.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/ModalSingleButton.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Scroll UI Sample.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Scroll UI Sample.prefab similarity index 98% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Scroll UI Sample.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Scroll UI Sample.prefab index e58fd1909..f1c697442 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Scroll UI Sample.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Scroll UI Sample.prefab @@ -31,12 +31,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8747907324888668265} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 126, y: -25} - m_SizeDelta: {x: 252, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &187402271665234622 CanvasRenderer: @@ -120,7 +119,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8747907325324488007} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -198,7 +196,6 @@ RectTransform: m_Children: - {fileID: 1358160809937143452} m_Father: {fileID: 8747907325768000811} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -289,7 +286,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8747907326218408609} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -365,7 +361,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8747907326224632397} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -441,7 +436,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8747907325689103684} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -520,7 +514,6 @@ RectTransform: - {fileID: 8747907324863920239} - {fileID: 8747907326620743393} m_Father: {fileID: 8747907325722657838} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -648,7 +641,6 @@ RectTransform: - {fileID: 8747907325252089051} - {fileID: 8747907326401285888} m_Father: {fileID: 8747907325722657838} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -736,7 +728,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 8747907325689103686} m_HandleRect: {fileID: 8747907326526105401} m_Direction: 0 - m_Value: 1 + m_Value: 0 m_Size: 0.9999998 m_NumberOfSteps: 0 m_OnValueChanged: @@ -777,7 +769,6 @@ RectTransform: - {fileID: 8747907325324488007} - {fileID: 8747907325689103684} m_Father: {fileID: 8747907326224632397} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -875,7 +866,6 @@ RectTransform: m_Children: - {fileID: 8747907324888668265} m_Father: {fileID: 8747907325722657838} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -964,7 +954,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8747907326526105401} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1041,7 +1030,6 @@ RectTransform: m_Children: - {fileID: 8747907324966354089} m_Father: {fileID: 8747907326620743393} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1121,7 +1109,6 @@ RectTransform: - {fileID: 8747907325091541477} - {fileID: 8747907325722657838} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1216,7 +1203,6 @@ RectTransform: m_Children: - {fileID: 8747907326526105401} m_Father: {fileID: 8747907325689103684} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1255,7 +1241,6 @@ RectTransform: m_Children: - {fileID: 8747907325788499339} m_Father: {fileID: 8747907326401285888} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1330,7 +1315,6 @@ RectTransform: m_Children: - {fileID: 8747907326218408609} m_Father: {fileID: 8747907325324488007} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1368,12 +1352,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8747907326224632397} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -24} - m_SizeDelta: {x: -144, y: 48} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 151} + m_SizeDelta: {x: -20, y: 48} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8747907326643813624 CanvasRenderer: @@ -1405,7 +1388,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 + m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -1416,4 +1399,4 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Scrollview + m_Text: Test Scrollview diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Scroll UI Sample.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Scroll UI Sample.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/Scroll UI Sample.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Scroll UI Sample.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab new file mode 100644 index 000000000..39035dee3 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab @@ -0,0 +1,507 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &195190419645158922 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 195190419645158933} + - component: {fileID: 195190419645158935} + - component: {fileID: 195190419645158932} + m_Layer: 5 + m_Name: On Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &195190419645158933 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190419645158922} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00005531311} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 195190421305919396} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000038146973, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &195190419645158935 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190419645158922} + m_CullTransparentMesh: 1 +--- !u!114 &195190419645158932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190419645158922} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.1254902, g: 0.5882353, b: 0.9529412, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: affa059594145a843b81788037b4ee21, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 4 +--- !u!1 &195190419895452205 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 195190419895452204} + - component: {fileID: 195190419895452206} + - component: {fileID: 195190419895452207} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &195190419895452204 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190419895452205} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00005531311} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 195190421305919396} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000038146973, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &195190419895452206 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190419895452205} + m_CullTransparentMesh: 0 +--- !u!114 &195190419895452207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190419895452205} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Toggle +--- !u!1 &195190420188018990 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 195190420188018985} + - component: {fileID: 195190420188018987} + - component: {fileID: 195190420188018984} + m_Layer: 5 + m_Name: Outline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &195190420188018985 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190420188018990} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00005531311} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 195190421305919396} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000038146973, y: 0} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &195190420188018987 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190420188018990} + m_CullTransparentMesh: 0 +--- !u!114 &195190420188018984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190420188018990} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.08235294, g: 0.08235294, b: 0.08235294, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b7bad1260586fa746a0b67e930892936, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 4 +--- !u!1 &195190420563360911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 195190420563360910} + - component: {fileID: 195190420563360919} + - component: {fileID: 195190420563360905} + - component: {fileID: 195190420563360906} + - component: {fileID: 3218775891302470945} + m_Layer: 5 + m_Name: Text Toggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &195190420563360910 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190420563360911} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 20} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 195190421305919396} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -29.99997, y: -19.99998} + m_SizeDelta: {x: 170, y: 60} + m_Pivot: {x: 0, y: 1} +--- !u!222 &195190420563360919 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190420563360911} + m_CullTransparentMesh: 0 +--- !u!114 &195190420563360905 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190420563360911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.1792453, g: 0.1792453, b: 0.1792453, a: 1} + m_HighlightedColor: {r: 0.09411766, g: 0.43921572, b: 0.7137255, a: 1} + m_PressedColor: {r: 0.34509805, g: 0.6901961, b: 0.96470594, a: 1} + m_SelectedColor: {r: 0.18039216, g: 0.18039216, b: 0.18039216, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 195190420571543381} + toggleTransition: 1 + graphic: {fileID: 0} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 195190419645158922} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_IsOn: 0 +--- !u!114 &195190420563360906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190420563360911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3218775891302470945 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190420563360911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07b3638c2f5db5b479ff24c2859713d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PokeFollowTransform: {fileID: 195190421305919396} + m_SmoothingSpeed: 16 + m_ReturnToInitialPosition: 1 + m_ApplyIfChildIsTarget: 1 + m_ClampToMaxDistance: 1 + m_MaxDistance: 20 +--- !u!1 &195190420571543371 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 195190420571543370} + - component: {fileID: 195190420571543380} + - component: {fileID: 195190420571543381} + m_Layer: 5 + m_Name: Off Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &195190420571543370 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190420571543371} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00005531311} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 195190421305919396} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000038146973, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &195190420571543380 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190420571543371} + m_CullTransparentMesh: 1 +--- !u!114 &195190420571543381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190420571543371} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: affa059594145a843b81788037b4ee21, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 4 +--- !u!1 &195190421305919397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 195190421305919396} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &195190421305919396 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195190421305919397} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -20} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 195190420571543370} + - {fileID: 195190419645158933} + - {fileID: 195190420188018985} + - {fileID: 195190419895452204} + m_Father: {fileID: 195190420563360910} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 170, y: 60} + m_Pivot: {x: 0, y: 1} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab.meta new file mode 100644 index 000000000..869262eb5 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6a448845c7017044e8a9f3d711cfe825 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/TextButton.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/TextButton.prefab similarity index 76% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/TextButton.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/TextButton.prefab index 3430b5112..acd5cb1dd 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/TextButton.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/TextButton.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 2482363001952073328} - component: {fileID: 1018296862946939238} - component: {fileID: 4462709362712937534} + - component: {fileID: 4722489013844015951} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -26,10 +27,12 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 909881759767330623} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -20} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3744793336206911786} + - {fileID: 2849559158440995629} m_Father: {fileID: 5289182684458692541} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -58,7 +61,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -66,7 +69,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: affa059594145a843b81788037b4ee21, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -76,6 +79,19 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 4 +--- !u!114 &4722489013844015951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 909881759767330623} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1 &2989151356592697494 GameObject: m_ObjectHideFlags: 0 @@ -104,6 +120,7 @@ RectTransform: 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: 2482363001952073328} m_RootOrder: 0 @@ -143,10 +160,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 16 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -154,7 +171,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Confirm + m_Text: Button --- !u!1 &5289182684458692540 GameObject: m_ObjectHideFlags: 0 @@ -166,10 +183,9 @@ GameObject: - component: {fileID: 5289182684458692541} - component: {fileID: 5289182684458692536} - component: {fileID: 5289182684458692542} - - component: {fileID: 7920265473048020210} - component: {fileID: 6653214391055899988} - component: {fileID: 192829670517972240} - - component: {fileID: 3380337414551334423} + - component: {fileID: 438796940644668670} m_Layer: 5 m_Name: TextButton m_TagString: Untagged @@ -187,6 +203,7 @@ RectTransform: 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: - {fileID: 2482363001952073328} m_Father: {fileID: 0} @@ -249,25 +266,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!114 &7920265473048020210 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5289182684458692540} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7951c64acb0fa62458bf30a60089fe2d, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 0 - m_CheckFor2DOcclusion: 0 - m_CheckFor3DOcclusion: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RaycastTriggerInteraction: 1 --- !u!114 &6653214391055899988 MonoBehaviour: m_ObjectHideFlags: 0 @@ -318,7 +316,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3380337414551334423 +--- !u!114 &438796940644668670 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -335,4 +333,80 @@ MonoBehaviour: m_ReturnToInitialPosition: 1 m_ApplyIfChildIsTarget: 1 m_ClampToMaxDistance: 1 - m_MaxDistance: 10 + m_MaxDistance: 20 +--- !u!1 &7228554695504750986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2849559158440995629} + - component: {fileID: 2199139639382771002} + - component: {fileID: 4810623784220459246} + m_Layer: 5 + m_Name: Outline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2849559158440995629 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7228554695504750986} + 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: 2482363001952073328} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -0.0000019073486, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2199139639382771002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7228554695504750986} + m_CullTransparentMesh: 0 +--- !u!114 &4810623784220459246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7228554695504750986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.08235294, g: 0.08235294, b: 0.08235294, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b7bad1260586fa746a0b67e930892936, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 4 diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/TextButton.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/TextButton.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_2D/TextButton.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Prefabs/UI/TextButton.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Scripts.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Scripts.meta new file mode 100644 index 000000000..5ff301013 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 89c7da9a19d09c8419df6ac7f38d429e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/PokeStation/IncrementUIText.cs b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Scripts/IncrementUIText.cs similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/PokeStation/IncrementUIText.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Scripts/IncrementUIText.cs diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/PokeStation/IncrementUIText.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Scripts/IncrementUIText.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/PokeStation/IncrementUIText.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Scripts/IncrementUIText.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites.meta new file mode 100644 index 000000000..488877877 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e849a70d25179dc42a5f1fbd87c1b42e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Asset.png b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Asset.png new file mode 100644 index 0000000000000000000000000000000000000000..a2c96759bebc5af73689e4e668e9178a77d005b3 GIT binary patch literal 1419 zcmbtU`#aNn9RF@?Gq-XpWsV`YC3o6%uqoFbmpmopVY8T09fok+HqX+Ca-I@7h;);k zv6D;G*`_TkN_KSI86k5XYBh-&&bOcX1J3*Xyx*_)`}Mv&&-;hZrzkYoPfLBTIsgD# z0scqAK%{*)H8|)6o}@kykjeg$sQ_Sm^t(asdE9ISNl0p#pEtnnM=gShDuob4007Q4 z4J8Q%05EjG5yJ6I$nqrpw{f?fuz?epWTZ{EMKscmU@SBq0o9?VMKu;-ZEB$`tJi;( zp?ZxU2PxZ-l=RHvifIgsPK^MDn$8cY8TF}#%CZy-@?~CgMc@1h>BN1)wu=XQaCY~U zhFrqvUvQI2?u)$EM)K(n9$WhE?LvC227^vd#>>BMx@F>2cnL%_itplYKS*ZOkS-j4 zXkSb>;Z*;dTAN{T7BRkOvlfz*H8yOJ1<^NDD<@Qpl#XC8k#X0RrD+fr>YNQcZ)%Iu zJN>E=zci^^j6vAWqYzw&xs%$EzTt_cbf)P4f)&EGjx87}p40`z*DK&=s1zJbIsZ#dWScN&118l06lRor#1f8gjWSTd_Vb+;o$& zjeNJx4NubaUTb@Algm?5dl2{L5$WfC^{Rs_n8Lc-EuHyLg;^j6F04uyWaiZGLxq)lbnL$ZAV8G_a}+&3xV?^N6$d&C0jx@^n}55Nh~3T!1tZ4D$k6u1T3sLo7T4gBO1hv^yBUYE7>U6yDn97B-RNXgtyZ061rQL5;`=0skvl++dZ4N9`=aVgCw)ae>17m zh_sf%NNC|+1M}i1qihbbRD9oi&xGq<6vG42Hig z9zL)Tg`e#;Z6_b&-*Qq!4LqbWmqVSVm-gfyco=~bUcB*SN9^}F6pUNsom}uG5kbE8 z3CF`(5l#f@+Lk|!ofR>4#QB}$(x6kXrP&N?LVAD;f&eRAOAlF8?MJRz_*pQL}Sa2yAaej4fB?@z}f=yNZ*hWfrvFTb{deGZx^prwfgF}}M_)$E)e-c?47?|8WT^vIy7~kG~n0w1X;`qbG+zi5IcNa)+ zk=`G_&UJ-N_sN81ZH=uI4Eo~rj!!#iI zZp$(dxnbK6#oIFv+&aH^y|XgzJPLKMfBWy= zet&%;OLm{Un5~#xdCr}KD+99ofszaMFRtUc6ZV87szZL0E!T@(?=Jj5`M=`rw@LqG zw+Pv%)JjAg=7{Q&-(=4p@QEX;TVAYEX~hx2EfV%R-+U50l`~B1BEGDAAmnzT=+A~9 z*^J(O3%>qX*dg9LO``Efy~yXRgmZ!&|NR5?*`EUi){BFVdQ&MBb@0CSQiLjV8( literal 0 HcmV?d00001 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png.meta new file mode 100644 index 000000000..1a9d53446 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: db3e7b7c8db355e499429545071a0321 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png new file mode 100644 index 0000000000000000000000000000000000000000..2193f73686f7438ac10f66e9889643b6785d0a3b GIT binary patch literal 3286 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 literal 0 HcmV?d00001 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png.meta new file mode 100644 index 000000000..d972e1449 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: b7bad1260586fa746a0b67e930892936 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png new file mode 100644 index 0000000000000000000000000000000000000000..2bbc296a71648a63e796b51ebd9fa4e8762e1a70 GIT binary patch literal 829 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zcaloCO|{#S9EO-XP4l)OOlRpde#$ zkh>GZx^prwfgF}}M_)$E)e-c?47?>`3x;TbZFuuK!7%1&1(eTh#M4?ejL#Tsk zLJ<2FzOKn(j8g^Jds$>+$`#+16gb>_KJ(^I-*@l7-@A9m?B31qfAiwrJ+GSaI_<#m za+~$}x3|sxw}0c`yJrsWpEv#Z&V4*PV(uT0=FoqAJe%S9!}@uz%MLt^UVbpqwV?E0 zvh7b^d(rG`*U$9l+WpOc_Vs(iyu((Ea_lCyYZ&(Y3Mkzl*Z7SwFr4`ii^D7i4`GH( zCIw%HC7cZ=j1$xtE{zHf(Etf!SkCBsT=c+sAenpr`|h2Uau+_o%(}fTzWB4rf~T41 z{$)n*uH=g8-yZw`m|U#SmCj(?v!{+VYWCOT1wsWsul2~EGq&IMz5ID*fw6x4^ItY| oIAYo^SNy*5`SG7q|If>R%e4G=Ym#OmFtsyyy85}Sb4q9e0O67pV*mgE literal 0 HcmV?d00001 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png.meta new file mode 100644 index 000000000..a7b5b2882 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: affa059594145a843b81788037b4ee21 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 8, y: 8, z: 8, w: 8} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Editor.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Editor.meta similarity index 77% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Editor.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Editor.meta index 6cce1c4ee..b2e7ff7c4 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Editor.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 426e14a93f21c354fa5cf5b5145eb963 +guid: 004f0e70ab2efb54a9d93a283d657b97 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Editor/Scripts.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Editor/Scripts.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Editor/Scripts.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Editor/Scripts.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Cylinder.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models/Primitive_Cylinder.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Cylinder.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models/Primitive_Cylinder.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Cylinder.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models/Primitive_Cylinder.fbx.meta similarity index 92% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Cylinder.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models/Primitive_Cylinder.fbx.meta index 0d27bffae..65a83a147 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Cylinder.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models/Primitive_Cylinder.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 9e1dc1c14313460d872de39e35129b39 ModelImporter: - serializedVersion: 20300 + serializedVersion: 22200 internalIDToNameTable: [] externalObjects: {} materials: @@ -14,6 +14,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -39,10 +40,12 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 1 @@ -54,6 +57,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -64,6 +68,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -96,6 +101,7 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 0 + importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Wedge.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models/Primitive_Wedge.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Wedge.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models/Primitive_Wedge.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Wedge.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models/Primitive_Wedge.fbx.meta similarity index 92% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Wedge.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models/Primitive_Wedge.fbx.meta index 12aa49545..7c76429f5 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Models/Primitive_Wedge.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models/Primitive_Wedge.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: ab3a79eba4de4be0ad5fead9fb858190 ModelImporter: - serializedVersion: 20300 + serializedVersion: 22200 internalIDToNameTable: [] externalObjects: {} materials: @@ -14,6 +14,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -39,10 +40,12 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 @@ -54,6 +57,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -64,6 +68,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -96,6 +101,7 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models/Reticle_Torus.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Models/Reticle_Torus.fbx new file mode 100644 index 0000000000000000000000000000000000000000..60c8be6b4e2b88975c9195b91ce013b451cd3e47 GIT binary patch literal 33056 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 m_RayInteractorChanged; + public bool smoothMotionEnabled { get => m_SmoothMotionEnabled; @@ -222,6 +229,8 @@ void OnStartTeleport(InputAction.CallbackContext context) if (m_RayInteractor != null) m_RayInteractor.gameObject.SetActive(false); + + m_RayInteractorChanged?.Invoke(m_TeleportInteractor); } void OnCancelTeleport(InputAction.CallbackContext context) @@ -235,6 +244,8 @@ void OnCancelTeleport(InputAction.CallbackContext context) if (m_RayInteractor != null) m_RayInteractor.gameObject.SetActive(true); + m_RayInteractorChanged?.Invoke(m_RayInteractor); + } void OnStartLocomotion(InputAction.CallbackContext context) diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/ActionBasedControllerManager.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/ActionBasedControllerManager.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/ActionBasedControllerManager.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/ActionBasedControllerManager.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/DestroySelf.cs b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/DestroySelf.cs new file mode 100644 index 000000000..93e53933e --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/DestroySelf.cs @@ -0,0 +1,29 @@ +namespace UnityEngine.XR.Interaction.Toolkit.Samples.StarterAssets +{ + /// + /// Destroys the GameObject it is attached to after a specified amount of time. + /// + public class DestroySelf : MonoBehaviour + { + [SerializeField] + [Tooltip("The amount of time, in seconds, to wait after Start before destroying the GameObject.")] + float m_Lifetime = 0.25f; + + /// + /// The amount of time, in seconds, to wait after Start before destroying the GameObject. + /// + public float lifetime + { + get => m_Lifetime; + set => m_Lifetime = value; + } + + /// + /// See . + /// + void Start() + { + Destroy(gameObject, m_Lifetime); + } + } +} \ No newline at end of file diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/DestroySelf.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/DestroySelf.cs.meta new file mode 100644 index 000000000..bf7bf1f7e --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/DestroySelf.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 717c12e2a4cfe764ab2580b1135e10fd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/DynamicMoveProvider.cs b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/DynamicMoveProvider.cs similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/DynamicMoveProvider.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/DynamicMoveProvider.cs diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/DynamicMoveProvider.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/DynamicMoveProvider.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/DynamicMoveProvider.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/DynamicMoveProvider.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/GazeInputManager.cs b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/GazeInputManager.cs similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/GazeInputManager.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/GazeInputManager.cs diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/GazeInputManager.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/GazeInputManager.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/GazeInputManager.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/GazeInputManager.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/ObjectSpawner.cs b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/ObjectSpawner.cs new file mode 100644 index 000000000..485e34ae7 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/ObjectSpawner.cs @@ -0,0 +1,237 @@ +using System; +using System.Collections.Generic; +using UnityEngine.XR.Interaction.Toolkit.Utilities; + +namespace UnityEngine.XR.Interaction.Toolkit.Samples.StarterAssets +{ + /// + /// Behavior with an API for spawning objects from a given set of prefabs. + /// + public class ObjectSpawner : MonoBehaviour + { + [SerializeField] + [Tooltip("The camera that objects will face when spawned. If not set, defaults to the main camera.")] + Camera m_CameraToFace; + + /// + /// The camera that objects will face when spawned. If not set, defaults to the camera. + /// + public Camera cameraToFace + { + get + { + EnsureFacingCamera(); + return m_CameraToFace; + } + set => m_CameraToFace = value; + } + + [SerializeField] + [Tooltip("The list of prefabs available to spawn.")] + List m_ObjectPrefabs = new List(); + + /// + /// The list of prefabs available to spawn. + /// + public List objectPrefabs + { + get => m_ObjectPrefabs; + set => m_ObjectPrefabs = value; + } + + [SerializeField] + [Tooltip("Optional prefab to spawn for each spawned object. Use a prefab with the Destroy Self component to make " + + "sure the visualization only lives temporarily.")] + GameObject m_SpawnVisualizationPrefab; + + /// + /// Optional prefab to spawn for each spawned object. + /// + /// Use a prefab with to make sure the visualization only lives temporarily. + public GameObject spawnVisualizationPrefab + { + get => m_SpawnVisualizationPrefab; + set => m_SpawnVisualizationPrefab = value; + } + + [SerializeField] + [Tooltip("The index of the prefab to spawn. If outside the range of the list, this behavior will select " + + "a random object each time it spawns.")] + int m_SpawnOptionIndex = -1; + + /// + /// The index of the prefab to spawn. If outside the range of , this behavior will + /// select a random object each time it spawns. + /// + /// + public int spawnOptionIndex + { + get => m_SpawnOptionIndex; + set => m_SpawnOptionIndex = value; + } + + /// + /// Whether this behavior will select a random object from each time it spawns. + /// + /// + /// + public bool isSpawnOptionRandomized => m_SpawnOptionIndex < 0 || m_SpawnOptionIndex >= m_ObjectPrefabs.Count; + + [SerializeField] + [Tooltip("Whether to only spawn an object if the spawn point is within view of the camera.")] + bool m_OnlySpawnInView = true; + + /// + /// Whether to only spawn an object if the spawn point is within view of the . + /// + public bool onlySpawnInView + { + get => m_OnlySpawnInView; + set => m_OnlySpawnInView = value; + } + + [SerializeField] + [Tooltip("The size, in viewport units, of the periphery inside the viewport that will not be considered in view.")] + float m_ViewportPeriphery = 0.15f; + + /// + /// The size, in viewport units, of the periphery inside the viewport that will not be considered in view. + /// + public float viewportPeriphery + { + get => m_ViewportPeriphery; + set => m_ViewportPeriphery = value; + } + + [SerializeField] + [Tooltip("When enabled, the object will be rotated about the y-axis when spawned by Spawn Angle Range, " + + "in relation to the direction of the spawn point to the camera.")] + bool m_ApplyRandomAngleAtSpawn = true; + + /// + /// When enabled, the object will be rotated about the y-axis when spawned by + /// in relation to the direction of the spawn point to the camera. + /// + public bool applyRandomAngleAtSpawn + { + get => m_ApplyRandomAngleAtSpawn; + set => m_ApplyRandomAngleAtSpawn = value; + } + + [SerializeField] + [Tooltip("The range in degrees that the object will randomly be rotated about the y axis when spawned, " + + "in relation to the direction of the spawn point to the camera.")] + float m_SpawnAngleRange = 45f; + + /// + /// The range in degrees that the object will randomly be rotated about the y axis when spawned, in relation + /// to the direction of the spawn point to the camera. + /// + public float spawnAngleRange + { + get => m_SpawnAngleRange; + set => m_SpawnAngleRange = value; + } + + [SerializeField] + [Tooltip("Whether to spawn each object as a child of this object.")] + bool m_SpawnAsChildren; + + /// + /// Whether to spawn each object as a child of this object. + /// + public bool spawnAsChildren + { + get => m_SpawnAsChildren; + set => m_SpawnAsChildren = value; + } + + /// + /// Event invoked after an object is spawned. + /// + /// + public event Action objectSpawned; + + /// + /// See . + /// + void Awake() + { + EnsureFacingCamera(); + } + + void EnsureFacingCamera() + { + if (m_CameraToFace == null) + m_CameraToFace = Camera.main; + } + + /// + /// Sets this behavior to select a random object from each time it spawns. + /// + /// + /// + public void RandomizeSpawnOption() + { + m_SpawnOptionIndex = -1; + } + + /// + /// Attempts to spawn an object from at the given position. The object will have a + /// yaw rotation that faces , plus or minus a random angle within . + /// + /// The world space position at which to spawn the object. + /// The world space normal of the spawn surface. + /// Returns if the spawner successfully spawned an object. Otherwise returns + /// , for instance if the spawn point is out of view of the camera. + /// + /// The object selected to spawn is based on . If the index is outside + /// the range of , this method will select a random prefab from the list to spawn. + /// Otherwise, it will spawn the prefab at the index. + /// + /// + public bool TrySpawnObject(Vector3 spawnPoint, Vector3 spawnNormal) + { + if (m_OnlySpawnInView) + { + var inViewMin = m_ViewportPeriphery; + var inViewMax = 1f - m_ViewportPeriphery; + var pointInViewportSpace = cameraToFace.WorldToViewportPoint(spawnPoint); + if (pointInViewportSpace.z < 0f || pointInViewportSpace.x > inViewMax || pointInViewportSpace.x < inViewMin || + pointInViewportSpace.y > inViewMax || pointInViewportSpace.y < inViewMin) + { + return false; + } + } + + var objectIndex = isSpawnOptionRandomized ? Random.Range(0, m_ObjectPrefabs.Count) : m_SpawnOptionIndex; + var newObject = Instantiate(m_ObjectPrefabs[objectIndex]); + if (m_SpawnAsChildren) + newObject.transform.parent = transform; + + newObject.transform.position = spawnPoint; + EnsureFacingCamera(); + + var facePosition = m_CameraToFace.transform.position; + var forward = facePosition - spawnPoint; + BurstMathUtility.ProjectOnPlane(forward, spawnNormal, out var projectedForward); + newObject.transform.rotation = Quaternion.LookRotation(projectedForward, spawnNormal); + + if (m_ApplyRandomAngleAtSpawn) + { + var randomRotation = Random.Range(-m_SpawnAngleRange, m_SpawnAngleRange); + newObject.transform.Rotate(Vector3.up, randomRotation); + } + + if (m_SpawnVisualizationPrefab != null) + { + var visualizationTrans = Instantiate(m_SpawnVisualizationPrefab).transform; + visualizationTrans.position = spawnPoint; + visualizationTrans.rotation = newObject.transform.rotation; + } + + objectSpawned?.Invoke(newObject); + return true; + } + } +} \ No newline at end of file diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/ObjectSpawner.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/ObjectSpawner.cs.meta new file mode 100644 index 000000000..70f000873 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/ObjectSpawner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 956dd6cf70eaca449a45b6a95b96c8c1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/XRPokeFollowAffordance.cs b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/XRPokeFollowAffordance.cs similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/XRPokeFollowAffordance.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/XRPokeFollowAffordance.cs diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/XRPokeFollowAffordance.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/XRPokeFollowAffordance.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/XRPokeFollowAffordance.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Scripts/XRPokeFollowAffordance.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette.meta new file mode 100644 index 000000000..6b68b7ee9 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 14305397b55fd2148ab7fcbdcbb60a50 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.mat b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.mat new file mode 100644 index 000000000..925d5b1bd --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.mat @@ -0,0 +1,172 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TunnelingVignette + m_Shader: {fileID: 4800000, guid: e51b4af1e50be764e8de46e07d4e3f3f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _WINDQUALITY_NONE + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Control: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ExtraTex: + 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} + - _Mask0: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Mask1: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Mask2: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Mask3: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal0: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal1: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal2: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal3: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Splat0: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Splat1: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Splat2: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Splat3: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SubsurfaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TerrainHolesTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - Vector1_3F06E706: 0.2 + - Vector1_75dd1e4765a74fbfb568941f1cbc3b28: 0.2 + - Vector1_EA51145: 0.7 + - Vector1_b81b3127f28249bf9aa125c543e5fa41: 0.591 + - _ApertureSize: 1 + - _BillboardKwToggle: 0 + - _BillboardShadowFade: 0.5 + - _ColorMask: 15 + - _EnableHeightBlend: 0 + - _EnableInstancedPerPixelNormal: 1 + - _FeatheringEffect: 0 + - _Glossiness: 0.5 + - _HeightTransition: 0 + - _HueVariationKwToggle: 0 + - _Metallic: 0 + - _Metallic0: 0 + - _Metallic1: 0 + - _Metallic2: 0 + - _Metallic3: 0 + - _NormalMapKwToggle: 0 + - _NumLayersCount: 1 + - _Smoothness0: 0.5 + - _Smoothness1: 0.5 + - _Smoothness2: 0.5 + - _Smoothness3: 0.5 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _SubsurfaceIndirect: 0.25 + - _SubsurfaceKwToggle: 0 + - _TwoSided: 2 + - _UseUIAlphaClip: 0 + - _WindQuality: 0 + m_Colors: + - Color_289bc150a04c4e18b064c9c73585a3e6: {r: 0, g: 0, b: 0, a: 1} + - Color_8A2FD431: {r: 0, g: 0, b: 0, a: 0} + - Color_9DC7CF27: {r: 0, g: 0, b: 0, a: 0} + - Color_c07642b1f5ef4fdba00f1bb21dbcab55: {r: 0, g: 0, b: 0, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _HueVariationColor: {r: 1, g: 0.5, b: 0, a: 0.1} + - _SubsurfaceColor: {r: 1, g: 1, b: 1, a: 1} + - _VignetteColor: {r: 0, g: 0, b: 0, a: 1} + - _VignetteColorBlend: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &8502541265190943013 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.mat.meta new file mode 100644 index 000000000..168c276c2 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0a35b7e20f75a8540a2c14b9555078cb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab new file mode 100644 index 000000000..7c3b55665 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab @@ -0,0 +1,132 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8429981633443581377 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8429981633443581382} + - component: {fileID: 8429981633443581380} + - component: {fileID: -7375739841766313277} + - component: {fileID: 8429981633443581383} + - component: {fileID: 5564773904428835032} + m_Layer: 0 + m_Name: TunnelingVignette + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8429981633443581382 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8429981633443581377} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &8429981633443581380 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8429981633443581377} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0a35b7e20f75a8540a2c14b9555078cb, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &-7375739841766313277 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8429981633443581377} + m_Mesh: {fileID: 1337149907330944951, guid: 5833e680dc0f7ae47aec6b4286570484, type: 3} +--- !u!114 &8429981633443581383 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8429981633443581377} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b1c500f2a52a5eb4a952658e1bf51e88, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DefaultParameters: + m_ApertureSize: 0.7 + m_FeatheringEffect: 0.2 + m_EaseInTime: 0.3 + m_EaseOutTime: 0.3 + m_EaseInTimeLock: 0 + m_EaseOutDelayTime: 0 + m_VignetteColor: {r: 0, g: 0, b: 0, a: 1} + m_VignetteColorBlend: {r: 0, g: 0, b: 0, a: 1} + m_ApertureVerticalPosition: 0 + m_CurrentParameters: + m_ApertureSize: 0.7 + m_FeatheringEffect: 0.2 + m_EaseInTime: 0.3 + m_EaseOutTime: 0.3 + m_EaseInTimeLock: 0 + m_EaseOutDelayTime: 0 + m_VignetteColor: {r: 0, g: 0, b: 0, a: 1} + m_VignetteColorBlend: {r: 0, g: 0, b: 0, a: 1} + m_ApertureVerticalPosition: 0 + m_LocomotionVignetteProviders: [] +--- !u!210 &5564773904428835032 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8429981633443581377} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 30010 + m_SortAtRoot: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab.meta new file mode 100644 index 000000000..b32de67ba --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6c8af5c8012f01440af6cb2bc3eb987c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.shader b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.shader new file mode 100644 index 000000000..5ed7341f0 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.shader @@ -0,0 +1,78 @@ +Shader "VR/TunnelingVignette" +{ + Properties + { + _ApertureSize("Aperture Size", Range(0, 1)) = 0.7 + _FeatheringEffect("Feathering Effect", Range(0, 1)) = 0.2 + _VignetteColor("Vignette Color", Color) = (0, 0, 0, 1) + _VignetteColorBlend("Vignette Color Blend", Color) = (0, 0, 0, 1) + } + SubShader + { + Tags { "Queue" = "Transparent+5" "IgnoreProjector" = "True" "RenderType" = "Transparent" } + LOD 100 + + Pass + { + Blend SrcAlpha OneMinusSrcAlpha + ZTest Always + ZWrite Off + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct v2f + { + float2 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + + UNITY_VERTEX_OUTPUT_STEREO + }; + + float4 _VignetteColor; + float4 _VignetteColorBlend; + float _ApertureSize; + float _FeatheringEffect; + + v2f vert(appdata v) + { + v2f o; + + UNITY_SETUP_INSTANCE_ID(v); + UNITY_INITIALIZE_OUTPUT(v2f, o); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); + + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = v.uv; + return o; + } + + UNITY_DECLARE_SCREENSPACE_TEXTURE(_MainTex); + + fixed4 frag(v2f i) : SV_Target + { + UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(i); + + float uvY = i.uv.y; + float alphaMin = (0.5 - sqrt(0.25 - ((_ApertureSize * _ApertureSize) * 0.25))); + float alpha = saturate(((uvY - alphaMin) / (_FeatheringEffect * _FeatheringEffect + 0.0001))); + fixed4 color = lerp(_VignetteColor, _VignetteColorBlend, uvY * 2); + color.w *= alpha; + + return color; + } + ENDCG + } + } +} \ No newline at end of file diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.shader.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.shader.meta new file mode 100644 index 000000000..1b250d1b1 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignette.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e51b4af1e50be764e8de46e07d4e3f3f +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx new file mode 100644 index 0000000000000000000000000000000000000000..2d84e5eceda93e8463236eb825af427b783923fb GIT binary patch literal 55932 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 Ux;>lq!?*K#dnR^dNM4@s-*qqU00000 literal 0 HcmV?d00001 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx.meta new file mode 100644 index 000000000..af207df4c --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 5833e680dc0f7ae47aec6b4286570484 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 0 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph new file mode 100644 index 000000000..613194c66 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph @@ -0,0 +1,315 @@ +{ + "m_SerializedProperties": [ + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty" + }, + "JSONnodeData": "{\n \"m_Guid\": {\n \"m_GuidSerialized\": \"fb4a403e-5675-4481-a508-c1e443c677f9\"\n },\n \"m_Name\": \"Aperture Size\",\n \"m_DefaultReferenceName\": \"Vector1_EA51145\",\n \"m_OverrideReferenceName\": \"_ApertureSize\",\n \"m_GeneratePropertyBlock\": true,\n \"m_Precision\": 0,\n \"m_GPUInstanced\": false,\n \"m_Hidden\": false,\n \"m_Value\": 0.699999988079071,\n \"m_FloatType\": 1,\n \"m_RangeValues\": {\n \"x\": 0.0,\n \"y\": 1.0\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty" + }, + "JSONnodeData": "{\n \"m_Guid\": {\n \"m_GuidSerialized\": \"32b8bdf5-0d53-4377-afd5-f149ffbee6d9\"\n },\n \"m_Name\": \"Feathering Effect\",\n \"m_DefaultReferenceName\": \"Vector1_3F06E706\",\n \"m_OverrideReferenceName\": \"_FeatheringEffect\",\n \"m_GeneratePropertyBlock\": true,\n \"m_Precision\": 1,\n \"m_GPUInstanced\": false,\n \"m_Hidden\": false,\n \"m_Value\": 0.20000000298023225,\n \"m_FloatType\": 1,\n \"m_RangeValues\": {\n \"x\": 0.0,\n \"y\": 1.0\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty" + }, + "JSONnodeData": "{\n \"m_Guid\": {\n \"m_GuidSerialized\": \"1fdab81f-03f2-44f6-b7c1-6969c7acb631\"\n },\n \"m_Name\": \"Vignette Color\",\n \"m_DefaultReferenceName\": \"Color_8A2FD431\",\n \"m_OverrideReferenceName\": \"_VignetteColor\",\n \"m_GeneratePropertyBlock\": true,\n \"m_Precision\": 0,\n \"m_GPUInstanced\": false,\n \"m_Hidden\": false,\n \"m_Value\": {\n \"r\": 0.0,\n \"g\": 0.0,\n \"b\": 0.0,\n \"a\": 1.0\n },\n \"m_ColorMode\": 0\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty" + }, + "JSONnodeData": "{\n \"m_Guid\": {\n \"m_GuidSerialized\": \"486748c5-9305-4aed-9bc5-887864bc209d\"\n },\n \"m_Name\": \"Vignette Color Blend\",\n \"m_DefaultReferenceName\": \"Color_9DC7CF27\",\n \"m_OverrideReferenceName\": \"_VignetteColorBlend\",\n \"m_GeneratePropertyBlock\": true,\n \"m_Precision\": 0,\n \"m_GPUInstanced\": false,\n \"m_Hidden\": false,\n \"m_Value\": {\n \"r\": 0.0,\n \"g\": 0.0,\n \"b\": 0.0,\n \"a\": 1.0\n },\n \"m_ColorMode\": 0\n}" + } + ], + "m_SerializedKeywords": [], + "m_SerializableNodes": [ + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.AddNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"751303cd-9b79-44e4-80a3-de432a9277c1\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Add\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": 258.0,\n \"y\": 342.0,\n \"width\": 135.00001525878907,\n \"height\": 118.00000762939453\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"A\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"A\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.00009999999747378752,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 1,\\n \\\"m_DisplayName\\\": \\\"B\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"B\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 2,\\n \\\"m_DisplayName\\\": \\\"Out\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": false,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.SaturateNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"5e698a56-f2ea-4853-9057-6ed854bd2e72\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Saturate\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": 600.0,\n \"y\": 208.0,\n \"width\": 139.0,\n \"height\": 94.0\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"In\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"In\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 1,\\n \\\"m_DisplayName\\\": \\\"Out\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": true,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.MultiplyNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"684568d5-b95a-45b3-bc94-5f80284f9ba0\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Multiply\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": 71.00005340576172,\n \"y\": 455.0,\n \"width\": 135.00001525878907,\n \"height\": 118.00000762939453\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicValueMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"A\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"A\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"e00\\\": 0.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 0.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 0.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"e00\\\": 1.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 1.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 1.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 1.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicValueMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 1,\\n \\\"m_DisplayName\\\": \\\"B\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"B\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"e00\\\": 2.0,\\n \\\"e01\\\": 2.0,\\n \\\"e02\\\": 2.0,\\n \\\"e03\\\": 2.0,\\n \\\"e10\\\": 2.0,\\n \\\"e11\\\": 2.0,\\n \\\"e12\\\": 2.0,\\n \\\"e13\\\": 2.0,\\n \\\"e20\\\": 2.0,\\n \\\"e21\\\": 2.0,\\n \\\"e22\\\": 2.0,\\n \\\"e23\\\": 2.0,\\n \\\"e30\\\": 2.0,\\n \\\"e31\\\": 2.0,\\n \\\"e32\\\": 2.0,\\n \\\"e33\\\": 2.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"e00\\\": 1.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 1.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 1.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 1.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicValueMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 2,\\n \\\"m_DisplayName\\\": \\\"Out\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"e00\\\": 0.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 0.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 0.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"e00\\\": 1.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 1.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 1.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 1.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": false,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.PropertyNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"12aec2ab-fdad-4a47-bb09-c351b57d7f12\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Property\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": -142.99998474121095,\n \"y\": 506.0000305175781,\n \"width\": 175.0,\n \"height\": 34.0\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"Feathering Effect\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": 0.0,\\n \\\"m_DefaultValue\\\": 0.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n }\n ],\n \"m_Precision\": 1,\n \"m_PreviewExpanded\": true,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n },\n \"m_PropertyGuidSerialized\": \"32b8bdf5-0d53-4377-afd5-f149ffbee6d9\"\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.DivideNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"6101923a-fd13-4123-aa6c-320e39a0e90e\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Divide\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": 432.0,\n \"y\": 208.0,\n \"width\": 135.0,\n \"height\": 118.0\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"A\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"A\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 1,\\n \\\"m_DisplayName\\\": \\\"B\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"B\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 2.0,\\n \\\"y\\\": 2.0,\\n \\\"z\\\": 2.0,\\n \\\"w\\\": 2.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 2,\\n \\\"m_DisplayName\\\": \\\"Out\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": false,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.SubtractNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"7126961a-3310-4dda-8e79-d386a49fae50\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Subtract\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": 259.0000915527344,\n \"y\": 147.00003051757813,\n \"width\": 135.00001525878907,\n \"height\": 118.00000762939453\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"A\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"A\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 1.0,\\n \\\"y\\\": 1.0,\\n \\\"z\\\": 1.0,\\n \\\"w\\\": 1.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 1,\\n \\\"m_DisplayName\\\": \\\"B\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"B\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 1.0,\\n \\\"y\\\": 1.0,\\n \\\"z\\\": 1.0,\\n \\\"w\\\": 1.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 2,\\n \\\"m_DisplayName\\\": \\\"Out\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": false,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.SubtractNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"5cb4c664-d66e-4465-baad-fefb030ab745\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Subtract\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": 92.99996948242188,\n \"y\": 215.00003051757813,\n \"width\": 137.0,\n \"height\": 118.0\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"A\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"A\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.5,\\n \\\"y\\\": 1.0,\\n \\\"z\\\": 1.0,\\n \\\"w\\\": 1.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 1,\\n \\\"m_DisplayName\\\": \\\"B\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"B\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 1.0,\\n \\\"y\\\": 1.0,\\n \\\"z\\\": 1.0,\\n \\\"w\\\": 1.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 2,\\n \\\"m_DisplayName\\\": \\\"Out\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": false,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.SquareRootNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"ac8b3c28-b707-46e4-ba34-619f5282e6f8\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Square Root\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": -108.0,\n \"y\": 326.0,\n \"width\": 139.0,\n \"height\": 94.0\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"In\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"In\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 1,\\n \\\"m_DisplayName\\\": \\\"Out\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": false,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.SubtractNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"3d0cf899-263f-4000-a702-fde5db82188e\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Subtract\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": -282.0,\n \"y\": 325.99993896484377,\n \"width\": 137.0,\n \"height\": 117.99999237060547\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"A\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"A\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.25,\\n \\\"y\\\": 1.0,\\n \\\"z\\\": 1.0,\\n \\\"w\\\": 1.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 1,\\n \\\"m_DisplayName\\\": \\\"B\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"B\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 1.0,\\n \\\"y\\\": 1.0,\\n \\\"z\\\": 1.0,\\n \\\"w\\\": 1.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 2,\\n \\\"m_DisplayName\\\": \\\"Out\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": false,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.MultiplyNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"d2e5ec84-9424-4052-8a9c-31fbf0195061\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Multiply\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": -457.0,\n \"y\": 421.9999694824219,\n \"width\": 135.00001525878907,\n \"height\": 118.00000762939453\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicValueMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"A\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"A\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"e00\\\": 0.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 0.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 0.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"e00\\\": 1.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 1.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 1.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 1.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicValueMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 1,\\n \\\"m_DisplayName\\\": \\\"B\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"B\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"e00\\\": 0.25,\\n \\\"e01\\\": 2.0,\\n \\\"e02\\\": 2.0,\\n \\\"e03\\\": 2.0,\\n \\\"e10\\\": 2.0,\\n \\\"e11\\\": 2.0,\\n \\\"e12\\\": 2.0,\\n \\\"e13\\\": 2.0,\\n \\\"e20\\\": 2.0,\\n \\\"e21\\\": 2.0,\\n \\\"e22\\\": 2.0,\\n \\\"e23\\\": 2.0,\\n \\\"e30\\\": 2.0,\\n \\\"e31\\\": 2.0,\\n \\\"e32\\\": 2.0,\\n \\\"e33\\\": 2.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"e00\\\": 1.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 1.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 1.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 1.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicValueMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 2,\\n \\\"m_DisplayName\\\": \\\"Out\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"e00\\\": 0.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 0.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 0.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"e00\\\": 1.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 1.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 1.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 1.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": false,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.MultiplyNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"12d1d2dd-bca1-4846-bb94-f9a50b6002c5\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Multiply\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": -643.0,\n \"y\": 356.9999694824219,\n \"width\": 135.00001525878907,\n \"height\": 118.00000762939453\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicValueMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"A\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"A\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"e00\\\": 0.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 0.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 0.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"e00\\\": 1.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 1.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 1.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 1.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicValueMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 1,\\n \\\"m_DisplayName\\\": \\\"B\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"B\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"e00\\\": 2.0,\\n \\\"e01\\\": 2.0,\\n \\\"e02\\\": 2.0,\\n \\\"e03\\\": 2.0,\\n \\\"e10\\\": 2.0,\\n \\\"e11\\\": 2.0,\\n \\\"e12\\\": 2.0,\\n \\\"e13\\\": 2.0,\\n \\\"e20\\\": 2.0,\\n \\\"e21\\\": 2.0,\\n \\\"e22\\\": 2.0,\\n \\\"e23\\\": 2.0,\\n \\\"e30\\\": 2.0,\\n \\\"e31\\\": 2.0,\\n \\\"e32\\\": 2.0,\\n \\\"e33\\\": 2.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"e00\\\": 1.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 1.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 1.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 1.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicValueMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 2,\\n \\\"m_DisplayName\\\": \\\"Out\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"e00\\\": 0.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 0.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 0.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"e00\\\": 1.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 1.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 1.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 1.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": false,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.PropertyNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"27891572-bc18-4443-9f56-cea914396659\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Property\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": -837.0,\n \"y\": 407.0,\n \"width\": 157.0,\n \"height\": 34.0\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"Aperture Size\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": 0.0,\\n \\\"m_DefaultValue\\\": 0.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": true,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n },\n \"m_PropertyGuidSerialized\": \"fb4a403e-5675-4481-a508-c1e443c677f9\"\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.PropertyNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"52cbc6de-9f81-4a0d-baf5-7fdf672e8611\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Property\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": -194.9999542236328,\n \"y\": -145.00001525878907,\n \"width\": 192.00001525878907,\n \"height\": 34.0\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector4MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"Vignette Color Blend\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": true,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n },\n \"m_PropertyGuidSerialized\": \"486748c5-9305-4aed-9bc5-887864bc209d\"\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.PropertyNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"5d29c86e-c042-4804-a5df-3a37f244ac6a\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Property\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": -162.99996948242188,\n \"y\": -187.0,\n \"width\": 158.0,\n \"height\": 34.0\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector4MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"Vignette Color\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": true,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n },\n \"m_PropertyGuidSerialized\": \"1fdab81f-03f2-44f6-b7c1-6969c7acb631\"\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.LerpNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"01088589-ae38-45dd-90c2-cdb7f866f19f\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Lerp\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": 219.00001525878907,\n \"y\": -202.99998474121095,\n \"width\": 207.99998474121095,\n \"height\": 326.0\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"A\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"A\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 1,\\n \\\"m_DisplayName\\\": \\\"B\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"B\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 1.0,\\n \\\"y\\\": 1.0,\\n \\\"z\\\": 1.0,\\n \\\"w\\\": 1.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 2,\\n \\\"m_DisplayName\\\": \\\"T\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"T\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 3,\\n \\\"m_DisplayName\\\": \\\"Out\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": true,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.MultiplyNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"bf9f5732-91f7-4fd0-8449-7fd1dde227ff\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Multiply\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": -137.0,\n \"y\": -98.00003051757813,\n \"width\": 137.0,\n \"height\": 118.0\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicValueMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"A\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"A\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"e00\\\": 2.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 0.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 0.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"e00\\\": 1.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 1.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 1.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 1.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicValueMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 1,\\n \\\"m_DisplayName\\\": \\\"B\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"B\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"e00\\\": 2.0,\\n \\\"e01\\\": 2.0,\\n \\\"e02\\\": 2.0,\\n \\\"e03\\\": 2.0,\\n \\\"e10\\\": 2.0,\\n \\\"e11\\\": 2.0,\\n \\\"e12\\\": 2.0,\\n \\\"e13\\\": 2.0,\\n \\\"e20\\\": 2.0,\\n \\\"e21\\\": 2.0,\\n \\\"e22\\\": 2.0,\\n \\\"e23\\\": 2.0,\\n \\\"e30\\\": 2.0,\\n \\\"e31\\\": 2.0,\\n \\\"e32\\\": 2.0,\\n \\\"e33\\\": 2.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"e00\\\": 1.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 1.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 1.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 1.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicValueMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 2,\\n \\\"m_DisplayName\\\": \\\"Out\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"e00\\\": 0.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 0.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 0.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"e00\\\": 1.0,\\n \\\"e01\\\": 0.0,\\n \\\"e02\\\": 0.0,\\n \\\"e03\\\": 0.0,\\n \\\"e10\\\": 0.0,\\n \\\"e11\\\": 1.0,\\n \\\"e12\\\": 0.0,\\n \\\"e13\\\": 0.0,\\n \\\"e20\\\": 0.0,\\n \\\"e21\\\": 0.0,\\n \\\"e22\\\": 1.0,\\n \\\"e23\\\": 0.0,\\n \\\"e30\\\": 0.0,\\n \\\"e31\\\": 0.0,\\n \\\"e32\\\": 0.0,\\n \\\"e33\\\": 1.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": false,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.SplitNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"066824fc-9d3f-4e5b-bc71-5afe8d611b69\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Split\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": -386.0,\n \"y\": -3.9999990463256838,\n \"width\": 129.0,\n \"height\": 149.0\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.DynamicVectorMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"In\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"In\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 1,\\n \\\"m_DisplayName\\\": \\\"R\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"R\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": 0.0,\\n \\\"m_DefaultValue\\\": 0.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 2,\\n \\\"m_DisplayName\\\": \\\"G\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"G\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": 0.0,\\n \\\"m_DefaultValue\\\": 0.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 3,\\n \\\"m_DisplayName\\\": \\\"B\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"B\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": 0.0,\\n \\\"m_DefaultValue\\\": 0.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 4,\\n \\\"m_DisplayName\\\": \\\"A\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"A\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": 0.0,\\n \\\"m_DefaultValue\\\": 0.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": true,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.UVNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"a3f66a6a-6869-4945-aee8-d522be0d5581\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"UV\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": -714.0000610351563,\n \"y\": -5.000043869018555,\n \"width\": 208.00001525878907,\n \"height\": 313.0\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector4MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"Out\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": true,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n },\n \"m_OutputChannel\": 0\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.UnlitMasterNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"16e4ac41-3b23-45ac-b89b-775d08f50411\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Unlit Master\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": 828.0,\n \"y\": -229.0,\n \"width\": 199.99998474121095,\n \"height\": 196.99998474121095\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.PositionMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 9,\\n \\\"m_DisplayName\\\": \\\"Vertex Position\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Vertex Position\\\",\\n \\\"m_StageCapability\\\": 1,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_Labels\\\": [\\n \\\"X\\\",\\n \\\"Y\\\",\\n \\\"Z\\\"\\n ],\\n \\\"m_Space\\\": 0\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.NormalMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 10,\\n \\\"m_DisplayName\\\": \\\"Vertex Normal\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Vertex Normal\\\",\\n \\\"m_StageCapability\\\": 1,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_Labels\\\": [\\n \\\"X\\\",\\n \\\"Y\\\",\\n \\\"Z\\\"\\n ],\\n \\\"m_Space\\\": 0\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.TangentMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 11,\\n \\\"m_DisplayName\\\": \\\"Vertex Tangent\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Vertex Tangent\\\",\\n \\\"m_StageCapability\\\": 1,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_Labels\\\": [\\n \\\"X\\\",\\n \\\"Y\\\",\\n \\\"Z\\\"\\n ],\\n \\\"m_Space\\\": 0\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.ColorRGBMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"Color\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Color\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.7353569269180298,\\n \\\"y\\\": 0.7353569269180298,\\n \\\"z\\\": 0.7353569269180298\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_Labels\\\": [\\n \\\"X\\\",\\n \\\"Y\\\",\\n \\\"Z\\\"\\n ],\\n \\\"m_ColorMode\\\": 0\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 7,\\n \\\"m_DisplayName\\\": \\\"Alpha\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Alpha\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": 1.0,\\n \\\"m_DefaultValue\\\": 1.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 8,\\n \\\"m_DisplayName\\\": \\\"AlphaClipThreshold\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"AlphaClipThreshold\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": 0.0,\\n \\\"m_DefaultValue\\\": 0.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": true,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n },\n \"m_DOTSInstancing\": false,\n \"m_SerializableSubShaders\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.Rendering.Universal.UniversalUnlitSubShader\"\n },\n \"JSONnodeData\": \"{}\"\n }\n ],\n \"m_SurfaceType\": 1,\n \"m_AlphaMode\": 0,\n \"m_TwoSided\": false,\n \"m_AddPrecomputedVelocity\": false\n}" + } + ], + "m_Groups": [], + "m_StickyNotes": [ + { + "m_GuidSerialized": "390dbc95-9b7d-4df5-8ca3-13a4d1964500", + "m_Title": "Reproduce the shader file", + "m_Content": "The shader TunnelingVignette.shader is the default shader to use for the TunnelingVignette.mat. This shadergraph primarily serves to demonstrate the computation of the default shader. The following steps detail the process for users who want to produce and set up a usable shader file that achieves the same function as the default shader.\n\n1. Right click the Unlit Master node and click Copy. In Unity Editor, navigate to an asset folder, right click Create -> Shader-> Unlit Graph to create a new Unlit shader file. Paste the copied shader to replace the code in the created shader file. \n\n2. Change the shader name in the first line of code to \"VR/TunnelingVignetteSG\" or a customized name.\n\n3. Replace all \"ZTest LEqual\" with \"ZTest Always\" to create a bubble of the vignette hemisphere geometry that prevents geometry from getting drawn inside the hemisphere.\n\n4. Add \"ZWrite Off\" under the first \"ZTest Always\" under the Pass block.\n\n4. Replace the line \"Queue\" = \"Transparent+0\" with \"Queue\" = \"Transparent+5\" to set the render queue to best work with the UI and scene objects in our demo projet. To allow game controllers and hands to show inside the hemisphere when tunneling, change their render queue to a value greater than this shader's render queue.\n\n5. You can further modify the code in the shader file to change other settings. Comment out \"LightMode\" = \"ShadowCaster\" to set \"Cast shadows\" to \"no\" and add \"IgnoreProjector\" = \"True\" under the \"Tags\" of the SubShader section to set \"Ignore projector\" to \"true\".", + "m_TextSize": 0, + "m_Theme": 0, + "m_Position": { + "serializedVersion": "2", + "x": -618.0, + "y": 593.0, + "width": 587.6500244140625, + "height": 385.6500244140625 + }, + "m_GroupGuidSerialized": "00000000-0000-0000-0000-000000000000" + }, + { + "m_GuidSerialized": "80e278b5-b486-43d6-85d1-56881ac5c795", + "m_Title": "Divide node maths", + "m_Content": "AlphMin / (AlphaMax - AlphaMin), \n\nAlphaMin is the distance between the central top point of the hemisphere to the cutting plane that is parallel to the hemisphere base, where the alpha value of the pixles on the intersection circular area is 0. AlphaMax is the distance between the central top point to the parallel cutting plane where the alpha value of the pixles on the intersection area is 1.\n\nAlphaMin = r^2 - 0.5 * Sqrt(1-ApertureSize^2), where r is the radius of the hemisphere model (0.5).\n\nAlphaMax = AlphaMin + FeatheringEffect (in the graph we use FeatheringEffect^2 to slow the increase rate from 0 to 1. A small value 0.0001 is added to prevent division by zero warning).\n", + "m_TextSize": 0, + "m_Theme": 0, + "m_Position": { + "serializedVersion": "2", + "x": 355.0, + "y": 561.0, + "width": 279.0, + "height": 332.0 + }, + "m_GroupGuidSerialized": "00000000-0000-0000-0000-000000000000" + } + ], + "m_SerializableEdges": [ + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"a3f66a6a-6869-4945-aee8-d522be0d5581\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"066824fc-9d3f-4e5b-bc71-5afe8d611b69\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 2,\n \"m_NodeGUIDSerialized\": \"066824fc-9d3f-4e5b-bc71-5afe8d611b69\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 1,\n \"m_NodeGUIDSerialized\": \"bf9f5732-91f7-4fd0-8449-7fd1dde227ff\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 2,\n \"m_NodeGUIDSerialized\": \"bf9f5732-91f7-4fd0-8449-7fd1dde227ff\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 2,\n \"m_NodeGUIDSerialized\": \"01088589-ae38-45dd-90c2-cdb7f866f19f\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"5d29c86e-c042-4804-a5df-3a37f244ac6a\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"01088589-ae38-45dd-90c2-cdb7f866f19f\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"52cbc6de-9f81-4a0d-baf5-7fdf672e8611\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 1,\n \"m_NodeGUIDSerialized\": \"01088589-ae38-45dd-90c2-cdb7f866f19f\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 3,\n \"m_NodeGUIDSerialized\": \"01088589-ae38-45dd-90c2-cdb7f866f19f\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"16e4ac41-3b23-45ac-b89b-775d08f50411\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"27891572-bc18-4443-9f56-cea914396659\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"12d1d2dd-bca1-4846-bb94-f9a50b6002c5\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"27891572-bc18-4443-9f56-cea914396659\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 1,\n \"m_NodeGUIDSerialized\": \"12d1d2dd-bca1-4846-bb94-f9a50b6002c5\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 2,\n \"m_NodeGUIDSerialized\": \"12d1d2dd-bca1-4846-bb94-f9a50b6002c5\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"d2e5ec84-9424-4052-8a9c-31fbf0195061\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 2,\n \"m_NodeGUIDSerialized\": \"d2e5ec84-9424-4052-8a9c-31fbf0195061\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 1,\n \"m_NodeGUIDSerialized\": \"3d0cf899-263f-4000-a702-fde5db82188e\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 2,\n \"m_NodeGUIDSerialized\": \"3d0cf899-263f-4000-a702-fde5db82188e\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"ac8b3c28-b707-46e4-ba34-619f5282e6f8\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 1,\n \"m_NodeGUIDSerialized\": \"ac8b3c28-b707-46e4-ba34-619f5282e6f8\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 1,\n \"m_NodeGUIDSerialized\": \"5cb4c664-d66e-4465-baad-fefb030ab745\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 2,\n \"m_NodeGUIDSerialized\": \"5cb4c664-d66e-4465-baad-fefb030ab745\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 1,\n \"m_NodeGUIDSerialized\": \"7126961a-3310-4dda-8e79-d386a49fae50\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 2,\n \"m_NodeGUIDSerialized\": \"066824fc-9d3f-4e5b-bc71-5afe8d611b69\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"7126961a-3310-4dda-8e79-d386a49fae50\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 2,\n \"m_NodeGUIDSerialized\": \"7126961a-3310-4dda-8e79-d386a49fae50\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"6101923a-fd13-4123-aa6c-320e39a0e90e\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"12aec2ab-fdad-4a47-bb09-c351b57d7f12\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"684568d5-b95a-45b3-bc94-5f80284f9ba0\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"12aec2ab-fdad-4a47-bb09-c351b57d7f12\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 1,\n \"m_NodeGUIDSerialized\": \"684568d5-b95a-45b3-bc94-5f80284f9ba0\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 2,\n \"m_NodeGUIDSerialized\": \"6101923a-fd13-4123-aa6c-320e39a0e90e\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"5e698a56-f2ea-4853-9057-6ed854bd2e72\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 2,\n \"m_NodeGUIDSerialized\": \"684568d5-b95a-45b3-bc94-5f80284f9ba0\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 1,\n \"m_NodeGUIDSerialized\": \"751303cd-9b79-44e4-80a3-de432a9277c1\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 2,\n \"m_NodeGUIDSerialized\": \"751303cd-9b79-44e4-80a3-de432a9277c1\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 1,\n \"m_NodeGUIDSerialized\": \"6101923a-fd13-4123-aa6c-320e39a0e90e\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 1,\n \"m_NodeGUIDSerialized\": \"5e698a56-f2ea-4853-9057-6ed854bd2e72\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 7,\n \"m_NodeGUIDSerialized\": \"16e4ac41-3b23-45ac-b89b-775d08f50411\"\n }\n}" + } + ], + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + } + }, + "m_Path": "Shader Graphs", + "m_ConcretePrecision": 0, + "m_ActiveOutputNodeGuidSerialized": "16e4ac41-3b23-45ac-b89b-775d08f50411" +} \ No newline at end of file diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph.meta new file mode 100644 index 000000000..43cac1bb5 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c109fab5d2bf5f64598ed69d2c16ceb3 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef new file mode 100644 index 000000000..39ec0adf5 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef @@ -0,0 +1,19 @@ +{ + "name": "Unity.XR.Interaction.Toolkit.Samples.StarterAssets", + "rootNamespace": "", + "references": [ + "Unity.InputSystem", + "Unity.Mathematics", + "Unity.XR.CoreUtils", + "Unity.XR.Interaction.Toolkit" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/XRI Default Input Actions.inputactions b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/XRI Default Input Actions.inputactions similarity index 82% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/XRI Default Input Actions.inputactions rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/XRI Default Input Actions.inputactions index f8aa12e7c..2370410d4 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/XRI Default Input Actions.inputactions +++ b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/XRI Default Input Actions.inputactions @@ -90,6 +90,17 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "4d22c160-9642-4784-bed3-f108d9099185", + "path": "/devicePosition", + "interactions": "", + "processors": "", + "groups": "", + "action": "Position", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "e2017383-a3f6-4c46-acb1-012b8eece9cc", @@ -101,6 +112,17 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "30a88e64-475a-4a1c-aca0-80b6a2bc3327", + "path": "/deviceRotation", + "interactions": "", + "processors": "", + "groups": "", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "Quaternion Fallback", "id": "fd9bd2d1-a464-4069-bf55-7f7a3cdb5a96", @@ -403,6 +425,24 @@ "processors": "", "interactions": "", "initialStateCheck": true + }, + { + "name": "Grip Position", + "type": "Value", + "id": "e1240870-ef45-4f3e-8110-ff1b9049c4ca", + "expectedControlType": "Vector3", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Grip Rotation", + "type": "Value", + "id": "41873a55-b316-4dbe-96e6-93477eef5e47", + "expectedControlType": "Quaternion", + "processors": "", + "interactions": "", + "initialStateCheck": true } ], "bindings": [ @@ -614,6 +654,28 @@ "action": "Aim Flags", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "21a4b6f9-1ebe-434f-b572-066a77b04c48", + "path": "{LeftHand}/gripPosition", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Grip Position", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "3c1f9e74-aba4-41d6-b519-90ed563be5d7", + "path": "{LeftHand}/gripRotation", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Grip Rotation", + "isComposite": false, + "isPartOfComposite": false } ] }, @@ -701,13 +763,31 @@ "processors": "", "interactions": "", "initialStateCheck": true + }, + { + "name": "Scale Toggle", + "type": "Button", + "id": "80ed7d74-56de-473c-bf76-da3bdd16b562", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Scale Delta", + "type": "Value", + "id": "2257500c-1efb-4f69-a54d-ed5db2708616", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true } ], "bindings": [ { "name": "", "id": "71a4d23f-3e9a-4513-923b-ba388c5e84bf", - "path": "{LeftHand}/gripPressed", + "path": "{LeftHand}/{GripButton}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -729,7 +809,7 @@ { "name": "", "id": "49a23327-a116-48c0-8af9-0d2c50c15a88", - "path": "{LeftHand}/grip", + "path": "{LeftHand}/{Grip}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -751,7 +831,7 @@ { "name": "", "id": "487f4f2e-9e9b-49aa-b0f2-4037a24624f5", - "path": "{LeftHand}/triggerPressed", + "path": "{LeftHand}/{TriggerButton}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -762,7 +842,7 @@ { "name": "", "id": "3b8b1b59-2fdc-4998-8259-50341075d9a2", - "path": "{LeftHand}/trigger", + "path": "{LeftHand}/{Trigger}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -773,7 +853,7 @@ { "name": "", "id": "b34c79c1-ab5e-4851-87ac-abc43705eae0", - "path": "{LeftHand}/triggerPressed", + "path": "{LeftHand}/{TriggerButton}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -795,7 +875,7 @@ { "name": "", "id": "71d94579-1bf4-4034-ab9e-e7166842128f", - "path": "{LeftHand}/trigger", + "path": "{LeftHand}/{Trigger}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -817,7 +897,7 @@ { "name": "", "id": "8ed313a6-c966-4669-8a62-4bb2319d485b", - "path": "{LeftHand}/Primary2DAxis", + "path": "{LeftHand}/{Primary2DAxis}", "interactions": "", "processors": "ScaleVector2(y=0),StickDeadzone", "groups": "Generic XR Controller", @@ -828,7 +908,7 @@ { "name": "", "id": "370f21e3-a80b-4b07-990b-299c2da0929a", - "path": "{LeftHand}/Primary2DAxis", + "path": "{LeftHand}/{Primary2DAxis}", "interactions": "", "processors": "ScaleVector2(x=0),StickDeadzone", "groups": "Generic XR Controller", @@ -839,13 +919,35 @@ { "name": "", "id": "7b30ca4b-9f98-4a44-9af5-a89412d5cdc8", - "path": "{LeftHand}/Primary2DAxis", + "path": "{LeftHand}/{Primary2DAxis}", "interactions": "", "processors": "", "groups": "Generic XR Controller", "action": "UI Scroll", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "8f872fc5-75dc-49e5-9bbd-f2e4d4498c65", + "path": "{LeftHand}/{Primary2DAxisClick}", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Scale Toggle", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b21d690b-51fc-413f-a887-08a2a39af3fc", + "path": "{LeftHand}/{Primary2DAxis}", + "interactions": "", + "processors": "ScaleVector2(x=0),StickDeadzone", + "groups": "Generic XR Controller", + "action": "Scale Delta", + "isComposite": false, + "isPartOfComposite": false } ] }, @@ -930,7 +1032,7 @@ { "name": "", "id": "95fa1419-ca7b-4c8a-8d15-7d46e58d82e3", - "path": "{LeftHand}/Primary2DAxis", + "path": "{LeftHand}/{Primary2DAxis}", "interactions": "Sector(directions=-1,sweepBehavior=3)", "processors": "", "groups": "Noncontinuous Move", @@ -941,7 +1043,7 @@ { "name": "", "id": "8da6ed3a-f621-49fe-8c76-1f6b7d7754d6", - "path": "{LeftHand}/Primary2DAxis", + "path": "{LeftHand}/{Primary2DAxis}", "interactions": "Sector(directions=1)", "processors": "", "groups": "Noncontinuous Move", @@ -952,7 +1054,7 @@ { "name": "", "id": "b8aebee7-fa03-43d4-bfb7-77a3f87452cc", - "path": "{LeftHand}/gripPressed", + "path": "{LeftHand}/{GripButton}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -963,7 +1065,7 @@ { "name": "", "id": "99cb7ad1-51ec-4611-af68-92a85f2c17d6", - "path": "{LeftHand}/Primary2DAxis", + "path": "{LeftHand}/{Primary2DAxis}", "interactions": "Sector(directions=12,sweepBehavior=1),Sector(directions=2,sweepBehavior=2)", "processors": "", "groups": "Noncontinuous Move", @@ -974,7 +1076,7 @@ { "name": "", "id": "8e383b1a-270f-4c20-819b-89a59cffb498", - "path": "{LeftHand}/Primary2DAxis", + "path": "{LeftHand}/{Primary2DAxis}", "interactions": "", "processors": "StickDeadzone", "groups": "Continuous Move", @@ -985,7 +1087,7 @@ { "name": "", "id": "5fe0ed53-b4d3-4cd8-b567-397a7d1e1c6a", - "path": "{LeftHand}/primary2DAxis", + "path": "{LeftHand}/{Primary2DAxis}", "interactions": "", "processors": "", "groups": "Noncontinuous Move", @@ -996,7 +1098,7 @@ { "name": "", "id": "9e2fa814-8cbd-4c65-a60d-a1503f30ffd8", - "path": "{LeftHand}/gripPressed", + "path": "{LeftHand}/{GripButton}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -1007,7 +1109,7 @@ { "name": "", "id": "a46b49d0-0754-4dac-a9a5-a822e10751f2", - "path": "{LeftHand}/Primary2DAxis", + "path": "{LeftHand}/{Primary2DAxis}", "interactions": "Sector(directions=12,sweepBehavior=1),Sector(directions=2,sweepBehavior=2)", "processors": "", "groups": "Generic XR Controller", @@ -1119,6 +1221,24 @@ "processors": "", "interactions": "", "initialStateCheck": true + }, + { + "name": "Grip Position", + "type": "Value", + "id": "defe4495-ba8f-4958-b2fb-98d889e45ac5", + "expectedControlType": "Vector3", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Grip Rotation", + "type": "Value", + "id": "6bc56065-b0db-4265-8cef-5c7d4f40128a", + "expectedControlType": "Quaternion", + "processors": "", + "interactions": "", + "initialStateCheck": true } ], "bindings": [ @@ -1330,6 +1450,28 @@ "action": "Aim Flags", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "efcaf94e-8faa-439e-983b-c65f79c3b743", + "path": "{RightHand}/gripPosition", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Grip Position", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "70a747b6-46e8-4d3b-aaec-20bcab8f1dd7", + "path": "{RightHand}/gripRotation", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Grip Rotation", + "isComposite": false, + "isPartOfComposite": false } ] }, @@ -1417,13 +1559,31 @@ "processors": "", "interactions": "", "initialStateCheck": true + }, + { + "name": "Scale Toggle", + "type": "Button", + "id": "5ad73d15-99a4-4bce-a76f-f49815602416", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Scale Delta", + "type": "Value", + "id": "19a21f59-bd21-4f77-b29d-4fda26ef6769", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true } ], "bindings": [ { "name": "", "id": "1ce80054-410d-4112-a332-50faa7fb4f23", - "path": "{RightHand}/gripPressed", + "path": "{RightHand}/{GripButton}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -1445,7 +1605,7 @@ { "name": "", "id": "dd433817-216c-46b9-8dd3-f3a4ea1767b9", - "path": "{RightHand}/grip", + "path": "{RightHand}/{Grip}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -1467,7 +1627,7 @@ { "name": "", "id": "fa59aed1-ae0b-4074-a58c-294b85f46228", - "path": "{RightHand}/triggerPressed", + "path": "{RightHand}/{TriggerButton}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -1478,7 +1638,7 @@ { "name": "", "id": "150f414f-61bf-47b1-b4f8-f772a2a40565", - "path": "{RightHand}/trigger", + "path": "{RightHand}/{Trigger}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -1489,7 +1649,7 @@ { "name": "", "id": "92bb5b8f-bf48-4dab-af05-50a865773895", - "path": "{RightHand}/triggerPressed", + "path": "{RightHand}/{TriggerButton}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -1511,7 +1671,7 @@ { "name": "", "id": "5b4ef08d-9ddd-4f0a-8539-d1114d14d143", - "path": "{RightHand}/trigger", + "path": "{RightHand}/{Trigger}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -1533,7 +1693,7 @@ { "name": "", "id": "5c0fa06c-b670-477f-a95d-eb3b4880e439", - "path": "{RightHand}/Primary2DAxis", + "path": "{RightHand}/{Primary2DAxis}", "interactions": "", "processors": "ScaleVector2(y=0),StickDeadzone", "groups": "Generic XR Controller", @@ -1544,7 +1704,7 @@ { "name": "", "id": "4caf4e8d-13e5-4bd6-8f42-b6b99c315ad0", - "path": "{RightHand}/Primary2DAxis", + "path": "{RightHand}/{Primary2DAxis}", "interactions": "", "processors": "ScaleVector2(x=0),StickDeadzone", "groups": "Generic XR Controller", @@ -1555,13 +1715,35 @@ { "name": "", "id": "af6fd279-2f48-4f51-8e9d-29b0b9d926f8", - "path": "{RightHand}/Primary2DAxis", + "path": "{RightHand}/{Primary2DAxis}", "interactions": "", "processors": "", "groups": "Generic XR Controller", "action": "UI Scroll", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "d8258e49-f7cc-44d7-bc27-77c2161e2005", + "path": "{RightHand}/{Primary2DAxisClick}", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Scale Toggle", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "ef10c39a-2987-41bb-bb80-0e476240adaa", + "path": "{RightHand}/{Primary2DAxis}", + "interactions": "", + "processors": "ScaleVector2(x=0),StickDeadzone", + "groups": "Generic XR Controller", + "action": "Scale Delta", + "isComposite": false, + "isPartOfComposite": false } ] }, @@ -1646,7 +1828,7 @@ { "name": "", "id": "919c4a6c-22ed-4083-8e14-f30e91ff59fe", - "path": "{RightHand}/Primary2DAxis", + "path": "{RightHand}/{Primary2DAxis}", "interactions": "Sector(directions=-1,sweepBehavior=3)", "processors": "", "groups": "Generic XR Controller", @@ -1657,7 +1839,7 @@ { "name": "", "id": "62690862-4688-4010-975b-b3d9c6062157", - "path": "{RightHand}/Primary2DAxis", + "path": "{RightHand}/{Primary2DAxis}", "interactions": "Sector(directions=1)", "processors": "", "groups": "Generic XR Controller", @@ -1668,7 +1850,7 @@ { "name": "", "id": "de466e6e-12bf-46a1-b0fd-ffbc343f3399", - "path": "{RightHand}/gripPressed", + "path": "{RightHand}/{GripButton}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -1679,7 +1861,7 @@ { "name": "", "id": "d6c08c3d-3d41-4695-994d-1ac9016a5a9e", - "path": "{RightHand}/Primary2DAxis", + "path": "{RightHand}/{Primary2DAxis}", "interactions": "Sector(directions=12,sweepBehavior=1),Sector(directions=2,sweepBehavior=2)", "processors": "", "groups": "Generic XR Controller", @@ -1690,7 +1872,7 @@ { "name": "", "id": "022046aa-be71-4288-859d-6dd42844f6e6", - "path": "{RightHand}/Primary2DAxis", + "path": "{RightHand}/{Primary2DAxis}", "interactions": "", "processors": "StickDeadzone", "groups": "Continuous Move", @@ -1701,7 +1883,7 @@ { "name": "", "id": "c4b46d7d-8231-4672-83f9-75af565faf57", - "path": "{RightHand}/primary2DAxis", + "path": "{RightHand}/{Primary2DAxis}", "interactions": "", "processors": "", "groups": "Noncontinuous Move", @@ -1712,7 +1894,7 @@ { "name": "", "id": "7ecb549e-ab98-4a4b-b979-38068fe3b811", - "path": "{RightHand}/gripPressed", + "path": "{RightHand}/{GripButton}", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -1723,7 +1905,7 @@ { "name": "", "id": "31d838df-4d4e-4c16-a373-b9c07d9d2e2a", - "path": "{RightHand}/Primary2DAxis", + "path": "{RightHand}/{Primary2DAxis}", "interactions": "Sector(directions=12,sweepBehavior=1),Sector(directions=2,sweepBehavior=2)", "processors": "", "groups": "Generic XR Controller", @@ -1836,7 +2018,7 @@ { "name": "", "id": "05c1e38e-79dd-41cb-95d5-74f42e65d92f", - "path": "/touch*/position", + "path": "/position", "interactions": "", "processors": "", "groups": "", @@ -2188,7 +2370,7 @@ { "name": "", "id": "198e6869-709e-448d-96d4-27186c9d56e6", - "path": "/touch*/click", + "path": "/Press", "interactions": "", "processors": "", "groups": "", @@ -2197,6 +2379,227 @@ "isPartOfComposite": false } ] + }, + { + "name": "Touchscreen Gestures", + "id": "6fb00339-a75a-4e5b-94e0-839f979f2a8a", + "actions": [ + { + "name": "Tap Start Position", + "type": "Value", + "id": "0f53f821-ec5d-472c-bd12-fb5ce515ae59", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Drag Current Position", + "type": "Value", + "id": "07fd51be-2a34-4531-939c-ff750fcf8e4d", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Drag Delta", + "type": "Value", + "id": "ccd1d49f-8e5b-4c66-8d2c-fb774934270b", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Pinch Start Position", + "type": "Value", + "id": "07f4446a-0f0c-4176-a67e-75be05a3be3c", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Pinch Gap", + "type": "Value", + "id": "c299ab55-2420-4eb1-a459-0af3846471b9", + "expectedControlType": "Axis", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Pinch Gap Delta", + "type": "Value", + "id": "d1d816b2-4bec-4393-bf83-a59146ee0abc", + "expectedControlType": "Axis", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Twist Start Position", + "type": "Value", + "id": "e476e037-f414-4b6d-ac4a-486d7228ec43", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Twist Delta Rotation", + "type": "Value", + "id": "5910a9c0-4a90-4a2c-92cb-e33054cfd463", + "expectedControlType": "Axis", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Screen Touch Count", + "type": "Value", + "id": "c1e4b6b1-d82a-485c-9d29-9d42e48df255", + "expectedControlType": "Integer", + "processors": "", + "interactions": "", + "initialStateCheck": true + } + ], + "bindings": [ + { + "name": "", + "id": "fea81b99-07f5-426a-beba-5e0832c14855", + "path": "/tapStartPosition", + "interactions": "Tap", + "processors": "", + "groups": "", + "action": "Tap Start Position", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "eb175a82-fad6-4249-bc9f-a6c9acee4436", + "path": "/dragCurrentPosition", + "interactions": "", + "processors": "", + "groups": "", + "action": "Drag Current Position", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "One Modifier", + "id": "2648faca-8c9b-4bcd-9653-fc9cfa39dbe3", + "path": "OneModifier", + "interactions": "", + "processors": "", + "groups": "", + "action": "Drag Current Position", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "modifier", + "id": "1f42a89b-32be-49d7-8153-507ff950cb3b", + "path": "/press", + "interactions": "", + "processors": "", + "groups": "", + "action": "Drag Current Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "binding", + "id": "7e88eed9-d5b6-4c3a-9dd7-ac83c45fced3", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "", + "action": "Drag Current Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "40fc89b1-2773-4288-b02f-892fea9b7d48", + "path": "/twistDeltaRotation", + "interactions": "", + "processors": "", + "groups": "", + "action": "Twist Delta Rotation", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "d919e652-0e4a-4f12-a1f9-b18cead206e2", + "path": "/fingerCount", + "interactions": "", + "processors": "", + "groups": "", + "action": "Screen Touch Count", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "044d4cc1-3ad7-4d38-a95f-994badd7e1a3", + "path": "/dragDelta", + "interactions": "", + "processors": "", + "groups": "", + "action": "Drag Delta", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "9e3b31e7-2f82-40f3-bfe1-ad0fa7f035d4", + "path": "/pinchStartPosition1", + "interactions": "", + "processors": "", + "groups": "", + "action": "Pinch Start Position", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "f3092672-a026-446d-8bb6-44843db135b1", + "path": "/pinchGapDelta", + "interactions": "", + "processors": "", + "groups": "", + "action": "Pinch Gap Delta", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "0f8550ed-7261-48e0-aa0e-6670f29141f5", + "path": "/twistStartPosition1", + "interactions": "", + "processors": "", + "groups": "", + "action": "Twist Start Position", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4f94c62c-7c6d-4547-82fe-b6ed10da8388", + "path": "/pinchGap", + "interactions": "", + "processors": "", + "groups": "", + "action": "Pinch Gap", + "isComposite": false, + "isPartOfComposite": false + } + ] } ], "controlSchemes": [ diff --git a/Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/XRI Default Input Actions.inputactions.meta b/Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/XRI Default Input Actions.inputactions.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/XRI Default Input Actions.inputactions.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.1/Starter Assets/XRI Default Input Actions.inputactions.meta diff --git a/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset b/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset index 3f314b5da..06793d803 100644 --- a/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset +++ b/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset @@ -44,4 +44,4 @@ MonoBehaviour: - - - - - + - Teleport diff --git a/Packages/manifest.json b/Packages/manifest.json index 4a6132d21..8a67b6cde 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -9,6 +9,7 @@ "com.unity.multiplayer.tools": "1.0.0", "com.unity.netcode.gameobjects": "1.5.2", "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.shadergraph": "14.0.8", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.5", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index cd549c6fa..7e8f23bbf 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -135,6 +135,33 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.render-pipelines.core": { + "version": "14.0.8", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.searcher": { + "version": "4.9.2", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.shadergraph": { + "version": "14.0.8", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "14.0.8", + "com.unity.searcher": "4.9.2" + } + }, "com.unity.test-framework": { "version": "1.1.33", "depth": 0, diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset new file mode 100644 index 000000000..a11ed5823 --- /dev/null +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3} + m_Name: + m_EditorClassIdentifier: + customInterpolatorErrorThreshold: 32 + customInterpolatorWarningThreshold: 16 From b01a2a54e197e970ac3255797db81d97c5e2de03 Mon Sep 17 00:00:00 2001 From: MarioYangNYU Date: Fri, 13 Oct 2023 17:36:05 -0400 Subject: [PATCH 02/23] Autonomlus Mode almost working --- .../.idea/workspace.xml | 85 +- ...b => RerunOpenXRCameraRig Simpsons.prefab} | 1061 +- ...RerunOpenXRCameraRig Simpsons.prefab.meta} | 0 .../Questionnaire/QN_VR/QN_Screen.prefab | 2 +- .../Scripts/QNDataStorageServer.cs | 12 +- .../Component_Core/Scenes/GameManagment.unity | 8 +- .../Scripts/Logger/GroundTruthLogger.cs | 2 +- .../Scripts/Logger/farlab_logger.cs | 4 +- .../Networking/ConnectionAndSpawning.cs | 8 +- .../Autonomous_XE_Rigged_Networked 1.prefab | 11699 ++++++++++++++++ ...tonomous_XE_Rigged_Networked 1.prefab.meta | 8 + Assets/Component_Driving/Scripts/$PID.cs | 23 + Assets/Component_Driving/Scripts/$PID.cs.meta | 11 + .../Scripts/AutonomousVehicleDriver.cs | 95 + .../Scripts/AutonomousVehicleDriver.cs.meta | 11 + .../Scripts/NetworkVehicleController.cs | 95 +- Assets/Component_Driving/WayPoint.prefab | 46 + Assets/Component_Driving/WayPoint.prefab.meta | 7 + .../CarMaterials/CarMats/paint_DarkBlue.mat | 86 + .../CarMats/paint_DarkBlue.mat.meta | 8 + Assets/Rerun | 2 +- Assets/WayPoint.cs | 47 + Assets/WayPoint.cs.meta | 11 + Assets/_Studies/Autonomous_MutualAware.meta | 8 + .../Autonomous_MutualAware/MutualCP1.unity | 1741 +++ .../MutualCP1.unity.meta} | 2 +- Packages/manifest.json | 6 +- Packages/packages-lock.json | 31 +- ProjectSettings/EditorBuildSettings.asset | 3 + ProjectSettings/ProjectSettings.asset | 2 + 30 files changed, 15040 insertions(+), 84 deletions(-) rename Assets/Component_Core/Prefabs/{RerunOVRCameraRig Simpsons.prefab => RerunOpenXRCameraRig Simpsons.prefab} (62%) rename Assets/Component_Core/Prefabs/{RerunOVRCameraRig Simpsons.prefab.meta => RerunOpenXRCameraRig Simpsons.prefab.meta} (100%) create mode 100644 Assets/Component_Driving/Autonomous_XE_Rigged_Networked 1.prefab create mode 100644 Assets/Component_Driving/Autonomous_XE_Rigged_Networked 1.prefab.meta create mode 100644 Assets/Component_Driving/Scripts/$PID.cs create mode 100644 Assets/Component_Driving/Scripts/$PID.cs.meta create mode 100644 Assets/Component_Driving/Scripts/AutonomousVehicleDriver.cs create mode 100644 Assets/Component_Driving/Scripts/AutonomousVehicleDriver.cs.meta create mode 100644 Assets/Component_Driving/WayPoint.prefab create mode 100644 Assets/Component_Driving/WayPoint.prefab.meta create mode 100644 Assets/Component_SceneElements/Legacy/Materials/CarMaterials/CarMats/paint_DarkBlue.mat create mode 100644 Assets/Component_SceneElements/Legacy/Materials/CarMaterials/CarMats/paint_DarkBlue.mat.meta create mode 100644 Assets/WayPoint.cs create mode 100644 Assets/WayPoint.cs.meta create mode 100644 Assets/_Studies/Autonomous_MutualAware.meta create mode 100644 Assets/_Studies/Autonomous_MutualAware/MutualCP1.unity rename Assets/{Components/StrangeTown.zip.meta => _Studies/Autonomous_MutualAware/MutualCP1.unity.meta} (74%) diff --git a/.idea/.idea.CrossCulturalDriving/.idea/workspace.xml b/.idea/.idea.CrossCulturalDriving/.idea/workspace.xml index 0c8a50f3a..863bf805a 100644 --- a/.idea/.idea.CrossCulturalDriving/.idea/workspace.xml +++ b/.idea/.idea.CrossCulturalDriving/.idea/workspace.xml @@ -10,10 +10,26 @@ - + + + + + + + + + + + + + + + + + - - - - + + + - - - - + - - - - - + - + + + + + + + + + +