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

ok we are nearly done with ui!!! now i gotta make some icons!!

Browse Source
This commit is contained in:
lunarcleint
2024-03-20 17:08:50 -07:00
parent 864239108a
commit defdad973d
2 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/editors/charter/Charter.hx
+35 -11
View File
@@ -565,28 +565,50 @@ class Charter extends UIState {
gridBackdrops.bottomLimitY = __endStep * 40;
eventsBackdrop.bottomSeparator.y = gridBackdrops.bottomLimitY-2;
regenerateWaveforms();
updateWaveforms();
}
public function regenerateWaveforms() {
if (waveformHandler == null ? true : waveformHandler.ampsNeeded != __endStep*40) {
trace("REGEN WAVES");
public function updateWaveforms() {
var wavesToGenerate:Array<{name:String, sound:FlxSound}> = [
{name: "Inst.ogg", sound: FlxG.sound.music},
];
if (vocals != null) wavesToGenerate.push({name: "Voices.ogg", sound: vocals});
for (strumLine in strumLines)
if (strumLine.vocals != null && strumLine.strumLine.vocalsSuffix != null && strumLine.strumLine.vocalsSuffix != "")
wavesToGenerate.push({
name: 'Voices${strumLine.strumLine.vocalsSuffix}.ogg',
sound: strumLine.vocals
});
var oldWaveformList:Array<String> = waveformHandler.waveformList;
var newWaveformList:Array<String> = [for (data in wavesToGenerate) data.name];
if (waveformHandler == null ? true : waveformHandler.ampsNeeded != __endStep*40) {
waveformHandler.clearWaveforms();
waveformHandler.ampsNeeded = __endStep * 40;
var wavesToGenerate:Array<{name:String, sound:FlxSound}> = [
{name: "Inst.ogg", sound: FlxG.sound.music},
{name: "Voices.ogg", sound: vocals}
];
for (data in wavesToGenerate) {
waveformHandler.generateShader(data.name, data.sound);
waveformHandler.waveformList.push(data.name);
}
} else if (waveformHandler != null && waveformHandler.waveformList.length != newWaveformList.length) {
for (name in oldWaveformList)
if (!newWaveformList.contains(name))
waveformHandler.clearWaveform(name);
for (strumLine in strumLines) // Update grids
strumLine.selectedWaveform = strumLine.selectedWaveform;
for (data in wavesToGenerate)
if (!oldWaveformList.contains(data.name))
waveformHandler.generateShader(data.name, data.sound);
waveformHandler.waveformList = newWaveformList;
}
for (strumLine in strumLines) {
if (strumLine.selectedWaveform == -1) continue;
var oldName:String = oldWaveformList[strumLine.selectedWaveform];
strumLine.selectedWaveform = waveformHandler.waveformList.indexOf(oldName);
}
}
@@ -1008,6 +1030,8 @@ class Charter extends UIState {
strumLines.members[strID].updateInfo();
undos.addToUndo(CEditStrumLine(strID, oldData, _));
if (oldData.vocalsSuffix != _.vocalsSuffix) updateWaveforms();
}));
}
source/funkin/editors/charter/CharterWaveformHandler.hx
+15 -1
View File
@@ -77,6 +77,20 @@ class CharterWaveformHandler extends FlxBasic {
return waveShader;
}
public function clearWaveform(name:String) {
waveDatas.get(name).dispose();
waveDatas.remove(name);
waveShaders.set(name, null);
waveShaders.remove(name);
analyzers.set(name, null);
analyzers.remove(name);
sounds.remove(name);
waveformList.remove(name);
}
public function clearWaveforms() {
for (data in waveDatas) data.dispose();
for (shader in waveShaders) shader = null;
@@ -84,7 +98,7 @@ class CharterWaveformHandler extends FlxBasic {
waveDatas.clear(); waveShaders.clear();
analyzers.clear(); sounds.clear();
waveformList = [];
}