diff --git a/BeatSaberCinema/Environment/EnvironmentController.cs b/BeatSaberCinema/Environment/EnvironmentController.cs index 7bd55cb..5400c99 100644 --- a/BeatSaberCinema/Environment/EnvironmentController.cs +++ b/BeatSaberCinema/Environment/EnvironmentController.cs @@ -321,14 +321,6 @@ private static void DefaultSceneModifications(VideoConfig? videoConfig) { Log.Warn("BTS movement effect not found"); } - - if (videoConfig!.screenPosition == null) - { - var placement = Placement.GetDefaultPlacementForScene(PlaybackController.Scene.SoloGameplay); - placement.Position.z = 80; - PlaybackController.Instance.VideoPlayer.SetPlacement(placement); - } - break; } case "OriginsEnvironment": diff --git a/BeatSaberCinema/HarmonyPatches/EnvironmentOverridePatch.cs b/BeatSaberCinema/HarmonyPatches/EnvironmentOverridePatch.cs index bbef20c..4a8e7fe 100644 --- a/BeatSaberCinema/HarmonyPatches/EnvironmentOverridePatch.cs +++ b/BeatSaberCinema/HarmonyPatches/EnvironmentOverridePatch.cs @@ -72,7 +72,8 @@ public static void Prefix(IDifficultyBeatmap difficultyBeatmap, ref OverrideEnvi "MonstercatEnvironment", "CrabRaveEnvironment", "SkrillexEnvironment", - "WeaveEnvironment" + "WeaveEnvironment", + "PyroEnvironment" }; var mapEnvironmentInfoSo = difficultyBeatmap.GetEnvironmentInfo(); diff --git a/BeatSaberCinema/Screen/Placement.cs b/BeatSaberCinema/Screen/Placement.cs index 4600d6b..de256af 100644 --- a/BeatSaberCinema/Screen/Placement.cs +++ b/BeatSaberCinema/Screen/Placement.cs @@ -60,9 +60,9 @@ public static Placement CreatePlacementForConfig(VideoConfig? config, PlaybackCo ); placement.Width = placement.Height * aspectRatio; - placement.Curvature = config?.screenCurvature; - placement.Subsurfaces = config?.screenSubsurfaces; - placement.CurveYAxis = config?.curveYAxis; + placement.Curvature = config.screenCurvature ?? defaultPlacement.Curvature; + placement.Subsurfaces = config.screenSubsurfaces; + placement.CurveYAxis = config.curveYAxis; return placement; } @@ -90,6 +90,7 @@ public static Placement GetDefaultPlacementForScene(PlaybackController.Scene sce "MonstercatEnvironment" => new Placement(new Vector3(0f, 5.46f, 40f), new Vector3(-5f, 0f, 0f), 13f), "SkrillexEnvironment" => new Placement(new Vector3(0f, 1.5f, 30f), Vector3.zero, 12f), "WeaveEnvironment" => new Placement(new Vector3(0f, 1.5f, 21f), Vector3.zero, 4.3f, null, 0f), + "PyroEnvironment" => new Placement(new Vector3(0f, 12f, 60f), Vector3.zero, 24f, null, 0f), _ => null }; } diff --git a/BeatSaberCinema/Video/VideoConfig.cs b/BeatSaberCinema/Video/VideoConfig.cs index 7b66351..e51bb51 100644 --- a/BeatSaberCinema/Video/VideoConfig.cs +++ b/BeatSaberCinema/Video/VideoConfig.cs @@ -80,7 +80,7 @@ [JsonIgnore] public string? VideoPath [JsonIgnore] public bool IsPlayable => (DownloadState == DownloadState.Downloaded || IsStreamable) && !PlaybackDisabledByMissingSuggestion; [JsonIgnore] public bool IsWIPLevel => LevelDir != null && LevelDir.Contains(VideoLoader.WIP_DIRECTORY_NAME); [JsonIgnore] public bool EnvironmentModified => (environment != null && environment.Length > 0) || screenPosition != null || screenHeight != null; - public float PlaybackSpeed => playbackSpeed ?? 1; + [JsonIgnore] public float PlaybackSpeed => playbackSpeed ?? 1; private static Regex _regexParseID = new Regex(@"\/watch\?v=([a-z0-9_-]*)",