Pull request #37: Adding 123 hotkeys

Merge in CEGJ/creative-jam-20 from jason to main

* commit 'c2145b8940fe97ae1bc954314229c42b4a9c9ab7':
  Adding 123 hotkeys

Assets/Scenes/Game.unity

@@ -2986,6 +2986,126 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.size
+      value: 17
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[14].m_ActionId
+      value: ce1dffb7-3600-4c58-a12a-ce124ef1ddd0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_ActionId
+      value: 4a73fe5c-a8b1-48a9-8377-e4d9941b4e32
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[16].m_ActionId
+      value: d392a866-be73-4182-8081-9878fbdc19c8
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[14].m_ActionName
+      value: Player/Dimension1[/Keyboard/1]
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_ActionName
+      value: Player/Dimension2[/Keyboard/2]
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[16].m_ActionName
+      value: Player/Dimension3[/Keyboard/3]
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 1536863736}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 1536863736}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 1536863736}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: SwitchWorld
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: SwitchWorld
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: SwitchWorld
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: WorldSwitcher, Assembly-CSharp
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: WorldSwitcher, Assembly-CSharp
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: WorldSwitcher, Assembly-CSharp
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
+    - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
+      propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
 --- !u!1001 &7226858077067413575

Assets/Scripts/WorldSwitcher.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections;
 using UnityEngine;
 using UnityEngine.Events;
+using UnityEngine.InputSystem;
 
 [Serializable]
 public class IntEvent : UnityEvent<int> {}
@@ -79,6 +80,21 @@ public class WorldSwitcher : MonoBehaviour {
 		transition = StartCoroutine(TransitionCamera(currentWorldIndex - lastWorldIndex < 0));
 	}
 
