diff --git a/Assets/Entities/Structures/Entities.Structures.asmdef b/Assets/Entities/Structures/Entities.Structures.asmdef index 21660e0..e8705f8 100644 --- a/Assets/Entities/Structures/Entities.Structures.asmdef +++ b/Assets/Entities/Structures/Entities.Structures.asmdef @@ -1,7 +1,7 @@ { "name": "Entities.Structures", "rootNamespace": "AsteroidGame", - "references": ["GUID:17a5862fcd6383b4b97bad4dcb1e2e5d","GUID:f26d68a0bdefa1043b120b820f55e190"], + "references": ["GUID:17a5862fcd6383b4b97bad4dcb1e2e5d","GUID:f26d68a0bdefa1043b120b820f55e190","GUID:896bd127e4aae4c4d86d99385f967c0c"], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, diff --git a/Assets/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset b/Assets/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset index 9b8a0bb..fd16943 100644 --- a/Assets/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset +++ b/Assets/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bcf384b154398e341b6b29969c078198, type: 3} m_Name: MotionBlur m_EditorClassIdentifier: - active: 1 + active: 0 quality: m_OverrideState: 1 m_Value: 1 @@ -94,7 +94,7 @@ MonoBehaviour: m_Value: 0.15 m_SampleCount: m_OverrideState: 0 - m_Value: 8 + m_Value: 10 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -250,7 +250,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 24f077503be6ae942a1e1245dbd53ea9, type: 3} m_Name: Bloom m_EditorClassIdentifier: - active: 1 + active: 0 quality: m_OverrideState: 1 m_Value: 1 @@ -525,10 +525,10 @@ MonoBehaviour: m_Value: 0 m_MaximumRadiusInPixels: m_OverrideState: 0 - m_Value: 32 + m_Value: 40 m_BilateralUpsample: m_OverrideState: 0 - m_Value: 0 + m_Value: 1 m_DirectionCount: m_OverrideState: 0 m_Value: 2 diff --git a/Assets/InputSystem/CameraControllActions.cs b/Assets/InputSystem/CameraControllActions.cs index 21357c1..f98e0e7 100644 --- a/Assets/InputSystem/CameraControllActions.cs +++ b/Assets/InputSystem/CameraControllActions.cs @@ -15,12 +15,15 @@ using System.Collections.Generic; using UnityEngine.InputSystem; using UnityEngine.InputSystem.Utilities; -public partial class @CameraControllActions : IInputActionCollection2, IDisposable +namespace InputSystem { - public InputActionAsset asset { get; } - public @CameraControllActions() + public partial class @CameraControllActions : IInputActionCollection2, IDisposable { - asset = InputActionAsset.FromJson(@"{ + public InputActionAsset asset { get; } + + public @CameraControllActions() + { + asset = InputActionAsset.FromJson(@"{ ""name"": ""CameraControllActions"", ""maps"": [ { @@ -138,119 +141,149 @@ public partial class @CameraControllActions : IInputActionCollection2, IDisposab ], ""controlSchemes"": [] }"); - // Camera - m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true); - m_Camera_Movement = m_Camera.FindAction("Movement", throwIfNotFound: true); - m_Camera_RotateCamera = m_Camera.FindAction("RotateCamera", throwIfNotFound: true); - m_Camera_ZoomCamera = m_Camera.FindAction("ZoomCamera", throwIfNotFound: true); - } + // Camera + m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true); + m_Camera_Movement = m_Camera.FindAction("Movement", throwIfNotFound: true); + m_Camera_RotateCamera = m_Camera.FindAction("RotateCamera", throwIfNotFound: true); + m_Camera_ZoomCamera = m_Camera.FindAction("ZoomCamera", throwIfNotFound: true); + } - 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 ICameraActions m_CameraActionsCallbackInterface; - private readonly InputAction m_Camera_Movement; - private readonly InputAction m_Camera_RotateCamera; - private readonly InputAction m_Camera_ZoomCamera; - public struct CameraActions - { - private @CameraControllActions m_Wrapper; - public CameraActions(@CameraControllActions wrapper) { m_Wrapper = wrapper; } - public InputAction @Movement => m_Wrapper.m_Camera_Movement; - public InputAction @RotateCamera => m_Wrapper.m_Camera_RotateCamera; - public InputAction @ZoomCamera => m_Wrapper.m_Camera_ZoomCamera; - 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 SetCallbacks(ICameraActions instance) + public void Dispose() { - if (m_Wrapper.m_CameraActionsCallbackInterface != null) + 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 ICameraActions m_CameraActionsCallbackInterface; + private readonly InputAction m_Camera_Movement; + private readonly InputAction m_Camera_RotateCamera; + private readonly InputAction m_Camera_ZoomCamera; + + public struct CameraActions + { + private @CameraControllActions m_Wrapper; + + public CameraActions(@CameraControllActions wrapper) { - @Movement.started -= m_Wrapper.m_CameraActionsCallbackInterface.OnMovement; - @Movement.performed -= m_Wrapper.m_CameraActionsCallbackInterface.OnMovement; - @Movement.canceled -= m_Wrapper.m_CameraActionsCallbackInterface.OnMovement; - @RotateCamera.started -= m_Wrapper.m_CameraActionsCallbackInterface.OnRotateCamera; - @RotateCamera.performed -= m_Wrapper.m_CameraActionsCallbackInterface.OnRotateCamera; - @RotateCamera.canceled -= m_Wrapper.m_CameraActionsCallbackInterface.OnRotateCamera; - @ZoomCamera.started -= m_Wrapper.m_CameraActionsCallbackInterface.OnZoomCamera; - @ZoomCamera.performed -= m_Wrapper.m_CameraActionsCallbackInterface.OnZoomCamera; - @ZoomCamera.canceled -= m_Wrapper.m_CameraActionsCallbackInterface.OnZoomCamera; + m_Wrapper = wrapper; } - m_Wrapper.m_CameraActionsCallbackInterface = instance; - if (instance != null) + + public InputAction @Movement => m_Wrapper.m_Camera_Movement; + public InputAction @RotateCamera => m_Wrapper.m_Camera_RotateCamera; + public InputAction @ZoomCamera => m_Wrapper.m_Camera_ZoomCamera; + + public InputActionMap Get() { - @Movement.started += instance.OnMovement; - @Movement.performed += instance.OnMovement; - @Movement.canceled += instance.OnMovement; - @RotateCamera.started += instance.OnRotateCamera; - @RotateCamera.performed += instance.OnRotateCamera; - @RotateCamera.canceled += instance.OnRotateCamera; - @ZoomCamera.started += instance.OnZoomCamera; - @ZoomCamera.performed += instance.OnZoomCamera; - @ZoomCamera.canceled += instance.OnZoomCamera; + 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 SetCallbacks(ICameraActions instance) + { + if (m_Wrapper.m_CameraActionsCallbackInterface != null) + { + @Movement.started -= m_Wrapper.m_CameraActionsCallbackInterface.OnMovement; + @Movement.performed -= m_Wrapper.m_CameraActionsCallbackInterface.OnMovement; + @Movement.canceled -= m_Wrapper.m_CameraActionsCallbackInterface.OnMovement; + @RotateCamera.started -= m_Wrapper.m_CameraActionsCallbackInterface.OnRotateCamera; + @RotateCamera.performed -= m_Wrapper.m_CameraActionsCallbackInterface.OnRotateCamera; + @RotateCamera.canceled -= m_Wrapper.m_CameraActionsCallbackInterface.OnRotateCamera; + @ZoomCamera.started -= m_Wrapper.m_CameraActionsCallbackInterface.OnZoomCamera; + @ZoomCamera.performed -= m_Wrapper.m_CameraActionsCallbackInterface.OnZoomCamera; + @ZoomCamera.canceled -= m_Wrapper.m_CameraActionsCallbackInterface.OnZoomCamera; + } + + m_Wrapper.m_CameraActionsCallbackInterface = instance; + if (instance != null) + { + @Movement.started += instance.OnMovement; + @Movement.performed += instance.OnMovement; + @Movement.canceled += instance.OnMovement; + @RotateCamera.started += instance.OnRotateCamera; + @RotateCamera.performed += instance.OnRotateCamera; + @RotateCamera.canceled += instance.OnRotateCamera; + @ZoomCamera.started += instance.OnZoomCamera; + @ZoomCamera.performed += instance.OnZoomCamera; + @ZoomCamera.canceled += instance.OnZoomCamera; + } } } + + public CameraActions @Camera => new CameraActions(this); + + public interface ICameraActions + { + void OnMovement(InputAction.CallbackContext context); + void OnRotateCamera(InputAction.CallbackContext context); + void OnZoomCamera(InputAction.CallbackContext context); + } } - public CameraActions @Camera => new CameraActions(this); - public interface ICameraActions - { - void OnMovement(InputAction.CallbackContext context); - void OnRotateCamera(InputAction.CallbackContext context); - void OnZoomCamera(InputAction.CallbackContext context); - } -} +} \ No newline at end of file diff --git a/Assets/InputSystem/InputSystem.asmdef b/Assets/InputSystem/InputSystem.asmdef new file mode 100644 index 0000000..c47a802 --- /dev/null +++ b/Assets/InputSystem/InputSystem.asmdef @@ -0,0 +1,16 @@ +{ + "name": "InputSystem", + "rootNamespace": "", + "references": [ + "GUID:75469ad4d38634e559750d17036d5f7c" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/InputSystem/InputSystem.asmdef.meta b/Assets/InputSystem/InputSystem.asmdef.meta new file mode 100644 index 0000000..b44972a --- /dev/null +++ b/Assets/InputSystem/InputSystem.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f008ecc6829887e478aeb5eb004eb01b +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/InputSystem/ReadInputExample.cs b/Assets/InputSystem/ReadInputExample.cs index e5d74c7..f6c3005 100644 --- a/Assets/InputSystem/ReadInputExample.cs +++ b/Assets/InputSystem/ReadInputExample.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.InputSystem; -namespace AsteroidGame.InputSystem +namespace InputSystem { public class ReadInputExample : MonoBehaviour { diff --git a/Assets/Scripts/CameraController.cs b/Assets/Scripts/CameraController.cs index 16c4097..031ec15 100644 --- a/Assets/Scripts/CameraController.cs +++ b/Assets/Scripts/CameraController.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; +using InputSystem; using UnityEngine; using UnityEngine.InputSystem; diff --git a/Assets/Scripts/Scripts.asmdef b/Assets/Scripts/Scripts.asmdef new file mode 100644 index 0000000..ca44ae3 --- /dev/null +++ b/Assets/Scripts/Scripts.asmdef @@ -0,0 +1,17 @@ +{ + "name": "Scripts", + "rootNamespace": "AsteroidGame", + "references": [ + "GUID:75469ad4d38634e559750d17036d5f7c", + "GUID:f008ecc6829887e478aeb5eb004eb01b" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/Scripts/Scripts.asmdef.meta b/Assets/Scripts/Scripts.asmdef.meta new file mode 100644 index 0000000..4c9188e --- /dev/null +++ b/Assets/Scripts/Scripts.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 896bd127e4aae4c4d86d99385f967c0c +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: