ActualHorse/CarmenSandiego
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

- Improved camera switching code to allow for more versatile camera direction.

Browse Source 
- Added additional camera layouts for round 2 and 3.
This commit is contained in:
ActualHorse
2025-12-20 23:19:19 -05:00
parent 08897ba99f
commit 82606881b3
29 changed files with 1294 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/UdonSharp/Cameras/Camera Switchers/CameraSwitchTrigger.asset
+3 -3
View File
@@ -116,19 +116,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _SwitchToCamera
Data: _SwitchFunction
- Name: $v
Entry: 7
Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _SwitchToCamera
Data: _SwitchFunction
- Name: <UserType>k__BackingField
Entry: 7
Data: 8|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Camera, UnityEngine.CoreModule
Data: System.String, mscorlib
- Name:
Entry: 8
Data:
Assets/UdonSharp/Cameras/Camera Switchers/CameraSwitchTrigger.cs
+2 -2
View File
@@ -10,14 +10,14 @@ using VRC.Udon.Common.Interfaces;
public class CameraSwitchTrigger : UdonSharpBehaviour
{
[SerializeField] private CameraControllerBase _CameraController;
[SerializeField] private Camera _SwitchToCamera;
[SerializeField] private string _SwitchFunction;
public override void OnPlayerTriggerEnter(VRCPlayerApi Player)
{
if (Networking.GetOwner(_CameraController.gameObject) == Networking.LocalPlayer)
{
_CameraController.SwitchToLiveCamera(_SwitchToCamera);
_CameraController.SendCustomEvent(_SwitchFunction);
}
base.OnPlayerTriggerEnter(Player);
Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset
+3 -3
View File
@@ -116,19 +116,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _Cameras
Data: _SwitchFunctions
- Name: $v
Entry: 7
Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Cameras
Data: _SwitchFunctions
- Name: <UserType>k__BackingField
Entry: 7
Data: 8|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Camera[], UnityEngine.CoreModule
Data: System.String[], mscorlib
- Name:
Entry: 8
Data:
Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs
+3 -3
View File
@@ -11,7 +11,7 @@ using VRC.Udon;
public class CameraTimedSwitcher : UdonSharpBehaviour
{
[SerializeField] private CameraControllerBase _CameraController;
[SerializeField] private Camera[] _Cameras;
[SerializeField] private string[] _SwitchFunctions;
[SerializeField] private float _TimeBetweenCuts = 5.0f;
@@ -24,8 +24,8 @@ public class CameraTimedSwitcher : UdonSharpBehaviour
{
if (_Active)
{
_CameraController.SwitchToLiveCamera(_Cameras[_NextCameraIndex]);
_NextCameraIndex = (_NextCameraIndex + 1) % _Cameras.Length;
_CameraController.SendCustomEvent(_SwitchFunctions[_NextCameraIndex]);
_NextCameraIndex = (_NextCameraIndex + 1) % _SwitchFunctions.Length;
SendCustomEventDelayedSeconds(nameof(SwitchToNextCamera), _TimeBetweenCuts);
}
Assets/UdonSharp/Cameras/CameraControllerRound1.cs
-11
View File
@@ -79,31 +79,26 @@ public class CameraControllerRound1 : CameraControllerBase
public void SwitchToPlayer1Camera()
{
DisableAllSwitchers();
SwitchToLiveCamera(Player1Camera);
}
public void SwitchToPlayer2Camera()
{
DisableAllSwitchers();
SwitchToLiveCamera(Player2Camera);
}
public void SwitchToPlayer3Camera()
{
DisableAllSwitchers();
SwitchToLiveCamera(Player3Camera);
}
public void SwitchToHostCamera()
{
DisableAllSwitchers();
SwitchToLiveCamera(HostCamera);
}
public void SwitchToVideoPlayerCamera()
{
DisableAllSwitchers();
SwitchToLiveCamera(VideoPlayerCamera);
}
@@ -114,7 +109,6 @@ public class CameraControllerRound1 : CameraControllerBase
}
public void SwitchToWideShotCamera()
{
DisableAllSwitchers();
ActivateWideShotCamera();
SwitchToLiveCamera(PrimaryFocusCamera);
}
@@ -125,7 +119,6 @@ public class CameraControllerRound1 : CameraControllerBase
}
public void SwitchToVideoMusicClueCamera()
{
DisableAllSwitchers();
ActivateVideoMusicClueCamera();
SwitchToLiveCamera(PrimaryFocusCamera);
}
@@ -136,7 +129,6 @@ public class CameraControllerRound1 : CameraControllerBase
}
public void SwitchToACMECrimenetComputerCamera()
{
DisableAllSwitchers();
ActivateACMECrimenetComputerCamera();
SwitchToLiveCamera(PrimaryFocusCamera);
}
@@ -147,7 +139,6 @@ public class CameraControllerRound1 : CameraControllerBase
}
public void SwitchToFilingCabinetCamera()
{
DisableAllSwitchers();
ActivateFilingCabinetCamera();
SwitchToLiveCamera(PrimaryFocusCamera);
}
@@ -158,7 +149,6 @@ public class CameraControllerRound1 : CameraControllerBase
}
public void SwitchToAllPlayersCamera()
{
DisableAllSwitchers();
ActivateAllPlayersCamera();
SwitchToLiveCamera(PrimaryFocusCamera);
}
@@ -169,7 +159,6 @@ public class CameraControllerRound1 : CameraControllerBase
}
public void SwitchToModemCamera()
{
DisableAllSwitchers();
ActivateModemCamera();
SwitchToLiveCamera(PrimaryFocusCamera);
}
Assets/UdonSharp/Cameras/CameraControllerRound2.asset
+389 -44
View File
@@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
Data: 12
Data: 18
- Name:
Entry: 7
Data:
@@ -455,19 +455,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: Player1CameraAnchor
Data: HostAndAllPlayersCameraTrigger
- Name: $v
Entry: 7
Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: Player1CameraAnchor
Data: HostAndAllPlayersCameraTrigger
- Name: <UserType>k__BackingField
Entry: 7
Data: 28|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: CameraAnchor, Assembly-CSharp
Data: CameraTimerSwitchTrigger, Assembly-CSharp
- Name:
Entry: 8
Data:
@@ -491,7 +491,7 @@ MonoBehaviour:
Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 4
Data: 2
- Name:
Entry: 7
Data: 30|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
@@ -503,25 +503,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 7
Data: 31|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 32|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 33|UnityEngine.SerializeField, UnityEngine.CoreModule
Data: 31|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -542,16 +524,22 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: Player2CameraAnchor
Data: HostAllPlayersTimerToggle
- Name: $v
Entry: 7
Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: Player2CameraAnchor
Data: HostAllPlayersTimerToggle
- Name: <UserType>k__BackingField
Entry: 9
Data: 28
Entry: 7
Data: 33|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: CameraTimedSwitcher, Assembly-CSharp
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -569,10 +557,19 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
Data: 2
- Name:
Entry: 7
Data: 35|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 36|UnityEngine.SerializeField, UnityEngine.CoreModule
@@ -596,16 +593,16 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: HostAndWinnerCameraAnchor
Data: HostPlayersAndWideShotTimerToggle
- Name: $v
Entry: 7
Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: HostAndWinnerCameraAnchor
Data: HostPlayersAndWideShotTimerToggle
- Name: <UserType>k__BackingField
Entry: 9
Data: 28
Data: 33
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -650,16 +647,22 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: LocationBoardCameraAnchor
Data: Player1CameraAnchor
- Name: $v
Entry: 7
Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: LocationBoardCameraAnchor
Data: Player1CameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 28
Entry: 7
Data: 41|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: CameraAnchor, Assembly-CSharp
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -677,13 +680,238 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 43|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 44|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: Player2CameraAnchor
- Name: $v
Entry: 7
Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: Player2CameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 41
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule
Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: HostAndWinnerCameraAnchor
- Name: $v
Entry: 7
Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: HostAndWinnerCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 41
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: LocationBoardCameraAnchor
- Name: $v
Entry: 7
Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: LocationBoardCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 41
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: ModemCameraAnchor
- Name: $v
Entry: 7
Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: ModemCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 41
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 56|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -707,13 +935,13 @@ MonoBehaviour:
Data: VideoPlayerCameraAnchor
- Name: $v
Entry: 7
Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: VideoPlayerCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 28
Data: 41
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -731,13 +959,130 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 45|UnityEngine.SerializeField, UnityEngine.CoreModule
Data: 59|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: WideShotCameraAnchor
- Name: $v
Entry: 7
Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: WideShotCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 41
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 62|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 63|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: AllPlayersCameraAnchor
- Name: $v
Entry: 7
Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: AllPlayersCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 41
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
Assets/UdonSharp/Cameras/CameraControllerRound2.cs
+45 -21
View File
@@ -17,16 +17,20 @@ public class CameraControllerRound2 : CameraControllerBase
[SerializeField] public Camera PrimaryFocusCamera;
[SerializeField] public Camera VideoPlayerCamera;
[Space]
//[SerializeField] public CameraTimerSwitchTrigger HostCameraTrigger;
[SerializeField] public CameraTimerSwitchTrigger HostAndAllPlayersCameraTrigger;
[Space]
//[SerializeField] public CameraTimedSwitcher HostAndAllPlayersTimerToggle;
//[SerializeField] public CameraTimedSwitcher HostAndIndividualPlayersTimerToggle;
[SerializeField] public CameraTimedSwitcher HostAllPlayersTimerToggle;
[SerializeField] public CameraTimedSwitcher HostPlayersAndWideShotTimerToggle;
[Space]
[SerializeField] public CameraAnchor Player1CameraAnchor;
[SerializeField] public CameraAnchor Player2CameraAnchor;
[SerializeField] public CameraAnchor HostAndWinnerCameraAnchor;
[SerializeField] public CameraAnchor LocationBoardCameraAnchor;
[SerializeField] public CameraAnchor ModemCameraAnchor;
[SerializeField] public CameraAnchor VideoPlayerCameraAnchor;
[Space]
[SerializeField] public CameraAnchor WideShotCameraAnchor;
[SerializeField] public CameraAnchor AllPlayersCameraAnchor;
public override void InitialiseCameras()
@@ -47,79 +51,99 @@ public class CameraControllerRound2 : CameraControllerBase
Networking.SetOwner(Player, PrimaryFocusCamera.gameObject);
Networking.SetOwner(Player, VideoPlayerCamera.gameObject);
Networking.SetOwner(Player, HostAndAllPlayersCameraTrigger.gameObject);
Networking.SetOwner(Player, HostAllPlayersTimerToggle.gameObject);
Networking.SetOwner(Player, HostPlayersAndWideShotTimerToggle.gameObject);
Networking.SetOwner(Player, Player1CameraAnchor.gameObject);
Networking.SetOwner(Player, Player2CameraAnchor.gameObject);
Networking.SetOwner(Player, HostAndWinnerCameraAnchor.gameObject);
Networking.SetOwner(Player, LocationBoardCameraAnchor.gameObject);
Networking.SetOwner(Player, VideoPlayerCameraAnchor.gameObject);
Networking.SetOwner(Player, WideShotCameraAnchor.gameObject);
Networking.SetOwner(Player, AllPlayersCameraAnchor.gameObject);
base.OnOwnershipTransferred(Player);
}
public void SwitchToPlayer1Camera()
{
DisableAllSwitchers();
SwitchToLiveCamera(Player1Camera);
}
public void SwitchToPlayer2Camera()
{
DisableAllSwitchers();
SwitchToLiveCamera(Player2Camera);
}
public void SwitchToHostAndWinnerCamera()
{
DisableAllSwitchers();
SwitchToLiveCamera(HostAndWinnerCamera);
}
public void SwitchToVideoPlayerCamera()
{
DisableAllSwitchers();
SwitchToLiveCamera(VideoPlayerCamera);
}
public void ActivateWideShotCamera()
{
//DefaultWideShotCameraAnchor.AttachCamera(PrimaryFocusCamera);
WideShotCameraAnchor.AttachCamera(PrimaryFocusCamera);
}
public void SwitchToWideShotCamera()
{
//DisableAllSwitchers();
//ActivateWideShotCamera();
//SwitchToLiveCamera(PrimaryFocusCamera);
ActivateWideShotCamera();
SwitchToLiveCamera(PrimaryFocusCamera);
}
public void ActivateAllPlayersCamera()
{
AllPlayersCameraAnchor.AttachCamera(PrimaryFocusCamera);
}
public void SwitchToAllPlayersCamera()
{
ActivateAllPlayersCamera();
SwitchToLiveCamera(PrimaryFocusCamera);
}
public void ActivateHostAllPlayersCameraSwitcher()
{
//ActivateAllPlayersCamera();
//HostAndIndividualPlayersTimerToggle.Activate = false;
//HostAndAllPlayersTimerToggle.Activate = true;
ActivateAllPlayersCamera();
HostAllPlayersTimerToggle.Activate = true;
HostPlayersAndWideShotTimerToggle.Activate = false;
}
public void ActivateHostPlayersAndWideShotCameraSwitcher()
{
ActivateWideShotCamera();
HostAllPlayersTimerToggle.Activate = false;
HostPlayersAndWideShotTimerToggle.Activate = true;
}
public void ActivateHostCameraTrigger()
public void ActivateHostAllPlayersCameraTrigger()
{
//HostCameraTrigger.gameObject.SetActive(true);
HostAndAllPlayersCameraTrigger.gameObject.SetActive(true);
}
public void DeactivateHostCameraTrigger()
public void DeactivateHostAllPlayersCameraTrigger()
{
//HostCameraTrigger.gameObject.SetActive(false);
HostAndAllPlayersCameraTrigger.gameObject.SetActive(false);
}
public override void DisableAllTriggers()
{
//HostCameraTrigger.gameObject.SetActive(false);
HostAndAllPlayersCameraTrigger.gameObject.SetActive(false);
}
public override void DisableAllSwitchers()
{
//HostAndAllPlayersTimerToggle.Activate = false;
//HostAndIndividualPlayersTimerToggle.Activate = false;
HostAllPlayersTimerToggle.Activate = false;
HostPlayersAndWideShotTimerToggle.Activate = false;
}
}
Assets/UdonSharp/Cameras/CameraControllerRound3.cs
+7 -14
View File
@@ -92,31 +92,26 @@ public class CameraControllerRound3 : CameraControllerBase
public void SwitchToPlayerCamera()
{
DisableAllSwitchers();
SwitchToLiveCamera(PlayerCamera);
}
public void SwitchToHostCamera()
{
DisableAllSwitchers();
SwitchToLiveCamera(HostCamera);
}
public void SwitchToOverheadCamera()
{
DisableAllSwitchers();
SwitchToLiveCamera(OverheadCamera);
}
public void SwitchToFrontCamera()
{
DisableAllSwitchers();
SwitchToLiveCamera(FrontCamera);
}
public void SwitchToVideoPlayerCamera()
{
DisableAllSwitchers();
SwitchToLiveCamera(VideoPlayerCamera);
}
@@ -146,14 +141,6 @@ public class CameraControllerRound3 : CameraControllerBase
}
public void ChangeMarkerCameraPosition()
{
HostCameraAnchorSequence[MarkerCameraAnchorPosition].AttachCamera(HostCamera);
PlayerCameraAnchorSequence[MarkerCameraAnchorPosition].AttachCamera(PlayerCamera);
RequestSerialization();
}
public void PlayIFeelGood(bool Play)
{
PlayIFeelGoodCallback = Play;
@@ -193,10 +180,16 @@ public class CameraControllerRound3 : CameraControllerBase
set
{
_MarkerCameraAnchorPosition = value;
ChangeMarkerCameraPosition();
_ChangeMarkerCameraPosition();
}
get => _MarkerCameraAnchorPosition;
}
private void _ChangeMarkerCameraPosition()
{
HostCameraAnchorSequence[MarkerCameraAnchorPosition].AttachCamera(HostCamera);
PlayerCameraAnchorSequence[MarkerCameraAnchorPosition].AttachCamera(PlayerCamera);
RequestSerialization();
}
private bool PlayIFeelGoodCallback
{