Merge pull request #187 from BeatLeader/camera-settings-fix

Fixed camera settings being null and causing black screen

Author: NSGolova

Source/1_Config/ConfigDefaults.cs

@@ -91,7 +91,7 @@ internal static class ConfigDefaults {
 
             ShowWatermark = true,
 
-            CameraSettings = new InternalReplayerCameraSettings {
+            CameraSettings = new ReplayerCameraSettings {
                 MaxCameraFOV = 110,
                 MinCameraFOV = 70,
                 CameraFOV = 90,

Source/2_Core/Models/Replayer/InternalReplayerCameraSettings.cs

@@ -43,6 +43,11 @@ public ReplayerSettings Settings {
         /// Specifies bindings to be used instead of the default ones.
         /// </summary>
         public ReplayerBindings? ReplayerBindings { get; set; }
+        
+        /// <summary>
+        /// Specifies whether the builtin camera should be disabled or not.
+        /// </summary>
+        public bool DisableBuiltinCamera { get; set; }
 
         public IReplay MainReplay => Replays[0];
         public bool IsBattleRoyale => Replays.Count > 1;

Source/2_Core/Models/Replayer/ReplayLaunchData.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using BeatLeader.Replayer;
 using BeatLeader.Utils;
 using JetBrains.Annotations;
@@ -41,10 +42,38 @@ public class ReplayerCameraSettings {
         public int MinCameraFOV { get; set; }
         public int CameraFOV { get; set; }
 
-        [JsonIgnore]
-        public virtual string? CameraView { get; set; }
+        public string? CameraView {
+            get => InputUtils.UsesFPFC ? FpfcCameraView : VRCameraView;
+            set {
+                if (InputUtils.UsesFPFC) {
+                    FpfcCameraView = value;
+                } else {
+                    VRCameraView = value;
+                }
+            }
+        }
+
+        public IReadOnlyList<ICameraView> CameraViews {
+            get => InputUtils.UsesFPFC ?
+                FpfcCameraViews ??= DefaultFpfcViews.ToList() :
+                VRCameraViews ??= DefaultVRViews.ToList();
+            set {
+                var views = value.ToList();
+                
+                if (InputUtils.UsesFPFC) {
+                    FpfcCameraViews = views;
+                } else {
+                    VRCameraViews = views;
+                }
+            }
+        }
+
+#pragma warning disable MA0016
+        public List<ICameraView>? VRCameraViews { get; set; }
+        public List<ICameraView>? FpfcCameraViews { get; set; }
+#pragma warning restore MA0016
 
-        [JsonIgnore]
-        public virtual IReadOnlyList<ICameraView>? CameraViews { get; set; }
+        public string? VRCameraView { get; set; }
+        public string? FpfcCameraView { get; set; }
     }
 }

Source/2_Core/Models/Replayer/ReplayerCameraSettings.cs

@@ -1,5 +1,6 @@
 using JetBrains.Annotations;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
 
 namespace BeatLeader.Models {
     [PublicAPI]
@@ -18,7 +19,15 @@ public class ReplayerSettings {
         public ReplayerUISettings UISettings { get; set; } = new();
         public BodySettings BodySettings { get; set; } = new();
 
-        [JsonConverter(typeof(ImplicitTypeConverter<InternalReplayerCameraSettings>))]
-        public ReplayerCameraSettings? CameraSettings { get; set; }
+        // This property exists as a fix for previous versions that were broken because of the camera settings being null
+        public ReplayerCameraSettings CameraSettings {
+            get => _originalCameraSettings ??= ConfigDefaults.ReplayerSettings.CameraSettings;
+            set => _originalCameraSettings = value;
+        }
+
+        // TODO: remove in the next release
+        // ReSharper disable once ReplaceWithFieldKeyword
+        [JsonProperty("CameraSettings"), UsedImplicitly]
+        private ReplayerCameraSettings? _originalCameraSettings = new();
     }
 }

Source/2_Core/Models/Replayer/ReplayerSettings.cs

@@ -121,8 +121,8 @@ private void UnpatchSmoothCamera() {
 
         private void LoadSettings() {
             var cameraSettings = _launchData.Settings.CameraSettings;
-            var views = cameraSettings!.CameraViews;
-            if (views == null) return;
+            var views = cameraSettings.CameraViews;
+           
             foreach (var view in views) {
                 _diContainer.Inject(view);
                 _views.Add(view);
@@ -136,7 +136,7 @@ private void LoadSettings() {
         }
 
         private void Awake() {
-            if (_launchData.Settings.CameraSettings == null) {
+            if (_launchData.DisableBuiltinCamera) {
                 // Prevent Start from being called
                 enabled = false;
                 return;

Source/2_Core/Replayer/Camera/ReplayerCameraController.cs

@@ -127,21 +127,14 @@ private static void InitHarmonyPatches() {
 
         #region Callbacks
 
-        private static ReplayerCameraSettings? _cameraSettings;
-
         private static void HandleReplayWasStarted(ReplayLaunchData data) {
             if (InputUtils.UsesFPFC) {
-                _cameraSettings = ReplayerLauncher.LaunchData!.Settings.CameraSettings;
-                ReplayerLauncher.LaunchData.Settings.CameraSettings = null; //disabling base camera
+                ReplayerLauncher.LaunchData!.DisableBuiltinCamera = true;
             }
             SetReplayState(true);
         }
 
         private static void HandleReplayWasFinished(ReplayLaunchData data) {
-            if (InputUtils.UsesFPFC) {
-                ReplayerLauncher.LaunchData!.Settings.CameraSettings = _cameraSettings;
-                _cameraSettings = null;
-            }
             SetReplayState(false);
         }