From fdc1d3b8f3490b331b3419e7accbd5d441cdf647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=95=EC=9D=B8?= Date: Wed, 9 Jul 2025 00:23:45 +0900 Subject: [PATCH] =?UTF-8?q?alarm=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/InputSystemActions.cs | 1508 ----------------- Assets/InputSystemActions.cs.meta | 2 - Assets/InputSystemActions.inputactions | 1067 ------------ Assets/InputSystemActions.inputactions.meta | 14 - ...r.prefab => AlarmSingleIconManager.prefab} | 8 +- ...eta => AlarmSingleIconManager.prefab.meta} | 0 .../Prefabs/UI/Factory/InfoWindow.prefab | 4 +- Assets/Scenes/SampleProject.unity | 29 +- .../UVC/Factory/Alarm/AlarmDetailView.cs | 21 +- .../UVC/Factory/Alarm/AlarmIconManager.cs | 34 +- .../Scripts/UVC/Factory/Alarm/AlarmManager.cs | 4 +- .../Alarm/AlarmSigleIconManager.cs.meta | 2 - .../UVC/Factory/Alarm/AlarmSingleIcon.cs | 4 +- ...onManager.cs => AlarmSingleIconManager.cs} | 4 +- .../Alarm/AlarmSingleIconManager.cs.meta | 2 + .../Factory/Camera/FactoryCameraController.cs | 24 +- ProjectSettings/ProjectSettings.asset | 1 + 17 files changed, 57 insertions(+), 2671 deletions(-) delete mode 100644 Assets/InputSystemActions.cs delete mode 100644 Assets/InputSystemActions.cs.meta delete mode 100644 Assets/InputSystemActions.inputactions delete mode 100644 Assets/InputSystemActions.inputactions.meta rename Assets/Resources/Prefabs/UI/Factory/{AlarmSigleIconManager.prefab => AlarmSingleIconManager.prefab} (99%) rename Assets/Resources/Prefabs/UI/Factory/{AlarmSigleIconManager.prefab.meta => AlarmSingleIconManager.prefab.meta} (100%) delete mode 100644 Assets/Scripts/UVC/Factory/Alarm/AlarmSigleIconManager.cs.meta rename Assets/Scripts/UVC/Factory/Alarm/{AlarmSigleIconManager.cs => AlarmSingleIconManager.cs} (98%) create mode 100644 Assets/Scripts/UVC/Factory/Alarm/AlarmSingleIconManager.cs.meta diff --git a/Assets/InputSystemActions.cs b/Assets/InputSystemActions.cs deleted file mode 100644 index 19b0a0b5..00000000 --- a/Assets/InputSystemActions.cs +++ /dev/null @@ -1,1508 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.11.2 -// from Assets/InputSystemActions.inputactions -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine.InputSystem; -using UnityEngine.InputSystem.Utilities; - -public partial class @InputSystemActions: IInputActionCollection2, IDisposable -{ - public InputActionAsset asset { get; } - public @InputSystemActions() - { - asset = InputActionAsset.FromJson(@"{ - ""name"": ""InputSystemActions"", - ""maps"": [ - { - ""name"": ""Camera"", - ""id"": ""df70fa95-8a34-4494-b137-73ab6b9c7d37"", - ""actions"": [ - { - ""name"": ""Move"", - ""type"": ""Value"", - ""id"": ""351f2ccd-1f9f-44bf-9bec-d62ac5c5f408"", - ""expectedControlType"": ""Vector2"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": true - }, - { - ""name"": ""Rotate"", - ""type"": ""Value"", - ""id"": ""c8884351-b22a-4c94-8f91-ed0087cfa8d9"", - ""expectedControlType"": ""Vector2"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": true - } - ], - ""bindings"": [ - { - ""name"": """", - ""id"": ""978bfe49-cc26-4a3d-ab7b-7d7a29327403"", - ""path"": ""/leftStick"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Gamepad"", - ""action"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": ""WASD"", - ""id"": ""00ca640b-d935-4593-8157-c05846ea39b3"", - ""path"": ""Dpad"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Move"", - ""isComposite"": true, - ""isPartOfComposite"": false - }, - { - ""name"": ""up"", - ""id"": ""e2062cb9-1b15-46a2-838c-2f8d72a0bdd9"", - ""path"": ""/w"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Keyboard&Mouse"", - ""HandleClick"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""up"", - ""id"": ""8180e8bd-4097-4f4e-ab88-4523101a6ce9"", - ""path"": ""/upArrow"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Keyboard&Mouse"", - ""HandleClick"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""320bffee-a40b-4347-ac70-c210eb8bc73a"", - ""path"": ""/s"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Keyboard&Mouse"", - ""HandleClick"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""1c5327b5-f71c-4f60-99c7-4e737386f1d1"", - ""path"": ""/downArrow"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Keyboard&Mouse"", - ""HandleClick"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""d2581a9b-1d11-4566-b27d-b92aff5fabbc"", - ""path"": ""/a"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Keyboard&Mouse"", - ""HandleClick"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""2e46982e-44cc-431b-9f0b-c11910bf467a"", - ""path"": ""/leftArrow"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Keyboard&Mouse"", - ""HandleClick"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""fcfe95b8-67b9-4526-84b5-5d0bc98d6400"", - ""path"": ""/d"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Keyboard&Mouse"", - ""HandleClick"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""77bff152-3580-4b21-b6de-dcd0c7e41164"", - ""path"": ""/rightArrow"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Keyboard&Mouse"", - ""HandleClick"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": """", - ""id"": ""1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8"", - ""path"": ""/{Primary2DAxis}"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""XR"", - ""HandleClick"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""3ea4d645-4504-4529-b061-ab81934c3752"", - ""path"": ""/stick"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Joystick"", - ""HandleClick"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": ""2D Vector"", - ""id"": ""8e30d468-dbfb-4fcb-94d3-756f64612fd2"", - ""path"": ""2DVector"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Move"", - ""isComposite"": true, - ""isPartOfComposite"": false - }, - { - ""name"": ""Up"", - ""id"": ""a58c375e-043c-47d2-bb91-fcaf52e1bbec"", - ""path"": ""/delta/y"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""Down"", - ""id"": ""876d9ab8-74ed-4b39-9650-8e4e3234660d"", - ""path"": ""/delta/y"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""Left"", - ""id"": ""97c02038-86da-4d25-b4dd-e16aa17da4e1"", - ""path"": ""/delta/x"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""Right"", - ""id"": ""c3ab71f3-b1bb-4ff0-926c-37a29ad1353e"", - ""path"": ""/delta/x"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""WASD"", - ""id"": ""b0ad035b-b18b-4bf2-a94c-1bd92f417b18"", - ""path"": ""Dpad"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Rotate"", - ""isComposite"": true, - ""isPartOfComposite"": false - }, - { - ""name"": ""left"", - ""id"": ""a81e0869-51f2-40b4-bf1d-129cbb615e1d"", - ""path"": ""/q"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Keyboard&Mouse"", - ""HandleClick"": ""Rotate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""4080b5c7-908b-4ff1-bd28-cdf6a56a14a1"", - ""path"": ""/e"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Keyboard&Mouse"", - ""HandleClick"": ""Rotate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""2D Vector"", - ""id"": ""388cefb8-8489-40e0-9b83-d81b8433c6c6"", - ""path"": ""2DVector"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Rotate"", - ""isComposite"": true, - ""isPartOfComposite"": false - }, - { - ""name"": ""Left"", - ""id"": ""77c8405c-47a5-4cdd-a9b7-86e3f6f5377c"", - ""path"": ""/delta/x"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Rotate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""Right"", - ""id"": ""7af7dd36-37ed-4560-bc8a-adee419673a3"", - ""path"": ""/delta/x"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Rotate"", - ""isComposite"": false, - ""isPartOfComposite"": true - } - ] - }, - { - ""name"": ""UI"", - ""id"": ""272f6d14-89ba-496f-b7ff-215263d3219f"", - ""actions"": [ - { - ""name"": ""Navigate"", - ""type"": ""PassThrough"", - ""id"": ""c95b2375-e6d9-4b88-9c4c-c5e76515df4b"", - ""expectedControlType"": ""Vector2"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""Submit"", - ""type"": ""Button"", - ""id"": ""7607c7b6-cd76-4816-beef-bd0341cfe950"", - ""expectedControlType"": ""Button"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""Cancel"", - ""type"": ""Button"", - ""id"": ""15cef263-9014-4fd5-94d9-4e4a6234a6ef"", - ""expectedControlType"": ""Button"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""Point"", - ""type"": ""PassThrough"", - ""id"": ""32b35790-4ed0-4e9a-aa41-69ac6d629449"", - ""expectedControlType"": ""Vector2"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": true - }, - { - ""name"": ""Click"", - ""type"": ""PassThrough"", - ""id"": ""3c7022bf-7922-4f7c-a998-c437916075ad"", - ""expectedControlType"": ""Button"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": true - }, - { - ""name"": ""RightClick"", - ""type"": ""PassThrough"", - ""id"": ""44b200b1-1557-4083-816c-b22cbdf77ddf"", - ""expectedControlType"": ""Button"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""MiddleClick"", - ""type"": ""PassThrough"", - ""id"": ""dad70c86-b58c-4b17-88ad-f5e53adf419e"", - ""expectedControlType"": ""Button"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""ScrollWheel"", - ""type"": ""PassThrough"", - ""id"": ""0489e84a-4833-4c40-bfae-cea84b696689"", - ""expectedControlType"": ""Vector2"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""TrackedDevicePosition"", - ""type"": ""PassThrough"", - ""id"": ""24908448-c609-4bc3-a128-ea258674378a"", - ""expectedControlType"": ""Vector3"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""TrackedDeviceOrientation"", - ""type"": ""PassThrough"", - ""id"": ""9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be"", - ""expectedControlType"": ""Quaternion"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""MouseDelta"", - ""type"": ""PassThrough"", - ""id"": ""89953ab7-4ac2-489d-9a68-0af548c92a6f"", - ""expectedControlType"": ""Vector2"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": true - }, - { - ""name"": ""Drag"", - ""type"": ""Value"", - ""id"": ""2a73bbf4-5c88-4e6e-a56c-8afeb7ebd2d0"", - ""expectedControlType"": ""Vector2"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": true - } - ], - ""bindings"": [ - { - ""name"": ""Gamepad"", - ""id"": ""809f371f-c5e2-4e7a-83a1-d867598f40dd"", - ""path"": ""2DVector"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Navigate"", - ""isComposite"": true, - ""isPartOfComposite"": false - }, - { - ""name"": ""up"", - ""id"": ""14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf"", - ""path"": ""/leftStick/up"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Gamepad"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""up"", - ""id"": ""9144cbe6-05e1-4687-a6d7-24f99d23dd81"", - ""path"": ""/rightStick/up"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Gamepad"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""2db08d65-c5fb-421b-983f-c71163608d67"", - ""path"": ""/leftStick/down"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Gamepad"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""58748904-2ea9-4a80-8579-b500e6a76df8"", - ""path"": ""/rightStick/down"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Gamepad"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""8ba04515-75aa-45de-966d-393d9bbd1c14"", - ""path"": ""/leftStick/left"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Gamepad"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""712e721c-bdfb-4b23-a86c-a0d9fcfea921"", - ""path"": ""/rightStick/left"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Gamepad"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""fcd248ae-a788-4676-a12e-f4d81205600b"", - ""path"": ""/leftStick/right"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Gamepad"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""1f04d9bc-c50b-41a1-bfcc-afb75475ec20"", - ""path"": ""/rightStick/right"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Gamepad"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": """", - ""id"": ""fb8277d4-c5cd-4663-9dc7-ee3f0b506d90"", - ""path"": ""/dpad"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Gamepad"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": ""Joystick"", - ""id"": ""e25d9774-381c-4a61-b47c-7b6b299ad9f9"", - ""path"": ""2DVector"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Navigate"", - ""isComposite"": true, - ""isPartOfComposite"": false - }, - { - ""name"": ""up"", - ""id"": ""3db53b26-6601-41be-9887-63ac74e79d19"", - ""path"": ""/stick/up"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Joystick"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""0cb3e13e-3d90-4178-8ae6-d9c5501d653f"", - ""path"": ""/stick/down"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Joystick"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""0392d399-f6dd-4c82-8062-c1e9c0d34835"", - ""path"": ""/stick/left"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Joystick"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""942a66d9-d42f-43d6-8d70-ecb4ba5363bc"", - ""path"": ""/stick/right"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Joystick"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""Keyboard"", - ""id"": ""ff527021-f211-4c02-933e-5976594c46ed"", - ""path"": ""2DVector"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Navigate"", - ""isComposite"": true, - ""isPartOfComposite"": false - }, - { - ""name"": ""up"", - ""id"": ""563fbfdd-0f09-408d-aa75-8642c4f08ef0"", - ""path"": ""/w"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""up"", - ""id"": ""eb480147-c587-4a33-85ed-eb0ab9942c43"", - ""path"": ""/upArrow"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""2bf42165-60bc-42ca-8072-8c13ab40239b"", - ""path"": ""/s"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""85d264ad-e0a0-4565-b7ff-1a37edde51ac"", - ""path"": ""/downArrow"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""74214943-c580-44e4-98eb-ad7eebe17902"", - ""path"": ""/a"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""cea9b045-a000-445b-95b8-0c171af70a3b"", - ""path"": ""/leftArrow"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""8607c725-d935-4808-84b1-8354e29bab63"", - ""path"": ""/d"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""4cda81dc-9edd-4e03-9d7c-a71a14345d0b"", - ""path"": ""/rightArrow"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse"", - ""HandleClick"": ""Navigate"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": """", - ""id"": ""9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc"", - ""path"": ""*/{Submit}"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse;Gamepad;Touch;Joystick;XR"", - ""HandleClick"": ""Submit"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""82627dcc-3b13-4ba9-841d-e4b746d6553e"", - ""path"": ""*/{Cancel}"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse;Gamepad;Touch;Joystick;XR"", - ""HandleClick"": ""Cancel"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""c52c8e0b-8179-41d3-b8a1-d149033bbe86"", - ""path"": ""/position"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse"", - ""HandleClick"": ""Point"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""e1394cbc-336e-44ce-9ea8-6007ed6193f7"", - ""path"": ""/position"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse"", - ""HandleClick"": ""Point"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""5693e57a-238a-46ed-b5ae-e64e6e574302"", - ""path"": ""/touch*/position"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Touch"", - ""HandleClick"": ""Point"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""4faf7dc9-b979-4210-aa8c-e808e1ef89f5"", - ""path"": ""/leftButton"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Keyboard&Mouse"", - ""HandleClick"": ""Click"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""8d66d5ba-88d7-48e6-b1cd-198bbfef7ace"", - ""path"": ""/tip"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Keyboard&Mouse"", - ""HandleClick"": ""Click"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""47c2a644-3ebc-4dae-a106-589b7ca75b59"", - ""path"": ""/touch*/press"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Touch"", - ""HandleClick"": ""Click"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""bb9e6b34-44bf-4381-ac63-5aa15d19f677"", - ""path"": ""/trigger"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""XR"", - ""HandleClick"": ""Click"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""38c99815-14ea-4617-8627-164d27641299"", - ""path"": ""/scroll"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Keyboard&Mouse"", - ""HandleClick"": ""ScrollWheel"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""4c191405-5738-4d4b-a523-c6a301dbf754"", - ""path"": ""/rightButton"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse"", - ""HandleClick"": ""RightClick"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""24066f69-da47-44f3-a07e-0015fb02eb2e"", - ""path"": ""/middleButton"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse"", - ""HandleClick"": ""MiddleClick"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77"", - ""path"": ""/devicePosition"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""XR"", - ""HandleClick"": ""TrackedDevicePosition"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""23e01e3a-f935-4948-8d8b-9bcac77714fb"", - ""path"": ""/deviceRotation"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""XR"", - ""HandleClick"": ""TrackedDeviceOrientation"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""3ebbc4b6-e98a-45d0-a026-fd33a8ed07d1"", - ""path"": ""/delta"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""MouseDelta"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": ""2D Vector"", - ""id"": ""e70277f7-bdb5-41c3-8ccf-6de9c44d696f"", - ""path"": ""2DVector"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Drag"", - ""isComposite"": true, - ""isPartOfComposite"": false - }, - { - ""name"": ""Up"", - ""id"": ""93aab51e-6e37-4a90-9a4e-52d9c66734e6"", - ""path"": ""/delta/y"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Drag"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""Down"", - ""id"": ""9227b639-71db-4b64-8e6f-2a40af6e5356"", - ""path"": ""/delta/y"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Drag"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""Left"", - ""id"": ""74989929-4f66-43d8-8f72-08ad30e80b63"", - ""path"": ""/delta/x"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Drag"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""Right"", - ""id"": ""f5ad73ff-294b-422e-9d4b-b81379b25e08"", - ""path"": ""/delta/x"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Drag"", - ""isComposite"": false, - ""isPartOfComposite"": true - } - ] - }, - { - ""name"": ""MouseControl"", - ""id"": ""739cfcf7-7b2b-466a-b279-1418662a59e0"", - ""actions"": [ - { - ""name"": ""Click"", - ""type"": ""PassThrough"", - ""id"": ""cd2dd8bd-1638-4435-bfd8-73db4c228770"", - ""expectedControlType"": ""Button"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""MiddleClick"", - ""type"": ""PassThrough"", - ""id"": ""6984c679-a874-4243-b825-8eccad55bde6"", - ""expectedControlType"": ""Button"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""RightClick"", - ""type"": ""PassThrough"", - ""id"": ""de031631-6039-4e47-9b01-5b432e06d5af"", - ""expectedControlType"": ""Button"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""Point"", - ""type"": ""Value"", - ""id"": ""03d4b3df-1fe1-492a-ad06-4ce400589655"", - ""expectedControlType"": ""Vector2"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": true - } - ], - ""bindings"": [ - { - ""name"": """", - ""id"": ""cb105049-9b91-49cb-93a5-167c0295fab2"", - ""path"": ""/leftButton"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Keyboard&Mouse"", - ""HandleClick"": ""Click"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""d90ff2da-6108-4d86-8fd6-c46befc9c752"", - ""path"": ""/tip"", - ""interactions"": """", - ""processors"": """", - ""groups"": "";Keyboard&Mouse"", - ""HandleClick"": ""Click"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""ac8ddca5-3164-405a-9c03-00e69ba5f9d8"", - ""path"": ""/touch*/press"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Touch"", - ""HandleClick"": ""Click"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""dfd3ff79-7b25-42b4-aad1-be5674a4c233"", - ""path"": ""/trigger"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""XR"", - ""HandleClick"": ""Click"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""9af26aba-1883-47bc-b820-d94198fed27d"", - ""path"": ""/middleButton"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse"", - ""HandleClick"": ""MiddleClick"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""9d4d0cf0-566c-4413-9995-68870b71187d"", - ""path"": ""/rightButton"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard&Mouse"", - ""HandleClick"": ""RightClick"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""5784cd38-6174-479d-ab61-b8a6dd7da428"", - ""path"": ""/position"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""HandleClick"": ""Point"", - ""isComposite"": false, - ""isPartOfComposite"": false - } - ] - } - ], - ""controlSchemes"": [ - { - ""name"": ""Keyboard&Mouse"", - ""bindingGroup"": ""Keyboard&Mouse"", - ""devices"": [ - { - ""devicePath"": """", - ""isOptional"": false, - ""isOR"": false - }, - { - ""devicePath"": """", - ""isOptional"": false, - ""isOR"": false - } - ] - }, - { - ""name"": ""Gamepad"", - ""bindingGroup"": ""Gamepad"", - ""devices"": [ - { - ""devicePath"": """", - ""isOptional"": false, - ""isOR"": false - } - ] - }, - { - ""name"": ""Touch"", - ""bindingGroup"": ""Touch"", - ""devices"": [ - { - ""devicePath"": """", - ""isOptional"": false, - ""isOR"": false - } - ] - }, - { - ""name"": ""Joystick"", - ""bindingGroup"": ""Joystick"", - ""devices"": [ - { - ""devicePath"": """", - ""isOptional"": false, - ""isOR"": false - } - ] - }, - { - ""name"": ""XR"", - ""bindingGroup"": ""XR"", - ""devices"": [ - { - ""devicePath"": """", - ""isOptional"": false, - ""isOR"": false - } - ] - } - ] -}"); - // Camera - m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true); - m_Camera_Move = m_Camera.FindAction("Move", throwIfNotFound: true); - m_Camera_Rotate = m_Camera.FindAction("Rotate", throwIfNotFound: true); - // UI - m_UI = asset.FindActionMap("UI", throwIfNotFound: true); - m_UI_Navigate = m_UI.FindAction("Navigate", throwIfNotFound: true); - m_UI_Submit = m_UI.FindAction("Submit", throwIfNotFound: true); - m_UI_Cancel = m_UI.FindAction("Cancel", throwIfNotFound: true); - m_UI_Point = m_UI.FindAction("Point", throwIfNotFound: true); - m_UI_Click = m_UI.FindAction("Click", throwIfNotFound: true); - m_UI_RightClick = m_UI.FindAction("RightClick", throwIfNotFound: true); - m_UI_MiddleClick = m_UI.FindAction("MiddleClick", throwIfNotFound: true); - m_UI_ScrollWheel = m_UI.FindAction("ScrollWheel", throwIfNotFound: true); - m_UI_TrackedDevicePosition = m_UI.FindAction("TrackedDevicePosition", throwIfNotFound: true); - m_UI_TrackedDeviceOrientation = m_UI.FindAction("TrackedDeviceOrientation", throwIfNotFound: true); - m_UI_MouseDelta = m_UI.FindAction("MouseDelta", throwIfNotFound: true); - m_UI_Drag = m_UI.FindAction("Drag", throwIfNotFound: true); - // MouseControl - m_MouseControl = asset.FindActionMap("MouseControl", throwIfNotFound: true); - m_MouseControl_Click = m_MouseControl.FindAction("Click", throwIfNotFound: true); - m_MouseControl_MiddleClick = m_MouseControl.FindAction("MiddleClick", throwIfNotFound: true); - m_MouseControl_RightClick = m_MouseControl.FindAction("RightClick", throwIfNotFound: true); - m_MouseControl_Point = m_MouseControl.FindAction("Point", throwIfNotFound: true); - } - - ~@InputSystemActions() - { - UnityEngine.Debug.Assert(!m_Camera.enabled, "This will cause a leak and performance issues, InputSystemActions.Camera.Disable() has not been called."); - UnityEngine.Debug.Assert(!m_UI.enabled, "This will cause a leak and performance issues, InputSystemActions.UI.Disable() has not been called."); - UnityEngine.Debug.Assert(!m_MouseControl.enabled, "This will cause a leak and performance issues, InputSystemActions.MouseControl.Disable() has not been called."); - } - - public void Dispose() - { - UnityEngine.Object.Destroy(asset); - } - - public InputBinding? bindingMask - { - get => asset.bindingMask; - set => asset.bindingMask = value; - } - - public ReadOnlyArray? devices - { - get => asset.devices; - set => asset.devices = value; - } - - public ReadOnlyArray controlSchemes => asset.controlSchemes; - - public bool Contains(InputAction action) - { - return asset.Contains(action); - } - - public IEnumerator GetEnumerator() - { - return asset.GetEnumerator(); - } - - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - - public void Enable() - { - asset.Enable(); - } - - public void Disable() - { - asset.Disable(); - } - - public IEnumerable bindings => asset.bindings; - - public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false) - { - return asset.FindAction(actionNameOrId, throwIfNotFound); - } - - public int FindBinding(InputBinding bindingMask, out InputAction action) - { - return asset.FindBinding(bindingMask, out action); - } - - // Camera - private readonly InputActionMap m_Camera; - private List m_CameraActionsCallbackInterfaces = new List(); - private readonly InputAction m_Camera_Move; - private readonly InputAction m_Camera_Rotate; - public struct CameraActions - { - private @InputSystemActions m_Wrapper; - public CameraActions(@InputSystemActions wrapper) { m_Wrapper = wrapper; } - public InputAction @Move => m_Wrapper.m_Camera_Move; - public InputAction @Rotate => m_Wrapper.m_Camera_Rotate; - public InputActionMap Get() { return m_Wrapper.m_Camera; } - public void Enable() { Get().Enable(); } - public void Disable() { Get().Disable(); } - public bool enabled => Get().enabled; - public static implicit operator InputActionMap(CameraActions set) { return set.Get(); } - public void AddCallbacks(ICameraActions instance) - { - if (instance == null || m_Wrapper.m_CameraActionsCallbackInterfaces.Contains(instance)) return; - m_Wrapper.m_CameraActionsCallbackInterfaces.Add(instance); - @Move.started += instance.OnMove; - @Move.performed += instance.OnMove; - @Move.canceled += instance.OnMove; - @Rotate.started += instance.OnRotate; - @Rotate.performed += instance.OnRotate; - @Rotate.canceled += instance.OnRotate; - } - - private void UnregisterCallbacks(ICameraActions instance) - { - @Move.started -= instance.OnMove; - @Move.performed -= instance.OnMove; - @Move.canceled -= instance.OnMove; - @Rotate.started -= instance.OnRotate; - @Rotate.performed -= instance.OnRotate; - @Rotate.canceled -= instance.OnRotate; - } - - public void RemoveCallbacks(ICameraActions instance) - { - if (m_Wrapper.m_CameraActionsCallbackInterfaces.Remove(instance)) - UnregisterCallbacks(instance); - } - - public void SetCallbacks(ICameraActions instance) - { - foreach (var item in m_Wrapper.m_CameraActionsCallbackInterfaces) - UnregisterCallbacks(item); - m_Wrapper.m_CameraActionsCallbackInterfaces.Clear(); - AddCallbacks(instance); - } - } - public CameraActions @Camera => new CameraActions(this); - - // UI - private readonly InputActionMap m_UI; - private List m_UIActionsCallbackInterfaces = new List(); - private readonly InputAction m_UI_Navigate; - private readonly InputAction m_UI_Submit; - private readonly InputAction m_UI_Cancel; - private readonly InputAction m_UI_Point; - private readonly InputAction m_UI_Click; - private readonly InputAction m_UI_RightClick; - private readonly InputAction m_UI_MiddleClick; - private readonly InputAction m_UI_ScrollWheel; - private readonly InputAction m_UI_TrackedDevicePosition; - private readonly InputAction m_UI_TrackedDeviceOrientation; - private readonly InputAction m_UI_MouseDelta; - private readonly InputAction m_UI_Drag; - public struct UIActions - { - private @InputSystemActions m_Wrapper; - public UIActions(@InputSystemActions wrapper) { m_Wrapper = wrapper; } - public InputAction @Navigate => m_Wrapper.m_UI_Navigate; - public InputAction @Submit => m_Wrapper.m_UI_Submit; - public InputAction @Cancel => m_Wrapper.m_UI_Cancel; - public InputAction @Point => m_Wrapper.m_UI_Point; - public InputAction @Click => m_Wrapper.m_UI_Click; - public InputAction @RightClick => m_Wrapper.m_UI_RightClick; - public InputAction @MiddleClick => m_Wrapper.m_UI_MiddleClick; - public InputAction @ScrollWheel => m_Wrapper.m_UI_ScrollWheel; - public InputAction @TrackedDevicePosition => m_Wrapper.m_UI_TrackedDevicePosition; - public InputAction @TrackedDeviceOrientation => m_Wrapper.m_UI_TrackedDeviceOrientation; - public InputAction @MouseDelta => m_Wrapper.m_UI_MouseDelta; - public InputAction @Drag => m_Wrapper.m_UI_Drag; - public InputActionMap Get() { return m_Wrapper.m_UI; } - public void Enable() { Get().Enable(); } - public void Disable() { Get().Disable(); } - public bool enabled => Get().enabled; - public static implicit operator InputActionMap(UIActions set) { return set.Get(); } - public void AddCallbacks(IUIActions instance) - { - if (instance == null || m_Wrapper.m_UIActionsCallbackInterfaces.Contains(instance)) return; - m_Wrapper.m_UIActionsCallbackInterfaces.Add(instance); - @Navigate.started += instance.OnNavigate; - @Navigate.performed += instance.OnNavigate; - @Navigate.canceled += instance.OnNavigate; - @Submit.started += instance.OnSubmit; - @Submit.performed += instance.OnSubmit; - @Submit.canceled += instance.OnSubmit; - @Cancel.started += instance.OnCancel; - @Cancel.performed += instance.OnCancel; - @Cancel.canceled += instance.OnCancel; - @Point.started += instance.OnPoint; - @Point.performed += instance.OnPoint; - @Point.canceled += instance.OnPoint; - @Click.started += instance.OnClick; - @Click.performed += instance.OnClick; - @Click.canceled += instance.OnClick; - @RightClick.started += instance.OnRightClick; - @RightClick.performed += instance.OnRightClick; - @RightClick.canceled += instance.OnRightClick; - @MiddleClick.started += instance.OnMiddleClick; - @MiddleClick.performed += instance.OnMiddleClick; - @MiddleClick.canceled += instance.OnMiddleClick; - @ScrollWheel.started += instance.OnScrollWheel; - @ScrollWheel.performed += instance.OnScrollWheel; - @ScrollWheel.canceled += instance.OnScrollWheel; - @TrackedDevicePosition.started += instance.OnTrackedDevicePosition; - @TrackedDevicePosition.performed += instance.OnTrackedDevicePosition; - @TrackedDevicePosition.canceled += instance.OnTrackedDevicePosition; - @TrackedDeviceOrientation.started += instance.OnTrackedDeviceOrientation; - @TrackedDeviceOrientation.performed += instance.OnTrackedDeviceOrientation; - @TrackedDeviceOrientation.canceled += instance.OnTrackedDeviceOrientation; - @MouseDelta.started += instance.OnMouseDelta; - @MouseDelta.performed += instance.OnMouseDelta; - @MouseDelta.canceled += instance.OnMouseDelta; - @Drag.started += instance.OnDrag; - @Drag.performed += instance.OnDrag; - @Drag.canceled += instance.OnDrag; - } - - private void UnregisterCallbacks(IUIActions instance) - { - @Navigate.started -= instance.OnNavigate; - @Navigate.performed -= instance.OnNavigate; - @Navigate.canceled -= instance.OnNavigate; - @Submit.started -= instance.OnSubmit; - @Submit.performed -= instance.OnSubmit; - @Submit.canceled -= instance.OnSubmit; - @Cancel.started -= instance.OnCancel; - @Cancel.performed -= instance.OnCancel; - @Cancel.canceled -= instance.OnCancel; - @Point.started -= instance.OnPoint; - @Point.performed -= instance.OnPoint; - @Point.canceled -= instance.OnPoint; - @Click.started -= instance.OnClick; - @Click.performed -= instance.OnClick; - @Click.canceled -= instance.OnClick; - @RightClick.started -= instance.OnRightClick; - @RightClick.performed -= instance.OnRightClick; - @RightClick.canceled -= instance.OnRightClick; - @MiddleClick.started -= instance.OnMiddleClick; - @MiddleClick.performed -= instance.OnMiddleClick; - @MiddleClick.canceled -= instance.OnMiddleClick; - @ScrollWheel.started -= instance.OnScrollWheel; - @ScrollWheel.performed -= instance.OnScrollWheel; - @ScrollWheel.canceled -= instance.OnScrollWheel; - @TrackedDevicePosition.started -= instance.OnTrackedDevicePosition; - @TrackedDevicePosition.performed -= instance.OnTrackedDevicePosition; - @TrackedDevicePosition.canceled -= instance.OnTrackedDevicePosition; - @TrackedDeviceOrientation.started -= instance.OnTrackedDeviceOrientation; - @TrackedDeviceOrientation.performed -= instance.OnTrackedDeviceOrientation; - @TrackedDeviceOrientation.canceled -= instance.OnTrackedDeviceOrientation; - @MouseDelta.started -= instance.OnMouseDelta; - @MouseDelta.performed -= instance.OnMouseDelta; - @MouseDelta.canceled -= instance.OnMouseDelta; - @Drag.started -= instance.OnDrag; - @Drag.performed -= instance.OnDrag; - @Drag.canceled -= instance.OnDrag; - } - - public void RemoveCallbacks(IUIActions instance) - { - if (m_Wrapper.m_UIActionsCallbackInterfaces.Remove(instance)) - UnregisterCallbacks(instance); - } - - public void SetCallbacks(IUIActions instance) - { - foreach (var item in m_Wrapper.m_UIActionsCallbackInterfaces) - UnregisterCallbacks(item); - m_Wrapper.m_UIActionsCallbackInterfaces.Clear(); - AddCallbacks(instance); - } - } - public UIActions @UI => new UIActions(this); - - // MouseControl - private readonly InputActionMap m_MouseControl; - private List m_MouseControlActionsCallbackInterfaces = new List(); - private readonly InputAction m_MouseControl_Click; - private readonly InputAction m_MouseControl_MiddleClick; - private readonly InputAction m_MouseControl_RightClick; - private readonly InputAction m_MouseControl_Point; - public struct MouseControlActions - { - private @InputSystemActions m_Wrapper; - public MouseControlActions(@InputSystemActions wrapper) { m_Wrapper = wrapper; } - public InputAction @Click => m_Wrapper.m_MouseControl_Click; - public InputAction @MiddleClick => m_Wrapper.m_MouseControl_MiddleClick; - public InputAction @RightClick => m_Wrapper.m_MouseControl_RightClick; - public InputAction @Point => m_Wrapper.m_MouseControl_Point; - public InputActionMap Get() { return m_Wrapper.m_MouseControl; } - public void Enable() { Get().Enable(); } - public void Disable() { Get().Disable(); } - public bool enabled => Get().enabled; - public static implicit operator InputActionMap(MouseControlActions set) { return set.Get(); } - public void AddCallbacks(IMouseControlActions instance) - { - if (instance == null || m_Wrapper.m_MouseControlActionsCallbackInterfaces.Contains(instance)) return; - m_Wrapper.m_MouseControlActionsCallbackInterfaces.Add(instance); - @Click.started += instance.OnClick; - @Click.performed += instance.OnClick; - @Click.canceled += instance.OnClick; - @MiddleClick.started += instance.OnMiddleClick; - @MiddleClick.performed += instance.OnMiddleClick; - @MiddleClick.canceled += instance.OnMiddleClick; - @RightClick.started += instance.OnRightClick; - @RightClick.performed += instance.OnRightClick; - @RightClick.canceled += instance.OnRightClick; - @Point.started += instance.OnPoint; - @Point.performed += instance.OnPoint; - @Point.canceled += instance.OnPoint; - } - - private void UnregisterCallbacks(IMouseControlActions instance) - { - @Click.started -= instance.OnClick; - @Click.performed -= instance.OnClick; - @Click.canceled -= instance.OnClick; - @MiddleClick.started -= instance.OnMiddleClick; - @MiddleClick.performed -= instance.OnMiddleClick; - @MiddleClick.canceled -= instance.OnMiddleClick; - @RightClick.started -= instance.OnRightClick; - @RightClick.performed -= instance.OnRightClick; - @RightClick.canceled -= instance.OnRightClick; - @Point.started -= instance.OnPoint; - @Point.performed -= instance.OnPoint; - @Point.canceled -= instance.OnPoint; - } - - public void RemoveCallbacks(IMouseControlActions instance) - { - if (m_Wrapper.m_MouseControlActionsCallbackInterfaces.Remove(instance)) - UnregisterCallbacks(instance); - } - - public void SetCallbacks(IMouseControlActions instance) - { - foreach (var item in m_Wrapper.m_MouseControlActionsCallbackInterfaces) - UnregisterCallbacks(item); - m_Wrapper.m_MouseControlActionsCallbackInterfaces.Clear(); - AddCallbacks(instance); - } - } - public MouseControlActions @MouseControl => new MouseControlActions(this); - private int m_KeyboardMouseSchemeIndex = -1; - public InputControlScheme KeyboardMouseScheme - { - get - { - if (m_KeyboardMouseSchemeIndex == -1) m_KeyboardMouseSchemeIndex = asset.FindControlSchemeIndex("Keyboard&Mouse"); - return asset.controlSchemes[m_KeyboardMouseSchemeIndex]; - } - } - private int m_GamepadSchemeIndex = -1; - public InputControlScheme GamepadScheme - { - get - { - if (m_GamepadSchemeIndex == -1) m_GamepadSchemeIndex = asset.FindControlSchemeIndex("Gamepad"); - return asset.controlSchemes[m_GamepadSchemeIndex]; - } - } - private int m_TouchSchemeIndex = -1; - public InputControlScheme TouchScheme - { - get - { - if (m_TouchSchemeIndex == -1) m_TouchSchemeIndex = asset.FindControlSchemeIndex("Touch"); - return asset.controlSchemes[m_TouchSchemeIndex]; - } - } - private int m_JoystickSchemeIndex = -1; - public InputControlScheme JoystickScheme - { - get - { - if (m_JoystickSchemeIndex == -1) m_JoystickSchemeIndex = asset.FindControlSchemeIndex("Joystick"); - return asset.controlSchemes[m_JoystickSchemeIndex]; - } - } - private int m_XRSchemeIndex = -1; - public InputControlScheme XRScheme - { - get - { - if (m_XRSchemeIndex == -1) m_XRSchemeIndex = asset.FindControlSchemeIndex("XR"); - return asset.controlSchemes[m_XRSchemeIndex]; - } - } - public interface ICameraActions - { - void OnMove(InputAction.CallbackContext context); - void OnRotate(InputAction.CallbackContext context); - } - public interface IUIActions - { - void OnNavigate(InputAction.CallbackContext context); - void OnSubmit(InputAction.CallbackContext context); - void OnCancel(InputAction.CallbackContext context); - void OnPoint(InputAction.CallbackContext context); - void OnClick(InputAction.CallbackContext context); - void OnRightClick(InputAction.CallbackContext context); - void OnMiddleClick(InputAction.CallbackContext context); - void OnScrollWheel(InputAction.CallbackContext context); - void OnTrackedDevicePosition(InputAction.CallbackContext context); - void OnTrackedDeviceOrientation(InputAction.CallbackContext context); - void OnMouseDelta(InputAction.CallbackContext context); - void OnDrag(InputAction.CallbackContext context); - } - public interface IMouseControlActions - { - void OnClick(InputAction.CallbackContext context); - void OnMiddleClick(InputAction.CallbackContext context); - void OnRightClick(InputAction.CallbackContext context); - void OnPoint(InputAction.CallbackContext context); - } -} diff --git a/Assets/InputSystemActions.cs.meta b/Assets/InputSystemActions.cs.meta deleted file mode 100644 index 139363e7..00000000 --- a/Assets/InputSystemActions.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 74d9a9294205ec340ba5e232f6081ac0 \ No newline at end of file diff --git a/Assets/InputSystemActions.inputactions b/Assets/InputSystemActions.inputactions deleted file mode 100644 index f90ad70f..00000000 --- a/Assets/InputSystemActions.inputactions +++ /dev/null @@ -1,1067 +0,0 @@ -{ - "name": "InputSystemActions", - "maps": [ - { - "name": "Camera", - "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", - "actions": [ - { - "name": "Move", - "type": "Value", - "id": "351f2ccd-1f9f-44bf-9bec-d62ac5c5f408", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Rotate", - "type": "Value", - "id": "c8884351-b22a-4c94-8f91-ed0087cfa8d9", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - } - ], - "bindings": [ - { - "name": "", - "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", - "path": "/leftStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "WASD", - "id": "00ca640b-d935-4593-8157-c05846ea39b3", - "path": "Dpad", - "interactions": "", - "processors": "", - "groups": "", - "action": "Move", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", - "path": "/w", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "8180e8bd-4097-4f4e-ab88-4523101a6ce9", - "path": "/upArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", - "path": "/s", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "1c5327b5-f71c-4f60-99c7-4e737386f1d1", - "path": "/downArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", - "path": "/a", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "2e46982e-44cc-431b-9f0b-c11910bf467a", - "path": "/leftArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", - "path": "/d", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "77bff152-3580-4b21-b6de-dcd0c7e41164", - "path": "/rightArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8", - "path": "/{Primary2DAxis}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "3ea4d645-4504-4529-b061-ab81934c3752", - "path": "/stick", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "2D Vector", - "id": "8e30d468-dbfb-4fcb-94d3-756f64612fd2", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Move", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "Up", - "id": "a58c375e-043c-47d2-bb91-fcaf52e1bbec", - "path": "/delta/y", - "interactions": "", - "processors": "", - "groups": "", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "Down", - "id": "876d9ab8-74ed-4b39-9650-8e4e3234660d", - "path": "/delta/y", - "interactions": "", - "processors": "", - "groups": "", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "Left", - "id": "97c02038-86da-4d25-b4dd-e16aa17da4e1", - "path": "/delta/x", - "interactions": "", - "processors": "", - "groups": "", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "Right", - "id": "c3ab71f3-b1bb-4ff0-926c-37a29ad1353e", - "path": "/delta/x", - "interactions": "", - "processors": "", - "groups": "", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "WASD", - "id": "b0ad035b-b18b-4bf2-a94c-1bd92f417b18", - "path": "Dpad", - "interactions": "", - "processors": "", - "groups": "", - "action": "Rotate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "left", - "id": "a81e0869-51f2-40b4-bf1d-129cbb615e1d", - "path": "/q", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Rotate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "4080b5c7-908b-4ff1-bd28-cdf6a56a14a1", - "path": "/e", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Rotate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "2D Vector", - "id": "388cefb8-8489-40e0-9b83-d81b8433c6c6", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Rotate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "Left", - "id": "77c8405c-47a5-4cdd-a9b7-86e3f6f5377c", - "path": "/delta/x", - "interactions": "", - "processors": "", - "groups": "", - "action": "Rotate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "Right", - "id": "7af7dd36-37ed-4560-bc8a-adee419673a3", - "path": "/delta/x", - "interactions": "", - "processors": "", - "groups": "", - "action": "Rotate", - "isComposite": false, - "isPartOfComposite": true - } - ] - }, - { - "name": "UI", - "id": "272f6d14-89ba-496f-b7ff-215263d3219f", - "actions": [ - { - "name": "Navigate", - "type": "PassThrough", - "id": "c95b2375-e6d9-4b88-9c4c-c5e76515df4b", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Submit", - "type": "Button", - "id": "7607c7b6-cd76-4816-beef-bd0341cfe950", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Cancel", - "type": "Button", - "id": "15cef263-9014-4fd5-94d9-4e4a6234a6ef", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Point", - "type": "PassThrough", - "id": "32b35790-4ed0-4e9a-aa41-69ac6d629449", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Click", - "type": "PassThrough", - "id": "3c7022bf-7922-4f7c-a998-c437916075ad", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "RightClick", - "type": "PassThrough", - "id": "44b200b1-1557-4083-816c-b22cbdf77ddf", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "MiddleClick", - "type": "PassThrough", - "id": "dad70c86-b58c-4b17-88ad-f5e53adf419e", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "ScrollWheel", - "type": "PassThrough", - "id": "0489e84a-4833-4c40-bfae-cea84b696689", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "TrackedDevicePosition", - "type": "PassThrough", - "id": "24908448-c609-4bc3-a128-ea258674378a", - "expectedControlType": "Vector3", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "TrackedDeviceOrientation", - "type": "PassThrough", - "id": "9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be", - "expectedControlType": "Quaternion", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "MouseDelta", - "type": "PassThrough", - "id": "89953ab7-4ac2-489d-9a68-0af548c92a6f", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Drag", - "type": "Value", - "id": "2a73bbf4-5c88-4e6e-a56c-8afeb7ebd2d0", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - } - ], - "bindings": [ - { - "name": "Gamepad", - "id": "809f371f-c5e2-4e7a-83a1-d867598f40dd", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Navigate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf", - "path": "/leftStick/up", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "9144cbe6-05e1-4687-a6d7-24f99d23dd81", - "path": "/rightStick/up", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "2db08d65-c5fb-421b-983f-c71163608d67", - "path": "/leftStick/down", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "58748904-2ea9-4a80-8579-b500e6a76df8", - "path": "/rightStick/down", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "8ba04515-75aa-45de-966d-393d9bbd1c14", - "path": "/leftStick/left", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "712e721c-bdfb-4b23-a86c-a0d9fcfea921", - "path": "/rightStick/left", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "fcd248ae-a788-4676-a12e-f4d81205600b", - "path": "/leftStick/right", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "1f04d9bc-c50b-41a1-bfcc-afb75475ec20", - "path": "/rightStick/right", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "fb8277d4-c5cd-4663-9dc7-ee3f0b506d90", - "path": "/dpad", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "Joystick", - "id": "e25d9774-381c-4a61-b47c-7b6b299ad9f9", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Navigate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "3db53b26-6601-41be-9887-63ac74e79d19", - "path": "/stick/up", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "0cb3e13e-3d90-4178-8ae6-d9c5501d653f", - "path": "/stick/down", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "0392d399-f6dd-4c82-8062-c1e9c0d34835", - "path": "/stick/left", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "942a66d9-d42f-43d6-8d70-ecb4ba5363bc", - "path": "/stick/right", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "Keyboard", - "id": "ff527021-f211-4c02-933e-5976594c46ed", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Navigate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "563fbfdd-0f09-408d-aa75-8642c4f08ef0", - "path": "/w", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "eb480147-c587-4a33-85ed-eb0ab9942c43", - "path": "/upArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "2bf42165-60bc-42ca-8072-8c13ab40239b", - "path": "/s", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "85d264ad-e0a0-4565-b7ff-1a37edde51ac", - "path": "/downArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "74214943-c580-44e4-98eb-ad7eebe17902", - "path": "/a", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "cea9b045-a000-445b-95b8-0c171af70a3b", - "path": "/leftArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "8607c725-d935-4808-84b1-8354e29bab63", - "path": "/d", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "4cda81dc-9edd-4e03-9d7c-a71a14345d0b", - "path": "/rightArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc", - "path": "*/{Submit}", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", - "action": "Submit", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "82627dcc-3b13-4ba9-841d-e4b746d6553e", - "path": "*/{Cancel}", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", - "action": "Cancel", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "c52c8e0b-8179-41d3-b8a1-d149033bbe86", - "path": "/position", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "e1394cbc-336e-44ce-9ea8-6007ed6193f7", - "path": "/position", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "5693e57a-238a-46ed-b5ae-e64e6e574302", - "path": "/touch*/position", - "interactions": "", - "processors": "", - "groups": "Touch", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4faf7dc9-b979-4210-aa8c-e808e1ef89f5", - "path": "/leftButton", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8d66d5ba-88d7-48e6-b1cd-198bbfef7ace", - "path": "/tip", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "47c2a644-3ebc-4dae-a106-589b7ca75b59", - "path": "/touch*/press", - "interactions": "", - "processors": "", - "groups": "Touch", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "bb9e6b34-44bf-4381-ac63-5aa15d19f677", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "38c99815-14ea-4617-8627-164d27641299", - "path": "/scroll", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "ScrollWheel", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4c191405-5738-4d4b-a523-c6a301dbf754", - "path": "/rightButton", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "RightClick", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "24066f69-da47-44f3-a07e-0015fb02eb2e", - "path": "/middleButton", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "MiddleClick", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77", - "path": "/devicePosition", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "TrackedDevicePosition", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "23e01e3a-f935-4948-8d8b-9bcac77714fb", - "path": "/deviceRotation", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "TrackedDeviceOrientation", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "3ebbc4b6-e98a-45d0-a026-fd33a8ed07d1", - "path": "/delta", - "interactions": "", - "processors": "", - "groups": "", - "action": "MouseDelta", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "2D Vector", - "id": "e70277f7-bdb5-41c3-8ccf-6de9c44d696f", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Drag", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "Up", - "id": "93aab51e-6e37-4a90-9a4e-52d9c66734e6", - "path": "/delta/y", - "interactions": "", - "processors": "", - "groups": "", - "action": "Drag", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "Down", - "id": "9227b639-71db-4b64-8e6f-2a40af6e5356", - "path": "/delta/y", - "interactions": "", - "processors": "", - "groups": "", - "action": "Drag", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "Left", - "id": "74989929-4f66-43d8-8f72-08ad30e80b63", - "path": "/delta/x", - "interactions": "", - "processors": "", - "groups": "", - "action": "Drag", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "Right", - "id": "f5ad73ff-294b-422e-9d4b-b81379b25e08", - "path": "/delta/x", - "interactions": "", - "processors": "", - "groups": "", - "action": "Drag", - "isComposite": false, - "isPartOfComposite": true - } - ] - }, - { - "name": "MouseControl", - "id": "739cfcf7-7b2b-466a-b279-1418662a59e0", - "actions": [ - { - "name": "Click", - "type": "PassThrough", - "id": "cd2dd8bd-1638-4435-bfd8-73db4c228770", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "MiddleClick", - "type": "PassThrough", - "id": "6984c679-a874-4243-b825-8eccad55bde6", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "RightClick", - "type": "PassThrough", - "id": "de031631-6039-4e47-9b01-5b432e06d5af", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Point", - "type": "Value", - "id": "03d4b3df-1fe1-492a-ad06-4ce400589655", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - } - ], - "bindings": [ - { - "name": "", - "id": "cb105049-9b91-49cb-93a5-167c0295fab2", - "path": "/leftButton", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "d90ff2da-6108-4d86-8fd6-c46befc9c752", - "path": "/tip", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "ac8ddca5-3164-405a-9c03-00e69ba5f9d8", - "path": "/touch*/press", - "interactions": "", - "processors": "", - "groups": "Touch", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "dfd3ff79-7b25-42b4-aad1-be5674a4c233", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "9af26aba-1883-47bc-b820-d94198fed27d", - "path": "/middleButton", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "MiddleClick", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "9d4d0cf0-566c-4413-9995-68870b71187d", - "path": "/rightButton", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "RightClick", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "5784cd38-6174-479d-ab61-b8a6dd7da428", - "path": "/position", - "interactions": "", - "processors": "", - "groups": "", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - } - ] - } - ], - "controlSchemes": [ - { - "name": "Keyboard&Mouse", - "bindingGroup": "Keyboard&Mouse", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - }, - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "Gamepad", - "bindingGroup": "Gamepad", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "Touch", - "bindingGroup": "Touch", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "Joystick", - "bindingGroup": "Joystick", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "XR", - "bindingGroup": "XR", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - } - ] -} \ No newline at end of file diff --git a/Assets/InputSystemActions.inputactions.meta b/Assets/InputSystemActions.inputactions.meta deleted file mode 100644 index e336413d..00000000 --- a/Assets/InputSystemActions.inputactions.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 052faaac586de48259a63d0c4782560b -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} - generateWrapperCode: 1 - wrapperCodePath: - wrapperClassName: - wrapperCodeNamespace: diff --git a/Assets/Resources/Prefabs/UI/Factory/AlarmSigleIconManager.prefab b/Assets/Resources/Prefabs/UI/Factory/AlarmSingleIconManager.prefab similarity index 99% rename from Assets/Resources/Prefabs/UI/Factory/AlarmSigleIconManager.prefab rename to Assets/Resources/Prefabs/UI/Factory/AlarmSingleIconManager.prefab index 3726b349..a04a5e4b 100644 --- a/Assets/Resources/Prefabs/UI/Factory/AlarmSigleIconManager.prefab +++ b/Assets/Resources/Prefabs/UI/Factory/AlarmSingleIconManager.prefab @@ -247,7 +247,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 150} + m_SizeDelta: {x: 200, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8257610451063185897 MonoBehaviour: @@ -678,7 +678,7 @@ GameObject: - component: {fileID: 3374630250525829090} - component: {fileID: 7240776144344761129} m_Layer: 5 - m_Name: AlarmSigleIconManager + m_Name: AlarmSingleIconManager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -714,7 +714,7 @@ MonoBehaviour: m_GameObject: {fileID: 7314511769243682470} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a651278faa6ca71468e19553474e6bb5, type: 3} + m_Script: {fileID: 11500000, guid: 52c271c8fd8668e48b7f38bf461cf166, type: 3} m_Name: m_EditorClassIdentifier: singleIcon: {fileID: 6655137998972703410} @@ -859,7 +859,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: new Text + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} diff --git a/Assets/Resources/Prefabs/UI/Factory/AlarmSigleIconManager.prefab.meta b/Assets/Resources/Prefabs/UI/Factory/AlarmSingleIconManager.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Factory/AlarmSigleIconManager.prefab.meta rename to Assets/Resources/Prefabs/UI/Factory/AlarmSingleIconManager.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Factory/InfoWindow.prefab b/Assets/Resources/Prefabs/UI/Factory/InfoWindow.prefab index 23735351..645eef9e 100644 --- a/Assets/Resources/Prefabs/UI/Factory/InfoWindow.prefab +++ b/Assets/Resources/Prefabs/UI/Factory/InfoWindow.prefab @@ -414,7 +414,7 @@ GameObject: m_Component: - component: {fileID: 4802890858156259540} - component: {fileID: 7623125061856383678} - - component: {fileID: 9096332282778631911} + - component: {fileID: -348142651904544222} m_Layer: 5 m_Name: InfoWindow m_TagString: Untagged @@ -454,7 +454,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4907041631117111019} m_CullTransparentMesh: 1 ---- !u!114 &9096332282778631911 +--- !u!114 &-348142651904544222 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Scenes/SampleProject.unity b/Assets/Scenes/SampleProject.unity index da83b3f3..90959d5e 100644 --- a/Assets/Scenes/SampleProject.unity +++ b/Assets/Scenes/SampleProject.unity @@ -174,7 +174,6 @@ GameObject: - component: {fileID: 88083293} - component: {fileID: 88083292} - component: {fileID: 88083291} - - component: {fileID: 88083294} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -243,31 +242,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &88083294 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 88083290} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 0 - callback: - m_PersistentCalls: - m_Calls: [] - - eventID: 1 - callback: - m_PersistentCalls: - m_Calls: [] - - eventID: 4 - callback: - m_PersistentCalls: - m_Calls: [] --- !u!1 &330585543 GameObject: m_ObjectHideFlags: 0 @@ -2185,7 +2159,8 @@ PrefabInstance: propertyPath: m_Name value: InfoWindow objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 9096332282778631911, guid: 036e56b4c097fc8409ffced10ff53562, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] diff --git a/Assets/Scripts/UVC/Factory/Alarm/AlarmDetailView.cs b/Assets/Scripts/UVC/Factory/Alarm/AlarmDetailView.cs index 5b8c8c97..9f47e0eb 100644 --- a/Assets/Scripts/UVC/Factory/Alarm/AlarmDetailView.cs +++ b/Assets/Scripts/UVC/Factory/Alarm/AlarmDetailView.cs @@ -36,20 +36,13 @@ namespace UVC.Factory.Alarm public void Show(DataObject data) { string combinedString = string.Empty; - // DataObject에 있는 모든 키-값 쌍을 순회합니다. - foreach (var kvp in data) - { - // 태그를 사용하여 줄바꿈 시에도 정렬이 유지되도록 합니다. - //combinedString += $"{kvp.Key}{kvp.Value ?? "null"}\n"; - // : 키가 텍스트 컨테이너 너비의 40%를 넘지 않도록 제한합니다. - // 키가 길면 이 지점에서 자동으로 줄바꿈됩니다. - // : 값의 시작 위치를 40% 지점으로 지정합니다. - // : 다음 줄에 영향을 주지 않도록 마진을 리셋합니다. - //combinedString += $"{kvp.Key}{kvp.Value ?? "null"}\n"; - // : 키 텍스트의 너비를 전체의 40%로 제한합니다. 키가 이 너비를 초과하면 자동으로 줄바꿈됩니다. - // : 값 텍스트의 시작 위치를 40% 지점으로 설정합니다. - combinedString += $"{kvp.Key}{kvp.Value ?? "null"}\n"; - } + + combinedString += $"ALARM_TYPE{data.GetString("ALARM_TYPE") ?? "null"}\n"; + combinedString += $"CODE{data.GetString("CODE") ?? "null"}\n"; + combinedString += $"MACHINENAME{data.GetString("MACHINENAME") ?? "null"}\n"; + combinedString += $"MESSAGE{data.GetString("MESSAGE") ?? "null"}\n"; + combinedString += $"TIMESTAMP{data.GetString("TIMESTAMP") ?? "null"}\n"; + combinedString = combinedString.TrimEnd('\n'); // 마지막 줄바꿈 제거 detailTxt.text = combinedString; diff --git a/Assets/Scripts/UVC/Factory/Alarm/AlarmIconManager.cs b/Assets/Scripts/UVC/Factory/Alarm/AlarmIconManager.cs index 3afd1428..00293549 100644 --- a/Assets/Scripts/UVC/Factory/Alarm/AlarmIconManager.cs +++ b/Assets/Scripts/UVC/Factory/Alarm/AlarmIconManager.cs @@ -39,7 +39,7 @@ namespace UVC.Factory.Alarm // 현재 클러스터가 펼쳐진 상태인지 여부를 나타내는 플래그입니다. private bool isExpanded = false; // 알람이 하나일 때 사용되는 단일 알람 아이콘의 인스턴스입니다. - private AlarmSigleIconManager singleAlarmIcon1 = null; + private AlarmSingleIconManager singleAlarmIcon1 = null; // UI 위치 계산에 필요한 컴포넌트들입니다. private RectTransform rectTransform; @@ -79,8 +79,8 @@ namespace UVC.Factory.Alarm // 클러스터 아이콘 클릭 시 OnPointerClick 메서드가 호출되도록 이벤트 핸들러를 등록합니다. clusterView.OnClickHandler += OnPointerClick; - // 카메라 위치가 변경될 때마다 OnCameraPositionChangedHandler가 호출되도록 등록합니다. - FactoryCameraController.Instance.OnCameraPositionChanged += OnCameraPositionChangedHandler; + // 카메라 높이가 변경될 때마다 OnCameraPositionUpChangedHandler가 호출되도록 등록합니다. + FactoryCameraController.Instance.OnCameraPositionUpChanged += OnCameraPositionUpChangedHandler; } /// @@ -214,7 +214,7 @@ namespace UVC.Factory.Alarm if (singleAlarmIcon1 == null) { // 단일 아이콘이 없으면 새로 생성합니다. - singleAlarmIcon1 = Instantiate(alarmSingleIconManagerPrefab, transform).GetComponent(); + singleAlarmIcon1 = Instantiate(alarmSingleIconManagerPrefab, transform).GetComponent(); } singleAlarmIcon1.gameObject.SetActive(true); singleAlarmIcon1.SetData(alarms[0], targetObject); @@ -267,10 +267,10 @@ namespace UVC.Factory.Alarm if (singleAlarmIcon1 != null) singleAlarmIcon1.gameObject.SetActive(false); // 재활용을 위해 기존에 생성된 아이콘들을 딕셔너리에 저장합니다. (Key: 알람 ID, Value: 아이콘 인스턴스) - var existingIcons = new Dictionary(); + var existingIcons = new Dictionary(); foreach (Transform child in expandedView.transform) { - AlarmSigleIconManager icon = child.GetComponent(); + AlarmSingleIconManager icon = child.GetComponent(); if (icon != null && icon.Data != null) { if (!existingIcons.ContainsKey(icon.Data.Id)) @@ -280,12 +280,12 @@ namespace UVC.Factory.Alarm } } - var activeIcons = new List(); + var activeIcons = new List(); // 현재 알람 목록을 순회하며 아이콘을 업데이트하거나 새로 생성 foreach (var alarmData in alarms) { - AlarmSigleIconManager icon; + AlarmSingleIconManager icon; if (existingIcons.TryGetValue(alarmData.Id, out icon)) { // 기존 아이콘 재사용 @@ -296,7 +296,7 @@ namespace UVC.Factory.Alarm { // 새 아이콘 생성 GameObject iconObj = Instantiate(alarmSingleIconManagerPrefab, expandedView.transform); - icon = iconObj.GetComponent(); + icon = iconObj.GetComponent(); icon.SetData(alarmData, targetObject); icon.OnDetail = OnDetailSingle; } @@ -355,12 +355,12 @@ namespace UVC.Factory.Alarm /// 개별 알람 아이콘 중 하나가 상세 보기를 활성화했을 때 호출됩니다. /// /// 상세 보기를 활성화한 아이콘 - private void OnDetailSingle(AlarmSigleIconManager alarmSingle) + private void OnDetailSingle(AlarmSingleIconManager alarmSingle) { // 다른 모든 아이콘들의 상세 보기는 숨깁니다. foreach (Transform child in expandedView.transform) { - AlarmSigleIconManager existingIcon = child.GetComponent(); + AlarmSingleIconManager existingIcon = child.GetComponent(); if (existingIcon != null) { if (existingIcon != alarmSingle) existingIcon.HideDetail(); // 다른 아이콘은 숨김 @@ -377,7 +377,7 @@ namespace UVC.Factory.Alarm // 모든 개별 아이콘의 상세 보기를 숨깁니다. foreach (Transform child in expandedView.transform) { - AlarmSigleIconManager existingIcon = child.GetComponent(); + AlarmSingleIconManager existingIcon = child.GetComponent(); if (existingIcon != null && existingIcon.IsDetailViewActive) existingIcon.HideDetail(); } if (singleAlarmIcon1 != null && singleAlarmIcon1.IsDetailViewActive) @@ -404,23 +404,19 @@ namespace UVC.Factory.Alarm }); } - private float cameraY = 0f; /// /// 카메라 위치가 변경될 때 호출되는 이벤트 핸들러입니다. /// 사용자가 줌 아웃(카메라가 멀어짐)하면 펼쳐진 클러스터를 자동으로 닫습니다. /// - private void OnCameraPositionChangedHandler(Vector3 position) + private void OnCameraPositionUpChangedHandler(float gap) { - Debug.Log($"Camera position changed: {cameraY}, {position.y}, {isZoomIn}"); - if (cameraY < position.y && isZoomIn) + if (isZoomIn) { - // 줌 인 상태에서 카메라 위치가 변경되면 클러스터를 해제 CollapseCluster(); isZoomIn = false; // 줌 인 상태를 해제합니다. } - cameraY = position.y; // 카메라의 Y 위치를 업데이트 } private void OnDestroy() @@ -431,7 +427,7 @@ namespace UVC.Factory.Alarm uiSpacingTweener.Kill(); } - FactoryCameraController.Instance.OnCameraPositionChanged -= OnCameraPositionChangedHandler; + FactoryCameraController.Instance.OnCameraPositionUpChanged -= OnCameraPositionUpChangedHandler; clusterView.OnClickHandler -= OnPointerClick; targetObject = null; alarms.Clear(); diff --git a/Assets/Scripts/UVC/Factory/Alarm/AlarmManager.cs b/Assets/Scripts/UVC/Factory/Alarm/AlarmManager.cs index a3931d41..a3bb0b28 100644 --- a/Assets/Scripts/UVC/Factory/Alarm/AlarmManager.cs +++ b/Assets/Scripts/UVC/Factory/Alarm/AlarmManager.cs @@ -137,7 +137,7 @@ namespace UVC.Factory.Alarm var RemovedItems = new List(arr.RemovedItems); var ModifiedList = arr.ModifiedList; - Debug.Log($"AlarmManager OnUpdateData: Added={AddedItems.Count}, Removed={RemovedItems.Count}, Modified={ModifiedList.Count}"); + //Debug.Log($"AlarmManager OnUpdateData: Added={AddedItems.Count}, Removed={RemovedItems.Count}, Modified={ModifiedList.Count}"); // 'CLEAR_TIME'이 설정된 항목은 '해제된 알람'으로 간주하고, 제거 리스트에 추가합니다. // AddedItems나 ModifiedList에 포함되어 있더라도 CLEAR_TIME이 있으면 즉시 해제 처리하기 위함입니다. @@ -224,7 +224,7 @@ namespace UVC.Factory.Alarm // 설비 ID를 이용해 씬에서 실제 FactoryObject를 찾습니다. FactoryObject? targetObject = dataManager!.FindByName(eqpId); - Debug.Log($"AlarmManager {targetObject == null} {data.Id}, {eqpId}"); + //Debug.Log($"AlarmManager {targetObject == null} {data.Id}, {eqpId}"); if (targetObject == null) return; // 해당 설비에 이미 활성화된 알람 UI가 있는지 확인합니다. diff --git a/Assets/Scripts/UVC/Factory/Alarm/AlarmSigleIconManager.cs.meta b/Assets/Scripts/UVC/Factory/Alarm/AlarmSigleIconManager.cs.meta deleted file mode 100644 index 054aad97..00000000 --- a/Assets/Scripts/UVC/Factory/Alarm/AlarmSigleIconManager.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: a651278faa6ca71468e19553474e6bb5 \ No newline at end of file diff --git a/Assets/Scripts/UVC/Factory/Alarm/AlarmSingleIcon.cs b/Assets/Scripts/UVC/Factory/Alarm/AlarmSingleIcon.cs index a2e7a08c..38d21bb3 100644 --- a/Assets/Scripts/UVC/Factory/Alarm/AlarmSingleIcon.cs +++ b/Assets/Scripts/UVC/Factory/Alarm/AlarmSingleIcon.cs @@ -8,7 +8,7 @@ namespace UVC.Factory.Alarm /// /// 개별 알람을 나타내는 가장 기본적인 UI 컴포넌트입니다. /// 이 컴포넌트는 버튼 기능과 텍스트 표시 기능을 가지고 있으며, - /// 상위 관리자인 'AlarmSigleIconManager'에 의해 제어됩니다. + /// 상위 관리자인 'AlarmSingleIconManager'에 의해 제어됩니다. /// public class AlarmSingleIcon : MonoBehaviour { @@ -35,7 +35,7 @@ namespace UVC.Factory.Alarm /// /// 이 버튼이 클릭되었을 때 호출될 이벤트를 정의합니다. - /// 상위 관리자(AlarmSigleIconManager)가 이 이벤트를 구독하여 클릭 시 특정 동작(예: 상세 정보 표시)을 수행합니다. + /// 상위 관리자(AlarmSingleIconManager)가 이 이벤트를 구독하여 클릭 시 특정 동작(예: 상세 정보 표시)을 수행합니다. /// public Action OnClickHandler; diff --git a/Assets/Scripts/UVC/Factory/Alarm/AlarmSigleIconManager.cs b/Assets/Scripts/UVC/Factory/Alarm/AlarmSingleIconManager.cs similarity index 98% rename from Assets/Scripts/UVC/Factory/Alarm/AlarmSigleIconManager.cs rename to Assets/Scripts/UVC/Factory/Alarm/AlarmSingleIconManager.cs index f9a6cfda..5ae3296d 100644 --- a/Assets/Scripts/UVC/Factory/Alarm/AlarmSigleIconManager.cs +++ b/Assets/Scripts/UVC/Factory/Alarm/AlarmSingleIconManager.cs @@ -8,7 +8,7 @@ namespace UVC.Factory.Alarm /// 개별 알람 아이콘 하나를 관리하는 클래스입니다. /// 평소에는 간단한 아이콘(AlarmSingleIcon)으로 표시되고, 클릭하면 상세 정보(AlarmDetailView)를 보여줍니다. /// - public class AlarmSigleIconManager : MonoBehaviour + public class AlarmSingleIconManager : MonoBehaviour { [Header("UI Components")] [Tooltip("알람을 간략하게 표시하는 아이콘 UI입니다.")] @@ -21,7 +21,7 @@ namespace UVC.Factory.Alarm /// 이 아이콘의 상세 보기가 활성화될 때 호출되는 이벤트입니다. /// 상위 관리자인 AlarmIconManager가 다른 아이콘들의 상세 보기를 닫는 등의 관리를 위해 사용합니다. /// - public Action OnDetail; + public Action OnDetail; // 이 아이콘이 표시하는 실제 알람 데이터입니다. private DataObject data; diff --git a/Assets/Scripts/UVC/Factory/Alarm/AlarmSingleIconManager.cs.meta b/Assets/Scripts/UVC/Factory/Alarm/AlarmSingleIconManager.cs.meta new file mode 100644 index 00000000..189d98ca --- /dev/null +++ b/Assets/Scripts/UVC/Factory/Alarm/AlarmSingleIconManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 52c271c8fd8668e48b7f38bf461cf166 \ No newline at end of file diff --git a/Assets/Scripts/UVC/Factory/Camera/FactoryCameraController.cs b/Assets/Scripts/UVC/Factory/Camera/FactoryCameraController.cs index 568edd67..ed67b3d2 100644 --- a/Assets/Scripts/UVC/Factory/Camera/FactoryCameraController.cs +++ b/Assets/Scripts/UVC/Factory/Camera/FactoryCameraController.cs @@ -65,6 +65,14 @@ namespace UVC.Factory /// public Action OnCameraPositionChanged; + /// + /// 카메라 높이가 변경될 때 발생합니다. + /// + /// 이 이벤트는 카메라 높이가 업데이트될 때마다 트리거됩니다. 구독자는 + /// 이 이벤트를 사용하여 UI 요소를 업데이트하거나 새 높이를 기반으로 계산을 수행하는 등 카메라 높이 변경에 대응할 수 있습니다. + /// + public Action OnCameraPositionUpChanged; + /// /// 카메라의 회전이 변경될 때 발생합니다. /// @@ -86,7 +94,8 @@ namespace UVC.Factory } } - private Transform prevTransform; // 이전 카메라 거리 + private Quaternion prevRotation; // 이전 카메라 각도 + private Vector3 prevPosition; // 이전 카메라 위치 private Vector3 lastPanPosition; private Vector3 rotationPivot; @@ -98,7 +107,8 @@ namespace UVC.Factory { // 스크립트 시작 시, 회전의 기준이 되는 중심점을 카메라 앞쪽으로 초기화합니다. rotationPivot = transform.position + transform.forward * 10f; - this.prevTransform = transform; // 초기 카메라 위치 저장 + this.prevRotation = transform.rotation; // 초기 카메라 각도 저장 + this.prevPosition = transform.position; // 초기 카메라 위치 저장 } private void StopFocusCoroutine() @@ -112,19 +122,21 @@ namespace UVC.Factory private void DispatchEvnet() { - if (prevTransform != null && (prevTransform.position != transform.position || prevTransform.rotation != transform.rotation)) + if (prevPosition != transform.position || prevRotation != transform.rotation) { OnCameraChanged?.Invoke(transform); - if (prevTransform.position != transform.position) + if (prevPosition != transform.position) { OnCameraPositionChanged?.Invoke(transform.position); + if (prevPosition.y < transform.position.y) OnCameraPositionUpChanged?.Invoke(transform.position.y - prevPosition.y); } - if (prevTransform.rotation != transform.rotation) + if (prevRotation != transform.rotation) { OnCameraRotationChanged?.Invoke(transform.rotation); } } - prevTransform = transform; // 현재 카메라 위치 저장 + prevRotation = transform.rotation; // 현재 카메라 각도 저장 + prevPosition = transform.position; // 현재 카메라 위치 저장 } private void ValidateCameraTransform() diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 2af0c484..192f1e20 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -838,6 +838,7 @@ PlayerSettings: platformArchitecture: {} scriptingBackend: Android: 1 + Standalone: 1 il2cppCompilerConfiguration: {} il2cppCodeGeneration: {} il2cppStacktraceInformation: {}