Added GameView Camera movement

testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/General/MoveCamera.cs

@@ -0,0 +1,97 @@
+using UnityEngine;
+
+public class MoveCamera : MonoBehaviour
+{
+    // Rotation variables
+    [SerializeField]
+    private float rotationSpeed = 5f; //How sensitive it with mouse
+
+    // Zoom variables
+    [SerializeField]
+    private float zoomSpeed = 20f; //How sensitive it with mousewheel
+    private float minFov = 10f;
+    private float maxFov = 90f;
+    private Camera cam;
+
+    // Move variables
+    [SerializeField]
+    private float mainSpeed = 7.0f; //regular speed
+    private float shiftAdd = 5.0f; //multiplied by how long shift is held.  Basically running
+    private float maxShift = 27.0f; //Maximum speed when holdin gshift
+    private float totalRun = 1.0f;
+
+    private void Start()
+    {
+        cam = GameObject.Find("MoveCamera").GetComponent<Camera>();
+    }
+
+    void Update()
+    {
+        // Mouse camera angle
+        if (Input.GetMouseButton(0))
+            transform.eulerAngles += rotationSpeed * new Vector3(-Input.GetAxis("Mouse Y"), Input.GetAxis("Mouse X"), 0);
+
+        // MouseWheel Zoom In Out
+        float fov = cam.fieldOfView;
+        fov -= Input.GetAxis("Mouse ScrollWheel") * zoomSpeed;
+        fov = Mathf.Clamp(fov, minFov, maxFov);
+        cam.fieldOfView = fov;
+
+        // Keyboard commands camera movement
+        Vector3 p = GetBaseInput();
+        if (p.sqrMagnitude > 0)
+        {
+            // only move while a direction key is pressed
+            if (Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift))
+            {
+                totalRun += Time.deltaTime;
+                p = p * totalRun * shiftAdd;
+                p.x = Mathf.Clamp(p.x, -maxShift, maxShift);
+                p.y = Mathf.Clamp(p.y, -maxShift, maxShift);
+                p.z = Mathf.Clamp(p.z, -maxShift, maxShift);
+            }
+            else
+            {
+                totalRun = Mathf.Clamp(totalRun * 0.5f, 1f, 1000f);
+                p = p * mainSpeed;
+            }
+
+            p = p * Time.deltaTime;
+            Vector3 newPosition = transform.position;
+            if (Input.GetKey(KeyCode.Space))
+            { 
+                transform.Translate(p);
+            }
+            else
+            {
+                //If player wants to move on X and Z axis only
+                transform.Translate(p);
+                newPosition.x = transform.position.x;
+                newPosition.z = transform.position.z;
+                transform.position = newPosition;
+            }
+        }
+    }
+
+    private Vector3 GetBaseInput()
+    { //returns the basic values, if it's 0 than it's not active.
+        Vector3 p_Velocity = new Vector3();
+        if (Input.GetKey(KeyCode.W) || Input.GetKey(KeyCode.UpArrow))
+        {
+            p_Velocity += new Vector3(0, 0, 1);
+        }
+        if (Input.GetKey(KeyCode.S) || Input.GetKey(KeyCode.DownArrow))
+        {
+            p_Velocity += new Vector3(0, 0, -1);
+        }
+        if (Input.GetKey(KeyCode.A) || Input.GetKey(KeyCode.LeftArrow))
+        {
+            p_Velocity += new Vector3(-1, 0, 0);
+        }
+        if (Input.GetKey(KeyCode.D) || Input.GetKey(KeyCode.RightArrow))
+        {
+            p_Velocity += new Vector3(1, 0, 0);
+        }
+        return p_Velocity;
+    }
+}

testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/General/MoveCamera.cs.meta

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

testumgebung/CrowdModelling/Assets/Scenes/Origin_OnlyYears.unity

@@ -3278,6 +3278,96 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1649793033}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &342493609
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 342493612}
+  - component: {fileID: 342493611}
+  - component: {fileID: 342493610}
+  m_Layer: 0
+  m_Name: MoveCamera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &342493610
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 342493609}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9311b989f258d554f8d63633d8169f59, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rotationSpeed: 5
+  zoomSpeed: 20
+  mainSpeed: 7
+--- !u!20 &342493611
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 342493609}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 3
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &342493612
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 342493609}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 41.145256, y: 10.941078, z: 11.188419}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 11
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &360616009
 GameObject:
   m_ObjectHideFlags: 0
@@ -3766,7 +3856,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1186137751}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &438685562
 PrefabInstance:
@@ -13108,8 +13198,8 @@ Transform:
   m_Children:
   - {fileID: 1940320491}
   - {fileID: 990797727}
-  - {fileID: 2136514436}
   - {fileID: 428692196}
+  - {fileID: 2136514436}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -21243,7 +21333,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2070248948}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 858a4265556863d48bd9141e31b3a0d7, type: 3}
   m_Name: 
@@ -21251,7 +21341,7 @@ MonoBehaviour:
   waypoints: []
   wanderTimer: []
   targetScattering: 2
-  leaveTimer: 200
+  leaveTimer: 20
   leavePosition: {x: 6, y: 0, z: 11}
 --- !u!114 &2070248951
 MonoBehaviour:
@@ -21302,7 +21392,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2070248948}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 53868b5ff78c70644a8569e9382640a9, type: 3}
   m_Name: 
@@ -21333,7 +21423,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2070248948}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9ba5089254dbef344a4fb2e4cf2c41b9, type: 3}
   m_Name: 
@@ -21786,7 +21876,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1186137751}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0}
 --- !u!4 &2137596805 stripped
 Transform: