From cfcc6cc0dd156bfe9db1bfc6ba7e17bb5ed9d076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Fri, 26 Jan 2024 09:51:51 +0100 Subject: [PATCH 1/2] v1.0.2 (#40) * Initial development commit * Update following core renewal (#32) * Auto increment pre-release version to 1.0.2-pre.1 [skip ci] * Update to support latest updates on camera package (#33) * Fix base class names * Add missing dependency * Auto increment pre-release version to 1.0.2-pre.2 [skip ci] * Call into base.UpdateController() (#34) * Auto increment pre-release version to 1.0.2-pre.3 [skip ci] * Adjust to core module changes for interactions (#35) * Fit core * Align default profiles folder structure with Meta package * Fix controller visualizer and interactors config --------- Co-authored-by: Dino Fejzagic * Auto increment pre-release version to 1.0.2-pre.4 [skip ci] * Update Package Dependencies (#36) * Auto increment pre-release version to 1.0.2-pre.5 [skip ci] * Update to SDK v2.3 support (#37) Co-authored-by: Dino Fejzagic * Auto increment pre-release version to 1.0.2-pre.6 [skip ci] * Feature/camera to player (#38) * Migration of CameraService to Player Service * Camera Folder Rename * File renames Camera -> Player * Validations of "Camera" use * Auto increment pre-release version to 1.0.2-pre.7 [skip ci] * Update branding and deps (#39) * Update README * Update namespaces * Update dependencies * Fix namespace * Auto increment pre-release version to 1.0.2-pre.8 [skip ci] --------- Co-authored-by: SimonDarksideJ Co-authored-by: realitycollectivebuildbot Co-authored-by: Dino Fejzagic --- .../development-buildandtestupmrelease.yml | 2 +- .../{InputService.meta => Controllers.meta} | 0 .../Pico4Controller.meta | 0 .../InteractionMappings_Left.meta} | 2 +- .../LeftPico4Controller_Grip.asset | 0 .../LeftPico4Controller_Grip.asset.meta | 0 .../LeftPico4Controller_GripPress.asset | 0 .../LeftPico4Controller_GripPress.asset.meta | 0 .../LeftPico4Controller_Menu.asset | 0 .../LeftPico4Controller_Menu.asset.meta | 0 ...ftPico4Controller_SpatialPointerPose.asset | 0 ...o4Controller_SpatialPointerPose.asset.meta | 0 .../LeftPico4Controller_Thumbstick.asset | 0 .../LeftPico4Controller_Thumbstick.asset.meta | 0 .../LeftPico4Controller_ThumbstickPress.asset | 0 ...Pico4Controller_ThumbstickPress.asset.meta | 0 .../LeftPico4Controller_Trigger.asset | 0 .../LeftPico4Controller_Trigger.asset.meta | 0 .../LeftPico4Controller_TriggerPress.asset | 0 ...eftPico4Controller_TriggerPress.asset.meta | 0 .../LeftPico4Controller_X_A.asset | 0 .../LeftPico4Controller_X_A.asset.meta | 0 .../LeftPico4Controller_Y_B.asset | 0 .../LeftPico4Controller_Y_B.asset.meta | 0 .../InteractionMappings_Right.meta} | 2 +- .../RightPico4Controller_Grip.asset | 0 .../RightPico4Controller_Grip.asset.meta | 0 .../RightPico4Controller_GripPress.asset | 0 .../RightPico4Controller_GripPress.asset.meta | 0 .../RightPico4Controller_Menu.asset | 0 .../RightPico4Controller_Menu.asset.meta | 0 ...htPico4Controller_SpatialPointerPose.asset | 0 ...o4Controller_SpatialPointerPose.asset.meta | 0 .../RightPico4Controller_Thumbstick.asset | 0 ...RightPico4Controller_Thumbstick.asset.meta | 0 ...RightPico4Controller_ThumbstickPress.asset | 0 ...Pico4Controller_ThumbstickPress.asset.meta | 0 .../RightPico4Controller_Trigger.asset | 0 .../RightPico4Controller_Trigger.asset.meta | 0 .../RightPico4Controller_TriggerPress.asset | 0 ...ghtPico4Controller_TriggerPress.asset.meta | 0 .../RightPico4Controller_X_A.asset | 0 .../RightPico4Controller_X_A.asset.meta | 0 .../RightPico4Controller_Y_B.asset | 0 .../RightPico4Controller_Y_B.asset.meta | 0 .../Pico4Controller/LeftPico4Controller.asset | 6 +- .../LeftPico4Controller.asset.meta | 0 .../RightPico4Controller.asset | 6 +- .../RightPico4Controller.asset.meta | 0 .../PicoControllerServiceModuleProfile.asset | 5 -- ...oControllerServiceModuleProfile.asset.meta | 0 .../PicoNeo3Controller.meta | 0 .../InteractionMappings_Left.meta} | 2 +- .../LeftPicoNeo3Controller_Grip.asset | 0 .../LeftPicoNeo3Controller_Grip.asset.meta | 0 .../LeftPicoNeo3Controller_GripPress.asset | 0 ...eftPicoNeo3Controller_GripPress.asset.meta | 0 .../LeftPicoNeo3Controller_Menu.asset | 0 .../LeftPicoNeo3Controller_Menu.asset.meta | 0 ...icoNeo3Controller_SpatialPointerPose.asset | 0 ...o3Controller_SpatialPointerPose.asset.meta | 0 .../LeftPicoNeo3Controller_Thumbstick.asset | 0 ...ftPicoNeo3Controller_Thumbstick.asset.meta | 0 ...ftPicoNeo3Controller_ThumbstickPress.asset | 0 ...oNeo3Controller_ThumbstickPress.asset.meta | 0 .../LeftPicoNeo3Controller_Trigger.asset | 0 .../LeftPicoNeo3Controller_Trigger.asset.meta | 0 .../LeftPicoNeo3Controller_TriggerPress.asset | 0 ...PicoNeo3Controller_TriggerPress.asset.meta | 0 .../LeftPicoNeo3Controller_X_A.asset | 0 .../LeftPicoNeo3Controller_X_A.asset.meta | 0 .../LeftPicoNeo3Controller_Y_B.asset | 0 .../LeftPicoNeo3Controller_Y_B.asset.meta | 0 .../InteractionMappings_Right.meta | 2 +- .../RightPicoNeo3Controller_Grip.asset | 0 .../RightPicoNeo3Controller_Grip.asset.meta | 0 .../RightPicoNeo3Controller_GripPress.asset | 0 ...ghtPicoNeo3Controller_GripPress.asset.meta | 0 .../RightPicoNeo3Controller_Menu.asset | 0 .../RightPicoNeo3Controller_Menu.asset.meta | 0 ...icoNeo3Controller_SpatialPointerPose.asset | 0 ...o3Controller_SpatialPointerPose.asset.meta | 0 .../RightPicoNeo3Controller_Thumbstick.asset | 0 ...htPicoNeo3Controller_Thumbstick.asset.meta | 0 ...htPicoNeo3Controller_ThumbstickPress.asset | 0 ...oNeo3Controller_ThumbstickPress.asset.meta | 0 .../RightPicoNeo3Controller_Trigger.asset | 0 ...RightPicoNeo3Controller_Trigger.asset.meta | 0 ...RightPicoNeo3Controller_TriggerPress.asset | 0 ...PicoNeo3Controller_TriggerPress.asset.meta | 0 .../RightPicoNeo3Controller_X_A.asset | 0 .../RightPicoNeo3Controller_X_A.asset.meta | 0 .../RightPicoNeo3Controller_Y_B.asset | 0 .../RightPicoNeo3Controller_Y_B.asset.meta | 0 .../LeftPicoNeo3Controller.asset | 15 +++- .../LeftPicoNeo3Controller.asset.meta | 0 .../RightPicoNeo3Controller.asset | 15 +++- .../RightPicoNeo3Controller.asset.meta | 0 ...PicoAllInOneHeadsetButtonsController.asset | 22 ----- ...llInOneHeadsetButtonsController.asset.meta | 8 -- ...llInOneHeadsetButtonsController_Menu.asset | 30 ------- ...neHeadsetButtonsController_Menu.asset.meta | 8 -- ...nOneHeadsetButtonsController_Trigger.asset | 30 ------- ...eadsetButtonsController_Trigger.asset.meta | 8 -- .../LeftPicoG24KController.asset | 27 ------ .../LeftPicoG24KController.asset.meta | 8 -- .../LeftPicoG24KController_Menu.asset | 30 ------- .../LeftPicoG24KController_Menu.asset.meta | 8 -- ...icoG24KController_SpatialPointerPose.asset | 32 ------- ...4KController_SpatialPointerPose.asset.meta | 8 -- .../LeftPicoG24KController_Touchpad.asset | 30 ------- ...LeftPicoG24KController_Touchpad.asset.meta | 8 -- ...LeftPicoG24KController_TouchpadPress.asset | 30 ------- ...icoG24KController_TouchpadPress.asset.meta | 8 -- .../LeftPicoG24KController_Trigger.asset | 30 ------- .../LeftPicoG24KController_Trigger.asset.meta | 8 -- .../LeftPicoG24KController_TriggerPress.asset | 30 ------- ...PicoG24KController_TriggerPress.asset.meta | 8 -- .../RightPicoG24KController.asset | 27 ------ .../RightPicoG24KController.asset.meta | 8 -- .../RightPicoG24KController_Menu.asset | 30 ------- .../RightPicoG24KController_Menu.asset.meta | 8 -- ...icoG24KController_SpatialPointerPose.asset | 32 ------- ...4KController_SpatialPointerPose.asset.meta | 8 -- .../RightPicoG24KController_Touchpad.asset | 30 ------- ...ightPicoG24KController_Touchpad.asset.meta | 8 -- ...ightPicoG24KController_TouchpadPress.asset | 30 ------- ...icoG24KController_TouchpadPress.asset.meta | 8 -- .../RightPicoG24KController_Trigger.asset | 30 ------- ...RightPicoG24KController_Trigger.asset.meta | 8 -- ...RightPicoG24KController_TriggerPress.asset | 30 ------- ...PicoG24KController_TriggerPress.asset.meta | 8 -- .../LeftPicoNeo2Controller.asset | 31 ------- .../LeftPicoNeo2Controller.asset.meta | 8 -- .../LeftPicoNeo2Controller_Grip.asset | 30 ------- .../LeftPicoNeo2Controller_Grip.asset.meta | 8 -- .../LeftPicoNeo2Controller_GripPress.asset | 30 ------- ...eftPicoNeo2Controller_GripPress.asset.meta | 8 -- .../LeftPicoNeo2Controller_Menu.asset | 30 ------- .../LeftPicoNeo2Controller_Menu.asset.meta | 8 -- ...icoNeo2Controller_SpatialPointerPose.asset | 32 ------- ...o2Controller_SpatialPointerPose.asset.meta | 8 -- .../LeftPicoNeo2Controller_Thumbstick.asset | 30 ------- ...ftPicoNeo2Controller_Thumbstick.asset.meta | 8 -- ...ftPicoNeo2Controller_ThumbstickPress.asset | 30 ------- ...oNeo2Controller_ThumbstickPress.asset.meta | 8 -- .../LeftPicoNeo2Controller_Trigger.asset | 30 ------- .../LeftPicoNeo2Controller_Trigger.asset.meta | 8 -- .../LeftPicoNeo2Controller_TriggerPress.asset | 30 ------- ...PicoNeo2Controller_TriggerPress.asset.meta | 8 -- .../LeftPicoNeo2Controller_X.asset | 30 ------- .../LeftPicoNeo2Controller_X.asset.meta | 8 -- .../LeftPicoNeo2Controller_Y.asset | 30 ------- .../LeftPicoNeo2Controller_Y.asset.meta | 8 -- .../RightPicoNeo2Controller.asset | 31 ------- .../RightPicoNeo2Controller.asset.meta | 8 -- .../RightPicoNeo2Controller_Grip.asset | 30 ------- .../RightPicoNeo2Controller_Grip.asset.meta | 8 -- .../RightPicoNeo2Controller_GripPress.asset | 30 ------- ...ghtPicoNeo2Controller_GripPress.asset.meta | 8 -- .../RightPicoNeo2Controller_Menu.asset | 30 ------- .../RightPicoNeo2Controller_Menu.asset.meta | 8 -- ...icoNeo2Controller_SpatialPointerPose.asset | 32 ------- ...o2Controller_SpatialPointerPose.asset.meta | 8 -- .../RightPicoNeo2Controller_Thumbstick.asset | 30 ------- ...htPicoNeo2Controller_Thumbstick.asset.meta | 8 -- ...htPicoNeo2Controller_ThumbstickPress.asset | 30 ------- ...oNeo2Controller_ThumbstickPress.asset.meta | 8 -- .../RightPicoNeo2Controller_Trigger.asset | 30 ------- ...RightPicoNeo2Controller_Trigger.asset.meta | 8 -- ...RightPicoNeo2Controller_TriggerPress.asset | 30 ------- ...PicoNeo2Controller_TriggerPress.asset.meta | 8 -- .../RightPicoNeo2Controller_X.asset | 30 ------- .../RightPicoNeo2Controller_X.asset.meta | 8 -- .../RightPicoNeo2Controller_Y.asset | 30 ------- .../RightPicoNeo2Controller_Y.asset.meta | 8 -- .../PicoPackageInstallerProfile.asset | 2 +- ...{CameraService.meta => PlayerService.meta} | 0 .../PicoPlayerRigServiceModuleProfile.asset} | 2 +- ...oPlayerRigServiceModuleProfile.asset.meta} | 0 Assets~/StandardAssets/Controllers.meta | 8 ++ .../Controllers/PicoController_Left.prefab | 77 +++++++++++++++++ .../PicoController_Left.prefab.meta} | 4 +- .../Controllers/PicoController_Right.prefab | 77 +++++++++++++++++ .../PicoController_Right.prefab.meta | 7 ++ .../RESERVED_FOR_FUTURE_USE.txt | 0 CHANGELOG.md | 5 +- Editor/PicoPackageInstaller.cs | 8 +- LICENSE.md | 2 +- README.md | 46 ++++------ .../PicoCameraRigServiceModuleProfile.cs | 24 ------ Runtime/{InputService.meta => Input.meta} | 0 Runtime/Input/Controllers.meta | 8 ++ .../IPicoControllerServiceModule.cs | 12 +++ .../IPicoControllerServiceModule.cs.meta | 0 .../Controllers}/Pico4Controller.cs | 28 +++---- .../Controllers}/Pico4Controller.cs.meta | 0 .../Controllers}/PicoController.cs | 35 ++++---- .../Controllers}/PicoController.cs.meta | 0 .../PicoControllerServiceModule.cs | 51 ++--------- .../PicoControllerServiceModule.cs.meta | 0 .../PicoControllerServiceModuleProfile.cs | 11 +-- ...PicoControllerServiceModuleProfile.cs.meta | 0 .../Controllers/PicoControllerVisualizer.cs | 16 ++++ .../PicoControllerVisualizer.cs.meta} | 4 +- .../Controllers}/PicoNeo3Controller.cs | 28 +++---- .../Controllers}/PicoNeo3Controller.cs.meta | 0 Runtime/InputService/Extensions.meta | 8 -- .../Extensions/HandednessExtensions.cs | 36 -------- .../IPicoControllerServiceModule.cs | 12 --- .../PicoAllInOneHeadsetButtonsController.cs | 84 ------------------- ...coAllInOneHeadsetButtonsController.cs.meta | 11 --- Runtime/InputService/PicoG24KController.cs | 62 -------------- .../InputService/PicoG24KController.cs.meta | 11 --- Runtime/InputService/PicoNeo2Controller.cs | 74 ---------------- .../InputService/PicoNeo2Controller.cs.meta | 11 --- Runtime/InputService/Profiles.meta | 8 -- Runtime/PicoPlatform.cs | 12 +-- Runtime/{CameraService.meta => Player.meta} | 0 .../IPicoPlayerRigServiceModule.cs} | 8 +- .../IPicoPlayerRigServiceModule.cs.meta} | 0 .../PicoPlayerRigServiceModule.cs} | 26 +++--- .../PicoPlayerRigServiceModule.cs.meta} | 0 .../PicoPlayerRigServiceModuleProfile.cs | 33 ++++++++ ...PicoPlayerRigServiceModuleProfile.cs.meta} | 0 Runtime/RealityToolkit.Pico.asmdef | 7 +- package.json | 8 +- 227 files changed, 388 insertions(+), 2013 deletions(-) rename Assets~/Profiles/{InputService.meta => Controllers.meta} (100%) rename Assets~/Profiles/{InputService => Controllers}/Pico4Controller.meta (100%) rename Assets~/Profiles/{InputService/PicoG24KController.meta => Controllers/Pico4Controller/InteractionMappings_Left.meta} (77%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_Grip.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_Grip.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_GripPress.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_GripPress.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_Menu.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_Menu.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_SpatialPointerPose.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_SpatialPointerPose.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_Thumbstick.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_Thumbstick.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_ThumbstickPress.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_ThumbstickPress.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_Trigger.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_Trigger.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_TriggerPress.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_TriggerPress.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_X_A.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_X_A.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_Y_B.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Left}/LeftPico4Controller_Y_B.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoAllInOneHeadsetButtonsController.meta => Controllers/Pico4Controller/InteractionMappings_Right.meta} (77%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_Grip.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_Grip.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_GripPress.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_GripPress.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_Menu.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_Menu.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_SpatialPointerPose.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_SpatialPointerPose.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_Thumbstick.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_Thumbstick.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_ThumbstickPress.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_ThumbstickPress.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_Trigger.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_Trigger.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_TriggerPress.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_TriggerPress.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_X_A.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_X_A.asset.meta (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_Y_B.asset (100%) rename Assets~/Profiles/{InputService/Pico4Controller => Controllers/Pico4Controller/InteractionMappings_Right}/RightPico4Controller_Y_B.asset.meta (100%) rename Assets~/Profiles/{InputService => Controllers}/Pico4Controller/LeftPico4Controller.asset (81%) rename Assets~/Profiles/{InputService => Controllers}/Pico4Controller/LeftPico4Controller.asset.meta (100%) rename Assets~/Profiles/{InputService => Controllers}/Pico4Controller/RightPico4Controller.asset (81%) rename Assets~/Profiles/{InputService => Controllers}/Pico4Controller/RightPico4Controller.asset.meta (100%) rename Assets~/Profiles/{InputService => Controllers}/PicoControllerServiceModuleProfile.asset (67%) rename Assets~/Profiles/{InputService => Controllers}/PicoControllerServiceModuleProfile.asset.meta (100%) rename Assets~/Profiles/{InputService => Controllers}/PicoNeo3Controller.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo2Controller.meta => Controllers/PicoNeo3Controller/InteractionMappings_Left.meta} (77%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_Grip.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_Grip.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_GripPress.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_GripPress.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_Menu.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_Menu.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_SpatialPointerPose.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_SpatialPointerPose.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_Thumbstick.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_Thumbstick.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_ThumbstickPress.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_ThumbstickPress.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_Trigger.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_Trigger.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_TriggerPress.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_TriggerPress.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_X_A.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_X_A.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_Y_B.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Left}/LeftPicoNeo3Controller_Y_B.asset.meta (100%) rename Runtime/CameraService/Profiles.meta => Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right.meta (77%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_Grip.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_Grip.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_GripPress.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_GripPress.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_Menu.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_Menu.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_SpatialPointerPose.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_SpatialPointerPose.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_Thumbstick.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_Thumbstick.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_ThumbstickPress.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_ThumbstickPress.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_Trigger.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_Trigger.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_TriggerPress.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_TriggerPress.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_X_A.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_X_A.asset.meta (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_Y_B.asset (100%) rename Assets~/Profiles/{InputService/PicoNeo3Controller => Controllers/PicoNeo3Controller/InteractionMappings_Right}/RightPicoNeo3Controller_Y_B.asset.meta (100%) rename Assets~/Profiles/{InputService => Controllers}/PicoNeo3Controller/LeftPicoNeo3Controller.asset (62%) rename Assets~/Profiles/{InputService => Controllers}/PicoNeo3Controller/LeftPicoNeo3Controller.asset.meta (100%) rename Assets~/Profiles/{InputService => Controllers}/PicoNeo3Controller/RightPicoNeo3Controller.asset (62%) rename Assets~/Profiles/{InputService => Controllers}/PicoNeo3Controller/RightPicoNeo3Controller.asset.meta (100%) delete mode 100644 Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController.asset delete mode 100644 Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Menu.asset delete mode 100644 Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Menu.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Trigger.asset delete mode 100644 Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Trigger.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController.asset delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Menu.asset delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Menu.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_SpatialPointerPose.asset delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_SpatialPointerPose.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Touchpad.asset delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Touchpad.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TouchpadPress.asset delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TouchpadPress.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Trigger.asset delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Trigger.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TriggerPress.asset delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TriggerPress.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController.asset delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Menu.asset delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Menu.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_SpatialPointerPose.asset delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_SpatialPointerPose.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Touchpad.asset delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Touchpad.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TouchpadPress.asset delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TouchpadPress.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Trigger.asset delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Trigger.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TriggerPress.asset delete mode 100644 Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TriggerPress.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Grip.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Grip.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_GripPress.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_GripPress.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Menu.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Menu.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_SpatialPointerPose.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_SpatialPointerPose.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Thumbstick.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Thumbstick.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_ThumbstickPress.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_ThumbstickPress.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Trigger.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Trigger.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_TriggerPress.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_TriggerPress.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_X.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_X.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Y.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Y.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Grip.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Grip.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_GripPress.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_GripPress.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Menu.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Menu.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_SpatialPointerPose.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_SpatialPointerPose.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Thumbstick.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Thumbstick.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_ThumbstickPress.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_ThumbstickPress.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Trigger.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Trigger.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_TriggerPress.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_TriggerPress.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_X.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_X.asset.meta delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Y.asset delete mode 100644 Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Y.asset.meta rename Assets~/Profiles/{CameraService.meta => PlayerService.meta} (100%) rename Assets~/Profiles/{CameraService/PicoCameraRigServiceModuleProfile.asset => PlayerService/PicoPlayerRigServiceModuleProfile.asset} (95%) rename Assets~/Profiles/{CameraService/PicoCameraRigServiceModuleProfile.asset.meta => PlayerService/PicoPlayerRigServiceModuleProfile.asset.meta} (100%) create mode 100644 Assets~/StandardAssets/Controllers.meta create mode 100644 Assets~/StandardAssets/Controllers/PicoController_Left.prefab rename Assets~/StandardAssets/{RESERVED_FOR_FUTURE_USE.txt.meta => Controllers/PicoController_Left.prefab.meta} (62%) create mode 100644 Assets~/StandardAssets/Controllers/PicoController_Right.prefab create mode 100644 Assets~/StandardAssets/Controllers/PicoController_Right.prefab.meta delete mode 100644 Assets~/StandardAssets/RESERVED_FOR_FUTURE_USE.txt delete mode 100644 Runtime/CameraService/Profiles/PicoCameraRigServiceModuleProfile.cs rename Runtime/{InputService.meta => Input.meta} (100%) create mode 100644 Runtime/Input/Controllers.meta create mode 100644 Runtime/Input/Controllers/IPicoControllerServiceModule.cs rename Runtime/{InputService => Input/Controllers}/IPicoControllerServiceModule.cs.meta (100%) rename Runtime/{InputService => Input/Controllers}/Pico4Controller.cs (59%) rename Runtime/{InputService => Input/Controllers}/Pico4Controller.cs.meta (100%) rename Runtime/{InputService => Input/Controllers}/PicoController.cs (87%) rename Runtime/{InputService => Input/Controllers}/PicoController.cs.meta (100%) rename Runtime/{InputService => Input/Controllers}/PicoControllerServiceModule.cs (75%) rename Runtime/{InputService => Input/Controllers}/PicoControllerServiceModule.cs.meta (100%) rename Runtime/{InputService/Profiles => Input/Controllers}/PicoControllerServiceModuleProfile.cs (58%) rename Runtime/{InputService/Profiles => Input/Controllers}/PicoControllerServiceModuleProfile.cs.meta (100%) create mode 100644 Runtime/Input/Controllers/PicoControllerVisualizer.cs rename Runtime/{InputService/Extensions/HandednessExtensions.cs.meta => Input/Controllers/PicoControllerVisualizer.cs.meta} (64%) rename Runtime/{InputService => Input/Controllers}/PicoNeo3Controller.cs (59%) rename Runtime/{InputService => Input/Controllers}/PicoNeo3Controller.cs.meta (100%) delete mode 100644 Runtime/InputService/Extensions.meta delete mode 100644 Runtime/InputService/Extensions/HandednessExtensions.cs delete mode 100644 Runtime/InputService/IPicoControllerServiceModule.cs delete mode 100644 Runtime/InputService/PicoAllInOneHeadsetButtonsController.cs delete mode 100644 Runtime/InputService/PicoAllInOneHeadsetButtonsController.cs.meta delete mode 100644 Runtime/InputService/PicoG24KController.cs delete mode 100644 Runtime/InputService/PicoG24KController.cs.meta delete mode 100644 Runtime/InputService/PicoNeo2Controller.cs delete mode 100644 Runtime/InputService/PicoNeo2Controller.cs.meta delete mode 100644 Runtime/InputService/Profiles.meta rename Runtime/{CameraService.meta => Player.meta} (100%) rename Runtime/{CameraService/IPicoCameraRigServiceModule.cs => Player/IPicoPlayerRigServiceModule.cs} (56%) rename Runtime/{CameraService/IPicoCameraRigServiceModule.cs.meta => Player/IPicoPlayerRigServiceModule.cs.meta} (100%) rename Runtime/{CameraService/PicoCameraRigServiceModule.cs => Player/PicoPlayerRigServiceModule.cs} (50%) rename Runtime/{CameraService/PicoCameraRigServiceModule.cs.meta => Player/PicoPlayerRigServiceModule.cs.meta} (100%) create mode 100644 Runtime/Player/PicoPlayerRigServiceModuleProfile.cs rename Runtime/{CameraService/Profiles/PicoCameraRigServiceModuleProfile.cs.meta => Player/PicoPlayerRigServiceModuleProfile.cs.meta} (100%) diff --git a/.github/workflows/development-buildandtestupmrelease.yml b/.github/workflows/development-buildandtestupmrelease.yml index 4c24cb0..fc6ac92 100644 --- a/.github/workflows/development-buildandtestupmrelease.yml +++ b/.github/workflows/development-buildandtestupmrelease.yml @@ -37,5 +37,5 @@ jobs: uses: realitycollective/reusableworkflows/.github/workflows/rununityUPMbuild.yml@v2 with: unityversion: ${{ needs.Validate-Unity.outputs.unityeditorversion }} - dependencies: '[{"development": "github.com/realitycollective/com.realitytoolkit.core.git"},{"development": "github.com/realitycollective/com.realitytoolkit.camera.git"},{"development": "github.com/realitycollective/com.realitycollective.utilities.git"},{"development": "github.com/realitycollective/com.realitytoolkit.service-framework.git"},{"pico_dependencies": "github.com/realitycollective/com.realitytoolkit.pico.git"}]' + dependencies: '[{"development": "github.com/realitycollective/com.realitytoolkit.core.git"},{"development": "github.com/realitycollective/com.realitytoolkit.player.git"},{"development": "github.com/realitycollective/com.realitycollective.utilities.git"},{"development": "github.com/realitycollective/com.realitytoolkit.service-framework.git"},{"pico_dependencies": "github.com/realitycollective/com.realitytoolkit.pico.git"}]' secrets: inherit diff --git a/Assets~/Profiles/InputService.meta b/Assets~/Profiles/Controllers.meta similarity index 100% rename from Assets~/Profiles/InputService.meta rename to Assets~/Profiles/Controllers.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller.meta b/Assets~/Profiles/Controllers/Pico4Controller.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller.meta rename to Assets~/Profiles/Controllers/Pico4Controller.meta diff --git a/Assets~/Profiles/InputService/PicoG24KController.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left.meta similarity index 77% rename from Assets~/Profiles/InputService/PicoG24KController.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left.meta index 22002ed..91f7c41 100644 --- a/Assets~/Profiles/InputService/PicoG24KController.meta +++ b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9166bdff29e637446a2c53d61ba4fd3b +guid: 5b1ed1c2d7391fa409a845052ccaf359 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Grip.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Grip.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Grip.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Grip.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Grip.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Grip.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Grip.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Grip.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_GripPress.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_GripPress.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_GripPress.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_GripPress.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_GripPress.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_GripPress.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_GripPress.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_GripPress.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Menu.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Menu.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Menu.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Menu.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Menu.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Menu.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Menu.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Menu.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_SpatialPointerPose.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_SpatialPointerPose.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_SpatialPointerPose.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_SpatialPointerPose.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_SpatialPointerPose.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_SpatialPointerPose.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_SpatialPointerPose.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_SpatialPointerPose.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Thumbstick.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Thumbstick.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Thumbstick.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Thumbstick.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Thumbstick.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Thumbstick.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Thumbstick.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Thumbstick.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_ThumbstickPress.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_ThumbstickPress.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_ThumbstickPress.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_ThumbstickPress.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_ThumbstickPress.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_ThumbstickPress.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_ThumbstickPress.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_ThumbstickPress.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Trigger.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Trigger.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Trigger.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Trigger.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Trigger.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Trigger.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Trigger.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Trigger.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_TriggerPress.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_TriggerPress.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_TriggerPress.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_TriggerPress.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_TriggerPress.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_TriggerPress.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_TriggerPress.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_TriggerPress.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_X_A.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_X_A.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_X_A.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_X_A.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_X_A.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_X_A.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_X_A.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_X_A.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Y_B.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Y_B.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Y_B.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Y_B.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Y_B.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Y_B.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller_Y_B.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Left/LeftPico4Controller_Y_B.asset.meta diff --git a/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right.meta similarity index 77% rename from Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right.meta index f2e6b2e..89d62ba 100644 --- a/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController.meta +++ b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 13ac1bcb6a538884fb2602923aa4faf3 +guid: c013d930ac5b8f24cbdb10ca126db0ed folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Grip.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Grip.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Grip.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Grip.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Grip.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Grip.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Grip.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Grip.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_GripPress.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_GripPress.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_GripPress.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_GripPress.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_GripPress.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_GripPress.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_GripPress.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_GripPress.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Menu.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Menu.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Menu.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Menu.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Menu.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Menu.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Menu.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Menu.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_SpatialPointerPose.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_SpatialPointerPose.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_SpatialPointerPose.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_SpatialPointerPose.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_SpatialPointerPose.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_SpatialPointerPose.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_SpatialPointerPose.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_SpatialPointerPose.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Thumbstick.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Thumbstick.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Thumbstick.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Thumbstick.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Thumbstick.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Thumbstick.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Thumbstick.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Thumbstick.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_ThumbstickPress.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_ThumbstickPress.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_ThumbstickPress.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_ThumbstickPress.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_ThumbstickPress.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_ThumbstickPress.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_ThumbstickPress.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_ThumbstickPress.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Trigger.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Trigger.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Trigger.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Trigger.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Trigger.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Trigger.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Trigger.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Trigger.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_TriggerPress.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_TriggerPress.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_TriggerPress.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_TriggerPress.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_TriggerPress.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_TriggerPress.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_TriggerPress.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_TriggerPress.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_X_A.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_X_A.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_X_A.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_X_A.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_X_A.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_X_A.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_X_A.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_X_A.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Y_B.asset b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Y_B.asset similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Y_B.asset rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Y_B.asset diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Y_B.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Y_B.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller_Y_B.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/InteractionMappings_Right/RightPico4Controller_Y_B.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller.asset b/Assets~/Profiles/Controllers/Pico4Controller/LeftPico4Controller.asset similarity index 81% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller.asset rename to Assets~/Profiles/Controllers/Pico4Controller/LeftPico4Controller.asset index d1c5015..261a2a0 100644 --- a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller.asset +++ b/Assets~/Profiles/Controllers/Pico4Controller/LeftPico4Controller.asset @@ -15,7 +15,7 @@ MonoBehaviour: controllerType: reference: 7cd3ce74-425f-40b2-944a-7d575da7ec74 handedness: 1 - visualizationProfile: {fileID: 11400000, guid: fe125eaaf5547684d8506b794c5a6016, type: 2} + controllerPrefab: {fileID: 2890383340010870617, guid: da54ec7ad266fde45b825accb4a69b21, type: 3} useCustomInteractions: 0 interactionMappingProfiles: - {fileID: 11400000, guid: f50ffe7457810314cb811315bf94f669, type: 2} @@ -28,6 +28,10 @@ MonoBehaviour: - {fileID: 11400000, guid: feb38331da4960d4990f4fff519cdbe9, type: 2} - {fileID: 11400000, guid: 602824ad5c69c004ebfb6982e382f2de, type: 2} - {fileID: 11400000, guid: 89244cee9823df24d8d0fcbd6905145c, type: 2} + controllerInteractors: + - {fileID: 3487613484555030544, guid: eb885e83bbe8cc24a87d61670583a82d, type: 3} + - {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + - {fileID: 8432135464014371632, guid: c61f3eb595c636c438edf4452a4ef65e, type: 3} lightThemeLeftControllerTexture: {fileID: 0} lightThemeLeftControllerTextureScaled: {fileID: 0} darkThemeLeftControllerTexture: {fileID: 0} diff --git a/Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/LeftPico4Controller.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/LeftPico4Controller.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/LeftPico4Controller.asset.meta diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller.asset b/Assets~/Profiles/Controllers/Pico4Controller/RightPico4Controller.asset similarity index 81% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller.asset rename to Assets~/Profiles/Controllers/Pico4Controller/RightPico4Controller.asset index 9b11649..0a9196e 100644 --- a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller.asset +++ b/Assets~/Profiles/Controllers/Pico4Controller/RightPico4Controller.asset @@ -15,7 +15,7 @@ MonoBehaviour: controllerType: reference: 7cd3ce74-425f-40b2-944a-7d575da7ec74 handedness: 2 - visualizationProfile: {fileID: 11400000, guid: 5ee67c77447ce88409a3e04e57806963, type: 2} + controllerPrefab: {fileID: 5627968163871842084, guid: 739e9a4a6099526418e8b197fa0f4040, type: 3} useCustomInteractions: 0 interactionMappingProfiles: - {fileID: 11400000, guid: e28a7a4ae794140438af19e796f00a78, type: 2} @@ -28,6 +28,10 @@ MonoBehaviour: - {fileID: 11400000, guid: 8a02ca137f2c91c49b2e41248afb74c8, type: 2} - {fileID: 11400000, guid: 58d1bf6a7626f0147969d5572bee843d, type: 2} - {fileID: 11400000, guid: 823b2264256861e4fbf666167def1b02, type: 2} + controllerInteractors: + - {fileID: 3487613484555030544, guid: eb885e83bbe8cc24a87d61670583a82d, type: 3} + - {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + - {fileID: 8432135464014371632, guid: c61f3eb595c636c438edf4452a4ef65e, type: 3} lightThemeLeftControllerTexture: {fileID: 0} lightThemeLeftControllerTextureScaled: {fileID: 0} darkThemeLeftControllerTexture: {fileID: 0} diff --git a/Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller.asset.meta b/Assets~/Profiles/Controllers/Pico4Controller/RightPico4Controller.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/Pico4Controller/RightPico4Controller.asset.meta rename to Assets~/Profiles/Controllers/Pico4Controller/RightPico4Controller.asset.meta diff --git a/Assets~/Profiles/InputService/PicoControllerServiceModuleProfile.asset b/Assets~/Profiles/Controllers/PicoControllerServiceModuleProfile.asset similarity index 67% rename from Assets~/Profiles/InputService/PicoControllerServiceModuleProfile.asset rename to Assets~/Profiles/Controllers/PicoControllerServiceModuleProfile.asset index acddc28..7028a25 100644 --- a/Assets~/Profiles/InputService/PicoControllerServiceModuleProfile.asset +++ b/Assets~/Profiles/Controllers/PicoControllerServiceModuleProfile.asset @@ -14,11 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: hasSetupDefaults: 1 controllerMappingProfiles: - - {fileID: 11400000, guid: 4043ca69eeaaf8b42b6a5cadd62b9b7f, type: 2} - - {fileID: 11400000, guid: b3de4000c219ae4419453fd99cad5c74, type: 2} - - {fileID: 11400000, guid: e020b02af905e3e4d9a9fda1dc24863d, type: 2} - - {fileID: 11400000, guid: e80f840176f296a49af66d1740fee240, type: 2} - - {fileID: 11400000, guid: 1204423f058281348be1c320ab00af96, type: 2} - {fileID: 11400000, guid: 43abbd94bd95dcc41b3f61cae733fc55, type: 2} - {fileID: 11400000, guid: 3535d92a7a302e240bed29df161173f7, type: 2} - {fileID: 11400000, guid: 51c4549d11ed180439c1776922dbe9cb, type: 2} diff --git a/Assets~/Profiles/InputService/PicoControllerServiceModuleProfile.asset.meta b/Assets~/Profiles/Controllers/PicoControllerServiceModuleProfile.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoControllerServiceModuleProfile.asset.meta rename to Assets~/Profiles/Controllers/PicoControllerServiceModuleProfile.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller.meta diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left.meta similarity index 77% rename from Assets~/Profiles/InputService/PicoNeo2Controller.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left.meta index 4c84ac1..73d34f6 100644 --- a/Assets~/Profiles/InputService/PicoNeo2Controller.meta +++ b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b588c14ad5c883044a6368496e3c3bad +guid: 46139702aea9ef04c9e8f939179f68e9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Grip.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Grip.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Grip.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Grip.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Grip.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Grip.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Grip.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Grip.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_GripPress.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_GripPress.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_GripPress.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_GripPress.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_GripPress.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_GripPress.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_GripPress.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_GripPress.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Menu.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Menu.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Menu.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Menu.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Menu.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Menu.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Menu.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Menu.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_SpatialPointerPose.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_SpatialPointerPose.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_SpatialPointerPose.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_SpatialPointerPose.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_SpatialPointerPose.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_SpatialPointerPose.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_SpatialPointerPose.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_SpatialPointerPose.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Thumbstick.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Thumbstick.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Thumbstick.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Thumbstick.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Thumbstick.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Thumbstick.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Thumbstick.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Thumbstick.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_ThumbstickPress.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_ThumbstickPress.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_ThumbstickPress.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_ThumbstickPress.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_ThumbstickPress.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_ThumbstickPress.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_ThumbstickPress.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_ThumbstickPress.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Trigger.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Trigger.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Trigger.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Trigger.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Trigger.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Trigger.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Trigger.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Trigger.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_TriggerPress.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_TriggerPress.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_TriggerPress.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_TriggerPress.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_TriggerPress.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_TriggerPress.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_TriggerPress.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_TriggerPress.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_X_A.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_X_A.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_X_A.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_X_A.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_X_A.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_X_A.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_X_A.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_X_A.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Y_B.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Y_B.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Y_B.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Y_B.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Y_B.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Y_B.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller_Y_B.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Left/LeftPicoNeo3Controller_Y_B.asset.meta diff --git a/Runtime/CameraService/Profiles.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right.meta similarity index 77% rename from Runtime/CameraService/Profiles.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right.meta index d9bf977..cf63eb2 100644 --- a/Runtime/CameraService/Profiles.meta +++ b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 59058f19ef76eb14f912c8a40dd245dc +guid: 55a1e0c5d09198a45b35517b005fe0cc folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Grip.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Grip.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Grip.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Grip.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Grip.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Grip.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Grip.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Grip.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_GripPress.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_GripPress.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_GripPress.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_GripPress.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_GripPress.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_GripPress.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_GripPress.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_GripPress.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Menu.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Menu.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Menu.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Menu.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Menu.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Menu.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Menu.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Menu.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_SpatialPointerPose.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_SpatialPointerPose.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_SpatialPointerPose.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_SpatialPointerPose.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_SpatialPointerPose.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_SpatialPointerPose.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_SpatialPointerPose.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_SpatialPointerPose.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Thumbstick.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Thumbstick.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Thumbstick.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Thumbstick.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Thumbstick.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Thumbstick.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Thumbstick.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Thumbstick.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_ThumbstickPress.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_ThumbstickPress.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_ThumbstickPress.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_ThumbstickPress.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_ThumbstickPress.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_ThumbstickPress.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_ThumbstickPress.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_ThumbstickPress.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Trigger.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Trigger.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Trigger.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Trigger.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Trigger.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Trigger.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Trigger.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Trigger.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_TriggerPress.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_TriggerPress.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_TriggerPress.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_TriggerPress.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_TriggerPress.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_TriggerPress.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_TriggerPress.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_TriggerPress.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_X_A.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_X_A.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_X_A.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_X_A.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_X_A.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_X_A.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_X_A.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_X_A.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Y_B.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Y_B.asset similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Y_B.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Y_B.asset diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Y_B.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Y_B.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller_Y_B.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/InteractionMappings_Right/RightPicoNeo3Controller_Y_B.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/LeftPicoNeo3Controller.asset similarity index 62% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/LeftPicoNeo3Controller.asset index 0464b77..221df3c 100644 --- a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller.asset +++ b/Assets~/Profiles/Controllers/PicoNeo3Controller/LeftPicoNeo3Controller.asset @@ -15,8 +15,7 @@ MonoBehaviour: controllerType: reference: a58f0550-e847-483e-9e5c-0119a7098530 handedness: 1 - visualizationProfile: {fileID: 11400000, guid: fe125eaaf5547684d8506b794c5a6016, - type: 2} + controllerPrefab: {fileID: 2890383340010870617, guid: da54ec7ad266fde45b825accb4a69b21, type: 3} useCustomInteractions: 0 interactionMappingProfiles: - {fileID: 11400000, guid: 520cb52e91ce83741928e02def9c4436, type: 2} @@ -29,3 +28,15 @@ MonoBehaviour: - {fileID: 11400000, guid: 459858e96a4866d45a4684ddb95cd26e, type: 2} - {fileID: 11400000, guid: 51ccfc3d79b458e44bad9a51a0bd882c, type: 2} - {fileID: 11400000, guid: 3af2e994543b84549a4b70f8216a6bdb, type: 2} + controllerInteractors: + - {fileID: 3487613484555030544, guid: eb885e83bbe8cc24a87d61670583a82d, type: 3} + - {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + - {fileID: 8432135464014371632, guid: c61f3eb595c636c438edf4452a4ef65e, type: 3} + lightThemeLeftControllerTexture: {fileID: 0} + lightThemeLeftControllerTextureScaled: {fileID: 0} + darkThemeLeftControllerTexture: {fileID: 0} + darkThemeLeftControllerTextureScaled: {fileID: 0} + lightThemeRightControllerTexture: {fileID: 0} + lightThemeRightControllerTextureScaled: {fileID: 0} + darkThemeRightControllerTexture: {fileID: 0} + darkThemeRightControllerTextureScaled: {fileID: 0} diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/LeftPicoNeo3Controller.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/LeftPicoNeo3Controller.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/LeftPicoNeo3Controller.asset.meta diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller.asset b/Assets~/Profiles/Controllers/PicoNeo3Controller/RightPicoNeo3Controller.asset similarity index 62% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller.asset rename to Assets~/Profiles/Controllers/PicoNeo3Controller/RightPicoNeo3Controller.asset index 74780c4..8b22699 100644 --- a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller.asset +++ b/Assets~/Profiles/Controllers/PicoNeo3Controller/RightPicoNeo3Controller.asset @@ -15,8 +15,7 @@ MonoBehaviour: controllerType: reference: a58f0550-e847-483e-9e5c-0119a7098530 handedness: 2 - visualizationProfile: {fileID: 11400000, guid: 5ee67c77447ce88409a3e04e57806963, - type: 2} + controllerPrefab: {fileID: 5627968163871842084, guid: 739e9a4a6099526418e8b197fa0f4040, type: 3} useCustomInteractions: 0 interactionMappingProfiles: - {fileID: 11400000, guid: 9e2821f99fa7bbd498c73dfc7830270f, type: 2} @@ -29,3 +28,15 @@ MonoBehaviour: - {fileID: 11400000, guid: 5ff52a513932510499fc13b9fc1f4392, type: 2} - {fileID: 11400000, guid: deceb38ff1e7820468badac0c38cc718, type: 2} - {fileID: 11400000, guid: 29c752b69b7f5f541b97f51de15c6512, type: 2} + controllerInteractors: + - {fileID: 3487613484555030544, guid: eb885e83bbe8cc24a87d61670583a82d, type: 3} + - {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + - {fileID: 8432135464014371632, guid: c61f3eb595c636c438edf4452a4ef65e, type: 3} + lightThemeLeftControllerTexture: {fileID: 0} + lightThemeLeftControllerTextureScaled: {fileID: 0} + darkThemeLeftControllerTexture: {fileID: 0} + darkThemeLeftControllerTextureScaled: {fileID: 0} + lightThemeRightControllerTexture: {fileID: 0} + lightThemeRightControllerTextureScaled: {fileID: 0} + darkThemeRightControllerTexture: {fileID: 0} + darkThemeRightControllerTextureScaled: {fileID: 0} diff --git a/Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller.asset.meta b/Assets~/Profiles/Controllers/PicoNeo3Controller/RightPicoNeo3Controller.asset.meta similarity index 100% rename from Assets~/Profiles/InputService/PicoNeo3Controller/RightPicoNeo3Controller.asset.meta rename to Assets~/Profiles/Controllers/PicoNeo3Controller/RightPicoNeo3Controller.asset.meta diff --git a/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController.asset b/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController.asset deleted file mode 100644 index 145c8bd..0000000 --- a/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController.asset +++ /dev/null @@ -1,22 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: d420c170b42dfe0438e2aa2a829775ed, type: 3} - m_Name: PicoAllInOneHeadsetButtonsController - m_EditorClassIdentifier: - controllerType: - reference: f661ead7-06fc-422b-918c-84c711bf9b6b - handedness: 0 - visualizationProfile: {fileID: 0} - useCustomInteractions: 0 - interactionMappingProfiles: - - {fileID: 11400000, guid: 286e7a6f30821fa4e969b2d222e83e22, type: 2} - - {fileID: 11400000, guid: a572dfd3a3b00b245807bddd9e643850, type: 2} diff --git a/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController.asset.meta b/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController.asset.meta deleted file mode 100644 index 49c53d9..0000000 --- a/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4043ca69eeaaf8b42b6a5cadd62b9b7f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Menu.asset b/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Menu.asset deleted file mode 100644 index da6259f..0000000 --- a/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Menu.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: PicoAllInOneHeadsetButtonsController_Menu - m_EditorClassIdentifier: - interactionMapping: - description: Menu - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 2 - description: Menu - axisConstraint: 2 - keyCode: 0 - inputName: Menu - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Menu.asset.meta b/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Menu.asset.meta deleted file mode 100644 index b093c66..0000000 --- a/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Menu.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a572dfd3a3b00b245807bddd9e643850 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Trigger.asset b/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Trigger.asset deleted file mode 100644 index 7e698a4..0000000 --- a/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Trigger.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: PicoAllInOneHeadsetButtonsController_Trigger - m_EditorClassIdentifier: - interactionMapping: - description: Trigger - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 1 - description: Select - axisConstraint: 2 - keyCode: 0 - inputName: Trigger - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Trigger.asset.meta b/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Trigger.asset.meta deleted file mode 100644 index 7a797d6..0000000 --- a/Assets~/Profiles/InputService/PicoAllInOneHeadsetButtonsController/PicoAllInOneHeadsetButtonsController_Trigger.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 286e7a6f30821fa4e969b2d222e83e22 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController.asset b/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController.asset deleted file mode 100644 index 72d36f9..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController.asset +++ /dev/null @@ -1,27 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: d420c170b42dfe0438e2aa2a829775ed, type: 3} - m_Name: LeftPicoG24KController - m_EditorClassIdentifier: - controllerType: - reference: 07b23b0b-1be1-4ac5-942e-0fe3bc65a260 - handedness: 1 - visualizationProfile: {fileID: 11400000, guid: fe125eaaf5547684d8506b794c5a6016, - type: 2} - useCustomInteractions: 0 - interactionMappingProfiles: - - {fileID: 11400000, guid: 6b245c09c96a948499c6e03a12213ec1, type: 2} - - {fileID: 11400000, guid: cef45cf68144cb94d99652a76c9fcfcb, type: 2} - - {fileID: 11400000, guid: 1fdc26adcd9687e4a982dcb765ba7b04, type: 2} - - {fileID: 11400000, guid: 7cbd0c8f71621c540b6e2131129e96da, type: 2} - - {fileID: 11400000, guid: 5dd5894f4d84e5f4c92191213aa848db, type: 2} - - {fileID: 11400000, guid: 384ddbd5f740873489df5e2291e4c091, type: 2} diff --git a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController.asset.meta b/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController.asset.meta deleted file mode 100644 index 4809a1b..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b3de4000c219ae4419453fd99cad5c74 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Menu.asset b/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Menu.asset deleted file mode 100644 index ea0173c..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Menu.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoG24KController_Menu - m_EditorClassIdentifier: - interactionMapping: - description: Menu - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 2 - description: Menu - axisConstraint: 2 - keyCode: 0 - inputName: Menu - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Menu.asset.meta b/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Menu.asset.meta deleted file mode 100644 index 157f6dd..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Menu.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cef45cf68144cb94d99652a76c9fcfcb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_SpatialPointerPose.asset b/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_SpatialPointerPose.asset deleted file mode 100644 index d9fa5a5..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_SpatialPointerPose.asset +++ /dev/null @@ -1,32 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoG24KController_SpatialPointerPose - m_EditorClassIdentifier: - interactionMapping: - description: Spatial Pointer Pose - stateChangeType: 0 - axisType: 7 - inputType: 3 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 4 - description: Pointer Pose - axisConstraint: 7 - keyCode: 0 - inputName: Spatial Pointer Pose - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: - - {fileID: 11400000, guid: 9e0e4acc675a18b4b9c65e9ff85cfe58, type: 2} - - {fileID: 11400000, guid: d3736f91cbeeb284fb90b9d389b7fe33, type: 2} diff --git a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_SpatialPointerPose.asset.meta b/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_SpatialPointerPose.asset.meta deleted file mode 100644 index 56232aa..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_SpatialPointerPose.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6b245c09c96a948499c6e03a12213ec1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Touchpad.asset b/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Touchpad.asset deleted file mode 100644 index b027bf0..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Touchpad.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoG24KController_Touchpad - m_EditorClassIdentifier: - interactionMapping: - description: Touchpad - stateChangeType: 0 - axisType: 4 - inputType: 17 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 5 - description: Teleport Direction - axisConstraint: 4 - keyCode: 0 - inputName: Touchpad - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Touchpad.asset.meta b/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Touchpad.asset.meta deleted file mode 100644 index 6849534..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Touchpad.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5dd5894f4d84e5f4c92191213aa848db -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TouchpadPress.asset b/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TouchpadPress.asset deleted file mode 100644 index 3700658..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TouchpadPress.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoG24KController_TouchpadPress - m_EditorClassIdentifier: - interactionMapping: - description: Touchpad Press - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: Touchpad Press - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TouchpadPress.asset.meta b/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TouchpadPress.asset.meta deleted file mode 100644 index 754e626..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TouchpadPress.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 384ddbd5f740873489df5e2291e4c091 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Trigger.asset b/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Trigger.asset deleted file mode 100644 index 639b199..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Trigger.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoG24KController_Trigger - m_EditorClassIdentifier: - interactionMapping: - description: Trigger - stateChangeType: 0 - axisType: 3 - inputType: 10 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 6 - description: Trigger - axisConstraint: 3 - keyCode: 0 - inputName: Trigger - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Trigger.asset.meta b/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Trigger.asset.meta deleted file mode 100644 index 142dac4..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_Trigger.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1fdc26adcd9687e4a982dcb765ba7b04 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TriggerPress.asset b/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TriggerPress.asset deleted file mode 100644 index b34fe03..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TriggerPress.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoG24KController_TriggerPress - m_EditorClassIdentifier: - interactionMapping: - description: Trigger Press - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 1 - description: Select - axisConstraint: 2 - keyCode: 0 - inputName: Trigger Press - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TriggerPress.asset.meta b/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TriggerPress.asset.meta deleted file mode 100644 index 46d6e06..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/LeftPicoG24KController_TriggerPress.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7cbd0c8f71621c540b6e2131129e96da -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController.asset b/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController.asset deleted file mode 100644 index 86a077d..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController.asset +++ /dev/null @@ -1,27 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: d420c170b42dfe0438e2aa2a829775ed, type: 3} - m_Name: RightPicoG24KController - m_EditorClassIdentifier: - controllerType: - reference: 07b23b0b-1be1-4ac5-942e-0fe3bc65a260 - handedness: 2 - visualizationProfile: {fileID: 11400000, guid: 5ee67c77447ce88409a3e04e57806963, - type: 2} - useCustomInteractions: 0 - interactionMappingProfiles: - - {fileID: 11400000, guid: 501e2e67b3ed96c4fb1bea991a104875, type: 2} - - {fileID: 11400000, guid: ec012d348b9e7c147bd766cb67cbaf7b, type: 2} - - {fileID: 11400000, guid: e8f621edf55951249a15d381c3e30573, type: 2} - - {fileID: 11400000, guid: 386ab3e8fbd566d4b8303648a4fe5692, type: 2} - - {fileID: 11400000, guid: b44df9c60a47eea45aaa1e806a80b9f2, type: 2} - - {fileID: 11400000, guid: 603653c4368665e4c9d23ba8a36bfb11, type: 2} diff --git a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController.asset.meta b/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController.asset.meta deleted file mode 100644 index df5a6b6..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e020b02af905e3e4d9a9fda1dc24863d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Menu.asset b/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Menu.asset deleted file mode 100644 index 12349e6..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Menu.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoG24KController_Menu - m_EditorClassIdentifier: - interactionMapping: - description: Menu - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 2 - description: Menu - axisConstraint: 2 - keyCode: 0 - inputName: Menu - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Menu.asset.meta b/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Menu.asset.meta deleted file mode 100644 index abd7385..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Menu.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ec012d348b9e7c147bd766cb67cbaf7b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_SpatialPointerPose.asset b/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_SpatialPointerPose.asset deleted file mode 100644 index 7ee17bb..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_SpatialPointerPose.asset +++ /dev/null @@ -1,32 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoG24KController_SpatialPointerPose - m_EditorClassIdentifier: - interactionMapping: - description: Spatial Pointer Pose - stateChangeType: 0 - axisType: 7 - inputType: 3 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 4 - description: Pointer Pose - axisConstraint: 7 - keyCode: 0 - inputName: Spatial Pointer Pose - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: - - {fileID: 11400000, guid: 9e0e4acc675a18b4b9c65e9ff85cfe58, type: 2} - - {fileID: 11400000, guid: d3736f91cbeeb284fb90b9d389b7fe33, type: 2} diff --git a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_SpatialPointerPose.asset.meta b/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_SpatialPointerPose.asset.meta deleted file mode 100644 index c313b73..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_SpatialPointerPose.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 501e2e67b3ed96c4fb1bea991a104875 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Touchpad.asset b/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Touchpad.asset deleted file mode 100644 index fc7148d..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Touchpad.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoG24KController_Touchpad - m_EditorClassIdentifier: - interactionMapping: - description: Touchpad - stateChangeType: 0 - axisType: 4 - inputType: 17 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 5 - description: Teleport Direction - axisConstraint: 4 - keyCode: 0 - inputName: Touchpad - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Touchpad.asset.meta b/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Touchpad.asset.meta deleted file mode 100644 index 132eefe..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Touchpad.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b44df9c60a47eea45aaa1e806a80b9f2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TouchpadPress.asset b/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TouchpadPress.asset deleted file mode 100644 index c3070a8..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TouchpadPress.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoG24KController_TouchpadPress - m_EditorClassIdentifier: - interactionMapping: - description: Touchpad Press - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: Touchpad Press - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TouchpadPress.asset.meta b/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TouchpadPress.asset.meta deleted file mode 100644 index 2aafc2b..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TouchpadPress.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 603653c4368665e4c9d23ba8a36bfb11 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Trigger.asset b/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Trigger.asset deleted file mode 100644 index beae759..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Trigger.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoG24KController_Trigger - m_EditorClassIdentifier: - interactionMapping: - description: Trigger - stateChangeType: 0 - axisType: 3 - inputType: 10 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 6 - description: Trigger - axisConstraint: 3 - keyCode: 0 - inputName: Trigger - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Trigger.asset.meta b/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Trigger.asset.meta deleted file mode 100644 index dc76662..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_Trigger.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e8f621edf55951249a15d381c3e30573 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TriggerPress.asset b/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TriggerPress.asset deleted file mode 100644 index 04e127c..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TriggerPress.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoG24KController_TriggerPress - m_EditorClassIdentifier: - interactionMapping: - description: Trigger Press - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 1 - description: Select - axisConstraint: 2 - keyCode: 0 - inputName: Trigger Press - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TriggerPress.asset.meta b/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TriggerPress.asset.meta deleted file mode 100644 index df0f9a3..0000000 --- a/Assets~/Profiles/InputService/PicoG24KController/RightPicoG24KController_TriggerPress.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 386ab3e8fbd566d4b8303648a4fe5692 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller.asset deleted file mode 100644 index e7a9bbc..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller.asset +++ /dev/null @@ -1,31 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: d420c170b42dfe0438e2aa2a829775ed, type: 3} - m_Name: LeftPicoNeo2Controller - m_EditorClassIdentifier: - controllerType: - reference: 5402e1d6-466e-438e-8667-0ab654eb8780 - handedness: 1 - visualizationProfile: {fileID: 11400000, guid: fe125eaaf5547684d8506b794c5a6016, - type: 2} - useCustomInteractions: 0 - interactionMappingProfiles: - - {fileID: 11400000, guid: cd4a36ddd192f544d83a75a9cacd254e, type: 2} - - {fileID: 11400000, guid: 8d829d41ef56d284c8fea26d450eb0e4, type: 2} - - {fileID: 11400000, guid: f69b0a69c406601449b9b58a3582988f, type: 2} - - {fileID: 11400000, guid: 55f0598b19837c748b2aacb85f66dcac, type: 2} - - {fileID: 11400000, guid: 60e6b89c0a3afb9408bf0901ce67c9a4, type: 2} - - {fileID: 11400000, guid: e5ed509547b99264c8149918274d8ad9, type: 2} - - {fileID: 11400000, guid: bafffdec7d909b046a54f58fc1cb9664, type: 2} - - {fileID: 11400000, guid: efbcb464a6249e94f8d579041cf8b669, type: 2} - - {fileID: 11400000, guid: ca2f9f1342581b74c8d7fb82c64128f9, type: 2} - - {fileID: 11400000, guid: f72b795de0cf0a942935bf509e2b2023, type: 2} diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller.asset.meta deleted file mode 100644 index bb733b0..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e80f840176f296a49af66d1740fee240 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Grip.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Grip.asset deleted file mode 100644 index 75396a7..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Grip.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoNeo2Controller_Grip - m_EditorClassIdentifier: - interactionMapping: - description: Grip - stateChangeType: 0 - axisType: 3 - inputType: 10 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 7 - description: Grip Strength - axisConstraint: 3 - keyCode: 0 - inputName: Grip - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Grip.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Grip.asset.meta deleted file mode 100644 index 3449c37..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Grip.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 60e6b89c0a3afb9408bf0901ce67c9a4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_GripPress.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_GripPress.asset deleted file mode 100644 index 3085e59..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_GripPress.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoNeo2Controller_GripPress - m_EditorClassIdentifier: - interactionMapping: - description: Grip Press - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 16 - description: Grip Press - axisConstraint: 2 - keyCode: 0 - inputName: Grip Press - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_GripPress.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_GripPress.asset.meta deleted file mode 100644 index d36fdd1..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_GripPress.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e5ed509547b99264c8149918274d8ad9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Menu.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Menu.asset deleted file mode 100644 index ae43acb..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Menu.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoNeo2Controller_Menu - m_EditorClassIdentifier: - interactionMapping: - description: Menu - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 2 - description: Menu - axisConstraint: 2 - keyCode: 0 - inputName: Menu - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Menu.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Menu.asset.meta deleted file mode 100644 index 8da3990..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Menu.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8d829d41ef56d284c8fea26d450eb0e4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_SpatialPointerPose.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_SpatialPointerPose.asset deleted file mode 100644 index b998071..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_SpatialPointerPose.asset +++ /dev/null @@ -1,32 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoNeo2Controller_SpatialPointerPose - m_EditorClassIdentifier: - interactionMapping: - description: Spatial Pointer Pose - stateChangeType: 0 - axisType: 7 - inputType: 3 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 4 - description: Pointer Pose - axisConstraint: 7 - keyCode: 0 - inputName: Spatial Pointer Pose - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: - - {fileID: 11400000, guid: 9e0e4acc675a18b4b9c65e9ff85cfe58, type: 2} - - {fileID: 11400000, guid: d3736f91cbeeb284fb90b9d389b7fe33, type: 2} diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_SpatialPointerPose.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_SpatialPointerPose.asset.meta deleted file mode 100644 index 76d1bb8..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_SpatialPointerPose.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cd4a36ddd192f544d83a75a9cacd254e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Thumbstick.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Thumbstick.asset deleted file mode 100644 index c4d43de..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Thumbstick.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoNeo2Controller_Thumbstick - m_EditorClassIdentifier: - interactionMapping: - description: Thumbstick - stateChangeType: 0 - axisType: 4 - inputType: 17 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 5 - description: Teleport Direction - axisConstraint: 4 - keyCode: 0 - inputName: Thumbstick - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Thumbstick.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Thumbstick.asset.meta deleted file mode 100644 index 9b298e7..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Thumbstick.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ca2f9f1342581b74c8d7fb82c64128f9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_ThumbstickPress.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_ThumbstickPress.asset deleted file mode 100644 index 6bebaca..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_ThumbstickPress.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoNeo2Controller_ThumbstickPress - m_EditorClassIdentifier: - interactionMapping: - description: Thumbstick Press - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: Thumbstick Press - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_ThumbstickPress.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_ThumbstickPress.asset.meta deleted file mode 100644 index 474e28e..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_ThumbstickPress.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f72b795de0cf0a942935bf509e2b2023 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Trigger.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Trigger.asset deleted file mode 100644 index 15d9d31..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Trigger.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoNeo2Controller_Trigger - m_EditorClassIdentifier: - interactionMapping: - description: Trigger - stateChangeType: 0 - axisType: 3 - inputType: 10 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 6 - description: Trigger - axisConstraint: 3 - keyCode: 0 - inputName: Trigger - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Trigger.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Trigger.asset.meta deleted file mode 100644 index 83e6a2f..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Trigger.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f69b0a69c406601449b9b58a3582988f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_TriggerPress.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_TriggerPress.asset deleted file mode 100644 index 19414f9..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_TriggerPress.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoNeo2Controller_TriggerPress - m_EditorClassIdentifier: - interactionMapping: - description: Trigger Press - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 1 - description: Select - axisConstraint: 2 - keyCode: 0 - inputName: Trigger Press - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_TriggerPress.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_TriggerPress.asset.meta deleted file mode 100644 index 55dc521..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_TriggerPress.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 55f0598b19837c748b2aacb85f66dcac -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_X.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_X.asset deleted file mode 100644 index 0649ae6..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_X.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoNeo2Controller_X - m_EditorClassIdentifier: - interactionMapping: - description: X - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: X - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_X.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_X.asset.meta deleted file mode 100644 index 2d4687c..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_X.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bafffdec7d909b046a54f58fc1cb9664 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Y.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Y.asset deleted file mode 100644 index 8676533..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Y.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: LeftPicoNeo2Controller_Y - m_EditorClassIdentifier: - interactionMapping: - description: Y - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: Y - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Y.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Y.asset.meta deleted file mode 100644 index 4a02665..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/LeftPicoNeo2Controller_Y.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: efbcb464a6249e94f8d579041cf8b669 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller.asset deleted file mode 100644 index 2369aa8..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller.asset +++ /dev/null @@ -1,31 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: d420c170b42dfe0438e2aa2a829775ed, type: 3} - m_Name: RightPicoNeo2Controller - m_EditorClassIdentifier: - controllerType: - reference: 5402e1d6-466e-438e-8667-0ab654eb8780 - handedness: 2 - visualizationProfile: {fileID: 11400000, guid: 5ee67c77447ce88409a3e04e57806963, - type: 2} - useCustomInteractions: 0 - interactionMappingProfiles: - - {fileID: 11400000, guid: a100700f9775a1742ae120e7b9c79c42, type: 2} - - {fileID: 11400000, guid: 7986e4b79b22fa04caa975610d192d55, type: 2} - - {fileID: 11400000, guid: 02e7c925e18bc7241847645919babb79, type: 2} - - {fileID: 11400000, guid: 7b671c372c062304582b70c89ad9aff4, type: 2} - - {fileID: 11400000, guid: 6c22da7990d07914bad3403c3bce77fe, type: 2} - - {fileID: 11400000, guid: cf378592126f8f14db141386991867e6, type: 2} - - {fileID: 11400000, guid: 7cd6a80bd579fc644b1511d0468b1e50, type: 2} - - {fileID: 11400000, guid: f8466eb5284d0cb48a6d85d58b52eb42, type: 2} - - {fileID: 11400000, guid: 3b0510687b529c740980310aa7708965, type: 2} - - {fileID: 11400000, guid: e76a2fe0e4fd5c14fba18d79638b87c5, type: 2} diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller.asset.meta deleted file mode 100644 index 5460a13..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1204423f058281348be1c320ab00af96 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Grip.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Grip.asset deleted file mode 100644 index 6bc7e37..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Grip.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoNeo2Controller_Grip - m_EditorClassIdentifier: - interactionMapping: - description: Grip - stateChangeType: 0 - axisType: 3 - inputType: 10 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 7 - description: Grip Strength - axisConstraint: 3 - keyCode: 0 - inputName: Grip - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Grip.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Grip.asset.meta deleted file mode 100644 index 80d5824..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Grip.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6c22da7990d07914bad3403c3bce77fe -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_GripPress.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_GripPress.asset deleted file mode 100644 index 0a850df..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_GripPress.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoNeo2Controller_GripPress - m_EditorClassIdentifier: - interactionMapping: - description: Grip Press - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 16 - description: Grip Press - axisConstraint: 2 - keyCode: 0 - inputName: Grip Press - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_GripPress.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_GripPress.asset.meta deleted file mode 100644 index a8df6d8..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_GripPress.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cf378592126f8f14db141386991867e6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Menu.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Menu.asset deleted file mode 100644 index 5b98fe6..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Menu.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoNeo2Controller_Menu - m_EditorClassIdentifier: - interactionMapping: - description: Menu - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 2 - description: Menu - axisConstraint: 2 - keyCode: 0 - inputName: Menu - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Menu.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Menu.asset.meta deleted file mode 100644 index 797f094..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Menu.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7986e4b79b22fa04caa975610d192d55 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_SpatialPointerPose.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_SpatialPointerPose.asset deleted file mode 100644 index ce8b2d1..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_SpatialPointerPose.asset +++ /dev/null @@ -1,32 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoNeo2Controller_SpatialPointerPose - m_EditorClassIdentifier: - interactionMapping: - description: Spatial Pointer Pose - stateChangeType: 0 - axisType: 7 - inputType: 3 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 4 - description: Pointer Pose - axisConstraint: 7 - keyCode: 0 - inputName: Spatial Pointer Pose - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: - - {fileID: 11400000, guid: 9e0e4acc675a18b4b9c65e9ff85cfe58, type: 2} - - {fileID: 11400000, guid: d3736f91cbeeb284fb90b9d389b7fe33, type: 2} diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_SpatialPointerPose.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_SpatialPointerPose.asset.meta deleted file mode 100644 index 907cd91..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_SpatialPointerPose.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a100700f9775a1742ae120e7b9c79c42 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Thumbstick.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Thumbstick.asset deleted file mode 100644 index 7c1aa68..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Thumbstick.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoNeo2Controller_Thumbstick - m_EditorClassIdentifier: - interactionMapping: - description: Thumbstick - stateChangeType: 0 - axisType: 4 - inputType: 17 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 5 - description: Teleport Direction - axisConstraint: 4 - keyCode: 0 - inputName: Thumbstick - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Thumbstick.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Thumbstick.asset.meta deleted file mode 100644 index ff63b9a..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Thumbstick.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3b0510687b529c740980310aa7708965 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_ThumbstickPress.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_ThumbstickPress.asset deleted file mode 100644 index f851a4b..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_ThumbstickPress.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoNeo2Controller_ThumbstickPress - m_EditorClassIdentifier: - interactionMapping: - description: Thumbstick Press - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: Thumbstick Press - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_ThumbstickPress.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_ThumbstickPress.asset.meta deleted file mode 100644 index 91623d2..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_ThumbstickPress.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e76a2fe0e4fd5c14fba18d79638b87c5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Trigger.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Trigger.asset deleted file mode 100644 index 0e54293..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Trigger.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoNeo2Controller_Trigger - m_EditorClassIdentifier: - interactionMapping: - description: Trigger - stateChangeType: 0 - axisType: 3 - inputType: 10 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 6 - description: Trigger - axisConstraint: 3 - keyCode: 0 - inputName: Trigger - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Trigger.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Trigger.asset.meta deleted file mode 100644 index 86fccb3..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Trigger.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 02e7c925e18bc7241847645919babb79 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_TriggerPress.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_TriggerPress.asset deleted file mode 100644 index 21cbec6..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_TriggerPress.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoNeo2Controller_TriggerPress - m_EditorClassIdentifier: - interactionMapping: - description: Trigger Press - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 1 - description: Select - axisConstraint: 2 - keyCode: 0 - inputName: Trigger Press - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_TriggerPress.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_TriggerPress.asset.meta deleted file mode 100644 index adfdc08..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_TriggerPress.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7b671c372c062304582b70c89ad9aff4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_X.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_X.asset deleted file mode 100644 index 2b528a7..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_X.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoNeo2Controller_X - m_EditorClassIdentifier: - interactionMapping: - description: X - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: X - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_X.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_X.asset.meta deleted file mode 100644 index 2917f2a..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_X.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7cd6a80bd579fc644b1511d0468b1e50 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Y.asset b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Y.asset deleted file mode 100644 index a50db69..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Y.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RightPicoNeo2Controller_Y - m_EditorClassIdentifier: - interactionMapping: - description: Y - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: Y - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Y.asset.meta b/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Y.asset.meta deleted file mode 100644 index 488abb2..0000000 --- a/Assets~/Profiles/InputService/PicoNeo2Controller/RightPicoNeo2Controller_Y.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f8466eb5284d0cb48a6d85d58b52eb42 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets~/Profiles/PicoPackageInstallerProfile.asset b/Assets~/Profiles/PicoPackageInstallerProfile.asset index 852754a..7e6f785 100644 --- a/Assets~/Profiles/PicoPackageInstallerProfile.asset +++ b/Assets~/Profiles/PicoPackageInstallerProfile.asset @@ -18,7 +18,7 @@ MonoBehaviour: configurations: - instancedType: reference: 01f7685f-40a4-49c1-b0cf-8d17dee1fb2b - name: Pico Camera Rig Service Module + name: Pico Player Rig Service Module priority: 0 profile: {fileID: 11400000, guid: 180d48ab9a306fa4f8fccb465ad411fa, type: 2} platformEntries: diff --git a/Assets~/Profiles/CameraService.meta b/Assets~/Profiles/PlayerService.meta similarity index 100% rename from Assets~/Profiles/CameraService.meta rename to Assets~/Profiles/PlayerService.meta diff --git a/Assets~/Profiles/CameraService/PicoCameraRigServiceModuleProfile.asset b/Assets~/Profiles/PlayerService/PicoPlayerRigServiceModuleProfile.asset similarity index 95% rename from Assets~/Profiles/CameraService/PicoCameraRigServiceModuleProfile.asset rename to Assets~/Profiles/PlayerService/PicoPlayerRigServiceModuleProfile.asset index 328032d..b6ffefb 100644 --- a/Assets~/Profiles/CameraService/PicoCameraRigServiceModuleProfile.asset +++ b/Assets~/Profiles/PlayerService/PicoPlayerRigServiceModuleProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7c20470ea673cf24a9554396ef332710, type: 3} - m_Name: PicoCameraRigServiceModuleProfile + m_Name: PicoPlayerRigServiceModuleProfile m_EditorClassIdentifier: trackingType: 1 trackingOriginMode: 2 diff --git a/Assets~/Profiles/CameraService/PicoCameraRigServiceModuleProfile.asset.meta b/Assets~/Profiles/PlayerService/PicoPlayerRigServiceModuleProfile.asset.meta similarity index 100% rename from Assets~/Profiles/CameraService/PicoCameraRigServiceModuleProfile.asset.meta rename to Assets~/Profiles/PlayerService/PicoPlayerRigServiceModuleProfile.asset.meta diff --git a/Assets~/StandardAssets/Controllers.meta b/Assets~/StandardAssets/Controllers.meta new file mode 100644 index 0000000..7ed47cf --- /dev/null +++ b/Assets~/StandardAssets/Controllers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 68b4f82855635474bbe76a0bf72fabf9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets~/StandardAssets/Controllers/PicoController_Left.prefab b/Assets~/StandardAssets/Controllers/PicoController_Left.prefab new file mode 100644 index 0000000..e61b365 --- /dev/null +++ b/Assets~/StandardAssets/Controllers/PicoController_Left.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8420265037568605346 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5907946963975545220} + - component: {fileID: 4524685670349425333} + - component: {fileID: 2890383340010870617} + m_Layer: 0 + m_Name: PicoController_Left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5907946963975545220 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8420265037568605346} + 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!114 &4524685670349425333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8420265037568605346} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1ba2bcdb414e3b47aca41fdc1a87e64, type: 3} + m_Name: + m_EditorClassIdentifier: + hand: 0 + neo3L: {fileID: 7118676274473289238, guid: 4ff92632f801a7444958bb72ef6aee53, type: 3} + neo3R: {fileID: 8449525692238721171, guid: d22bd72bebc3950409d2de288cdcabd2, type: 3} + PICO_4L: {fileID: 3222469904833361626, guid: 853840c5196b2486a97e1785f3a68575, type: 3} + PICO_4R: {fileID: 1704171135803129665, guid: 3a5f20f82a5224d7d969e99da633fc69, type: 3} + G3: {fileID: 3592357975929350142, guid: 4632f3d33fc5ea94e8a7673306cbb3e2, type: 3} + legacyMaterial: {fileID: 2100000, guid: ea5d1bb890cef78439598b7062576fa3, type: 2} + controllerSimulation: 0 +--- !u!114 &2890383340010870617 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8420265037568605346} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 935763c130f7e614099774c8b2eb16d0, type: 3} + m_Name: + m_EditorClassIdentifier: + handedness: 1 + destroyOnSourceLost: 1 + useSourcePoseData: 1 + poseAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + pokePose: {fileID: 0} + gripPose: {fileID: 0} diff --git a/Assets~/StandardAssets/RESERVED_FOR_FUTURE_USE.txt.meta b/Assets~/StandardAssets/Controllers/PicoController_Left.prefab.meta similarity index 62% rename from Assets~/StandardAssets/RESERVED_FOR_FUTURE_USE.txt.meta rename to Assets~/StandardAssets/Controllers/PicoController_Left.prefab.meta index f15f0c2..97dbe66 100644 --- a/Assets~/StandardAssets/RESERVED_FOR_FUTURE_USE.txt.meta +++ b/Assets~/StandardAssets/Controllers/PicoController_Left.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 3176a27d95068464e88015ae75896cfa -TextScriptImporter: +guid: da54ec7ad266fde45b825accb4a69b21 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets~/StandardAssets/Controllers/PicoController_Right.prefab b/Assets~/StandardAssets/Controllers/PicoController_Right.prefab new file mode 100644 index 0000000..8303771 --- /dev/null +++ b/Assets~/StandardAssets/Controllers/PicoController_Right.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7509628536513958878 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1491361978168828495} + - component: {fileID: 551019631008867320} + - component: {fileID: 5627968163871842084} + m_Layer: 0 + m_Name: PicoController_Right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1491361978168828495 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7509628536513958878} + 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!114 &551019631008867320 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7509628536513958878} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1ba2bcdb414e3b47aca41fdc1a87e64, type: 3} + m_Name: + m_EditorClassIdentifier: + hand: 0 + neo3L: {fileID: 7118676274473289238, guid: 4ff92632f801a7444958bb72ef6aee53, type: 3} + neo3R: {fileID: 8449525692238721171, guid: d22bd72bebc3950409d2de288cdcabd2, type: 3} + PICO_4L: {fileID: 3222469904833361626, guid: 853840c5196b2486a97e1785f3a68575, type: 3} + PICO_4R: {fileID: 1704171135803129665, guid: 3a5f20f82a5224d7d969e99da633fc69, type: 3} + G3: {fileID: 3592357975929350142, guid: 4632f3d33fc5ea94e8a7673306cbb3e2, type: 3} + legacyMaterial: {fileID: 2100000, guid: ea5d1bb890cef78439598b7062576fa3, type: 2} + controllerSimulation: 0 +--- !u!114 &5627968163871842084 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7509628536513958878} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 935763c130f7e614099774c8b2eb16d0, type: 3} + m_Name: + m_EditorClassIdentifier: + handedness: 1 + destroyOnSourceLost: 1 + useSourcePoseData: 1 + poseAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + pokePose: {fileID: 0} + gripPose: {fileID: 0} diff --git a/Assets~/StandardAssets/Controllers/PicoController_Right.prefab.meta b/Assets~/StandardAssets/Controllers/PicoController_Right.prefab.meta new file mode 100644 index 0000000..560ead4 --- /dev/null +++ b/Assets~/StandardAssets/Controllers/PicoController_Right.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 739e9a4a6099526418e8b197fa0f4040 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets~/StandardAssets/RESERVED_FOR_FUTURE_USE.txt b/Assets~/StandardAssets/RESERVED_FOR_FUTURE_USE.txt deleted file mode 100644 index e69de29..0000000 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d013ff..8d31a50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,3 @@ # Changelog -All notable changes to this project will be documented in this file. - -The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), -and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +Please refer to the package's [Releases GitHub Page](https://github.com/realitycollective/com.realitytoolkit.pico/releases) for the changelog. \ No newline at end of file diff --git a/Editor/PicoPackageInstaller.cs b/Editor/PicoPackageInstaller.cs index 769abd4..37149c8 100644 --- a/Editor/PicoPackageInstaller.cs +++ b/Editor/PicoPackageInstaller.cs @@ -14,21 +14,21 @@ namespace RealityToolkit.Pico.Editor [InitializeOnLoad] internal static class PicoPackageInstaller { - private static readonly string destinationPath = $"{MixedRealityPreferences.ProfileGenerationPath}Pico"; - private static readonly string sourcePath = Path.GetFullPath($"{PathFinderUtility.ResolvePath(typeof(PicoPackagePathFinder)).ForwardSlashes()}{Path.DirectorySeparatorChar}{MixedRealityPreferences.HIDDEN_PACKAGE_ASSETS_PATH}"); + private static readonly string destinationPath = $"{RealityToolkitPreferences.ProfileGenerationPath}Pico"; + private static readonly string sourcePath = Path.GetFullPath($"{PathFinderUtility.ResolvePath(typeof(PicoPackagePathFinder)).ForwardSlashes()}{Path.DirectorySeparatorChar}{RealityToolkitPreferences.HIDDEN_PACKAGE_ASSETS_PATH}"); static PicoPackageInstaller() { EditorApplication.delayCall += CheckPackage; } - [MenuItem(MixedRealityPreferences.Editor_Menu_Keyword + "/Packages/Install Pico Package Assets...", true)] + [MenuItem(RealityToolkitPreferences.Editor_Menu_Keyword + "/Packages/Install Pico Package Assets...", true)] private static bool ImportPackageAssetsValidation() { return !Directory.Exists($"{destinationPath}{Path.DirectorySeparatorChar}"); } - [MenuItem(MixedRealityPreferences.Editor_Menu_Keyword + "/Packages/Install Pico Package Assets...")] + [MenuItem(RealityToolkitPreferences.Editor_Menu_Keyword + "/Packages/Install Pico Package Assets...")] private static void ImportPackageAssets() { EditorPreferences.Set($"{nameof(PicoPackageInstaller)}.Assets", false); diff --git a/LICENSE.md b/LICENSE.md index 7578f20..55596fe 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 Reality Collective +Copyright (c) 2022-2024 Reality Collective Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index f0bafff..da96c97 100644 --- a/README.md +++ b/README.md @@ -1,48 +1,36 @@ # Reality Toolkit - PICO -![GitHub](https://user-images.githubusercontent.com/9565734/198220057-d90bcfc5-9b5e-43e4-a9a6-c5ac3ba946a5.png) +![com.realitytoolkit.pico](https://github.com/realitycollective/realitycollective.logo/blob/main/RealityToolkit/RepoBanners/com.realitytoolkit.pico.png?raw=true) -The [PICO](https://www.picoxr.com/) platform components for the [Reality Toolkit](https://github.com/realitycollective/com.realitytoolkit.core). -This package enables your Reality Toolkit based project to run on PICO devices. +The PICO platform components for the Reality Toolkit. This package enables your [Reality Toolkit](https://www.realitytoolkit.io/) based project to run on PICO devices. -[![openupm](https://img.shields.io/npm/v/com.realitytoolkit.pico?label=openupm®istry_uri=https://package.openupm.com)](https://openupm.com/packages/com.realitytoolkit.pico/) -[![Discord](https://img.shields.io/discord/597064584980987924.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/hF7TtRCFmB) +[![openupm](https://img.shields.io/npm/v/com.realitytoolkit.pico?label=openupm®istry_uri=https://package.openupm.com)](https://openupm.com/packages/com.realitytoolkit.pico/) [![Discord](https://img.shields.io/discord/597064584980987924.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/hF7TtRCFmB) [![Publish main branch and increment version](https://github.com/realitycollective/com.realitytoolkit.pico/actions/workflows/main-publish.yml/badge.svg)](https://github.com/realitycollective/com.realitytoolkit.pico/actions/workflows/main-publish.yml) [![Publish development branch on Merge](https://github.com/realitycollective/com.realitytoolkit.pico/actions/workflows/development-publish.yml/badge.svg)](https://github.com/realitycollective/com.realitytoolkit.pico/actions/workflows/development-publish.yml) [![Build and test UPM packages for platforms, all branches except main](https://github.com/realitycollective/com.realitytoolkit.pico/actions/workflows/development-buildandtestupmrelease.yml/badge.svg)](https://github.com/realitycollective/com.realitytoolkit.pico/actions/workflows/development-buildandtestupmrelease.yml) -## What is included? +## Installation -- Service modules for the Reality Toolkit's Camera Service -- Service modules for the Reality Toolkit's Input Service +Make sure to always use the same source for all toolkit modules. Avoid using different installation sources within the same project. We provide the following ways to install Reality Toolkit modules: -## Supported Devices +### Method 1: Using Package Manager for git users -- PICO G24K* -- PICO Neo 2* -- PICO Neo 3 Pro -- PICO Neo 3 Link -- PICO Neo 3 Pro Eye -- PICO 4 -- PICO 4 Pro -- PICO 4 Enterprise +1. Open the Package Manager using the Window menu -> Package Manager -*Requires the legacy v1 Pico integration SDK package as a dependency +2. Inside the Package Manager, click on the "+" button on the top left and select "Add package from git URL..." -## Requirements +3. Input the following URL: https://github.com/realitycollective/com.realitytoolkit.pico.git and click "Add". -- [RealityToolkit.Core](https://github.com/realitycollective/com.realitytoolkit.core) -- [RealityToolkit.Camera](https://github.com/realitycollective/com.realitytoolkit.camera) -- [Unity 2020.3 and above](https://unity.com/) -- [PICO Unity Integration SDK](https://developer-global.pico-interactive.com/sdk?deviceId=1&platformId=1&itemId=12) -- [OpenUPM](https://openupm.com/docs/) - -## Getting Started - -Import the [PICO Unity Integration SDK](https://developer-global.pico-interactive.com/sdk?deviceId=1&platformId=1&itemId=12) to your project and then install the PICO module for the toolkit using: +### Method 2: OpenUPM ```text openupm add com.realitytoolkit.pico ``` -If you already have an instance of the Reality Toolkit in your scene, then installing this package will automatically add the PICO modules to your configuration profile. +### Method 3: Unity Asset Store + +This option will be available soon. + +## Getting Started + +Check the ["Getting Started"](https://www.realitytoolkit.io/) documentation for the Reality Toolkit and to learn more about this module. \ No newline at end of file diff --git a/Runtime/CameraService/Profiles/PicoCameraRigServiceModuleProfile.cs b/Runtime/CameraService/Profiles/PicoCameraRigServiceModuleProfile.cs deleted file mode 100644 index dfbd9b8..0000000 --- a/Runtime/CameraService/Profiles/PicoCameraRigServiceModuleProfile.cs +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) Reality Collective. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using RealityToolkit.CameraService.Definitions; -using Unity.XR.PXR; -using UnityEngine; - -namespace RealityToolkit.Pico.CameraService.Profiles -{ - /// - /// Configuration profile for . - /// - public class PicoCameraRigServiceModuleProfile : BaseCameraServiceModuleProfile - { - [SerializeField] - [Tooltip("The rendering foveation level to use.")] - private FoveationLevel foveationLevel = FoveationLevel.None; - - /// - /// The rendering foveation level to use. - /// - public FoveationLevel FoveationLevel => foveationLevel; - } -} diff --git a/Runtime/InputService.meta b/Runtime/Input.meta similarity index 100% rename from Runtime/InputService.meta rename to Runtime/Input.meta diff --git a/Runtime/Input/Controllers.meta b/Runtime/Input/Controllers.meta new file mode 100644 index 0000000..a1d5d10 --- /dev/null +++ b/Runtime/Input/Controllers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 032b47b826be95c47b495c4b43046a96 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Input/Controllers/IPicoControllerServiceModule.cs b/Runtime/Input/Controllers/IPicoControllerServiceModule.cs new file mode 100644 index 0000000..4cd6930 --- /dev/null +++ b/Runtime/Input/Controllers/IPicoControllerServiceModule.cs @@ -0,0 +1,12 @@ +// Copyright (c) Reality Collective. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using RealityToolkit.Input.Interfaces.Modules; + +namespace RealityToolkit.Pico.Input.Controllers +{ + /// + /// Fully qualifies the specific implementation of . + /// + public interface IPicoControllerServiceModule : IControllerServiceModule { } +} diff --git a/Runtime/InputService/IPicoControllerServiceModule.cs.meta b/Runtime/Input/Controllers/IPicoControllerServiceModule.cs.meta similarity index 100% rename from Runtime/InputService/IPicoControllerServiceModule.cs.meta rename to Runtime/Input/Controllers/IPicoControllerServiceModule.cs.meta diff --git a/Runtime/InputService/Pico4Controller.cs b/Runtime/Input/Controllers/Pico4Controller.cs similarity index 59% rename from Runtime/InputService/Pico4Controller.cs rename to Runtime/Input/Controllers/Pico4Controller.cs index f114c05..9b45462 100644 --- a/Runtime/InputService/Pico4Controller.cs +++ b/Runtime/Input/Controllers/Pico4Controller.cs @@ -4,12 +4,12 @@ using RealityCollective.Definitions.Utilities; using RealityToolkit.Definitions.Controllers; using RealityToolkit.Definitions.Devices; -using RealityToolkit.InputSystem.Interfaces.Modules; +using RealityToolkit.Input.Interfaces.Modules; using System.Collections.Generic; using UnityEngine; using UnityEngine.XR; -namespace RealityToolkit.Pico.InputService +namespace RealityToolkit.Pico.Input.Controllers { [System.Runtime.InteropServices.Guid("7cd3ce74-425f-40b2-944a-7d575da7ec74")] public class Pico4Controller : PicoController @@ -18,7 +18,7 @@ public class Pico4Controller : PicoController public Pico4Controller() { } /// - public Pico4Controller(IMixedRealityControllerServiceModule controllerServiceModule, TrackingState trackingState, Handedness controllerHandedness, MixedRealityControllerMappingProfile controllerMappingProfile) + public Pico4Controller(IControllerServiceModule controllerServiceModule, TrackingState trackingState, Handedness controllerHandedness, ControllerProfile controllerMappingProfile) : base(controllerServiceModule, trackingState, controllerHandedness, controllerMappingProfile) { } private const string menuButtonInputName = "Menu"; @@ -33,18 +33,18 @@ public Pico4Controller(IMixedRealityControllerServiceModule controllerServiceMod private const string yBButtonInputName = "Y/B"; /// - public override MixedRealityInteractionMapping[] DefaultInteractions => new[] + public override InteractionMapping[] DefaultInteractions => new[] { - new MixedRealityInteractionMapping(spatialPointerPoseInputName, AxisType.SixDof, spatialPointerPoseInputName, DeviceInputType.SpatialPointer), - new MixedRealityInteractionMapping(menuButtonInputName, AxisType.Digital, menuButtonInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(triggerInputName, AxisType.SingleAxis, triggerInputName, DeviceInputType.Trigger), - new MixedRealityInteractionMapping(triggerPressInputName, AxisType.Digital, triggerPressInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(gripInputName, AxisType.SingleAxis, gripInputName, DeviceInputType.Trigger), - new MixedRealityInteractionMapping(gripPressInputName, AxisType.Digital, gripPressInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(xAButtonInputName, AxisType.Digital, xAButtonInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(yBButtonInputName, AxisType.Digital, yBButtonInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(thumbstickInputName, AxisType.DualAxis, thumbstickInputName, DeviceInputType.ThumbStick), - new MixedRealityInteractionMapping(thumbstickPressInputName, AxisType.Digital, thumbstickPressInputName, DeviceInputType.ButtonPress) + new InteractionMapping(spatialPointerPoseInputName, AxisType.SixDof, spatialPointerPoseInputName, DeviceInputType.SpatialPointer), + new InteractionMapping(menuButtonInputName, AxisType.Digital, menuButtonInputName, DeviceInputType.ButtonPress), + new InteractionMapping(triggerInputName, AxisType.SingleAxis, triggerInputName, DeviceInputType.Trigger), + new InteractionMapping(triggerPressInputName, AxisType.Digital, triggerPressInputName, DeviceInputType.ButtonPress), + new InteractionMapping(gripInputName, AxisType.SingleAxis, gripInputName, DeviceInputType.Trigger), + new InteractionMapping(gripPressInputName, AxisType.Digital, gripPressInputName, DeviceInputType.ButtonPress), + new InteractionMapping(xAButtonInputName, AxisType.Digital, xAButtonInputName, DeviceInputType.ButtonPress), + new InteractionMapping(yBButtonInputName, AxisType.Digital, yBButtonInputName, DeviceInputType.ButtonPress), + new InteractionMapping(thumbstickInputName, AxisType.DualAxis, thumbstickInputName, DeviceInputType.ThumbStick), + new InteractionMapping(thumbstickPressInputName, AxisType.Digital, thumbstickPressInputName, DeviceInputType.ButtonPress) }; /// diff --git a/Runtime/InputService/Pico4Controller.cs.meta b/Runtime/Input/Controllers/Pico4Controller.cs.meta similarity index 100% rename from Runtime/InputService/Pico4Controller.cs.meta rename to Runtime/Input/Controllers/Pico4Controller.cs.meta diff --git a/Runtime/InputService/PicoController.cs b/Runtime/Input/Controllers/PicoController.cs similarity index 87% rename from Runtime/InputService/PicoController.cs rename to Runtime/Input/Controllers/PicoController.cs index e51296a..a5208df 100644 --- a/Runtime/InputService/PicoController.cs +++ b/Runtime/Input/Controllers/PicoController.cs @@ -4,14 +4,14 @@ using RealityCollective.Definitions.Utilities; using RealityToolkit.Definitions.Controllers; using RealityToolkit.Definitions.Devices; -using RealityToolkit.InputSystem.Controllers; -using RealityToolkit.InputSystem.Extensions; -using RealityToolkit.InputSystem.Interfaces.Modules; +using RealityToolkit.Input.Controllers; +using RealityToolkit.Input.Extensions; +using RealityToolkit.Input.Interfaces.Modules; using System.Collections.Generic; using UnityEngine; using UnityEngine.XR; -namespace RealityToolkit.Pico.InputService +namespace RealityToolkit.Pico.Input.Controllers { /// /// Base implementation for controllers on the . @@ -22,7 +22,7 @@ public abstract class PicoController : BaseController public PicoController() { } /// - public PicoController(IMixedRealityControllerServiceModule controllerServiceModule, TrackingState trackingState, Handedness controllerHandedness, MixedRealityControllerMappingProfile controllerMappingProfile) + public PicoController(IControllerServiceModule controllerServiceModule, TrackingState trackingState, Handedness controllerHandedness, ControllerProfile controllerMappingProfile) : base(controllerServiceModule, trackingState, controllerHandedness, controllerMappingProfile) { } /// @@ -43,11 +43,6 @@ public PicoController(IMixedRealityControllerServiceModule controllerServiceModu /// protected virtual IReadOnlyDictionary> DualAxisInputFeatureUsageMap { get; set; } = new Dictionary>(); - ///// - ///// The controller's pose in world space. - ///// - //protected MixedRealityPose ControllerPose { get; set; } - /// /// The controller's pointer pose in world space. /// @@ -65,6 +60,8 @@ public override void UpdateController() UpdateControllerPose(); UpdateSpatialPointerPose(); UpdateInteractionMappings(); + + base.UpdateController(); } /// @@ -86,7 +83,7 @@ protected virtual void UpdateTrackingState() if (TrackingState != currentTrackingState) { - InputSystem?.RaiseSourceTrackingStateChanged(InputSource, this, TrackingState); + InputService?.RaiseSourceTrackingStateChanged(InputSource, this, TrackingState); } } @@ -117,7 +114,7 @@ protected virtual void UpdateControllerPose() if (updatedControllerPose != Pose) { Pose = updatedControllerPose; - InputSystem?.RaiseSourcePoseChanged(InputSource, this, Pose); + InputService?.RaiseSourcePoseChanged(InputSource, this, Pose); } } @@ -132,9 +129,9 @@ protected virtual void UpdateSpatialPointerPose() /// /// Updates the controller's mappings. /// - /// The to update. + /// The to update. /// The data is read from. - protected virtual void UpdateDigitalInteractionMapping(MixedRealityInteractionMapping interactionMapping, InputDevice inputDevice) + protected virtual void UpdateDigitalInteractionMapping(InteractionMapping interactionMapping, InputDevice inputDevice) { Debug.Assert(interactionMapping.AxisType == AxisType.Digital); @@ -150,9 +147,9 @@ protected virtual void UpdateDigitalInteractionMapping(MixedRealityInteractionMa /// /// Updates the controller's mappings. /// - /// The to update. + /// The to update. /// The data is read from. - protected virtual void UpdateSingleAxisInteractionMapping(MixedRealityInteractionMapping interactionMapping, InputDevice inputDevice) + protected virtual void UpdateSingleAxisInteractionMapping(InteractionMapping interactionMapping, InputDevice inputDevice) { Debug.Assert(interactionMapping.AxisType == AxisType.SingleAxis); @@ -171,9 +168,9 @@ protected virtual void UpdateSingleAxisInteractionMapping(MixedRealityInteractio /// /// Updates the controller's mappings. /// - /// The to update. + /// The to update. /// The data is read from. - protected virtual void UpdateDualAxisInteractionMapping(MixedRealityInteractionMapping interactionMapping, InputDevice inputDevice) + protected virtual void UpdateDualAxisInteractionMapping(InteractionMapping interactionMapping, InputDevice inputDevice) { Debug.Assert(interactionMapping.AxisType == AxisType.DualAxis); @@ -193,7 +190,7 @@ protected virtual void UpdateDualAxisInteractionMapping(MixedRealityInteractionM /// Updates the spatial pointer pose interaction mapping value. /// /// The spatial pointer pose mapping. - protected void UpdateSpatialPointer(MixedRealityInteractionMapping interactionMapping) + protected void UpdateSpatialPointer(InteractionMapping interactionMapping) { Debug.Assert(interactionMapping.AxisType == AxisType.SixDof); interactionMapping.PoseData = SpatialPointerPose; diff --git a/Runtime/InputService/PicoController.cs.meta b/Runtime/Input/Controllers/PicoController.cs.meta similarity index 100% rename from Runtime/InputService/PicoController.cs.meta rename to Runtime/Input/Controllers/PicoController.cs.meta diff --git a/Runtime/InputService/PicoControllerServiceModule.cs b/Runtime/Input/Controllers/PicoControllerServiceModule.cs similarity index 75% rename from Runtime/InputService/PicoControllerServiceModule.cs rename to Runtime/Input/Controllers/PicoControllerServiceModule.cs index 314bf6f..273eab6 100644 --- a/Runtime/InputService/PicoControllerServiceModule.cs +++ b/Runtime/Input/Controllers/PicoControllerServiceModule.cs @@ -4,15 +4,14 @@ using RealityCollective.Definitions.Utilities; using RealityCollective.ServiceFramework.Attributes; using RealityToolkit.Definitions.Devices; -using RealityToolkit.InputSystem.Controllers; -using RealityToolkit.InputSystem.Interfaces; -using RealityToolkit.Pico.InputService.Profiles; +using RealityToolkit.Input.Controllers; +using RealityToolkit.Input.Interfaces; using System; using System.Collections.Generic; using Unity.XR.PXR; using UnityEngine; -namespace RealityToolkit.Pico.InputService +namespace RealityToolkit.Pico.Input.Controllers { /// /// Manages active controllers when running on the . @@ -22,44 +21,14 @@ namespace RealityToolkit.Pico.InputService public class PicoControllerServiceModule : BaseControllerServiceModule, IPicoControllerServiceModule { /// - public PicoControllerServiceModule(string name, uint priority, PicoControllerServiceModuleProfile profile, IMixedRealityInputSystem parentService) + public PicoControllerServiceModule(string name, uint priority, PicoControllerServiceModuleProfile profile, IInputService parentService) : base(name, priority, profile, parentService) { } private readonly Dictionary activeControllers = new Dictionary(); -#if PICO_XR_LEGACY - private bool allInOneHeadsetButtonsControllerEnabled; -#endif - -#if PICO_XR_LEGACY - /// - public override void Initialize() - { - if (!Application.isPlaying) - { - return; - } - - allInOneHeadsetButtonsControllerEnabled = TryGetControllerMappingProfile(typeof(PicoAllInOneHeadsetButtonsController), Handedness.None, out _); - } -#endif - /// public override void Update() { -#if PICO_XR_LEGACY - if (allInOneHeadsetButtonsControllerEnabled) - { - // The all-in-one controller is located on the Pico headset itself and always available. - // It also doesn't have a handedness associated. - var headsetController = GetOrAddController(Handedness.None, typeof(PicoAllInOneHeadsetButtonsController)); - if (headsetController != null) - { - headsetController.UpdateController(); - } - } -#endif - // We allow one type of controller per hand, check if there is a controller connected // for the left hand and update accordingly. if (PXR_Input.IsControllerConnected(PXR_Input.Controller.LeftController)) @@ -92,14 +61,6 @@ private void UpdateController(Handedness handedness) PicoController controller; switch (activeControllerDeviceType) { -#if PICO_XR_LEGACY - case PXR_Input.ControllerDevice.G2: - controller = GetOrAddController(handedness, typeof(PicoG24KController)); - break; - case PXR_Input.ControllerDevice.Neo2: - controller = GetOrAddController(handedness, typeof(PicoNeo2Controller)); - break; -#endif case PXR_Input.ControllerDevice.Neo3: controller = GetOrAddController(handedness, typeof(PicoNeo3Controller)); break; @@ -166,7 +127,7 @@ private PicoController GetOrAddController(Handedness handedness, Type type) detectedController.TryRenderControllerModel(); AddController(detectedController); activeControllers.Add(handedness, detectedController); - InputSystem?.RaiseSourceDetected(detectedController.InputSource, detectedController); + InputService?.RaiseSourceDetected(detectedController.InputSource, detectedController); return detectedController; } @@ -181,7 +142,7 @@ private void RemoveController(Handedness handedness, bool removeFromRegistry = t { if (TryGetController(handedness, out var controller)) { - InputSystem?.RaiseSourceLost(controller.InputSource, controller); + InputService?.RaiseSourceLost(controller.InputSource, controller); if (removeFromRegistry) { diff --git a/Runtime/InputService/PicoControllerServiceModule.cs.meta b/Runtime/Input/Controllers/PicoControllerServiceModule.cs.meta similarity index 100% rename from Runtime/InputService/PicoControllerServiceModule.cs.meta rename to Runtime/Input/Controllers/PicoControllerServiceModule.cs.meta diff --git a/Runtime/InputService/Profiles/PicoControllerServiceModuleProfile.cs b/Runtime/Input/Controllers/PicoControllerServiceModuleProfile.cs similarity index 58% rename from Runtime/InputService/Profiles/PicoControllerServiceModuleProfile.cs rename to Runtime/Input/Controllers/PicoControllerServiceModuleProfile.cs index 549a3d6..4c52723 100644 --- a/Runtime/InputService/Profiles/PicoControllerServiceModuleProfile.cs +++ b/Runtime/Input/Controllers/PicoControllerServiceModuleProfile.cs @@ -4,27 +4,22 @@ using RealityCollective.Definitions.Utilities; using RealityToolkit.Definitions.Controllers; -namespace RealityToolkit.Pico.InputService.Profiles +namespace RealityToolkit.Pico.Input.Controllers { /// /// Configuration profile for . /// - public class PicoControllerServiceModuleProfile : BaseMixedRealityControllerServiceModuleProfile + public class PicoControllerServiceModuleProfile : BaseControllerServiceModuleProfile { /// public override ControllerDefinition[] GetDefaultControllerOptions() { return new[] { - new ControllerDefinition(typeof(PicoAllInOneHeadsetButtonsController), Handedness.None), - new ControllerDefinition(typeof(PicoG24KController), Handedness.Left), - new ControllerDefinition(typeof(PicoG24KController), Handedness.Right), - new ControllerDefinition(typeof(PicoNeo2Controller), Handedness.Left), - new ControllerDefinition(typeof(PicoNeo2Controller), Handedness.Right), new ControllerDefinition(typeof(PicoNeo3Controller), Handedness.Left), new ControllerDefinition(typeof(PicoNeo3Controller), Handedness.Right), new ControllerDefinition(typeof(Pico4Controller), Handedness.Left), - new ControllerDefinition(typeof(Pico4Controller), Handedness.Right), + new ControllerDefinition(typeof(Pico4Controller), Handedness.Right) }; } } diff --git a/Runtime/InputService/Profiles/PicoControllerServiceModuleProfile.cs.meta b/Runtime/Input/Controllers/PicoControllerServiceModuleProfile.cs.meta similarity index 100% rename from Runtime/InputService/Profiles/PicoControllerServiceModuleProfile.cs.meta rename to Runtime/Input/Controllers/PicoControllerServiceModuleProfile.cs.meta diff --git a/Runtime/Input/Controllers/PicoControllerVisualizer.cs b/Runtime/Input/Controllers/PicoControllerVisualizer.cs new file mode 100644 index 0000000..0c2b438 --- /dev/null +++ b/Runtime/Input/Controllers/PicoControllerVisualizer.cs @@ -0,0 +1,16 @@ +// Copyright (c) Reality Collective. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using RealityToolkit.Input.Controllers; +using Unity.XR.PXR; +using UnityEngine; + +namespace RealityToolkit.Pico.Input.Controllers +{ + /// + /// Visualizers Pico controllers using the integration package's prefabs. + /// + [System.Runtime.InteropServices.Guid("ad2f586e-edc9-4876-b70d-a20c7038d73c")] + [RequireComponent(typeof(PXR_ControllerLoader))] + public class PicoControllerVisualizer : BaseControllerVisualizer { } +} diff --git a/Runtime/InputService/Extensions/HandednessExtensions.cs.meta b/Runtime/Input/Controllers/PicoControllerVisualizer.cs.meta similarity index 64% rename from Runtime/InputService/Extensions/HandednessExtensions.cs.meta rename to Runtime/Input/Controllers/PicoControllerVisualizer.cs.meta index 4e282a1..bb9c648 100644 --- a/Runtime/InputService/Extensions/HandednessExtensions.cs.meta +++ b/Runtime/Input/Controllers/PicoControllerVisualizer.cs.meta @@ -1,11 +1,11 @@ fileFormatVersion: 2 -guid: ed72942cd759b1b4fb2989b60d4884fd +guid: 935763c130f7e614099774c8b2eb16d0 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + icon: {fileID: 2800000, guid: 08c0fd91bdca45afa09ec64323cf3848, type: 3} userData: assetBundleName: assetBundleVariant: diff --git a/Runtime/InputService/PicoNeo3Controller.cs b/Runtime/Input/Controllers/PicoNeo3Controller.cs similarity index 59% rename from Runtime/InputService/PicoNeo3Controller.cs rename to Runtime/Input/Controllers/PicoNeo3Controller.cs index bc2bc80..7ef5c33 100644 --- a/Runtime/InputService/PicoNeo3Controller.cs +++ b/Runtime/Input/Controllers/PicoNeo3Controller.cs @@ -4,12 +4,12 @@ using RealityCollective.Definitions.Utilities; using RealityToolkit.Definitions.Controllers; using RealityToolkit.Definitions.Devices; -using RealityToolkit.InputSystem.Interfaces.Modules; +using RealityToolkit.Input.Interfaces.Modules; using System.Collections.Generic; using UnityEngine; using UnityEngine.XR; -namespace RealityToolkit.Pico.InputService +namespace RealityToolkit.Pico.Input.Controllers { [System.Runtime.InteropServices.Guid("a58f0550-e847-483e-9e5c-0119a7098530")] public class PicoNeo3Controller : PicoController @@ -18,7 +18,7 @@ public class PicoNeo3Controller : PicoController public PicoNeo3Controller() { } /// - public PicoNeo3Controller(IMixedRealityControllerServiceModule controllerServiceModule, TrackingState trackingState, Handedness controllerHandedness, MixedRealityControllerMappingProfile controllerMappingProfile) + public PicoNeo3Controller(IControllerServiceModule controllerServiceModule, TrackingState trackingState, Handedness controllerHandedness, ControllerProfile controllerMappingProfile) : base(controllerServiceModule, trackingState, controllerHandedness, controllerMappingProfile) { } private const string menuButtonInputName = "Menu"; @@ -33,18 +33,18 @@ public PicoNeo3Controller(IMixedRealityControllerServiceModule controllerService private const string yBButtonInputName = "Y/B"; /// - public override MixedRealityInteractionMapping[] DefaultInteractions => new[] + public override InteractionMapping[] DefaultInteractions => new[] { - new MixedRealityInteractionMapping(spatialPointerPoseInputName, AxisType.SixDof, spatialPointerPoseInputName, DeviceInputType.SpatialPointer), - new MixedRealityInteractionMapping(menuButtonInputName, AxisType.Digital, menuButtonInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(triggerInputName, AxisType.SingleAxis, triggerInputName, DeviceInputType.Trigger), - new MixedRealityInteractionMapping(triggerPressInputName, AxisType.Digital, triggerPressInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(gripInputName, AxisType.SingleAxis, gripInputName, DeviceInputType.Trigger), - new MixedRealityInteractionMapping(gripPressInputName, AxisType.Digital, gripPressInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(xAButtonInputName, AxisType.Digital, xAButtonInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(yBButtonInputName, AxisType.Digital, yBButtonInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(thumbstickInputName, AxisType.DualAxis, thumbstickInputName, DeviceInputType.ThumbStick), - new MixedRealityInteractionMapping(thumbstickPressInputName, AxisType.Digital, thumbstickPressInputName, DeviceInputType.ButtonPress) + new InteractionMapping(spatialPointerPoseInputName, AxisType.SixDof, spatialPointerPoseInputName, DeviceInputType.SpatialPointer), + new InteractionMapping(menuButtonInputName, AxisType.Digital, menuButtonInputName, DeviceInputType.ButtonPress), + new InteractionMapping(triggerInputName, AxisType.SingleAxis, triggerInputName, DeviceInputType.Trigger), + new InteractionMapping(triggerPressInputName, AxisType.Digital, triggerPressInputName, DeviceInputType.ButtonPress), + new InteractionMapping(gripInputName, AxisType.SingleAxis, gripInputName, DeviceInputType.Trigger), + new InteractionMapping(gripPressInputName, AxisType.Digital, gripPressInputName, DeviceInputType.ButtonPress), + new InteractionMapping(xAButtonInputName, AxisType.Digital, xAButtonInputName, DeviceInputType.ButtonPress), + new InteractionMapping(yBButtonInputName, AxisType.Digital, yBButtonInputName, DeviceInputType.ButtonPress), + new InteractionMapping(thumbstickInputName, AxisType.DualAxis, thumbstickInputName, DeviceInputType.ThumbStick), + new InteractionMapping(thumbstickPressInputName, AxisType.Digital, thumbstickPressInputName, DeviceInputType.ButtonPress) }; /// diff --git a/Runtime/InputService/PicoNeo3Controller.cs.meta b/Runtime/Input/Controllers/PicoNeo3Controller.cs.meta similarity index 100% rename from Runtime/InputService/PicoNeo3Controller.cs.meta rename to Runtime/Input/Controllers/PicoNeo3Controller.cs.meta diff --git a/Runtime/InputService/Extensions.meta b/Runtime/InputService/Extensions.meta deleted file mode 100644 index 28a303a..0000000 --- a/Runtime/InputService/Extensions.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: daf25b9d8fdce984d928c1e8707b1002 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Runtime/InputService/Extensions/HandednessExtensions.cs b/Runtime/InputService/Extensions/HandednessExtensions.cs deleted file mode 100644 index 522ae49..0000000 --- a/Runtime/InputService/Extensions/HandednessExtensions.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) Reality Collective. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using Unity.XR.PXR; -using RealityCollective.Definitions.Utilities; - -namespace RealityToolkit.Pico.InputService.Extensions -{ - /// - /// Extension methods for . - /// - public static class HandednessExtensions - { - /// - /// Converts the to a Pico value. - /// - /// The to convert. - /// - public static PXR_Input.Controller ToPicoController(this Handedness handedness) - { - switch (handedness) - { - case Handedness.Left: - return PXR_Input.Controller.LeftController; - case Handedness.Right: - return PXR_Input.Controller.RightController; - case Handedness.None: - case Handedness.Both: - case Handedness.Other: - case Handedness.Any: - default: - return PXR_Input.Controller.RightController; - } - } - } -} \ No newline at end of file diff --git a/Runtime/InputService/IPicoControllerServiceModule.cs b/Runtime/InputService/IPicoControllerServiceModule.cs deleted file mode 100644 index 8527cd6..0000000 --- a/Runtime/InputService/IPicoControllerServiceModule.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) Reality Collective. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using RealityToolkit.InputSystem.Interfaces.Modules; - -namespace RealityToolkit.Pico.InputService -{ - /// - /// Fully qualifies the specific implementation of . - /// - public interface IPicoControllerServiceModule : IMixedRealityControllerServiceModule { } -} diff --git a/Runtime/InputService/PicoAllInOneHeadsetButtonsController.cs b/Runtime/InputService/PicoAllInOneHeadsetButtonsController.cs deleted file mode 100644 index 2896aab..0000000 --- a/Runtime/InputService/PicoAllInOneHeadsetButtonsController.cs +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright (c) Reality Collective. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using RealityCollective.Definitions.Utilities; -using RealityToolkit.Definitions.Controllers; -using RealityToolkit.Definitions.Devices; -using RealityToolkit.InputSystem.Extensions; -using RealityToolkit.InputSystem.Interfaces.Modules; -using UnityEngine; - -namespace RealityToolkit.Pico.InputService -{ - /// - /// The is located on the Pico headset itself - /// and has only two buttons. One for selecting and one for going back. It's a common feature of all - /// Pico devices and operates using the user's gaze. - /// - [System.Runtime.InteropServices.Guid("f661ead7-06fc-422b-918c-84c711bf9b6b")] - public class PicoAllInOneHeadsetButtonsController : PicoController - { - /// - public PicoAllInOneHeadsetButtonsController() { } - - /// - public PicoAllInOneHeadsetButtonsController(IMixedRealityControllerServiceModule controllerDataProvider, TrackingState trackingState, Handedness controllerHandedness, MixedRealityControllerMappingProfile controllerMappingProfile) - : base(controllerDataProvider, trackingState, controllerHandedness, controllerMappingProfile) { } - - private const string triggerButtonInputName = "Trigger"; - private const string menuButtonInputName = "Menu"; - - /// - public override MixedRealityInteractionMapping[] DefaultInteractions => new[] - { - new MixedRealityInteractionMapping(triggerButtonInputName, AxisType.Digital, triggerButtonInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(menuButtonInputName, AxisType.Digital, menuButtonInputName, DeviceInputType.ButtonPress) - }; - - /// - protected override void UpdateTrackingState() - { - if (TrackingState != TrackingState.NotApplicable) - { - TrackingState = TrackingState.NotApplicable; - InputSystem?.RaiseSourceTrackingStateChanged(InputSource, this, TrackingState); - } - } - - /// - protected override void UpdateInteractionMappings() - { - Debug.Assert(Interactions != null && Interactions.Length > 0, $"Interaction mappings must be defined for {GetType().Name} - {ControllerHandedness}."); - - for (var i = 0; i < Interactions.Length; i++) - { - var interactionMapping = Interactions[i]; - switch (interactionMapping.InputType) - { - case DeviceInputType.ButtonPress: - UpdateButtonPress(interactionMapping); - break; - default: - Debug.LogError($"Input {interactionMapping.InputType} is not handled for controller {GetType().Name} - {ControllerHandedness}."); - break; - } - - interactionMapping.RaiseInputAction(InputSource, ControllerHandedness); - } - } - - private void UpdateButtonPress(MixedRealityInteractionMapping interactionMapping) - { - Debug.Assert(interactionMapping.AxisType == AxisType.Digital); - - if (interactionMapping.InputName.Equals(triggerButtonInputName)) - { - interactionMapping.BoolData = Input.GetKey(KeyCode.JoystickButton0); - } - else if (interactionMapping.InputName.Equals(menuButtonInputName)) - { - interactionMapping.BoolData = Input.GetKey(KeyCode.Escape); - } - } - } -} \ No newline at end of file diff --git a/Runtime/InputService/PicoAllInOneHeadsetButtonsController.cs.meta b/Runtime/InputService/PicoAllInOneHeadsetButtonsController.cs.meta deleted file mode 100644 index e9b0c82..0000000 --- a/Runtime/InputService/PicoAllInOneHeadsetButtonsController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ff1dd1985a0083d42b37b8ee48f27aba -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Runtime/InputService/PicoG24KController.cs b/Runtime/InputService/PicoG24KController.cs deleted file mode 100644 index a99850b..0000000 --- a/Runtime/InputService/PicoG24KController.cs +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) Reality Collective. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using RealityCollective.Definitions.Utilities; -using RealityToolkit.Definitions.Controllers; -using RealityToolkit.Definitions.Devices; -using RealityToolkit.InputSystem.Interfaces.Modules; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.XR; - -namespace RealityToolkit.Pico.InputService -{ - [System.Runtime.InteropServices.Guid("07b23b0b-1be1-4ac5-942e-0fe3bc65a260")] - public class PicoG24KController : PicoController - { - /// - public PicoG24KController() { } - - /// - public PicoG24KController(IMixedRealityControllerServiceModule controllerDataProvider, TrackingState trackingState, Handedness controllerHandedness, MixedRealityControllerMappingProfile controllerMappingProfile) - : base(controllerDataProvider, trackingState, controllerHandedness, controllerMappingProfile) { } - - private const string menuButtonInputName = "Menu"; - private const string triggerInputName = "Trigger"; - private const string triggerPressInputName = "Trigger Press"; - private const string touchpadInputName = "Touchpad"; - private const string touchpadPressInputName = "Touchpad Press"; - private const string spatialPointerPoseInputName = "Spatial Pointer Pose"; - - /// - public override MixedRealityInteractionMapping[] DefaultInteractions => new[] - { - new MixedRealityInteractionMapping(spatialPointerPoseInputName, AxisType.SixDof, spatialPointerPoseInputName, DeviceInputType.SpatialPointer), - new MixedRealityInteractionMapping(menuButtonInputName, AxisType.Digital, menuButtonInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(triggerInputName, AxisType.SingleAxis, triggerInputName, DeviceInputType.Trigger), - new MixedRealityInteractionMapping(triggerPressInputName, AxisType.Digital, triggerPressInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(touchpadInputName, AxisType.DualAxis, touchpadInputName, DeviceInputType.ThumbStick), - new MixedRealityInteractionMapping(touchpadPressInputName, AxisType.Digital, touchpadPressInputName, DeviceInputType.ButtonPress) - }; - - /// - protected override IReadOnlyDictionary> DigitalInputFeatureUsageMap { get; set; } = new Dictionary> - { - { menuButtonInputName, CommonUsages.menuButton }, - { triggerPressInputName, CommonUsages.triggerButton }, - { touchpadPressInputName, CommonUsages.primary2DAxisClick } - }; - - /// - protected override IReadOnlyDictionary> SingleAxisInputFeatureUsageMap { get; set; } = new Dictionary> - { - { triggerInputName, CommonUsages.trigger } - }; - - /// - protected override IReadOnlyDictionary> DualAxisInputFeatureUsageMap { get; set; } = new Dictionary> - { - { touchpadInputName, CommonUsages.primary2DAxis } - }; - } -} \ No newline at end of file diff --git a/Runtime/InputService/PicoG24KController.cs.meta b/Runtime/InputService/PicoG24KController.cs.meta deleted file mode 100644 index a87b6a0..0000000 --- a/Runtime/InputService/PicoG24KController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cdca989eb12104645bef2f1e5dafbf42 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Runtime/InputService/PicoNeo2Controller.cs b/Runtime/InputService/PicoNeo2Controller.cs deleted file mode 100644 index 0c62ecd..0000000 --- a/Runtime/InputService/PicoNeo2Controller.cs +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright (c) Reality Collective. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using RealityCollective.Definitions.Utilities; -using RealityToolkit.Definitions.Controllers; -using RealityToolkit.Definitions.Devices; -using RealityToolkit.InputSystem.Interfaces.Modules; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.XR; - -namespace RealityToolkit.Pico.InputService -{ - [System.Runtime.InteropServices.Guid("5402e1d6-466e-438e-8667-0ab654eb8780")] - public class PicoNeo2Controller : PicoController - { - /// - public PicoNeo2Controller() { } - - /// - public PicoNeo2Controller(IMixedRealityControllerServiceModule controllerDataProvider, TrackingState trackingState, Handedness controllerHandedness, MixedRealityControllerMappingProfile controllerMappingProfile) - : base(controllerDataProvider, trackingState, controllerHandedness, controllerMappingProfile) { } - - private const string menuButtonInputName = "Menu"; - private const string triggerInputName = "Trigger"; - private const string triggerPressInputName = "Trigger Press"; - private const string gripInputName = "Grip"; - private const string gripPressInputName = "Grip Press"; - private const string thumbstickInputName = "Thumbstick"; - private const string thumbstickPressInputName = "Thumbstick Press"; - private const string spatialPointerPoseInputName = "Spatial Pointer Pose"; - private const string xButtonInputName = "X"; - private const string yButtonInputName = "Y"; - - /// - public override MixedRealityInteractionMapping[] DefaultInteractions => new[] - { - new MixedRealityInteractionMapping(spatialPointerPoseInputName, AxisType.SixDof, spatialPointerPoseInputName, DeviceInputType.SpatialPointer), - new MixedRealityInteractionMapping(menuButtonInputName, AxisType.Digital, menuButtonInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(triggerInputName, AxisType.SingleAxis, triggerInputName, DeviceInputType.Trigger), - new MixedRealityInteractionMapping(triggerPressInputName, AxisType.Digital, triggerPressInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(gripInputName, AxisType.SingleAxis, gripInputName, DeviceInputType.Trigger), - new MixedRealityInteractionMapping(gripPressInputName, AxisType.Digital, gripPressInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(xButtonInputName, AxisType.Digital, xButtonInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(yButtonInputName, AxisType.Digital, yButtonInputName, DeviceInputType.ButtonPress), - new MixedRealityInteractionMapping(thumbstickInputName, AxisType.DualAxis, thumbstickInputName, DeviceInputType.ThumbStick), - new MixedRealityInteractionMapping(thumbstickPressInputName, AxisType.Digital, thumbstickPressInputName, DeviceInputType.ButtonPress) - }; - - /// - protected override IReadOnlyDictionary> DigitalInputFeatureUsageMap { get; set; } = new Dictionary> - { - { menuButtonInputName, CommonUsages.menuButton }, - { triggerPressInputName, CommonUsages.triggerButton }, - { gripPressInputName, CommonUsages.gripButton }, - { thumbstickPressInputName, CommonUsages.primary2DAxisClick }, - { xButtonInputName, CommonUsages.primaryButton }, - { yButtonInputName, CommonUsages.secondaryButton } - }; - - /// - protected override IReadOnlyDictionary> SingleAxisInputFeatureUsageMap { get; set; } = new Dictionary> - { - { triggerInputName, CommonUsages.trigger }, - { gripInputName, CommonUsages.grip } - }; - - /// - protected override IReadOnlyDictionary> DualAxisInputFeatureUsageMap { get; set; } = new Dictionary> - { - { thumbstickInputName, CommonUsages.primary2DAxis } - }; - } -} \ No newline at end of file diff --git a/Runtime/InputService/PicoNeo2Controller.cs.meta b/Runtime/InputService/PicoNeo2Controller.cs.meta deleted file mode 100644 index 26a8315..0000000 --- a/Runtime/InputService/PicoNeo2Controller.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ad4c4b82b76a6034b96f33c55b1733b1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Runtime/InputService/Profiles.meta b/Runtime/InputService/Profiles.meta deleted file mode 100644 index 3184857..0000000 --- a/Runtime/InputService/Profiles.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2ef9fb57affc47242862f7f6e36d8803 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Runtime/PicoPlatform.cs b/Runtime/PicoPlatform.cs index 7befa2c..0e43a05 100644 --- a/Runtime/PicoPlatform.cs +++ b/Runtime/PicoPlatform.cs @@ -10,7 +10,7 @@ using UnityEngine.XR; using UnityEngine.XR.Management; -#if UNITY_EDITOR && !PICO_XR_LEGACY && PICO_XR_LP +#if UNITY_EDITOR && PICO_XR_LP using Unity.XR.PICO.LivePreview; #else using Unity.XR.PXR; @@ -24,18 +24,14 @@ namespace RealityToolkit.Pico [System.Runtime.InteropServices.Guid("91d05795-d44e-4a4d-8055-e770b592137f")] public class PicoPlatform : BasePlatform { - // Subsystem descriptor IDs have changed in between Pico SDK v1 and v2. -#if PICO_XR_LEGACY - private const string xrDisplaySubsystemDescriptorId = "PicoXR Display"; - private const string xrInputSubsystemDescriptorId = "PicoXR Input"; -#else +#if !UNITY_EDITOR || !PICO_XR_LP private const string xrDisplaySubsystemDescriptorId = "PICO Display"; private const string xrInputSubsystemDescriptorId = "PICO Input"; #endif // When in editor and the live preview package is available, we are looking for a different // loader type and also different descriptors. -#if UNITY_EDITOR && !PICO_XR_LEGACY && PICO_XR_LP +#if UNITY_EDITOR && PICO_XR_LP private const string xrLivePreviewDisplaySubsystemDescriptorId = "PICO LP Display"; private const string xrLivePreviewInputSubsystemDescriptorId = "PICO LP Input"; @@ -68,7 +64,7 @@ public override bool IsAvailable // When in editor and the live preview package is available, // we must look for different descriptor IDs to determine platfrom availability. // If not in editor or no live preview package available, just use the runtime player build descriptors. -#if UNITY_EDITOR && !PICO_XR_LEGACY && PICO_XR_LP +#if UNITY_EDITOR && PICO_XR_LP var displaySubsystemDescriptorId = xrLivePreviewDisplaySubsystemDescriptorId; var inputSubsystemDescriptorId = xrLivePreviewInputSubsystemDescriptorId; #else diff --git a/Runtime/CameraService.meta b/Runtime/Player.meta similarity index 100% rename from Runtime/CameraService.meta rename to Runtime/Player.meta diff --git a/Runtime/CameraService/IPicoCameraRigServiceModule.cs b/Runtime/Player/IPicoPlayerRigServiceModule.cs similarity index 56% rename from Runtime/CameraService/IPicoCameraRigServiceModule.cs rename to Runtime/Player/IPicoPlayerRigServiceModule.cs index d27d2a8..0e0cb0a 100644 --- a/Runtime/CameraService/IPicoCameraRigServiceModule.cs +++ b/Runtime/Player/IPicoPlayerRigServiceModule.cs @@ -1,12 +1,12 @@ // Copyright (c) Reality Collective. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. -using RealityToolkit.CameraService.Interfaces; +using RealityToolkit.Player.Interfaces; -namespace RealityToolkit.Pico.CameraService +namespace RealityToolkit.Pico.Player { /// - /// Fully qualifies the specific implementation of . + /// Fully qualifies the specific implementation of . /// - public interface IPicoCameraRigServiceModule : ICameraRigServiceModule { } + public interface IPicoPlayerRigServiceModule : IPlayerRigServiceModule { } } diff --git a/Runtime/CameraService/IPicoCameraRigServiceModule.cs.meta b/Runtime/Player/IPicoPlayerRigServiceModule.cs.meta similarity index 100% rename from Runtime/CameraService/IPicoCameraRigServiceModule.cs.meta rename to Runtime/Player/IPicoPlayerRigServiceModule.cs.meta diff --git a/Runtime/CameraService/PicoCameraRigServiceModule.cs b/Runtime/Player/PicoPlayerRigServiceModule.cs similarity index 50% rename from Runtime/CameraService/PicoCameraRigServiceModule.cs rename to Runtime/Player/PicoPlayerRigServiceModule.cs index 387aad2..8ecc4ee 100644 --- a/Runtime/CameraService/PicoCameraRigServiceModule.cs +++ b/Runtime/Player/PicoPlayerRigServiceModule.cs @@ -2,31 +2,33 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. using RealityCollective.ServiceFramework.Attributes; -using RealityToolkit.CameraService.Interfaces; -using RealityToolkit.CameraService.Modules; -using RealityToolkit.Pico.CameraService.Profiles; +using RealityToolkit.Player.Interfaces; +using RealityToolkit.Player.Modules; using Unity.XR.PXR; using UnityEngine; +using FoveatedRenderingMode = Unity.XR.PXR.FoveatedRenderingMode; -namespace RealityToolkit.Pico.CameraService +namespace RealityToolkit.Pico.Player { /// - /// service module used when running on the . + /// service module used when running on the . /// [RuntimePlatform(typeof(PicoPlatform))] [System.Runtime.InteropServices.Guid("01f7685f-40a4-49c1-b0cf-8d17dee1fb2b")] - public class PicoCameraRigServiceModule : BaseCameraServiceModule, IPicoCameraRigServiceModule + public class PicoPlayerRigServiceModule : BasePlayerRigServiceModule, IPicoPlayerRigServiceModule { /// - public PicoCameraRigServiceModule(string name, uint priority, PicoCameraRigServiceModuleProfile profile, ICameraService parentService) + public PicoPlayerRigServiceModule(string name, uint priority, PicoPlayerRigServiceModuleProfile profile, IPlayerService parentService) : base(name, priority, profile, parentService) { foveationLevel = profile.FoveationLevel; - cameraService = parentService; + foveatedRenderingMode = profile.FoveatedRenderingMode; + PlayerService = parentService; } private readonly FoveationLevel foveationLevel; - private readonly ICameraService cameraService; + private readonly FoveatedRenderingMode foveatedRenderingMode; + private readonly IPlayerService PlayerService; /// public override void Initialize() @@ -34,10 +36,8 @@ public override void Initialize() base.Initialize(); PXR_Plugin.System.UPxr_SetSecure(PXR_ProjectSetting.GetProjectConfig().useContentProtect); - PXR_Plugin.PlatformSetting.UPxr_BindVerifyService(cameraService.CameraRig.RigTransform.gameObject.name); - cameraService.CameraRig.PlayerCamera.depthTextureMode = DepthTextureMode.Depth; - - PXR_FoveationRendering.SetFoveationLevel(foveationLevel); + PlayerService.PlayerRig.RigCamera.depthTextureMode = DepthTextureMode.Depth; + PXR_FoveationRendering.SetFoveationLevel(foveationLevel, foveatedRenderingMode == FoveatedRenderingMode.EyeTrackedFoveatedRendering); } } } \ No newline at end of file diff --git a/Runtime/CameraService/PicoCameraRigServiceModule.cs.meta b/Runtime/Player/PicoPlayerRigServiceModule.cs.meta similarity index 100% rename from Runtime/CameraService/PicoCameraRigServiceModule.cs.meta rename to Runtime/Player/PicoPlayerRigServiceModule.cs.meta diff --git a/Runtime/Player/PicoPlayerRigServiceModuleProfile.cs b/Runtime/Player/PicoPlayerRigServiceModuleProfile.cs new file mode 100644 index 0000000..551257c --- /dev/null +++ b/Runtime/Player/PicoPlayerRigServiceModuleProfile.cs @@ -0,0 +1,33 @@ +// Copyright (c) Reality Collective. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using RealityToolkit.Player.Definitions; +using Unity.XR.PXR; +using UnityEngine; + +namespace RealityToolkit.Pico.Player +{ + /// + /// Configuration profile for . + /// + public class PicoPlayerRigServiceModuleProfile : BasePlayerRigServiceModuleProfile + { + [SerializeField] + [Tooltip("The rendering foveation level to use.")] + private FoveationLevel foveationLevel = FoveationLevel.None; + + /// + /// The rendering foveation level to use. + /// + public FoveationLevel FoveationLevel => foveationLevel; + + [SerializeField] + [Tooltip("The foveation rendering mode.")] + private FoveatedRenderingMode foveatedRenderingMode = FoveatedRenderingMode.FixedFoveatedRendering; + + /// + /// The foveation rendering mode. + /// + public FoveatedRenderingMode FoveatedRenderingMode => foveatedRenderingMode; + } +} diff --git a/Runtime/CameraService/Profiles/PicoCameraRigServiceModuleProfile.cs.meta b/Runtime/Player/PicoPlayerRigServiceModuleProfile.cs.meta similarity index 100% rename from Runtime/CameraService/Profiles/PicoCameraRigServiceModuleProfile.cs.meta rename to Runtime/Player/PicoPlayerRigServiceModuleProfile.cs.meta diff --git a/Runtime/RealityToolkit.Pico.asmdef b/Runtime/RealityToolkit.Pico.asmdef index 135118c..7688004 100644 --- a/Runtime/RealityToolkit.Pico.asmdef +++ b/Runtime/RealityToolkit.Pico.asmdef @@ -3,11 +3,11 @@ "rootNamespace": "RealityToolkit.Pico", "references": [ "GUID:f3241d040533491e8a1e2714b27c3111", + "GUID:de07d9dfb71843b46aa2c474f73ca4cc", "GUID:b2d046948d6452a4b8485efc9ce0f88c", "GUID:13703f41b24bb904cb2305abe6317e3d", "GUID:e40ba710768534012815d3193fa296cb", "GUID:65a004a26c89ac5468e8d4b4b057f1c8", - "GUID:de07d9dfb71843b46aa2c474f73ca4cc", "GUID:f70b6e413e9cf3744b522089b55c7e84" ], "includePlatforms": [ @@ -21,11 +21,6 @@ "autoReferenced": true, "defineConstraints": [], "versionDefines": [ - { - "name": "com.unity.xr.picoxr", - "expression": "[1.0,2.0.7]", - "define": "PICO_XR_LEGACY" - }, { "name": "com.unity.pico.livepreview", "expression": "1.0.0", diff --git a/package.json b/package.json index 2cf30f7..09088e5 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,8 @@ "XR", "Mixed Reality" ], - "version": "1.0.1", - "unity": "2020.3", + "version": "1.0.2-pre.8", + "unity": "2021.3", "homepage": "https://github.com/realitycollective", "bugs": { "url": "https://github.com/realitycollective/realitytoolkit.dev/issues" @@ -25,7 +25,9 @@ "url": "https://github.com/realitycollective" }, "dependencies": { - "com.realitytoolkit.core": "1.0.0-pre.7" + "com.realitytoolkit.core": "1.0.0-pre.37", + "com.realitytoolkit.player": "1.0.3-pre.1", + "com.unity.xr.picoxr": "2.3.4" }, "assets": [ { From bf69880a5f5ee1b9ff6116dde7676116fe66a273 Mon Sep 17 00:00:00 2001 From: "Simon (Darkside) Jackson" Date: Tue, 7 May 2024 15:58:46 +0100 Subject: [PATCH 2/2] Update workflows [skip ci] --- .github/workflows/development-publish.yml | 6 +----- .github/workflows/main-publish.yml | 17 +++++++++-------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/development-publish.yml b/.github/workflows/development-publish.yml index ce5054c..62b81e2 100644 --- a/.github/workflows/development-publish.yml +++ b/.github/workflows/development-publish.yml @@ -1,12 +1,9 @@ name: Publish development branch on Merge on: - pull_request: - types: - - closed + push: branches: - development - # Ignore PRs targeting main # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -17,7 +14,6 @@ concurrency: jobs: release_on_merge: - if: github.event.pull_request.merged == true name: Tag and Publish UPM package uses: realitycollective/reusableworkflows/.github/workflows/upversionandtagrelease.yml@v2 with: diff --git a/.github/workflows/main-publish.yml b/.github/workflows/main-publish.yml index 4ffbd77..b453997 100644 --- a/.github/workflows/main-publish.yml +++ b/.github/workflows/main-publish.yml @@ -1,16 +1,17 @@ name: Publish main branch and increment version on: - pull_request: - types: - - closed + push: branches: - main + # Allows you to run this workflow manually from the Actions tab, last resort if GitHub does not behave + workflow_dispatch: + jobs: # Get Version to tag and release the branch, no up-version - [no-ver] included in PR title validate-environment: - if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'no-ver') + if: contains(github.event.head_commit.message, 'no-ver') name: Get Version from UPM package uses: realitycollective/reusableworkflows/.github/workflows/getpackageversionfrompackage.yml@v2 with: @@ -28,7 +29,7 @@ jobs: # Up version the release and publish major release upversion-major-Package: - if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'no-ver') == false && contains(github.event.pull_request.title, 'major-release') + if: contains(github.event.head_commit.message, 'no-ver') == false && contains(github.event.head_commit.message, 'major-release') name: Major Version package and release uses: realitycollective/reusableworkflows/.github/workflows/upversionandtagrelease.yml@v2 with: @@ -38,7 +39,7 @@ jobs: # Up version the release and publish minor release upversion-minor-Package: - if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'no-ver') == false && contains(github.event.pull_request.title, 'minor-release') + if: contains(github.event.head_commit.message, 'no-ver') == false && contains(github.event.head_commit.message, 'minor-release') name: Minor Version package and release uses: realitycollective/reusableworkflows/.github/workflows/upversionandtagrelease.yml@v2 with: @@ -48,7 +49,7 @@ jobs: # Up version the release and publish patch release (default) upversion-patch-Package: - if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'no-ver') == false && contains(github.event.pull_request.title, 'minor-release') == false && contains(github.event.pull_request.title, 'major-release') == false + if: contains(github.event.head_commit.message, 'no-ver') == false && contains(github.event.head_commit.message, 'minor-release') == false && contains(github.event.head_commit.message, 'major-release') == false name: Patch Version package and release uses: realitycollective/reusableworkflows/.github/workflows/upversionandtagrelease.yml@v2 with: @@ -88,4 +89,4 @@ jobs: build-type: patch target-branch: development createTag: false - secrets: inherit + secrets: inherit \ No newline at end of file