move InputDetector to RovSim.Rov namespace

eit-nemo-group3 · Dec 28, 2022 · 7ab31e0 · 7ab31e0
1 parent 6d87b8b
commit 7ab31e0
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 20 deletions.
diff --git a/Assets/Scripts/Input.meta b/Assets/Scripts/Input.meta
diff --git a/Assets/Scripts/Menu/PauseMenu.cs b/Assets/Scripts/Menu/PauseMenu.cs
@@ -15,7 +15,7 @@ public class PauseMenu : MonoBehaviour
         // Update is called once per frame
         private void Update()
         {
-            if (UnityEngine.Input.GetKeyDown(KeyCode.Escape))
+            if (Input.GetKeyDown(KeyCode.Escape))
             {
                 if (_gameIsPaused)
                 {

diff --git a/Assets/Scripts/Rov/CameraControl.cs b/Assets/Scripts/Rov/CameraControl.cs
@@ -1,5 +1,4 @@
 using UnityEngine;
-using RovSim.Input;
 
 namespace RovSim.Rov
 {
@@ -29,14 +28,10 @@ public class CameraControl : MonoBehaviour
 		[SerializeField]
 		private float maxAngle = 45;
 
-		private Camera _camera;
-		//private Rigidbody _body;
 		private InputDetector _inputDetector;
 
 		private void Awake()
 		{
-			_camera = GetComponent<Camera>();
-			//_body = GetComponent<Rigidbody>();
 			_inputDetector = GetComponent<InputDetector>();
 		}
 

diff --git a/Assets/Scripts/Rov/Grabber.cs b/Assets/Scripts/Rov/Grabber.cs
@@ -1,5 +1,4 @@
 using UnityEngine;
-using RovSim.Input;
 
 namespace RovSim.Rov
 {
@@ -22,10 +21,10 @@ private void Start()
 		// Update is called once per frame
 		private void Update()
 		{
-			grab();
+			Grab();
 		}
 
-		private void grab()
+		private void Grab()
 		{
 			if (_inputDetector.ClosePressed)
 			{

diff --git a/Assets/Scripts/Input/InputDetector.cs → Assets/Scripts/Rov/InputDetector.cs b/Assets/Scripts/Input/InputDetector.cs → Assets/Scripts/Rov/InputDetector.cs
@@ -1,7 +1,7 @@
 using UnityEngine;
 using UnityEngine.InputSystem;
 
-namespace RovSim.Input
+namespace RovSim.Rov
 {
 	public class InputDetector : MonoBehaviour
 	{

diff --git a/Assets/Scripts/Input/InputDetector.cs.meta → Assets/Scripts/Rov/InputDetector.cs.meta b/Assets/Scripts/Input/InputDetector.cs.meta → Assets/Scripts/Rov/InputDetector.cs.meta
diff --git a/Assets/Scripts/Rov/Movement.cs b/Assets/Scripts/Rov/Movement.cs
@@ -1,5 +1,4 @@
 using UnityEngine;
-using RovSim.Input;
 
 namespace RovSim.Rov
 {

diff --git a/Assets/Scripts/Rov/Pickup.cs b/Assets/Scripts/Rov/Pickup.cs
@@ -1,5 +1,4 @@
 using UnityEngine;
-using RovSim.Input;
 
 namespace RovSim.Rov
 {