Fixed freecam acting up with more than 1 person

Team-Nijito · Apr 2, 2022 · 7e9d481 · 7e9d481
1 parent 2f011c5
commit 7e9d481
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/Colormancy/Assets/Scripts/UI/Camera/EnableFreeCam.cs b/Colormancy/Assets/Scripts/UI/Camera/EnableFreeCam.cs
@@ -37,10 +37,10 @@ void Start()
 
     private void Update()
     {
-        if (!m_inFreeCamMode && Input.GetKey(KeyCode.O))
+        if (photonView.IsMine && !m_inFreeCamMode && Input.GetKey(KeyCode.O))
         {
             m_inFreeCamMode = true;
-            HandControlToFreeCam();
+            photonView.RPC("HandControlToFreeCam", PhotonNetwork.LocalPlayer);
         }
     }
 
@@ -90,10 +90,10 @@ public void HandControlFromFreeCam()
         m_inFreeCamMode = false;
     }
 
+    [PunRPC]
     public void HandControlToFreeCam()
     {
-        GameObject freeCam = Instantiate(m_freeCamPrefab);
-        freeCam.transform.position = transform.position;
+        GameObject freeCam = PhotonNetwork.Instantiate("Player/" + m_freeCamPrefab.name, transform.position, Quaternion.identity);
         DontDestroyOnLoad(freeCam);
         freeCam.GetComponent<FreeCam>().SetHumanForm(gameObject);
         photonView.Owner.TagObject = freeCam;

diff --git a/Colormancy/Assets/Scripts/UI/Camera/FreeCam.cs b/Colormancy/Assets/Scripts/UI/Camera/FreeCam.cs
@@ -1,4 +1,5 @@
-using System;
+using Photon.Pun;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -22,7 +23,7 @@
 /// 
 /// This script is modified for usage in Photon.
 /// </summary>
-public class FreeCam : MonoBehaviour
+public class FreeCam : MonoBehaviourPunCallbacks
 {
     /// <summary>
     /// Normal speed of camera movement.
@@ -58,11 +59,13 @@ public class FreeCam : MonoBehaviour
 
     void Update()
     {
-        if (Input.GetKey(KeyCode.P))
+        if (photonView.IsMine && Input.GetKey(KeyCode.P))
         {
             // switch back to human form
+            //photonView.RPC("HandControlFromFreeCam", PhotonNetwork.LocalPlayer);
+
             humanform.GetComponent<EnableFreeCam>().HandControlFromFreeCam();
-            Destroy(gameObject);
+            PhotonNetwork.Destroy(gameObject);
             return;
         }
 
@@ -134,9 +137,10 @@ void Update()
         }
     }
 
-    void OnDisable()
+    public override void OnDisable()
     {
         StopLooking();
+        base.OnDisable();
     }
 
     public void SetHumanForm(GameObject h)