KittenBox/gmtk-2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

potential fix for network camera

Browse Source
This commit is contained in:
Amaan Shawkath
2021-06-13 03:28:35 +01:00
parent 3b1d880963
commit a202fd5e6a
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/Models/Main.unity
View File

@@ -976,7 +976,7 @@ MonoBehaviour:
ModeOverride: 0 ModeOverride: 0
LensShift: {x: 0, y: 0} LensShift: {x: 0, y: 0}
GateFit: 2 GateFit: 2
m_SensorSize: {x: 1.7091503, y: 1} m_SensorSize: {x: 1.5816994, y: 1}
m_Transitions: m_Transitions:
m_BlendHint: 0 m_BlendHint: 0
m_InheritPosition: 0 m_InheritPosition: 0
@@ -1607,7 +1607,7 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 714303808} m_GameObject: {fileID: 714303808}
m_LocalRotation: {x: -0.00849294, y: 0.30381006, z: -0.073214345, w: -0.9498774} m_LocalRotation: {x: -0.008523712, y: 0.3021867, z: -0.072742335, w: -0.95043105}
m_LocalPosition: {x: -0, y: 0.36, z: 2.5} m_LocalPosition: {x: -0, y: 0.36, z: 2.5}
m_LocalScale: {x: 4, y: 4, z: 4} m_LocalScale: {x: 4, y: 4, z: 4}
m_Children: m_Children:
@@ -1644,7 +1644,7 @@ MonoBehaviour:
ModeOverride: 0 ModeOverride: 0
LensShift: {x: 0, y: 0} LensShift: {x: 0, y: 0}
GateFit: 2 GateFit: 2
m_SensorSize: {x: 1.7091503, y: 1} m_SensorSize: {x: 1.5816994, y: 1}
m_Transitions: m_Transitions:
m_BlendHint: 0 m_BlendHint: 0
m_InheritPosition: 0 m_InheritPosition: 0
@@ -3733,7 +3733,7 @@ MonoBehaviour:
ModeOverride: 0 ModeOverride: 0
LensShift: {x: 0, y: 0} LensShift: {x: 0, y: 0}
GateFit: 2 GateFit: 2
m_SensorSize: {x: 1.7091503, y: 1} m_SensorSize: {x: 1.5816994, y: 1}
m_Transitions: m_Transitions:
m_BlendHint: 0 m_BlendHint: 0
m_InheritPosition: 0 m_InheritPosition: 0
@@ -3774,6 +3774,7 @@ MonoBehaviour:
player: {fileID: 750378831} player: {fileID: 750378831}
activeCamera: {fileID: 381303739} activeCamera: {fileID: 381303739}
networkCamera: {fileID: 561286952} networkCamera: {fileID: 561286952}
playerCamera: {fileID: 381303739}
activeNode: {fileID: 0} activeNode: {fileID: 0}
previousNode: {fileID: 0} previousNode: {fileID: 0}
networkView: 0 networkView: 0

17
Assets/Scripts/GameManager.cs
View File

@@ -10,10 +10,13 @@ public class GameManager : MonoBehaviour
public GameObject player; public GameObject player;
public CinemachineVirtualCamera activeCamera; public CinemachineVirtualCamera activeCamera;
public CinemachineVirtualCamera networkCamera; public CinemachineVirtualCamera networkCamera;
public CinemachineVirtualCamera playerCamera;
public GameObject activeNode; public GameObject activeNode;
public Node previousNode; public Node previousNode;
public bool networkView = false; public bool networkView = false;
private bool exiting = false;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
@@ -22,12 +25,20 @@ public class GameManager : MonoBehaviour
public void SetActiveCamera(CinemachineVirtualCamera vCam) public void SetActiveCamera(CinemachineVirtualCamera vCam)
{ {
if (vCam == networkCamera && activeCamera != networkCamera && activeCamera != playerCamera)
{
exiting = true;
}
else
{
exiting = false;
}
vCam.Priority = 20; vCam.Priority = 20;
activeCamera.Priority = 0; activeCamera.Priority = 0;
activeCamera = vCam; activeCamera = vCam;
if(!activeCamera == networkCamera) { networkView = false; } networkView = (!exiting && activeCamera == networkCamera) ? true : false;
} }
// Update is called once per frame // Update is called once per frame
@@ -38,11 +49,9 @@ public class GameManager : MonoBehaviour
private void FixedUpdate() private void FixedUpdate()
{ {
//Leave network view with x //Leave network view with x
if (Keyboard.current.xKey.wasPressedThisFrame && networkView) if (Keyboard.current.xKey.wasPressedThisFrame && networkView)
{ {
player.GetComponent<StarterAssets.FirstPersonController>().enabled = true;
SetActiveCamera(networkCamera); SetActiveCamera(networkCamera);
activeNode.GetComponent<Node>().DisableNode(); activeNode.GetComponent<Node>().DisableNode();
activeNode = null; activeNode = null;