gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main'

Browse Source
This commit is contained in:
Ne_Eo
2024-07-26 04:45:52 +02:00
parent d8104ee4db 42cbb45360
commit 7607455f33
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/linux.yml
+1 -1
View File
@@ -36,7 +36,7 @@ jobs:
run: | run: |
haxelib run lime build linux haxelib run lime build linux
- name: Tar files - name: Tar files
run: tar -zcvf CodenameEngine.tar.gz export/release/linux/bin run: tar -zcvf CodenameEngine.tar.gz -C export/release/linux/bin .
- name: Uploading artifact (entire build) - name: Uploading artifact (entire build)
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
.github/workflows/macos.yml
+1 -1
View File
@@ -33,7 +33,7 @@ jobs:
run: | run: |
haxelib run lime build mac haxelib run lime build mac
- name: Tar files - name: Tar files
run: tar -zcvf CodenameEngine.tar.gz export/release/macos/bin run: tar -zcvf CodenameEngine.tar.gz -C export/release/macos/bin .
- name: Uploading artifact (entire build) - name: Uploading artifact (entire build)
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
source/funkin/editors/charter/Charter.hx
+13 -6
View File
@@ -598,17 +598,24 @@ class Charter extends UIState {
updateWaveforms(); updateWaveforms();
} }
inline function isSoundLoaded(sound:FlxSound) {
@:privateAccess
return sound != null && sound._sound != null && sound._sound.length > 0;
}
public function updateWaveforms() { public function updateWaveforms() {
var wavesToGenerate:Array<{name:String, sound:FlxSound}> = [ var wavesToGenerate:Array<{name:String, sound:FlxSound}> = [];
{name: "Inst.ogg", sound: FlxG.sound.music},
]; if(isSoundLoaded(FlxG.sound.music))
if (@:privateAccess vocals._sound != null) //for some reason Assets.exists returns true regardless if the file actually exists wavesToGenerate.push({name: "Inst.ogg", sound: FlxG.sound.music});
if (PlayState.SONG.meta.needsVoices != false && isSoundLoaded(vocals))
wavesToGenerate.push({name: "Voices.ogg", sound: vocals}); wavesToGenerate.push({name: "Voices.ogg", sound: vocals});
for (strumLine in strumLines) for (strumLine in strumLines)
if (strumLine.vocals != null && strumLine.strumLine.vocalsSuffix != null && strumLine.strumLine.vocalsSuffix != "") if (strumLine.vocals != null && strumLine.strumLine.vocalsSuffix != null && strumLine.strumLine.vocalsSuffix != "" && isSoundLoaded(strumLine.vocals))
wavesToGenerate.push({ wavesToGenerate.push({
name: 'Voices${strumLine.strumLine.vocalsSuffix}.ogg', name: 'Voices${strumLine.strumLine.vocalsSuffix}.ogg',
sound: strumLine.vocals sound: strumLine.vocals
}); });