Merge pull request #7 from eviltwo/merge-camera-packages

Merge camera packages

README.md

@@ -25,16 +25,10 @@
 https://github.com/eviltwo/ActionGameCore.git?path=src/ActionGameCore/Assets/CharacterControls
 ```
 
-### FPSCameraControls v1.3.0
-FPS視点のカメラ。
+### CameraControls v1.4.0
+FPSとTPS視点のカメラ。
 ```
-https://github.com/eviltwo/ActionGameCore.git?path=src/ActionGameCore/Assets/FPSCameraControls
-```
-
-### TPSCameraControls v1.3.0
-TPS視点のカメラ。
-```
-https://github.com/eviltwo/ActionGameCore.git?path=src/ActionGameCore/Assets/TPSCameraControls
+https://github.com/eviltwo/ActionGameCore.git?path=src/ActionGameCore/Assets/CameraControls
 ```
 
 ### Interactions v0.5.1

src/ActionGameCore/Assets/FPSCameraControls/CHANGELOG.md → src/ActionGameCore/Assets/CameraControls/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.4.0] - 2024-06-28
+### Changed
+- Merged with TPS package.
+- Renamed namespace to CameraControls.
+- Separated script to Controller and Input.
+
 ## [1.3.0] - 2024-06-28
 ### Changed
 - Support SteamInput.

src/ActionGameCore/Assets/TPSCameraControls/Scripts/Runtime/TPSCameraControls.asmdef → src/ActionGameCore/Assets/CameraControls/Scripts/Runtime/Controllers/CameraControls.Controllers.asmdef

@@ -1,5 +1,5 @@
 {
-    "name": "TPSCameraControls",
+    "name": "CameraControls.Controllers",
     "rootNamespace": "",
     "references": [
         "GUID:75469ad4d38634e559750d17036d5f7c",

src/ActionGameCore/Assets/CameraControls/Scripts/Runtime/Controllers/FPSCameraController.cs

@@ -0,0 +1,63 @@
+using UnityEngine;
+
+namespace CameraControls.Controllers
+{
+    public class FPSCameraController : MonoBehaviour, ICameraController
+    {
+        [SerializeField]
+        public Transform Target = null;
+
+        [SerializeField]
+        public float OffsetY = 1.5f;
+
+        [SerializeField]
+        public float Sensitivity = 1.0f;
+
+        [SerializeField]
+        public float AngleMin = -90.0f;
+
+        [SerializeField]
+        public float AngleMax = 90.0f;
+
+        [SerializeField]
+        public int SmoothingFrameCount = 2;
+
+        [SerializeField]
+        private bool _lockAndHideCursor = true;
+
+        private Vector2 _deltaAngles;
+        private Vector3 _lookAngles;
+
+        public bool Enabled => enabled;
+
+        public void SetDeltaAngles(Vector2 deltaAngles)
+        {
+            _deltaAngles = deltaAngles;
+        }
+
+        private void Start()
+        {
+            if (_lockAndHideCursor)
+            {
+                Cursor.visible = false;
+                Cursor.lockState = CursorLockMode.Locked;
+            }
+        }
+
+        private void LateUpdate()
+        {
+            if (Target == null)
+            {
+                return;
+            }
+
+            var position = Target.position + new Vector3(0, OffsetY, 0);
+
+            _lookAngles.x = Mathf.Clamp(_lookAngles.x - _deltaAngles.y * Sensitivity, -AngleMax, -AngleMin); // Look up and down
+            _lookAngles.y = (_lookAngles.y + _deltaAngles.x * Sensitivity) % 360; // Look left and right
+            var rotation = Quaternion.Euler(_lookAngles);
+
+            transform.SetPositionAndRotation(position, rotation);
+        }
+    }
+}

src/ActionGameCore/Assets/CameraControls/Scripts/Runtime/Controllers/ICameraController.cs

@@ -0,0 +1,10 @@
+using UnityEngine;
+
+namespace CameraControls.Controllers
+{
+    public interface ICameraController
+    {
+        bool Enabled { get; }
+        void SetDeltaAngles(Vector2 deltaAngles);
+    }
+}

src/ActionGameCore/Assets/CameraControls/Scripts/Runtime/Controllers/TPSCameraController.cs

@@ -0,0 +1,92 @@
+using UnityEngine;
+
+namespace CameraControls.Controllers
+{
+    public class TPSCameraController : MonoBehaviour, ICameraController
+    {
+        public enum OffsetRotationType
+        {
+            FullRotation = 0,
+            HorizontalRotation = 1,
+        }
+
+        [SerializeField]
+        public Transform Target = null;
+
+        [SerializeField]
+        public Vector3 Offset = Vector3.zero;
+
+        [SerializeField]
+        public OffsetRotationType OffsetRotation = OffsetRotationType.HorizontalRotation;
+
+        [SerializeField]
+        public float Distance = 5.0f;
+
+        [SerializeField]
+        public float Sensitivity = 1.0f;
+
+        [SerializeField]
+        public float AngleMin = -90.0f;
+
+        [SerializeField]
+        public float AngleMax = 90.0f;
+
+        [SerializeField]
+        public bool IsCheckWall = true;
+
+        [SerializeField]
+        public LayerMask WallLayerMask = ~0;
+
+        [SerializeField]
+        public int SmoothingFrameCount = 2;
+
+        [SerializeField]
+        private bool _lockAndHideCursor = true;
+
+        private Vector2 _deltaAngles;
+        private Vector3 _lookAngles;
+
+        public bool Enabled => enabled;
+
+        public void SetDeltaAngles(Vector2 deltaAngles)
+        {
+            _deltaAngles = deltaAngles;
+        }
+
+        private void Start()
+        {
+            if (_lockAndHideCursor)
+            {
+                Cursor.visible = false;
+                Cursor.lockState = CursorLockMode.Locked;
+            }
+        }
+
+        private void LateUpdate()
+        {
+            if (Target == null)
+            {
+                return;
+            }
+
+            _lookAngles.x = Mathf.Clamp(_lookAngles.x - _deltaAngles.y * Sensitivity, -AngleMax, -AngleMin); // Look up and down
+            _lookAngles.y = (_lookAngles.y + _deltaAngles.x * Sensitivity) % 360; // Look left and right
+            var rotation = Quaternion.Euler(_lookAngles);
+
+            var offsetRotation = OffsetRotation == OffsetRotationType.FullRotation ? rotation : Quaternion.AngleAxis(_lookAngles.y, Vector3.up);
+            var pivot = Target.position + offsetRotation * Offset;
+
+            var distance = Distance;
+            if (IsCheckWall)
+            {
+                var ray = new Ray(pivot, rotation * Vector3.back);
+                if (Physics.Raycast(ray, out var hit, Distance, WallLayerMask))
+                {
+                    distance = hit.distance;
+                }
+            }
+
+            transform.SetPositionAndRotation(pivot + rotation * Vector3.back * distance, rotation);
+        }
+    }
+}

src/ActionGameCore/Assets/FPSCameraControls/Scripts/Runtime/FPSCameraControls.asmdef → src/ActionGameCore/Assets/CameraControls/Scripts/Runtime/Inputs/CameraControls.Inputs.asmdef

@@ -1,9 +1,10 @@
 {
-    "name": "FPSCameraControls",
+    "name": "CameraControls.Inputs",
     "rootNamespace": "",
     "references": [
         "GUID:75469ad4d38634e559750d17036d5f7c",
-        "GUID:68bd7fdb68ef2684e982e8a9825b18a5"
+        "GUID:68bd7fdb68ef2684e982e8a9825b18a5",
+        "GUID:aeee1f7ffaac59745996d0fed47daca6"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],