Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense

Cinemachine import + scene with orbit testing

Assets/Scenes/CameraTestScene.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8d93f4efce7c0184996144dd798ecf26
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6a6257909222aea0e9e62f20702c3fab
+guid: 70b7e2a1b9153b94594759b1da1b682f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Scripts/Camera.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7d1dcd378ecc29a48b2b54ceb2c48c62
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Camera/CameraController.cs

@@ -0,0 +1,29 @@
+using UnityEngine;
+using Cinemachine;
+
+public class CameraController : MonoBehaviour
+{
+    //[SerializeField] private CinemachineVirtualCamera cam;
+    //private CinemachineOrbitalTransposer orbitalTransposer;
+
+    //private void Start()
+    //{
+    //    orbitalTransposer = cam.GetCinemachineComponent<CinemachineOrbitalTransposer>();
+    //}
+
+    //private void Update()
+    //{
+    //    if (Input.GetMouseButtonDown(1))
+    //    {
+    //        orbitalTransposer.m_XAxis.m_InputAxisName = "Mouse X";
+    //        //orbitalTransposer.
+    //    }
+
+    //    if (Input.GetMouseButtonUp(1))
+    //    {
+
+    //        orbitalTransposer.m_XAxis.m_InputAxisName = null;
+
+    //    }
+    //}
+}

Assets/Scripts/Camera/CameraController.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cf9c49671cd01e143b3f6bb3ecf490d5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Packages/manifest.json

@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "com.unity.cinemachine": "2.9.7",
     "com.unity.collab-proxy": "2.3.1",
     "com.unity.ide.rider": "3.0.28",
     "com.unity.ide.visualstudio": "2.0.22",

Packages/packages-lock.json

@@ -10,6 +10,15 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.cinemachine": {
+      "version": "2.9.7",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.test-framework": "1.1.31"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.collab-proxy": {
       "version": "2.3.1",
       "depth": 0,

ProjectSettings/InputManager.asset

@@ -485,3 +485,4 @@ InputManager:
     type: 2
     axis: 5
     joyNum: 0
+  m_UsePhysicalKeys: 1