diff options
| author |   Spartan322 <Megacake1234@gmail.com> | 2023-03-08 23:15:15 +0100 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2023-03-09 02:18:39 +0100 |
| commit | 99c99ce56bb3e73e65ff70352d4c9eef3d7f0f86 (patch) | |
| tree | f3808a85792e5d58db8297211e5887b0c92d29d5 /game/src/MusicConductor/SongInfo.gd | |
| parent | ec0584d9fafd96753aed73e7c388da8e2f5b3833 (diff) | |
Fix up MusicPlayer for future work
Add music import files
Rename MusicUIController to MusicPlayer
Adjust MusicPlayer node position, offset, and anchors
Adjust MusicConductor, MusicPlayer, and SongInfo style to conform with other GDScript files
Correct capability for MusicPlayer to desync from the MusicConductor
Adjusted MusicPlayer button text to use media player unicode symbols
Adjust MusicPlayer to correct mouse filter problems
Adjust MusicPlayer to appear more consistent
Correct lack of path_join use in SongInfo
Correct mouse filter problems in OptionsMenu
Diffstat (limited to 'game/src/MusicConductor/SongInfo.gd')
| -rw-r--r-- | game/src/MusicConductor/SongInfo.gd | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/game/src/MusicConductor/SongInfo.gd b/game/src/MusicConductor/SongInfo.gd index 85ef96a..f7343c0 100644 --- a/game/src/MusicConductor/SongInfo.gd +++ b/game/src/MusicConductor/SongInfo.gd @@ -1,11 +1,11 @@ extends Node class_name SongInfo -var fullyQualifiedPath : String = "" -var readableName : String = "" -var loadedStream : Resource +var song_path : String = "" +var song_name : String = "" +var song_stream : Resource func _init(dirname:String, fname:String): - fullyQualifiedPath = dirname + fname - readableName = fname.get_basename().replace("_", " ") - loadedStream = load(fullyQualifiedPath) + song_path = dirname.path_join(fname) + song_name = fname.get_basename().replace("_", " ") + song_stream = load(song_path) |