Gameplay: Fix scenecontrol related bugs

Arcthesia · Aug 15, 2024 · 7b67ebb · 7b67ebb
1 parent 289a5d0
commit 7b67ebb
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 2,795 deletions.
diff --git a/Assets/Fonts/NotoSans-Light SDF.asset b/Assets/Fonts/NotoSans-Light SDF.asset
diff --git a/Assets/Fonts/NotoSans-Regular SDF.asset b/Assets/Fonts/NotoSans-Regular SDF.asset
diff --git a/Assets/Fonts/NotoSansJP-Regular SDF.asset b/Assets/Fonts/NotoSansJP-Regular SDF.asset
diff --git a/Assets/Fonts/SourceCodePro-Regular SDF.asset b/Assets/Fonts/SourceCodePro-Regular SDF.asset
diff --git a/Assets/Scenes/Compose.unity b/Assets/Scenes/Compose.unity
@@ -91169,7 +91169,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1931281401}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.88875276
+  m_Size: 0.8887528
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -106658,8 +106658,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 505154477}
   m_HandleRect: {fileID: 505154476}
   m_Direction: 2
-  m_Value: 1.000001
-  m_Size: 0.9204472
+  m_Value: 1.000002
+  m_Size: 0.92044723
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

diff --git a/Assets/Scripts/Compose/EventsEditor/Scenecontrol/ScenecontrolLuaEnvironment.cs b/Assets/Scripts/Compose/EventsEditor/Scenecontrol/ScenecontrolLuaEnvironment.cs
@@ -190,7 +190,7 @@ private void RunScript()
                 if (File.Exists(perChartPath))
                 {
                     lastPath = perChartPath;
-                    LuaRunner.RunScript(File.ReadAllText(perChartPath), this, new ScriptLoader(perChartPath));
+                    LuaRunner.RunScript(File.ReadAllText(perChartPath), this, new ScriptLoader(folderPath));
                 }
             }
             catch (Exception e)

diff --git a/Assets/Scripts/Compose/Rendering/FrameRenderer.cs b/Assets/Scripts/Compose/Rendering/FrameRenderer.cs
@@ -115,6 +115,7 @@ public async UniTask RenderVideo(CancellationToken token, RenderStatusDelegate o
                 Services.Grid.IsGridEnabled = false;
                 Services.Cursor.EnableLaneCursor = false;
                 await Services.Gameplay.Audio.PrepareVideoPlayback();
+                await UniTask.Delay(500);
 
                 bool shouldUpdateTiming = false;
                 float unityStartTime = Time.time;

diff --git a/Assets/Scripts/Gameplay/Scenecontrol/Channels/ContextChannels/ScreenHeightChannel.cs b/Assets/Scripts/Gameplay/Scenecontrol/Channels/ContextChannels/ScreenHeightChannel.cs
@@ -18,7 +18,7 @@ public override List<object> SerializeProperties(ScenecontrolSerialization seria
 
         public override float ValueAt(int timing)
         {
-            return Screen.height;
+            return Services.Camera.GameplayCamera.pixelHeight;
         }
 
         protected override IEnumerable<ValueChannel> GetChildrenChannels()

diff --git a/Assets/Scripts/Gameplay/Scenecontrol/Channels/ContextChannels/ScreenWidthChannel.cs b/Assets/Scripts/Gameplay/Scenecontrol/Channels/ContextChannels/ScreenWidthChannel.cs
@@ -18,7 +18,7 @@ public override List<object> SerializeProperties(ScenecontrolSerialization seria
 
         public override float ValueAt(int timing)
         {
-            return Screen.width;
+            return Services.Camera.GameplayCamera.pixelWidth;
         }
 
         protected override IEnumerable<ValueChannel> GetChildrenChannels()

diff --git a/Assets/Scripts/Gameplay/Scenecontrol/PostProcessing/PostProcessing.cs b/Assets/Scripts/Gameplay/Scenecontrol/PostProcessing/PostProcessing.cs
@@ -150,8 +150,8 @@ public void EnablePostProcess()
         [MoonSharpHidden]
         public void DisablePostProcess()
         {
-            layer.enabled = false || Settings.DisableAdvancedGraphics.Value;
-            volume.enabled = false || Settings.DisableAdvancedGraphics.Value;
+            layer.enabled = false;
+            volume.enabled = false;
         }
 
         private void Awake()

diff --git a/Assets/Scripts/Storage/Loader/GameplayLoader.cs b/Assets/Scripts/Storage/Loader/GameplayLoader.cs
@@ -85,6 +85,7 @@ private void LoadChart(LevelStorage level, ChartSettings chart)
 
         private void LoadMetadata(LevelStorage level, ChartSettings chart)
         {
+            gameplayData.BaseBpm.Value = chart.BaseBpm;
             gameplayControl.Skin.AlignmentSkin = chart.Skin?.Side ?? string.Empty;
             gameplayControl.Skin.AccentSkin = chart.Skin?.Accent ?? string.Empty;
             gameplayControl.Skin.NoteSkin = chart.Skin?.Note ?? string.Empty;