finished the first version of the camera

Author: bigasdev

Runtime/Camera/CameraManager.cs

@@ -15,7 +15,7 @@ public static CameraManager Instance{
         }
 #region code-functions
         [HideInInspector] public UnityEvent<Transform> OnTargetChange = new UnityEvent<Transform>();
-        [HideInInspector] public UnityEvent<float> OnZoom = new UnityEvent<float>();
+        [HideInInspector] public UnityEvent<float, float> OnCameraShake = new UnityEvent<float, float>();
 #endregion
 
 #region camera-variables
@@ -39,11 +39,8 @@ public Transform Target{
             }
         }
 #endregion 
-#region zoom-variables
-        [Header("Zoom settings")]
-        [SerializeField] protected float zoomSpeed = 4f;
-        protected float originalCameraSize;
-        protected float zoomFactor;
+#region shake-variables
+        protected Coroutine shakeRoutine;
 #endregion
         /// <summary>
         /// This region will be focused on the basic camera functions as well as the workflow of it.
@@ -71,7 +68,6 @@ private void LateUpdate() {
         }
         protected virtual void Work(){
             FollowTarget();
-            HandleZoom();
         }
         protected virtual void FollowTarget(){
             if(Target == null)return;
@@ -89,11 +85,20 @@ protected virtual void FollowTarget(){
             }
             this.transform.position = new Vector3(xNew, yNew, transform.position.z);
         }
-        protected virtual void HandleZoom(){
-            float targetSize = originalCameraSize - zoomFactor;
-            if(targetSize != currentCamera.orthographicSize){
-                currentCamera.orthographicSize = Mathf.Lerp(currentCamera.orthographicSize, targetSize, Time.deltaTime * zoomSpeed);
+        protected virtual IEnumerator Shake(float duration, float magnitude) {
+            Vector3 originalPos3 = currentCamera.transform.localPosition;
+            Vector2 originalPos = currentCamera.transform.localPosition;
+            float elapsedTime = 0f;
+            while (elapsedTime < duration) {
+                    currentCamera.transform.localPosition = new Vector3(originalPos.x + Random.insideUnitCircle.x * magnitude, originalPos.y + Random.insideUnitCircle.y * magnitude, -10f);
+
+                    elapsedTime += Time.deltaTime;
+                    yield return null;
             }
+
+            currentCamera.transform.localPosition = originalPos3;
+            //DefaultPosition();
+            shakeRoutine = null;
         }
 #region publicfunctions
         //Region for every function that will be called from other scripts.
@@ -104,12 +109,16 @@ public virtual void SetTarget(Transform target, bool xLocked = false, bool yLock
             hasYLocked = yLocked;
             OnTargetChange.Invoke(target);
         }
-        public virtual void SetZoom(float zoomAmount, float zoomSpeed = 4f, string reason=""){
-            if(debug)BDebug.Log($"Camera is now zooming: {zoomAmount}, {reason}", "Camera", Color.green);
-            zoomFactor = zoomAmount;
-            this.zoomSpeed = zoomSpeed;
-            OnZoom.Invoke(zoomAmount);
+        public virtual void SetShake(float duration, float magnitude, string reason = "") {
+            if(debug)BDebug.Log($"Camera is now shaking for {duration}seconds at {magnitude}X, {reason}", "Camera", Color.green);
+            if (shakeRoutine != null) {
+                return;
+            }
+            shakeRoutine = StartCoroutine(Shake(duration, magnitude));
+            OnCameraShake.Invoke(duration, magnitude);
         }
+
+
 #endregion
     }
     public enum Updates{

Tests/Runtime/EntityExample.cs

@@ -15,6 +15,9 @@ private void Start() {
         CameraManager.Instance.OnTargetChange.AddListener((target)=>{
             Debug.Log(target);
         });
+        CameraManager.Instance.OnCameraShake.AddListener((d,m)=>{
+            Debug.Log(d+m);
+        });
     }
     private void Update() {
         if(BGameInput.Instance.GetKeyPress("Interaction")){
@@ -29,7 +32,7 @@ private void Update() {
         if(BGameInput.Instance.GetKeyPress("Example")){
             var rnd = Random.Range(0, entitysOnExample.Count - 1);
 
-            CameraManager.Instance.SetZoom(2, 4, "I want");
+            CameraManager.Instance.SetShake(.5f, 1.5f, "Testing the zoom!");
 
             entitysOnExample[rnd].MoveTo(new Vector2(1,0));
         }