Merge pull request #104 from Project-Funk-Engine/cleanup

Cleanup code and last features

Author: LifeHckr

Audio/midi/Song2.mid

@@ -10,6 +10,9 @@ public partial class MidiMaestro : Resource
 {
     private MidiFile _midiFile;
 
+    public static TempoMap TempoMap;
+    public static TimeSignature TimeSignature;
+
     //The four note rows that we care about
     private midiNoteInfo[] _upNotes;
     private midiNoteInfo[] _downNotes;
@@ -28,18 +31,20 @@ public MidiMaestro(string filePath)
 
         if (!FileAccess.FileExists(filePath))
         {
-            GD.PrintErr("ERROR: Unable to load level Midi file: " + filePath);
+            GD.PushError("ERROR: Unable to load level Midi file: " + filePath);
         }
 
         _midiFile = MidiFile.Read(filePath);
+        TempoMap = _midiFile.GetTempoMap();
+        TimeSignature = TempoMap.GetTimeSignatureAtTime(new MidiTimeSpan());
 
         //Strip out the notes from the midi file
         foreach (var track in _midiFile.GetTrackChunks())
         {
             string trackName = track.Events.OfType<SequenceTrackNameEvent>().FirstOrDefault()?.Text;
             midiNoteInfo[] noteEvents = track
                 .GetNotes()
-                .Select(note => new midiNoteInfo(note, _midiFile.GetTempoMap()))
+                .Select(note => new midiNoteInfo(note))
                 .ToArray();
 
             switch (trackName)
@@ -77,19 +82,23 @@ public midiNoteInfo[] GetNotes(ArrowType arrowType)
 public class midiNoteInfo
 {
     private readonly Melanchall.DryWetMidi.Interaction.Note _note;
-    private readonly TempoMap _tempoMap;
 
-    public midiNoteInfo(Melanchall.DryWetMidi.Interaction.Note note, TempoMap tempoMap)
+    public midiNoteInfo(Melanchall.DryWetMidi.Interaction.Note note)
     {
         _note = note;
-        _tempoMap = tempoMap;
+    }
+
+    public long GetStartTimeBeat()
+    {
+        var beatsBar = _note.TimeAs<BarBeatTicksTimeSpan>(MidiMaestro.TempoMap);
+        return beatsBar.Bars * MidiMaestro.TimeSignature.Numerator + beatsBar.Beats;
     }
 
     public long GetStartTimeTicks() => _note.Time;
 
     public float GetStartTimeSeconds() =>
-        _note.TimeAs<MetricTimeSpan>(_tempoMap).Milliseconds / 1000f
-        + _note.TimeAs<MetricTimeSpan>(_tempoMap).Seconds;
+        _note.TimeAs<MetricTimeSpan>(MidiMaestro.TempoMap).Milliseconds / 1000f
+        + _note.TimeAs<MetricTimeSpan>(MidiMaestro.TempoMap).Seconds;
 
     public long GetEndTime() => _note.EndTime;
 

Classes/MidiMaestro/MidiMaestro.cs

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://csx04jwaoo20u"]
 
-[ext_resource type="Script" path="res://Globals/BgAudioPlayer.cs" id="1_w7def"]
+[ext_resource type="Script" path="res://Globals/BgAudioPlayer/BgAudioPlayer.cs" id="1_w7def"]
 
 [node name="BgAudioPlayer" type="AudioStreamPlayer"]
 script = ExtResource("1_w7def")

Globals/BGAudioPlayer.tscn Globals/BgAudioPlayer/BGAudioPlayer.tscnGlobals/BGAudioPlayer.tscn renamed to Globals/BgAudioPlayer/BGAudioPlayer.tscn

@@ -0,0 +1,17 @@
+[remap]
+
+importer="csv_translation"
+type="Translation"
+uid="uid://drjnsd6mqpxqh"
+
+[deps]
+
+files=["res://Globals/Translations/translations.en.translation", "res://Globals/Translations/translations.cn.translation"]
+
+source_file="res://Globals/Translations/translations.csv"
+dest_files=["res://Globals/Translations/translations.en.translation", "res://Globals/Translations/translations.cn.translation"]
+
+[params]
+
+compress=true
+delimiter=0

Globals/BgAudioPlayer.cs Globals/BgAudioPlayer/BgAudioPlayer.csGlobals/BgAudioPlayer.cs renamed to Globals/BgAudioPlayer/BgAudioPlayer.cs

@@ -24,13 +24,13 @@ buses/default_bus_layout=""
 StageProducer="*res://Globals/StageProducer.cs"
 TimeKeeper="*res://Globals/TimeKeeper.cs"
 Scribe="*res://Globals/Scribe.cs"
-BgAudioPlayer="*res://Globals/BGAudioPlayer.tscn"
+BgAudioPlayer="*res://Globals/BgAudioPlayer/BGAudioPlayer.tscn"
 
 [display]
 
 window/size/viewport_width=640
 window/size/viewport_height=360
-window/stretch/mode="viewport"
+window/stretch/mode="canvas_items"
 window/stretch/scale_mode="integer"
 
 [dotnet]
@@ -191,7 +191,7 @@ QWERT_arrowRight={
 
 [internationalization]
 
-locale/translations=PackedStringArray("res://Globals/translations.cn.translation", "res://Globals/translations.en.translation")
+locale/translations=PackedStringArray("res://Globals/Translations/translations.cn.translation", "res://Globals/Translations/translations.en.translation")
 
 [rendering]
 

Globals/translations.csv Globals/Translations/translations.csvGlobals/translations.csv renamed to Globals/Translations/translations.csv

@@ -60,8 +60,8 @@ script = ExtResource("1_456es")
 notePlacementBar = NodePath("ProgressBar")
 currentComboMultText = NodePath("TextEdit")
 _particles = NodePath("ProgressBar/Rock")
-_currentNote = NodePath("NoteQueueSprite/NextNote")
-_nextNote = NodePath("NoteQueueSprite/CurrentNote")
+_currentNote = NodePath("NoteQueueSprite/CurrentNote")
+_nextNote = NodePath("NoteQueueSprite/NextNote")
 fullBarParticles = NodePath("ProgressBar/CPUParticles2D")
 
 [node name="ProgressBar" type="TextureProgressBar" parent="."]