diff --git a/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs b/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs index 44484f659..7527a6413 100644 --- a/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs +++ b/Assets/_DDD/_Scripts/CameraSystem/CameraGameObject.cs @@ -6,7 +6,7 @@ namespace DDD public class CameraGameObject : MonoBehaviour { [field: SerializeField] - public string Id { get; private set; } + public CameraType CameraType { get; private set; } private CinemachineCamera _cinemachineCamera; diff --git a/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs index edfd6fa79..6c0a42cc6 100644 --- a/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs +++ b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs @@ -4,10 +4,16 @@ namespace DDD { + public enum CameraType + { + None = 0, + RestaurantBaseCamera = 1 + } + public class CameraManager : Singleton, IManager { [ShowInInspector, ReadOnly] - private Dictionary _cameraGameObjects = new(); + private Dictionary _cameraGameObjects = new(); private CinemachineBrain _cinemachineBrain; @@ -23,24 +29,24 @@ public void PostInit() public void RegisterCamera(CameraGameObject cameraGameObject) { - _cameraGameObjects.TryAdd(cameraGameObject.Id, cameraGameObject); + _cameraGameObjects.TryAdd(cameraGameObject.CameraType, cameraGameObject); } public void UnRegisterCamera(CameraGameObject cameraGameObject) { - _cameraGameObjects.Remove(cameraGameObject.Id); + _cameraGameObjects.Remove(cameraGameObject.CameraType); } - public void SwitchCamera(string id, CinemachineBlendDefinition.Styles blendStyle = CinemachineBlendDefinition.Styles.Cut, float blendDuration = 1f) + public void SwitchCamera(CameraType cameraType, CinemachineBlendDefinition.Styles blendStyle = CinemachineBlendDefinition.Styles.Cut, float blendDuration = 1f) { _cinemachineBrain.DefaultBlend = new CinemachineBlendDefinition(blendStyle, blendDuration); foreach (var item in _cameraGameObjects) { - int newPriority = item.Value.Id == id ? 10 : 0; + int newPriority = item.Value.CameraType == cameraType ? 10 : 0; item.Value.SetPriority(newPriority); } } - public CameraGameObject GetCameraGameObject(string id) => _cameraGameObjects[id]; + public CameraGameObject GetCameraGameObject(CameraType cameraType) => _cameraGameObjects[cameraType]; } } \ No newline at end of file