From 290c568cb5be0456741ed1c3acf7791389beeb24 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Fri, 24 Nov 2023 16:11:53 -0500
Subject: [PATCH 1/4] Disable notification actions while playtest is open.
---
.../handlers/ChartEditorNotificationHandler.hx | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
index 796e70381..a81b704b7 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
@@ -21,7 +21,7 @@ class ChartEditorNotificationHandler
*/
public static function success(state:ChartEditorState, title:String, body:String):Notification
{
- return sendNotification(title, body, NotificationType.Success);
+ return sendNotification(state, title, body, NotificationType.Success);
}
/**
@@ -30,7 +30,7 @@ class ChartEditorNotificationHandler
*/
public static function warning(state:ChartEditorState, title:String, body:String):Notification
{
- return sendNotification(title, body, NotificationType.Warning);
+ return sendNotification(state, title, body, NotificationType.Warning);
}
/**
@@ -48,7 +48,7 @@ class ChartEditorNotificationHandler
*/
public static function error(state:ChartEditorState, title:String, body:String):Notification
{
- return sendNotification(title, body, NotificationType.Error);
+ return sendNotification(state, title, body, NotificationType.Error);
}
/**
@@ -66,7 +66,7 @@ class ChartEditorNotificationHandler
*/
public static function info(state:ChartEditorState, title:String, body:String):Notification
{
- return sendNotification(title, body, NotificationType.Info);
+ return sendNotification(state, title, body, NotificationType.Info);
}
/**
@@ -79,7 +79,7 @@ class ChartEditorNotificationHandler
*/
public static function infoWithActions(state:ChartEditorState, title:String, body:String, actions:Array<NotificationAction>):Notification
{
- return sendNotification(title, body, NotificationType.Info, actions);
+ return sendNotification(state, title, body, NotificationType.Info, actions);
}
/**
@@ -101,7 +101,7 @@ class ChartEditorNotificationHandler
NotificationManager.instance.removeNotification(notif);
}
- static function sendNotification(title:String, body:String, ?type:NotificationType, ?actions:Array<NotificationAction>):Notification
+ static function sendNotification(state:ChartEditorState, title:String, body:String, ?type:NotificationType, ?actions:Array<NotificationAction>):Notification
{
#if !mac
var actionNames:Array<String> = actions == null ? [] : actions.map(action -> action.text);
@@ -127,6 +127,8 @@ class ChartEditorNotificationHandler
if (action != null && action.callback != null)
{
button.onClick = function(_) {
+ // Don't allow actions to be clicked while the playtest is open.
+ if (state.subState != null) return;
action.callback();
};
}
From ed10d2c5d017dd5eaec2c4cd3bbbf0a4688f36a2 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Tue, 28 Nov 2023 20:36:59 -0500
Subject: [PATCH 2/4] Multiple chart editor bug fixes +tweaks
---
assets | 2 +-
source/funkin/data/song/SongDataUtils.hx | 33 +++-
source/funkin/play/PlayState.hx | 21 ++
.../ui/debug/charting/ChartEditorState.hx | 22 ++-
.../commands/ChangeStartingBPMCommand.hx | 54 +++++
.../charting/commands/PasteItemsCommand.hx | 6 +-
.../handlers/ChartEditorDialogHandler.hx | 186 +++++++++---------
.../handlers/ChartEditorToolboxHandler.hx | 15 +-
8 files changed, 230 insertions(+), 109 deletions(-)
create mode 100644 source/funkin/ui/debug/charting/commands/ChangeStartingBPMCommand.hx
diff --git a/assets b/assets
index c6aef3e3e..a88cfa4c2 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit c6aef3e3e6abc573c75dc5dbc90059ccdb6da83c
+Subproject commit a88cfa4c2eb3d4b8fc0bb0f7770d6a8359755bb4
diff --git a/source/funkin/data/song/SongDataUtils.hx b/source/funkin/data/song/SongDataUtils.hx
index 9a9f758b1..4ae4b1426 100644
--- a/source/funkin/data/song/SongDataUtils.hx
+++ b/source/funkin/data/song/SongDataUtils.hx
@@ -32,10 +32,7 @@ class SongDataUtils
return new SongNoteData(time, data, length, kind);
};
- trace(notes);
- trace(notes[0]);
var result = [for (i in 0...notes.length) offsetNote(notes[i])];
- trace(result);
return result;
}
@@ -54,6 +51,36 @@ class SongDataUtils
});
}
+ /**
+ * Given an array of SongNoteData objects, return a new array of SongNoteData objects
+ * which excludes any notes whose timestamps are outside of the given range.
+ * @param notes The notes to modify.
+ * @param startTime The start of the range in milliseconds.
+ * @param endTime The end of the range in milliseconds.
+ * @return The filtered array of notes.
+ */
+ public static function clampSongNoteData(notes:Array<SongNoteData>, startTime:Float, endTime:Float):Array<SongNoteData>
+ {
+ return notes.filter(function(note:SongNoteData):Bool {
+ return note.time >= startTime && note.time <= endTime;
+ });
+ }
+
+ /**
+ * Given an array of SongEventData objects, return a new array of SongEventData objects
+ * which excludes any events whose timestamps are outside of the given range.
+ * @param events The events to modify.
+ * @param startTime The start of the range in milliseconds.
+ * @param endTime The end of the range in milliseconds.
+ * @return The filtered array of events.
+ */
+ public static function clampSongEventData(events:Array<SongEventData>, startTime:Float, endTime:Float):Array<SongEventData>
+ {
+ return events.filter(function(event:SongEventData):Bool {
+ return event.time >= startTime && event.time <= endTime;
+ });
+ }
+
/**
* Return a new array without a certain subset of notes from an array of SongNoteData objects.
* Does not mutate the original array.
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index c9512aa93..e17aee6f2 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -468,6 +468,8 @@ class PlayState extends MusicBeatSubState
var generatedMusic:Bool = false;
var perfectMode:Bool = false;
+ static final BACKGROUND_COLOR:FlxColor = FlxColor.MAGENTA;
+
/**
* Instantiate a new PlayState.
* @param params The parameters used to initialize the PlayState.
@@ -631,6 +633,24 @@ class PlayState extends MusicBeatSubState
initialized = true;
}
+ public override function draw():Void
+ {
+ // if (FlxG.renderBlit)
+ // {
+ // camGame.fill(BACKGROUND_COLOR);
+ // }
+ // else if (FlxG.renderTile)
+ // {
+ // FlxG.log.warn("PlayState background not displayed properly on tile renderer!");
+ // }
+ // else
+ // {
+ // FlxG.log.warn("PlayState background not displayed properly, unknown renderer!");
+ // }
+
+ super.draw();
+ }
+
function assertChartExists():Bool
{
// Returns null if the song failed to load or doesn't have the selected difficulty.
@@ -1258,6 +1278,7 @@ class PlayState extends MusicBeatSubState
function initCameras():Void
{
camGame = new SwagCamera();
+ camGame.bgColor = BACKGROUND_COLOR; // Show a pink background behind the stage.
camHUD = new FlxCamera();
camHUD.bgColor.alpha = 0; // Show the game scene behind the camera.
camCutscene = new FlxCamera();
diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index 983840b75..6840fa091 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -2137,8 +2137,6 @@ class ChartEditorState extends HaxeUIState
// Disable the menu item if we're not on a desktop platform.
var menubarItemGoToBackupsFolder = findComponent('menubarItemGoToBackupsFolder', MenuItem);
if (menubarItemGoToBackupsFolder != null) menubarItemGoToBackupsFolder.disabled = true;
-
- menubarItemGoToBackupsFolder.disabled = true;
#end
addUIClickListener('menubarItemUserGuide', _ -> this.openUserGuideDialog());
@@ -2291,9 +2289,11 @@ class ChartEditorState extends HaxeUIState
*/
function openBackupsFolder():Void
{
+ #if sys
// TODO: Is there a way to open a folder and highlight a file in it?
var absoluteBackupsPath:String = Path.join([Sys.getCwd(), ChartEditorImportExportHandler.BACKUPS_PATH]);
WindowUtil.openFolder(absoluteBackupsPath);
+ #end
}
/**
@@ -4263,7 +4263,16 @@ class ChartEditorState extends HaxeUIState
var startTimestamp:Float = 0;
if (playtestStartTime) startTimestamp = scrollPositionInMs + playheadPositionInMs;
- var targetSong:Song = Song.buildRaw(currentSongId, songMetadata.values(), availableVariations, songChartData, false);
+ var targetSong:Song;
+ try
+ {
+ targetSong = Song.buildRaw(currentSongId, songMetadata.values(), availableVariations, songChartData, false);
+ }
+ catch (e)
+ {
+ this.error("Could Not Playtest", 'Got an error trying to playtest the song.\n${e}');
+ return;
+ }
// TODO: Rework asset system so we can remove this.
switch (currentSongStage)
@@ -4308,6 +4317,8 @@ class ChartEditorState extends HaxeUIState
if (audioInstTrack != null) FlxG.sound.music = audioInstTrack;
if (audioVocalTrackGroup != null) targetState.vocals = audioVocalTrackGroup;
+ this.persistentUpdate = false;
+ this.persistentDraw = false;
openSubState(targetState);
}
@@ -4521,6 +4532,8 @@ class ChartEditorState extends HaxeUIState
var prevDifficulty = availableDifficulties[availableDifficulties.length - 1];
selectedDifficulty = prevDifficulty;
+ Conductor.mapTimeChanges(state.currentSongMetadata.timeChanges);
+
refreshDifficultyTreeSelection();
refreshMetadataToolbox();
}
@@ -4639,6 +4652,9 @@ class ChartEditorState extends HaxeUIState
@:nullSafety(Off)
function resetConductorAfterTest(_:FlxSubState = null):Void
{
+ this.persistentUpdate = true;
+ this.persistentDraw = true;
+
moveSongToScrollPosition();
var instVolumeSlider:Null<Slider> = findComponent('menubarItemVolumeInstrumental', Slider);
diff --git a/source/funkin/ui/debug/charting/commands/ChangeStartingBPMCommand.hx b/source/funkin/ui/debug/charting/commands/ChangeStartingBPMCommand.hx
new file mode 100644
index 000000000..f5f978aa2
--- /dev/null
+++ b/source/funkin/ui/debug/charting/commands/ChangeStartingBPMCommand.hx
@@ -0,0 +1,54 @@
+package funkin.ui.debug.charting.commands;
+
+/**
+ * A command which changes the starting BPM of the song.
+ */
+@:nullSafety
+@:access(funkin.ui.debug.charting.ChartEditorState)
+class ChangeStartingBPMCommand implements ChartEditorCommand
+{
+ var targetBPM:Float;
+
+ var previousBPM:Float = 100;
+
+ public function new(targetBPM:Float)
+ {
+ this.targetBPM = targetBPM;
+ }
+
+ public function execute(state:ChartEditorState):Void
+ {
+ var timeChanges:Array<SongTimeChange> = state.currentSongMetadata.timeChanges;
+ if (timeChanges == null || timeChanges.length == 0)
+ {
+ previousBPM = 100;
+ timeChanges = [new SongTimeChange(0, event.value)];
+ }
+ else
+ {
+ previousBPM = timeChanges[0].bpm;
+ timeChanges[0].bpm = event.value;
+ }
+
+ state.currentSongMetadata.timeChanges = timeChanges;
+
+ Conductor.mapTimeChanges(state.currentSongMetadata.timeChanges);
+ }
+
+ public function undo(state:ChartEditorState):Void
+ {
+ var timeChanges:Array<SongTimeChange> = state.currentSongMetadata.timeChanges;
+ if (timeChanges == null || timeChanges.length == 0)
+ {
+ timeChanges = [new SongTimeChange(0, previousBPM)];
+ }
+ else
+ {
+ timeChanges[0].bpm = previousBPM;
+ }
+
+ state.currentSongMetadata.timeChanges = timeChanges;
+
+ Conductor.mapTimeChanges(state.currentSongMetadata.timeChanges);
+ }
+}
diff --git a/source/funkin/ui/debug/charting/commands/PasteItemsCommand.hx b/source/funkin/ui/debug/charting/commands/PasteItemsCommand.hx
index 1857b44db..75382da41 100644
--- a/source/funkin/ui/debug/charting/commands/PasteItemsCommand.hx
+++ b/source/funkin/ui/debug/charting/commands/PasteItemsCommand.hx
@@ -32,10 +32,14 @@ class PasteItemsCommand implements ChartEditorCommand
return;
}
- trace(currentClipboard.notes);
+ var stepEndOfSong:Float = Conductor.getTimeInSteps(state.songLengthInMs);
+ var stepCutoff:Float = stepEndOfSong - 1.0;
+ var msCutoff:Float = Conductor.getStepTimeInMs(stepCutoff);
addedNotes = SongDataUtils.offsetSongNoteData(currentClipboard.notes, Std.int(targetTimestamp));
+ addedNotes = SongDataUtils.clampSongNoteData(addedNotes, 0.0, msCutoff);
addedEvents = SongDataUtils.offsetSongEventData(currentClipboard.events, Std.int(targetTimestamp));
+ addedEvents = SongDataUtils.clampSongEventData(addedEvents, 0.0, msCutoff);
state.currentSongChartNoteData = state.currentSongChartNoteData.concat(addedNotes);
state.currentSongChartEventData = state.currentSongChartEventData.concat(addedEvents);
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
index 23895be68..d84063117 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
@@ -87,7 +87,7 @@ class ChartEditorDialogHandler
if (dialog == null) throw 'Could not locate Welcome dialog';
state.isHaxeUIDialogOpen = true;
- dialog.onDialogClosed = function(_event) {
+ dialog.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
// Called when the Welcome dialog is closed while it is closable.
state.stopWelcomeMusic();
@@ -109,7 +109,7 @@ class ChartEditorDialogHandler
var fileName:String = fileNamePattern.match(chartPath) ? fileNamePattern.matched(1) : chartPath;
linkRecentChart.text = fileName;
linkRecentChart.tooltip = chartPath;
- linkRecentChart.onClick = function(_event) {
+ linkRecentChart.onClick = function(_) {
dialog.hideDialog(DialogButton.CANCEL);
state.stopWelcomeMusic();
@@ -155,7 +155,7 @@ class ChartEditorDialogHandler
// Create New Song "Easy/Normal/Hard"
var linkCreateBasic:Null<Link> = dialog.findComponent('splashCreateFromSongBasicOnly', Link);
if (linkCreateBasic == null) throw 'Could not locate splashCreateFromSongBasicOnly link in Welcome dialog';
- linkCreateBasic.onClick = function(_event) {
+ linkCreateBasic.onClick = function(_) {
// Hide the welcome dialog
dialog.hideDialog(DialogButton.CANCEL);
state.stopWelcomeMusic();
@@ -169,7 +169,7 @@ class ChartEditorDialogHandler
// Create New Song "Erect/Nightmare"
var linkCreateErect:Null<Link> = dialog.findComponent('splashCreateFromSongErectOnly', Link);
if (linkCreateErect == null) throw 'Could not locate splashCreateFromSongErectOnly link in Welcome dialog';
- linkCreateErect.onClick = function(_event) {
+ linkCreateErect.onClick = function(_) {
// Hide the welcome dialog
dialog.hideDialog(DialogButton.CANCEL);
@@ -182,7 +182,7 @@ class ChartEditorDialogHandler
// Create New Song "Easy/Normal/Hard/Erect/Nightmare"
var linkCreateErect:Null<Link> = dialog.findComponent('splashCreateFromSongBasicErect', Link);
if (linkCreateErect == null) throw 'Could not locate splashCreateFromSongBasicErect link in Welcome dialog';
- linkCreateErect.onClick = function(_event) {
+ linkCreateErect.onClick = function(_) {
// Hide the welcome dialog
dialog.hideDialog(DialogButton.CANCEL);
@@ -194,7 +194,7 @@ class ChartEditorDialogHandler
var linkImportChartLegacy:Null<Link> = dialog.findComponent('splashImportChartLegacy', Link);
if (linkImportChartLegacy == null) throw 'Could not locate splashImportChartLegacy link in Welcome dialog';
- linkImportChartLegacy.onClick = function(_event) {
+ linkImportChartLegacy.onClick = function(_) {
// Hide the welcome dialog
dialog.hideDialog(DialogButton.CANCEL);
state.stopWelcomeMusic();
@@ -205,7 +205,7 @@ class ChartEditorDialogHandler
var buttonBrowse:Null<Button> = dialog.findComponent('splashBrowse', Button);
if (buttonBrowse == null) throw 'Could not locate splashBrowse button in Welcome dialog';
- buttonBrowse.onClick = function(_event) {
+ buttonBrowse.onClick = function(_) {
// Hide the welcome dialog
dialog.hideDialog(DialogButton.CANCEL);
state.stopWelcomeMusic();
@@ -235,7 +235,7 @@ class ChartEditorDialogHandler
var linkTemplateSong:Link = new Link();
linkTemplateSong.text = songName;
- linkTemplateSong.onClick = function(_event) {
+ linkTemplateSong.onClick = function(_) {
dialog.hideDialog(DialogButton.CANCEL);
state.stopWelcomeMusic();
@@ -259,12 +259,12 @@ class ChartEditorDialogHandler
{
var dialog:Null<Dialog> = openDialog(state, CHART_EDITOR_DIALOG_BACKUP_AVAILABLE_LAYOUT, true, true);
if (dialog == null) throw 'Could not locate Backup Available dialog';
- dialog.onDialogClosed = function(_event) {
+ dialog.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
- if (_event.button == DialogButton.APPLY)
+ if (event.button == DialogButton.APPLY)
{
// User loaded the backup! Close the welcome dialog behind this.
- if (welcomeDialog != null) welcomeDialog.hideDialog(DialogButton.CANCEL);
+ if (welcomeDialog != null) welcomeDialog.hideDialog(DialogButton.APPLY);
}
else
{
@@ -286,22 +286,22 @@ class ChartEditorDialogHandler
var buttonCancel:Null<Button> = dialog.findComponent('dialogCancel', Button);
if (buttonCancel == null) throw 'Could not locate dialogCancel button in Backup Available dialog';
- buttonCancel.onClick = function(_event) {
+ buttonCancel.onClick = function(_) {
// Don't hide the welcome dialog behind this.
dialog.hideDialog(DialogButton.CANCEL);
}
var buttonGoToFolder:Null<Button> = dialog.findComponent('buttonGoToFolder', Button);
if (buttonGoToFolder == null) throw 'Could not locate buttonGoToFolder button in Backup Available dialog';
- buttonGoToFolder.onClick = function(_event) {
+ buttonGoToFolder.onClick = function(_) {
state.openBackupsFolder();
// Don't hide the welcome dialog behind this.
- // dialog.hideDialog(DialogButton.CANCEL);
+ // Don't close this dialog.
}
var buttonOpenBackup:Null<Button> = dialog.findComponent('buttonOpenBackup', Button);
if (buttonOpenBackup == null) throw 'Could not locate buttonOpenBackup button in Backup Available dialog';
- buttonOpenBackup.onClick = function(_event) {
+ buttonOpenBackup.onClick = function(_) {
var latestBackupPath:Null<String> = ChartEditorImportExportHandler.getLatestBackupPath();
var result:Null<Array<String>> = (latestBackupPath != null) ? state.loadFromFNFCPath(latestBackupPath) : null;
@@ -338,9 +338,9 @@ class ChartEditorDialogHandler
var dialog:Null<Dialog> = openDialog(state, CHART_EDITOR_DIALOG_UPLOAD_CHART_LAYOUT, true, closable);
if (dialog == null) throw 'Could not locate Upload Chart dialog';
- dialog.onDialogClosed = function(_event) {
+ dialog.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
- if (_event.button == DialogButton.APPLY)
+ if (event.button == DialogButton.APPLY)
{
// Simply let the dialog close.
}
@@ -355,26 +355,26 @@ class ChartEditorDialogHandler
if (buttonCancel == null) throw 'Could not locate dialogCancel button in Upload Chart dialog';
state.isHaxeUIDialogOpen = true;
- buttonCancel.onClick = function(_event) {
+ buttonCancel.onClick = function(_) {
dialog.hideDialog(DialogButton.CANCEL);
}
var chartBox:Null<Box> = dialog.findComponent('chartBox', Box);
if (chartBox == null) throw 'Could not locate chartBox in Upload Chart dialog';
- chartBox.onMouseOver = function(_event) {
+ chartBox.onMouseOver = function(_) {
chartBox.swapClass('upload-bg', 'upload-bg-hover');
Cursor.cursorMode = Pointer;
}
- chartBox.onMouseOut = function(_event) {
+ chartBox.onMouseOut = function(_) {
chartBox.swapClass('upload-bg-hover', 'upload-bg');
Cursor.cursorMode = Default;
}
var onDropFile:String->Void;
- chartBox.onClick = function(_event) {
+ chartBox.onClick = function(_) {
Dialogs.openBinaryFile('Open Chart', [
{label: 'Friday Night Funkin\' Chart (.fnfc)', extension: 'fnfc'}], function(selectedFile:SelectedFileInfo) {
if (selectedFile != null && selectedFile.bytes != null)
@@ -453,20 +453,20 @@ class ChartEditorDialogHandler
// Open the "Open Chart" wizard
// Step 1. Open Chart
var openChartDialog:Dialog = openChartDialog(state);
- openChartDialog.onDialogClosed = function(_event) {
+ openChartDialog.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
- if (_event.button == DialogButton.APPLY)
+ if (event.button == DialogButton.APPLY)
{
// Step 2. Upload instrumental
var uploadInstDialog:Dialog = openUploadInstDialog(state, closable);
- uploadInstDialog.onDialogClosed = function(_event) {
+ uploadInstDialog.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
- if (_event.button == DialogButton.APPLY)
+ if (event.button == DialogButton.APPLY)
{
// Step 3. Upload Vocals
// NOTE: Uploading vocals is optional, so we don't need to check if the user cancelled the wizard.
var uploadVocalsDialog:Dialog = openUploadVocalsDialog(state, closable); // var uploadVocalsDialog:Dialog
- uploadVocalsDialog.onDialogClosed = function(_event) {
+ uploadVocalsDialog.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
state.currentWorkingFilePath = null; // Built from parts, so no .fnfc to save to.
state.switchToCurrentInstrumental();
@@ -494,20 +494,20 @@ class ChartEditorDialogHandler
// Step 1. Open Chart
var openChartDialog:Null<Dialog> = openImportChartDialog(state, format);
if (openChartDialog == null) throw 'Could not locate Import Chart dialog';
- openChartDialog.onDialogClosed = function(_event) {
+ openChartDialog.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
- if (_event.button == DialogButton.APPLY)
+ if (event.button == DialogButton.APPLY)
{
// Step 2. Upload instrumental
var uploadInstDialog:Dialog = openUploadInstDialog(state, closable);
- uploadInstDialog.onDialogClosed = function(_event) {
+ uploadInstDialog.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
- if (_event.button == DialogButton.APPLY)
+ if (event.button == DialogButton.APPLY)
{
// Step 3. Upload Vocals
// NOTE: Uploading vocals is optional, so we don't need to check if the user cancelled the wizard.
var uploadVocalsDialog:Dialog = openUploadVocalsDialog(state, closable); // var uploadVocalsDialog:Dialog
- uploadVocalsDialog.onDialogClosed = function(_event) {
+ uploadVocalsDialog.onDialogClosed = function(_) {
state.isHaxeUIDialogOpen = false;
state.currentWorkingFilePath = null; // New file, so no path.
state.switchToCurrentInstrumental();
@@ -532,21 +532,21 @@ class ChartEditorDialogHandler
public static function openCreateSongWizardBasicOnly(state:ChartEditorState, closable:Bool):Void
{
// Step 1. Song Metadata
- var songMetadataDialog:Dialog = openSongMetadataDialog(state, false, Constants.DEFAULT_VARIATION);
- songMetadataDialog.onDialogClosed = function(_event) {
+ var songMetadataDialog:Dialog = openSongMetadataDialog(state, false, Constants.DEFAULT_VARIATION, true);
+ songMetadataDialog.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
- if (_event.button == DialogButton.APPLY)
+ if (event.button == DialogButton.APPLY)
{
// Step 2. Upload Instrumental
var uploadInstDialog:Dialog = openUploadInstDialog(state, closable);
- uploadInstDialog.onDialogClosed = function(_event) {
+ uploadInstDialog.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
- if (_event.button == DialogButton.APPLY)
+ if (event.button == DialogButton.APPLY)
{
// Step 3. Upload Vocals
// NOTE: Uploading vocals is optional, so we don't need to check if the user cancelled the wizard.
var uploadVocalsDialog:Dialog = openUploadVocalsDialog(state, closable); // var uploadVocalsDialog:Dialog
- uploadVocalsDialog.onDialogClosed = function(_event) {
+ uploadVocalsDialog.onDialogClosed = function(_) {
state.isHaxeUIDialogOpen = false;
state.currentWorkingFilePath = null; // New file, so no path.
state.switchToCurrentInstrumental();
@@ -571,21 +571,21 @@ class ChartEditorDialogHandler
public static function openCreateSongWizardErectOnly(state:ChartEditorState, closable:Bool):Void
{
// Step 1. Song Metadata
- var songMetadataDialog:Dialog = openSongMetadataDialog(state, true, Constants.DEFAULT_VARIATION);
- songMetadataDialog.onDialogClosed = function(_event) {
+ var songMetadataDialog:Dialog = openSongMetadataDialog(state, true, Constants.DEFAULT_VARIATION, true);
+ songMetadataDialog.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
- if (_event.button == DialogButton.APPLY)
+ if (event.button == DialogButton.APPLY)
{
// Step 2. Upload Instrumental
var uploadInstDialog:Dialog = openUploadInstDialog(state, closable);
- uploadInstDialog.onDialogClosed = function(_event) {
+ uploadInstDialog.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
- if (_event.button == DialogButton.APPLY)
+ if (event.button == DialogButton.APPLY)
{
// Step 3. Upload Vocals
// NOTE: Uploading vocals is optional, so we don't need to check if the user cancelled the wizard.
var uploadVocalsDialog:Dialog = openUploadVocalsDialog(state, closable); // var uploadVocalsDialog:Dialog
- uploadVocalsDialog.onDialogClosed = function(_event) {
+ uploadVocalsDialog.onDialogClosed = function(_) {
state.isHaxeUIDialogOpen = false;
state.currentWorkingFilePath = null; // New file, so no path.
state.switchToCurrentInstrumental();
@@ -610,41 +610,41 @@ class ChartEditorDialogHandler
public static function openCreateSongWizardBasicErect(state:ChartEditorState, closable:Bool):Void
{
// Step 1. Song Metadata
- var songMetadataDialog:Dialog = openSongMetadataDialog(state, false, Constants.DEFAULT_VARIATION);
- songMetadataDialog.onDialogClosed = function(_event) {
+ var songMetadataDialog:Dialog = openSongMetadataDialog(state, false, Constants.DEFAULT_VARIATION, true);
+ songMetadataDialog.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
- if (_event.button == DialogButton.APPLY)
+ if (event.button == DialogButton.APPLY)
{
// Step 2. Upload Instrumental
var uploadInstDialog:Dialog = openUploadInstDialog(state, closable);
- uploadInstDialog.onDialogClosed = function(_event) {
+ uploadInstDialog.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
- if (_event.button == DialogButton.APPLY)
+ if (event.button == DialogButton.APPLY)
{
// Step 3. Upload Vocals
// NOTE: Uploading vocals is optional, so we don't need to check if the user cancelled the wizard.
var uploadVocalsDialog:Dialog = openUploadVocalsDialog(state, closable); // var uploadVocalsDialog:Dialog
- uploadVocalsDialog.onDialogClosed = function(_event) {
+ uploadVocalsDialog.onDialogClosed = function(_) {
state.switchToCurrentInstrumental();
// Step 4. Song Metadata (Erect)
- var songMetadataDialogErect:Dialog = openSongMetadataDialog(state, true, 'erect');
- songMetadataDialogErect.onDialogClosed = function(_event) {
+ var songMetadataDialogErect:Dialog = openSongMetadataDialog(state, true, 'erect', false);
+ songMetadataDialogErect.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
- if (_event.button == DialogButton.APPLY)
+ if (event.button == DialogButton.APPLY)
{
// Switch to the Erect variation so uploading the instrumental applies properly.
state.selectedVariation = 'erect';
// Step 5. Upload Instrumental (Erect)
var uploadInstDialogErect:Dialog = openUploadInstDialog(state, closable);
- uploadInstDialogErect.onDialogClosed = function(_event) {
+ uploadInstDialogErect.onDialogClosed = function(event) {
state.isHaxeUIDialogOpen = false;
- if (_event.button == DialogButton.APPLY)
+ if (event.button == DialogButton.APPLY)
{
// Step 6. Upload Vocals (Erect)
// NOTE: Uploading vocals is optional, so we don't need to check if the user cancelled the wizard.
var uploadVocalsDialogErect:Dialog = openUploadVocalsDialog(state, closable); // var uploadVocalsDialog:Dialog
- uploadVocalsDialogErect.onDialogClosed = function(_event) {
+ uploadVocalsDialogErect.onDialogClosed = function(_) {
state.isHaxeUIDialogOpen = false;
state.currentWorkingFilePath = null; // New file, so no path.
state.switchToCurrentInstrumental();
@@ -696,19 +696,19 @@ class ChartEditorDialogHandler
var buttonCancel:Null<Button> = dialog.findComponent('dialogCancel', Button);
if (buttonCancel == null) throw 'Could not locate dialogCancel button in Upload Instrumental dialog';
- buttonCancel.onClick = function(_event) {
+ buttonCancel.onClick = function(_) {
dialog.hideDialog(DialogButton.CANCEL);
}
var instrumentalBox:Null<Box> = dialog.findComponent('instrumentalBox', Box);
if (instrumentalBox == null) throw 'Could not locate instrumentalBox in Upload Instrumental dialog';
- instrumentalBox.onMouseOver = function(_event) {
+ instrumentalBox.onMouseOver = function(_) {
instrumentalBox.swapClass('upload-bg', 'upload-bg-hover');
Cursor.cursorMode = Pointer;
}
- instrumentalBox.onMouseOut = function(_event) {
+ instrumentalBox.onMouseOut = function(_) {
instrumentalBox.swapClass('upload-bg-hover', 'upload-bg');
Cursor.cursorMode = Default;
}
@@ -717,7 +717,7 @@ class ChartEditorDialogHandler
var onDropFile:String->Void;
- instrumentalBox.onClick = function(_event) {
+ instrumentalBox.onClick = function(_) {
Dialogs.openBinaryFile('Open Instrumental', [
{label: 'Audio File (.ogg)', extension: 'ogg'}], function(selectedFile:SelectedFileInfo) {
if (selectedFile != null && selectedFile.bytes != null)
@@ -774,10 +774,13 @@ class ChartEditorDialogHandler
/**
* Opens the dialog in the wizard where the user can set song metadata like name and artist and BPM.
* @param state The ChartEditorState instance.
+ * @param erect Whether to create erect difficulties or normal ones.
+ * @param targetVariation The variation to create difficulties for.
+ * @param clearExistingMetadata Whether to clear existing metadata when confirming.
* @return The dialog to open.
*/
@:haxe.warning("-WVarInit")
- public static function openSongMetadataDialog(state:ChartEditorState, erect:Bool, targetVariation:String):Dialog
+ public static function openSongMetadataDialog(state:ChartEditorState, erect:Bool, targetVariation:String, clearExistingMetadata:Bool):Dialog
{
var dialog:Null<Dialog> = openDialog(state, CHART_EDITOR_DIALOG_SONG_METADATA_LAYOUT, true, false);
if (dialog == null) throw 'Could not locate Song Metadata dialog';
@@ -790,7 +793,7 @@ class ChartEditorDialogHandler
var buttonCancel:Null<Button> = dialog.findComponent('dialogCancel', Button);
if (buttonCancel == null) throw 'Could not locate dialogCancel button in Song Metadata dialog';
state.isHaxeUIDialogOpen = true;
- buttonCancel.onClick = function(_event) {
+ buttonCancel.onClick = function(_) {
state.isHaxeUIDialogOpen = false;
dialog.hideDialog(DialogButton.CANCEL);
}
@@ -902,8 +905,12 @@ class ChartEditorDialogHandler
var dialogContinue:Null<Button> = dialog.findComponent('dialogContinue', Button);
if (dialogContinue == null) throw 'Could not locate dialogContinue button in Song Metadata dialog';
- dialogContinue.onClick = (_event) -> {
- if (targetVariation == Constants.DEFAULT_VARIATION) state.songMetadata.clear();
+ dialogContinue.onClick = (_) -> {
+ if (clearExistingMetadata)
+ {
+ state.songMetadata.clear();
+ state.songChartData.clear();
+ }
state.songMetadata.set(targetVariation, newSongMetadata);
@@ -943,13 +950,13 @@ class ChartEditorDialogHandler
var buttonCancel:Null<Button> = dialog.findComponent('dialogCancel', Button);
if (buttonCancel == null) throw 'Could not locate dialogCancel button in Upload Vocals dialog';
- buttonCancel.onClick = function(_event) {
+ buttonCancel.onClick = function(_) {
dialog.hideDialog(DialogButton.CANCEL);
}
var dialogNoVocals:Null<Button> = dialog.findComponent('dialogNoVocals', Button);
if (dialogNoVocals == null) throw 'Could not locate dialogNoVocals button in Upload Vocals dialog';
- dialogNoVocals.onClick = function(_event) {
+ dialogNoVocals.onClick = function(_) {
// Dismiss
state.wipeVocalData();
dialog.hideDialog(DialogButton.APPLY);
@@ -1008,7 +1015,7 @@ class ChartEditorDialogHandler
}
};
- vocalsEntry.onClick = function(_event) {
+ vocalsEntry.onClick = function(_) {
Dialogs.openBinaryFile('Open $charName Vocals', [
{label: 'Audio File (.ogg)', extension: 'ogg'}], function(selectedFile) {
if (selectedFile != null && selectedFile.bytes != null)
@@ -1057,7 +1064,7 @@ class ChartEditorDialogHandler
var dialogContinue:Null<Button> = dialog.findComponent('dialogContinue', Button);
if (dialogContinue == null) throw 'Could not locate dialogContinue button in Upload Vocals dialog';
- dialogContinue.onClick = function(_event) {
+ dialogContinue.onClick = function(_) {
// Dismiss
dialog.hideDialog(DialogButton.APPLY);
};
@@ -1079,7 +1086,7 @@ class ChartEditorDialogHandler
var buttonCancel:Null<Button> = dialog.findComponent('dialogCancel', Button);
if (buttonCancel == null) throw 'Could not locate dialogCancel button in Open Chart dialog';
- buttonCancel.onClick = function(_event) {
+ buttonCancel.onClick = function(_) {
dialog.hideDialog(DialogButton.CANCEL);
}
@@ -1093,7 +1100,7 @@ class ChartEditorDialogHandler
var buttonContinue:Null<Button> = dialog.findComponent('dialogContinue', Button);
if (buttonContinue == null) throw 'Could not locate dialogContinue button in Open Chart dialog';
- buttonContinue.onClick = function(_event) {
+ buttonContinue.onClick = function(_) {
state.loadSong(songMetadata, songChartData);
dialog.hideDialog(DialogButton.APPLY);
@@ -1137,11 +1144,11 @@ class ChartEditorDialogHandler
songVariationMetadataEntryLabel.text = 'Click to browse for <song>-metadata-${variation}.json file.';
#end
- songVariationMetadataEntry.onMouseOver = function(_event) {
+ songVariationMetadataEntry.onMouseOver = function(_) {
songVariationMetadataEntry.swapClass('upload-bg', 'upload-bg-hover');
Cursor.cursorMode = Pointer;
}
- songVariationMetadataEntry.onMouseOut = function(_event) {
+ songVariationMetadataEntry.onMouseOut = function(_) {
songVariationMetadataEntry.swapClass('upload-bg-hover', 'upload-bg');
Cursor.cursorMode = Default;
}
@@ -1161,11 +1168,11 @@ class ChartEditorDialogHandler
songVariationChartDataEntryLabel.text = 'Click to browse for <song>-chart-${variation}.json file.';
#end
- songVariationChartDataEntry.onMouseOver = function(_event) {
+ songVariationChartDataEntry.onMouseOver = function(_) {
songVariationChartDataEntry.swapClass('upload-bg', 'upload-bg-hover');
Cursor.cursorMode = Pointer;
}
- songVariationChartDataEntry.onMouseOut = function(_event) {
+ songVariationChartDataEntry.onMouseOut = function(_) {
songVariationChartDataEntry.swapClass('upload-bg-hover', 'upload-bg');
Cursor.cursorMode = Default;
}
@@ -1215,7 +1222,7 @@ class ChartEditorDialogHandler
if (variation == Constants.DEFAULT_VARIATION) constructVariationEntries(songMetadataVariation.playData.songVariations);
};
- onClickMetadataVariation = function(variation:String, label:Label, _event:UIEvent) {
+ onClickMetadataVariation = function(variation:String, label:Label, _:UIEvent) {
Dialogs.openBinaryFile('Open Chart ($variation) Metadata', [
{label: 'JSON File (.json)', extension: 'json'}], function(selectedFile) {
if (selectedFile != null && selectedFile.bytes != null)
@@ -1299,7 +1306,7 @@ class ChartEditorDialogHandler
}
};
- onClickChartDataVariation = function(variation:String, label:Label, _event:UIEvent) {
+ onClickChartDataVariation = function(variation:String, label:Label, _:UIEvent) {
Dialogs.openBinaryFile('Open Chart ($variation) Metadata', [
{label: 'JSON File (.json)', extension: 'json'}], function(selectedFile) {
if (selectedFile != null && selectedFile.bytes != null)
@@ -1351,11 +1358,11 @@ class ChartEditorDialogHandler
metadataEntry.onClick = onClickMetadataVariation.bind(Constants.DEFAULT_VARIATION).bind(metadataEntryLabel);
addDropHandler(metadataEntry, onDropFileMetadataVariation.bind(Constants.DEFAULT_VARIATION).bind(metadataEntryLabel));
- metadataEntry.onMouseOver = function(_event) {
+ metadataEntry.onMouseOver = function(_) {
metadataEntry.swapClass('upload-bg', 'upload-bg-hover');
Cursor.cursorMode = Pointer;
}
- metadataEntry.onMouseOut = function(_event) {
+ metadataEntry.onMouseOut = function(_) {
metadataEntry.swapClass('upload-bg-hover', 'upload-bg');
Cursor.cursorMode = Default;
}
@@ -1395,7 +1402,7 @@ class ChartEditorDialogHandler
if (buttonCancel == null) throw 'Could not locate dialogCancel button in Import Chart dialog';
state.isHaxeUIDialogOpen = true;
- buttonCancel.onClick = function(_event) {
+ buttonCancel.onClick = function(_) {
state.isHaxeUIDialogOpen = false;
dialog.hideDialog(DialogButton.CANCEL);
}
@@ -1403,18 +1410,18 @@ class ChartEditorDialogHandler
var importBox:Null<Box> = dialog.findComponent('importBox', Box);
if (importBox == null) throw 'Could not locate importBox in Import Chart dialog';
- importBox.onMouseOver = function(_event) {
+ importBox.onMouseOver = function(_) {
importBox.swapClass('upload-bg', 'upload-bg-hover');
Cursor.cursorMode = Pointer;
}
- importBox.onMouseOut = function(_event) {
+ importBox.onMouseOut = function(_) {
importBox.swapClass('upload-bg-hover', 'upload-bg');
Cursor.cursorMode = Default;
}
var onDropFile:String->Void;
- importBox.onClick = function(_event) {
+ importBox.onClick = function(_) {
Dialogs.openBinaryFile('Import Chart - ${prettyFormat}', fileFilter != null ? [fileFilter] : [], function(selectedFile:SelectedFileInfo) {
if (selectedFile != null && selectedFile.bytes != null)
{
@@ -1484,13 +1491,13 @@ class ChartEditorDialogHandler
var buttonCancel:Null<Button> = dialog.findComponent('dialogCancel', Button);
if (buttonCancel == null) throw 'Could not locate dialogCancel button in Add Variation dialog';
- buttonCancel.onClick = function(_event) {
+ buttonCancel.onClick = function(_) {
dialog.hideDialog(DialogButton.CANCEL);
}
var buttonAdd:Null<Button> = dialog.findComponent('dialogAdd', Button);
if (buttonAdd == null) throw 'Could not locate dialogAdd button in Add Variation dialog';
- buttonAdd.onClick = function(_event) {
+ buttonAdd.onClick = function(_) {
// This performs validation before the onSubmit callback is called.
variationForm.submit();
}
@@ -1529,12 +1536,13 @@ class ChartEditorDialogHandler
var dialogBPM:Null<NumberStepper> = dialog.findComponent('dialogBPM', NumberStepper);
if (dialogBPM == null) throw 'Could not locate dialogBPM NumberStepper in Add Variation dialog';
- dialogBPM.value = state.currentSongMetadata.timeChanges[0].bpm;
+ var currentStartingBPM:Float = state.currentSongMetadata.timeChanges[0].bpm;
+ dialogBPM.value = currentStartingBPM;
// If all validators succeeded, this callback is called.
state.isHaxeUIDialogOpen = true;
- variationForm.onSubmit = function(_event) {
+ variationForm.onSubmit = function(_) {
state.isHaxeUIDialogOpen = false;
trace('Add Variation dialog submitted, validation succeeded!');
@@ -1550,6 +1558,8 @@ class ChartEditorDialogHandler
state.songMetadata.set(pendingVariation.variation, pendingVariation);
state.difficultySelectDirty = true; // Force the Difficulty toolbox to update.
+ // Don't update conductor since we haven't switched to the new variation yet.
+
state.success('Add Variation', 'Added new variation "${pendingVariation.variation}"');
dialog.hideDialog(DialogButton.APPLY);
@@ -1574,13 +1584,13 @@ class ChartEditorDialogHandler
var buttonCancel:Null<Button> = dialog.findComponent('dialogCancel', Button);
if (buttonCancel == null) throw 'Could not locate dialogCancel button in Add Difficulty dialog';
- buttonCancel.onClick = function(_event) {
+ buttonCancel.onClick = function(_) {
dialog.hideDialog(DialogButton.CANCEL);
}
var buttonAdd:Null<Button> = dialog.findComponent('dialogAdd', Button);
if (buttonAdd == null) throw 'Could not locate dialogAdd button in Add Difficulty dialog';
- buttonAdd.onClick = function(_event) {
+ buttonAdd.onClick = function(_) {
// This performs validation before the onSubmit callback is called.
difficultyForm.submit();
}
@@ -1600,7 +1610,7 @@ class ChartEditorDialogHandler
inputScrollSpeed.value = state.currentSongChartScrollSpeed;
labelScrollSpeed.text = 'Scroll Speed: ${inputScrollSpeed.value}x';
- difficultyForm.onSubmit = function(_event) {
+ difficultyForm.onSubmit = function(_) {
trace('Add Difficulty dialog submitted, validation succeeded!');
var dialogDifficultyName:Null<TextField> = dialog.findComponent('dialogDifficultyName', TextField);
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx
index a43dd2989..81bd333c3 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx
@@ -609,19 +609,8 @@ class ChartEditorToolboxHandler
inputBPM.onChange = function(event:UIEvent) {
if (event.value == null || event.value <= 0) return;
- var timeChanges:Array<SongTimeChange> = state.currentSongMetadata.timeChanges;
- if (timeChanges == null || timeChanges.length == 0)
- {
- timeChanges = [new SongTimeChange(0, event.value)];
- }
- else
- {
- timeChanges[0].bpm = event.value;
- }
-
- state.currentSongMetadata.timeChanges = timeChanges;
-
- Conductor.mapTimeChanges(state.currentSongMetadata.timeChanges);
+ // Use a command so we can undo/redo this action.
+ state.performCommand(new ChangeStartingBPMCommand(event.value));
};
inputBPM.value = state.currentSongMetadata.timeChanges[0].bpm;
From 8ef380e0b208d75c4e3bdd44ef05c4f4dca2c392 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 29 Nov 2023 16:53:08 -0500
Subject: [PATCH 3/4] Resolve merge issues
---
source/funkin/ui/debug/charting/ChartEditorState.hx | 2 +-
.../charting/commands/ChangeStartingBPMCommand.hx | 11 +++++++++--
.../charting/handlers/ChartEditorToolboxHandler.hx | 7 ++++++-
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index b8b7b3bea..a3a8344c8 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -4613,7 +4613,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
var prevDifficulty = availableDifficulties[availableDifficulties.length - 1];
selectedDifficulty = prevDifficulty;
- Conductor.mapTimeChanges(state.currentSongMetadata.timeChanges);
+ Conductor.mapTimeChanges(this.currentSongMetadata.timeChanges);
refreshDifficultyTreeSelection();
refreshMetadataToolbox();
diff --git a/source/funkin/ui/debug/charting/commands/ChangeStartingBPMCommand.hx b/source/funkin/ui/debug/charting/commands/ChangeStartingBPMCommand.hx
index f5f978aa2..3c45c1168 100644
--- a/source/funkin/ui/debug/charting/commands/ChangeStartingBPMCommand.hx
+++ b/source/funkin/ui/debug/charting/commands/ChangeStartingBPMCommand.hx
@@ -1,5 +1,7 @@
package funkin.ui.debug.charting.commands;
+import funkin.data.song.SongData.SongTimeChange;
+
/**
* A command which changes the starting BPM of the song.
*/
@@ -22,12 +24,12 @@ class ChangeStartingBPMCommand implements ChartEditorCommand
if (timeChanges == null || timeChanges.length == 0)
{
previousBPM = 100;
- timeChanges = [new SongTimeChange(0, event.value)];
+ timeChanges = [new SongTimeChange(0, targetBPM)];
}
else
{
previousBPM = timeChanges[0].bpm;
- timeChanges[0].bpm = event.value;
+ timeChanges[0].bpm = targetBPM;
}
state.currentSongMetadata.timeChanges = timeChanges;
@@ -51,4 +53,9 @@ class ChangeStartingBPMCommand implements ChartEditorCommand
Conductor.mapTimeChanges(state.currentSongMetadata.timeChanges);
}
+
+ public function toString():String
+ {
+ return 'Change Starting BPM to ${targetBPM}';
+ }
}
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx
index b9cae0376..418f57464 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx
@@ -11,6 +11,7 @@ import funkin.play.character.BaseCharacter.CharacterType;
import funkin.play.event.SongEvent;
import funkin.data.event.SongEventData;
import funkin.data.song.SongData.SongTimeChange;
+import funkin.ui.debug.charting.commands.ChangeStartingBPMCommand;
import funkin.play.character.BaseCharacter.CharacterType;
import funkin.play.character.CharacterData;
import funkin.play.character.CharacterData.CharacterDataParser;
@@ -611,7 +612,11 @@ class ChartEditorToolboxHandler
if (event.value == null || event.value <= 0) return;
// Use a command so we can undo/redo this action.
- state.performCommand(new ChangeStartingBPMCommand(event.value));
+ var startingBPM = state.currentSongMetadata.timeChanges[0].bpm;
+ if (event.value != startingBPM)
+ {
+ state.performCommand(new ChangeStartingBPMCommand(event.value));
+ }
};
inputBPM.value = state.currentSongMetadata.timeChanges[0].bpm;
From 554c7bb31dc35ea5143d1ccb9709b3edd4bb6c0b Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Thu, 7 Dec 2023 14:29:45 -0500
Subject: [PATCH 4/4] null + macro things?
---
assets | 2 +-
.../debug/charting/handlers/ChartEditorNotificationHandler.hx | 2 ++
source/funkin/util/macro/FlxMacro.hx | 2 ++
source/funkin/util/macro/GitCommit.hx | 2 ++
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/assets b/assets
index d2a2327bb..830127dcc 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit d2a2327bb1eb04a1aa07d7340201f42217829005
+Subproject commit 830127dcc38e4f0fc35b162bd0f696a77679b046
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
index a81b704b7..5c340feb7 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
@@ -139,6 +139,8 @@ class ChartEditorNotificationHandler
return notif;
#else
+ // TODO: Implement notifications on Mac OS OR... make sure the null is handled properly on mac?
+ return null;
trace('WARNING: Notifications are not supported on Mac OS.');
#end
}
diff --git a/source/funkin/util/macro/FlxMacro.hx b/source/funkin/util/macro/FlxMacro.hx
index 0c1a5fa78..cec6b72ec 100644
--- a/source/funkin/util/macro/FlxMacro.hx
+++ b/source/funkin/util/macro/FlxMacro.hx
@@ -1,5 +1,6 @@
package funkin.util.macro;
+#if !display
#if macro
class FlxMacro
{
@@ -33,3 +34,4 @@ class FlxMacro
}
}
#end
+#end
diff --git a/source/funkin/util/macro/GitCommit.hx b/source/funkin/util/macro/GitCommit.hx
index d0c034828..b3ddd2b7e 100644
--- a/source/funkin/util/macro/GitCommit.hx
+++ b/source/funkin/util/macro/GitCommit.hx
@@ -1,5 +1,6 @@
package funkin.util.macro;
+#if !display
#if (debug || FORCE_DEBUG_VERSION)
class GitCommit
{
@@ -65,3 +66,4 @@ class GitCommit
}
}
#end
+#end