+	public void OnDimension1(InputAction.CallbackContext ctx) {
+		if (ctx.performed)
+			SwitchWorld(0);
+	}
+
+	public void OnDimension2(InputAction.CallbackContext ctx) {
+		if (ctx.performed)
+			SwitchWorld(1);
+	}
+
+	public void OnDimension3(InputAction.CallbackContext ctx) {
+		if (ctx.performed)
+			SwitchWorld(2);
+	}
+
 	/*void OnGUI() {
 		for (int i = 0; i < worldInfos.Length; ++i) {
 			if (GUILayout.Button($"World {i}"))

Assets/Settings/ConjureCreativeJam20.cs

@@ -62,6 +62,33 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
                     ""processors"": """",
                     ""interactions"": """",
                     ""initialStateCheck"": false
+                },
+                {
+                    ""name"": ""Dimension1"",
+                    ""type"": ""Button"",
+                    ""id"": ""ce1dffb7-3600-4c58-a12a-ce124ef1ddd0"",
+                    ""expectedControlType"": ""Button"",
+                    ""processors"": """",
+                    ""interactions"": """",
+                    ""initialStateCheck"": false
+                },
+                {
+                    ""name"": ""Dimension2"",
+                    ""type"": ""Button"",
+                    ""id"": ""4a73fe5c-a8b1-48a9-8377-e4d9941b4e32"",
+                    ""expectedControlType"": ""Button"",
+                    ""processors"": """",
+                    ""interactions"": """",
+                    ""initialStateCheck"": false
+                },
+                {
+                    ""name"": ""Dimension3"",
+                    ""type"": ""Button"",
+                    ""id"": ""d392a866-be73-4182-8081-9878fbdc19c8"",
+                    ""expectedControlType"": ""Button"",
+                    ""processors"": """",
+                    ""interactions"": """",
+                    ""initialStateCheck"": false
                 }
             ],
             ""bindings"": [
@@ -306,6 +333,39 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
                     ""action"": ""Pause"",
                     ""isComposite"": false,
                     ""isPartOfComposite"": false
+                },
+                {
+                    ""name"": """",
+                    ""id"": ""8ff86459-0301-428f-9c14-66444870ce9d"",
+                    ""path"": ""<Keyboard>/1"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": ""Keyboard&Mouse"",
+                    ""action"": ""Dimension1"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
+                },
+                {
+                    ""name"": """",
+                    ""id"": ""ae9973d7-05ba-432d-8bee-c18db95965a9"",
+                    ""path"": ""<Keyboard>/2"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": ""Keyboard&Mouse"",
+                    ""action"": ""Dimension2"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
+                },
+                {
+                    ""name"": """",
+                    ""id"": ""374cfa5d-88f9-4467-a1ec-e76b85f7a222"",
+                    ""path"": ""<Keyboard>/3"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": ""Keyboard&Mouse"",
+                    ""action"": ""Dimension3"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
                 }
             ]
         },
@@ -895,6 +955,9 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
         m_Player_Look = m_Player.FindAction("Look", throwIfNotFound: true);
         m_Player_Fire = m_Player.FindAction("Fire", throwIfNotFound: true);
         m_Player_Pause = m_Player.FindAction("Pause", throwIfNotFound: true);
+        m_Player_Dimension1 = m_Player.FindAction("Dimension1", throwIfNotFound: true);
+        m_Player_Dimension2 = m_Player.FindAction("Dimension2", throwIfNotFound: true);
+        m_Player_Dimension3 = m_Player.FindAction("Dimension3", throwIfNotFound: true);
         // UI
         m_UI = asset.FindActionMap("UI", throwIfNotFound: true);
         m_UI_Navigate = m_UI.FindAction("Navigate", throwIfNotFound: true);
@@ -970,6 +1033,9 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
     private readonly InputAction m_Player_Look;
     private readonly InputAction m_Player_Fire;
     private readonly InputAction m_Player_Pause;
+    private readonly InputAction m_Player_Dimension1;
+    private readonly InputAction m_Player_Dimension2;
+    private readonly InputAction m_Player_Dimension3;
     public struct PlayerActions
     {
         private @ConjureCreativeJam20 m_Wrapper;
@@ -978,6 +1044,9 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
         public InputAction @Look => m_Wrapper.m_Player_Look;
         public InputAction @Fire => m_Wrapper.m_Player_Fire;
         public InputAction @Pause => m_Wrapper.m_Player_Pause;
+        public InputAction @Dimension1 => m_Wrapper.m_Player_Dimension1;
+        public InputAction @Dimension2 => m_Wrapper.m_Player_Dimension2;
+        public InputAction @Dimension3 => m_Wrapper.m_Player_Dimension3;
         public InputActionMap Get() { return m_Wrapper.m_Player; }
         public void Enable() { Get().Enable(); }
         public void Disable() { Get().Disable(); }
@@ -999,6 +1068,15 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
                 @Pause.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnPause;
                 @Pause.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnPause;
                 @Pause.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnPause;
+                @Dimension1.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension1;
+                @Dimension1.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension1;
+                @Dimension1.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension1;
+                @Dimension2.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension2;
+                @Dimension2.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension2;
+                @Dimension2.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension2;
+                @Dimension3.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension3;
+                @Dimension3.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension3;
+                @Dimension3.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension3;
             }
             m_Wrapper.m_PlayerActionsCallbackInterface = instance;
             if (instance != null)
@@ -1015,6 +1093,15 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
                 @Pause.started += instance.OnPause;
                 @Pause.performed += instance.OnPause;
                 @Pause.canceled += instance.OnPause;
+                @Dimension1.started += instance.OnDimension1;
+                @Dimension1.performed += instance.OnDimension1;
+                @Dimension1.canceled += instance.OnDimension1;
+                @Dimension2.started += instance.OnDimension2;
+                @Dimension2.performed += instance.OnDimension2;
+                @Dimension2.canceled += instance.OnDimension2;
+                @Dimension3.started += instance.OnDimension3;
+                @Dimension3.performed += instance.OnDimension3;
+                @Dimension3.canceled += instance.OnDimension3;
             }
         }
     }
@@ -1175,6 +1262,9 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
         void OnLook(InputAction.CallbackContext context);
         void OnFire(InputAction.CallbackContext context);
         void OnPause(InputAction.CallbackContext context);
+        void OnDimension1(InputAction.CallbackContext context);
+        void OnDimension2(InputAction.CallbackContext context);
+        void OnDimension3(InputAction.CallbackContext context);
     }
     public interface IUIActions
     {

Assets/Settings/ConjureCreativeJam20.inputactions

@@ -40,6 +40,33 @@
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false
+                },
+                {
+                    "name": "Dimension1",
+                    "type": "Button",
+                    "id": "ce1dffb7-3600-4c58-a12a-ce124ef1ddd0",
+                    "expectedControlType": "Button",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
+                },
+                {
+                    "name": "Dimension2",
+                    "type": "Button",
+                    "id": "4a73fe5c-a8b1-48a9-8377-e4d9941b4e32",
+                    "expectedControlType": "Button",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
+                },
+                {
+                    "name": "Dimension3",
+                    "type": "Button",
+                    "id": "d392a866-be73-4182-8081-9878fbdc19c8",
+                    "expectedControlType": "Button",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
                 }
             ],
             "bindings": [
@@ -284,6 +311,39 @@
                     "action": "Pause",
                     "isComposite": false,
                     "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "8ff86459-0301-428f-9c14-66444870ce9d",
+                    "path": "<Keyboard>/1",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "Keyboard&Mouse",
+                    "action": "Dimension1",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "ae9973d7-05ba-432d-8bee-c18db95965a9",
+                    "path": "<Keyboard>/2",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "Keyboard&Mouse",
+                    "action": "Dimension2",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "374cfa5d-88f9-4467-a1ec-e76b85f7a222",
+                    "path": "<Keyboard>/3",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "Keyboard&Mouse",
+                    "action": "Dimension3",
+                    "isComposite": false,
+                    "isPartOfComposite": false
                 }
             ]
         },