From 9f2ff22bd01ca168827537d96197457117232bcd Mon Sep 17 00:00:00 2001
From: JWS <james.surine@gmail.com>
Date: Fri, 28 Jan 2022 09:10:58 -0600
Subject: [PATCH] Fix PC based mouse look for ship spawn

---
 Assets/CameraFollowRocket.cs           |  52 ++++++++++++++++++++++++-
 Assets/RockField1.prefab               | Bin 8484 -> 8484 bytes
 Assets/RockField2.prefab               | Bin 8484 -> 8484 bytes
 Assets/RocketSphere.cs                 |   4 +-
 ProjectSettings/GraphicsSettings.asset | Bin 5528 -> 5540 bytes
 ProjectSettings/ProjectSettings.asset  | Bin 72844 -> 72928 bytes
 6 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/Assets/CameraFollowRocket.cs b/Assets/CameraFollowRocket.cs
index ccb210e..82386f5 100644
--- a/Assets/CameraFollowRocket.cs
+++ b/Assets/CameraFollowRocket.cs
@@ -9,21 +9,71 @@ public class CameraFollowRocket : MonoBehaviour
     public Transform player;
     public float rotSpeed;
 
+#if !UNITY_ANDROID || UNITY_EDITOR
+    public float sensitivityX = 15F;
+    public float sensitivityY = 15F;
+    public float sensitivity = 0.1f;
+
+    public float minimumX = -360F;
+    public float maximumX = 360F;
+
+    public float minimumY = -60F;
+    public float maximumY = 60F;
+
+    Quaternion originalRotation;
+
+    float rotationX = 0;
+    float rotationY = 0;
+#endif
+
     private void Start()
     {
         // start the camera in a random direction
         Quaternion rot = Quaternion.LookRotation(Random.onUnitSphere);
         transform.rotation = rot;
+
+#if !UNITY_ANDROID || UNITY_EDITOR
+        // Make the rigid body not change rotation
+        originalRotation = transform.localRotation;
+#endif
     }
 
+#if !UNITY_ANDROID || UNITY_EDITOR
+    public static float ClampAngle(float angle, float min, float max)
+    {
+        if (angle < -360F)
+            angle += 360F;
+        if (angle > 360F)
+            angle -= 360F;
+        return Mathf.Clamp(angle, min, max);
+    }
+#endif
+
     // this camera repositioning will get overridden with any VR camera update if it is active and tracking
     void LateUpdate()
     {
-        if (player.transform)
+
+        if (player.transform && player.gameObject.activeSelf)
         {
             Quaternion rot = Quaternion.LookRotation(player.position);
 
             transform.rotation = Quaternion.Slerp(this.transform.rotation, rot, Time.deltaTime * rotSpeed * 0.1f);
         }
+        else
+        {
+#if !UNITY_ANDROID || UNITY_EDITOR
+    // Read the mouse input axis
+            rotationX = rotationX + Input.GetAxis("Mouse X") * sensitivityX;
+            rotationY += Input.GetAxis("Mouse Y") * sensitivityY;
+
+            rotationX = ClampAngle(rotationX, minimumX, maximumX);
+            rotationY = ClampAngle(rotationY, minimumY, maximumY);
+
+            Quaternion xQuaternion = Quaternion.AngleAxis(rotationX, Vector3.up);
+            Quaternion yQuaternion = Quaternion.AngleAxis(rotationY, -Vector3.right);
+
+            transform.localRotation = originalRotation * xQuaternion * yQuaternion;
+#endif
+        }
     }
 }
diff --git a/Assets/RockField1.prefab b/Assets/RockField1.prefab
index 36679a1840fecba4cfcec8e53c3b74f921fd94cd..d48bef1ca59f24f8f3fe73c16c0dea46d2039c48 100644
GIT binary patch
delta 14
VcmZ4Dw8Uw{1$joU%@^f^838UB1#SQU

delta 14
VcmZ4Dw8Uw{1$jos%@^f^838Tg1!VvL

diff --git a/Assets/RockField2.prefab b/Assets/RockField2.prefab
index 58258793ce9e97e8dddd5e8057eadb4cdc33aa8d..c2589a0519c8509481db5d571e6cb880f38a0a8e 100644
GIT binary patch
delta 14
VcmZ4Dw8Uw{1$joU%@^f^838UB1#SQU

delta 14
VcmZ4Dw8Uw{1$jos%@^f^838Tg1!VvL

diff --git a/Assets/RocketSphere.cs b/Assets/RocketSphere.cs
index 1410875..f34da4b 100644
--- a/Assets/RocketSphere.cs
+++ b/Assets/RocketSphere.cs
@@ -188,7 +188,9 @@ void CmdMySetActive(bool active, Quaternion rotation)
     [Command]
     void CmdSpawnShip()
     {
-        RpcSpawnShip();
+	    rpcSpawnShipDelay();
+
+        //RpcSpawnShip();
     }
 
     [ClientRpc]
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
index 4794c37a03dbac71db4a0fafa0a9d2f81291930e..9861984a752be30a740c2c5d7e930ae86ef0d8cd 100644
GIT binary patch
delta 40
wcmbQCy+oUXfk8xrfkAZ1Mvgbaj46}93ZG}>o_tiKnvIcxfuY%MvXy8Y0O2zW5&!@I

delta 33
pcmZ3YJwuy=fk8xrfkAY}Mvgbaj1iN+3ZG}>ntW8Gda{pb1OS`p3OxV-

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index a87e50118774f5935e4790aa4df04b42f815a7c5..069140e2d751967bca927ea70795fd58f991ebc3 100644
GIT binary patch
delta 152
zcmeC#$?{+)ivR;7%S;AFnFkCE45C2xhDL#{0*o;%76uYP5h!2+(TkZg*|`^%J9p<F
z7xL(x!wnW>SR$3<&c#^nyTkSWChqCK-ZE`(VPRxp;$;QuFw`^9GX&D|+Yj<F1~UpX
o0@<eO!snKsob3S8?eKZ+^g<R!$?Xr=87&wYnYK%EG8PL101V0^`Tzg`

delta 74
zcmaE`lci@TivR;7OD+SWOb-JCgD8+ap;2I~0Amab(;xBa2iX|awr^o!{KCk|43sw1
cGhmS3F38X5&$!)$gVBPKk#T!2Cu6ZN0E<}=GXMYp