diff --git a/Project.xml b/Project.xml
index a83db1677..ccf6c83a3 100644
--- a/Project.xml
+++ b/Project.xml
@@ -200,6 +200,12 @@
<postbuild haxe="source/Prebuild.hx"/> -->
<postbuild haxe="source/Postbuild.hx"/> -->
+ <!-- Enable this on platforms which do not support dropping files onto the window. -->
+ <set name="FILE_DROP_UNSUPPORTED" if="mac" />
+ <section unless="FILE_DROP_UNSUPPORTED">
+ <set name="FILE_DROP_SUPPORTED" />
+ </section>
+
<!-- Options for Polymod -->
<section if="polymod">
<!-- Turns on additional debug logging. -->
diff --git a/source/funkin/input/Cursor.hx b/source/funkin/input/Cursor.hx
index 37e819469..edd9e70f3 100644
--- a/source/funkin/input/Cursor.hx
+++ b/source/funkin/input/Cursor.hx
@@ -4,9 +4,34 @@ import openfl.utils.Assets;
import lime.app.Future;
import openfl.display.BitmapData;
+@:nullSafety
class Cursor
{
- public static var cursorMode(default, set):CursorMode;
+ /**
+ * The current cursor mode.
+ * Set this value to change the cursor graphic.
+ */
+ public static var cursorMode(default, set):Null<CursorMode> = null;
+
+ /**
+ * Show the cursor.
+ */
+ public static inline function show():Void
+ {
+ FlxG.mouse.visible = true;
+ // Reset the cursor mode.
+ Cursor.cursorMode = Default;
+ }
+
+ /**
+ * Hide the cursor.
+ */
+ public static inline function hide():Void
+ {
+ FlxG.mouse.visible = false;
+ // Reset the cursor mode.
+ Cursor.cursorMode = null;
+ }
static final CURSOR_DEFAULT_PARAMS:CursorParams =
{
@@ -15,7 +40,7 @@ class Cursor
offsetX: 0,
offsetY: 0,
};
- static var assetCursorDefault:BitmapData = null;
+ static var assetCursorDefault:Null<BitmapData> = null;
static final CURSOR_CROSS_PARAMS:CursorParams =
{
@@ -24,7 +49,7 @@ class Cursor
offsetX: 0,
offsetY: 0,
};
- static var assetCursorCross:BitmapData = null;
+ static var assetCursorCross:Null<BitmapData> = null;
static final CURSOR_ERASER_PARAMS:CursorParams =
{
@@ -33,16 +58,16 @@ class Cursor
offsetX: 0,
offsetY: 0,
};
- static var assetCursorEraser:BitmapData = null;
+ static var assetCursorEraser:Null<BitmapData> = null;
static final CURSOR_GRABBING_PARAMS:CursorParams =
{
graphic: "assets/images/cursor/cursor-grabbing.png",
scale: 1.0,
- offsetX: 32,
+ offsetX: -8,
offsetY: 0,
};
- static var assetCursorGrabbing:BitmapData = null;
+ static var assetCursorGrabbing:Null<BitmapData> = null;
static final CURSOR_HOURGLASS_PARAMS:CursorParams =
{
@@ -51,25 +76,34 @@ class Cursor
offsetX: 0,
offsetY: 0,
};
- static var assetCursorHourglass:BitmapData = null;
+ static var assetCursorHourglass:Null<BitmapData> = null;
static final CURSOR_POINTER_PARAMS:CursorParams =
{
graphic: "assets/images/cursor/cursor-pointer.png",
scale: 1.0,
- offsetX: 8,
+ offsetX: -8,
offsetY: 0,
};
- static var assetCursorPointer:BitmapData = null;
+ static var assetCursorPointer:Null<BitmapData> = null;
static final CURSOR_TEXT_PARAMS:CursorParams =
{
graphic: "assets/images/cursor/cursor-text.png",
- scale: 1.0,
+ scale: 0.2,
offsetX: 0,
offsetY: 0,
};
- static var assetCursorText:BitmapData = null;
+ static var assetCursorText:Null<BitmapData> = null;
+
+ static final CURSOR_TEXT_VERTICAL_PARAMS:CursorParams =
+ {
+ graphic: "assets/images/cursor/cursor-text-vertical.png",
+ scale: 0.2,
+ offsetX: 0,
+ offsetY: 0,
+ };
+ static var assetCursorTextVertical:Null<BitmapData> = null;
static final CURSOR_ZOOM_IN_PARAMS:CursorParams =
{
@@ -78,7 +112,7 @@ class Cursor
offsetX: 0,
offsetY: 0,
};
- static var assetCursorZoomIn:BitmapData = null;
+ static var assetCursorZoomIn:Null<BitmapData> = null;
static final CURSOR_ZOOM_OUT_PARAMS:CursorParams =
{
@@ -87,11 +121,36 @@ class Cursor
offsetX: 0,
offsetY: 0,
};
- static var assetCursorZoomOut:BitmapData = null;
+ static var assetCursorZoomOut:Null<BitmapData> = null;
- static function set_cursorMode(value:CursorMode):CursorMode
+ static final CURSOR_CROSSHAIR_PARAMS:CursorParams =
+ {
+ graphic: "assets/images/cursor/cursor-crosshair.png",
+ scale: 1.0,
+ offsetX: -16,
+ offsetY: -16,
+ };
+ static var assetCursorCrosshair:Null<BitmapData> = null;
+
+ static final CURSOR_CELL_PARAMS:CursorParams =
+ {
+ graphic: "assets/images/cursor/cursor-cell.png",
+ scale: 1.0,
+ offsetX: -16,
+ offsetY: -16,
+ };
+ static var assetCursorCell:Null<BitmapData> = null;
+
+ // DESIRED CURSOR: Resize NS (vertical)
+ // DESIRED CURSOR: Resize EW (horizontal)
+ // DESIRED CURSOR: Resize NESW (diagonal)
+ // DESIRED CURSOR: Resize NWSE (diagonal)
+ // DESIRED CURSOR: Help (Cursor with question mark)
+ // DESIRED CURSOR: Menu (Cursor with menu icon)
+
+ static function set_cursorMode(value:Null<CursorMode>):Null<CursorMode>
{
- if (cursorMode != value)
+ if (value != null && cursorMode != value)
{
cursorMode = value;
setCursorGraphic(cursorMode);
@@ -99,16 +158,9 @@ class Cursor
return cursorMode;
}
- public static inline function show():Void
- {
- FlxG.mouse.visible = true;
- }
-
- public static inline function hide():Void
- {
- FlxG.mouse.visible = false;
- }
-
+ /**
+ * Synchronous.
+ */
static function setCursorGraphic(?value:CursorMode = null):Void
{
if (value == null)
@@ -117,6 +169,156 @@ class Cursor
return;
}
+ switch (value)
+ {
+ case Default:
+ if (assetCursorDefault == null)
+ {
+ var bitmapData:BitmapData = Assets.getBitmapData(CURSOR_DEFAULT_PARAMS.graphic);
+ assetCursorDefault = bitmapData;
+ applyCursorParams(assetCursorDefault, CURSOR_DEFAULT_PARAMS);
+ }
+ else
+ {
+ applyCursorParams(assetCursorDefault, CURSOR_DEFAULT_PARAMS);
+ }
+
+ case Cross:
+ if (assetCursorCross == null)
+ {
+ var bitmapData:BitmapData = Assets.getBitmapData(CURSOR_CROSS_PARAMS.graphic);
+ assetCursorCross = bitmapData;
+ applyCursorParams(assetCursorCross, CURSOR_CROSS_PARAMS);
+ }
+ else
+ {
+ applyCursorParams(assetCursorCross, CURSOR_CROSS_PARAMS);
+ }
+
+ case Eraser:
+ if (assetCursorEraser == null)
+ {
+ var bitmapData:BitmapData = Assets.getBitmapData(CURSOR_ERASER_PARAMS.graphic);
+ assetCursorEraser = bitmapData;
+ applyCursorParams(assetCursorEraser, CURSOR_ERASER_PARAMS);
+ }
+ else
+ {
+ applyCursorParams(assetCursorEraser, CURSOR_ERASER_PARAMS);
+ }
+
+ case Grabbing:
+ if (assetCursorGrabbing == null)
+ {
+ var bitmapData:BitmapData = Assets.getBitmapData(CURSOR_GRABBING_PARAMS.graphic);
+ assetCursorGrabbing = bitmapData;
+ applyCursorParams(assetCursorGrabbing, CURSOR_GRABBING_PARAMS);
+ }
+ else
+ {
+ applyCursorParams(assetCursorGrabbing, CURSOR_GRABBING_PARAMS);
+ }
+
+ case Hourglass:
+ if (assetCursorHourglass == null)
+ {
+ var bitmapData:BitmapData = Assets.getBitmapData(CURSOR_HOURGLASS_PARAMS.graphic);
+ assetCursorHourglass = bitmapData;
+ applyCursorParams(assetCursorHourglass, CURSOR_HOURGLASS_PARAMS);
+ }
+ else
+ {
+ applyCursorParams(assetCursorHourglass, CURSOR_HOURGLASS_PARAMS);
+ }
+
+ case Pointer:
+ if (assetCursorPointer == null)
+ {
+ var bitmapData:BitmapData = Assets.getBitmapData(CURSOR_POINTER_PARAMS.graphic);
+ assetCursorPointer = bitmapData;
+ applyCursorParams(assetCursorPointer, CURSOR_POINTER_PARAMS);
+ }
+ else
+ {
+ applyCursorParams(assetCursorPointer, CURSOR_POINTER_PARAMS);
+ }
+
+ case Text:
+ if (assetCursorText == null)
+ {
+ var bitmapData:BitmapData = Assets.getBitmapData(CURSOR_TEXT_PARAMS.graphic);
+ assetCursorText = bitmapData;
+ applyCursorParams(assetCursorText, CURSOR_TEXT_PARAMS);
+ }
+ else
+ {
+ applyCursorParams(assetCursorText, CURSOR_TEXT_PARAMS);
+ }
+
+ case ZoomIn:
+ if (assetCursorZoomIn == null)
+ {
+ var bitmapData:BitmapData = Assets.getBitmapData(CURSOR_ZOOM_IN_PARAMS.graphic);
+ assetCursorZoomIn = bitmapData;
+ applyCursorParams(assetCursorZoomIn, CURSOR_ZOOM_IN_PARAMS);
+ }
+ else
+ {
+ applyCursorParams(assetCursorZoomIn, CURSOR_ZOOM_IN_PARAMS);
+ }
+
+ case ZoomOut:
+ if (assetCursorZoomOut == null)
+ {
+ var bitmapData:BitmapData = Assets.getBitmapData(CURSOR_ZOOM_OUT_PARAMS.graphic);
+ assetCursorZoomOut = bitmapData;
+ applyCursorParams(assetCursorZoomOut, CURSOR_ZOOM_OUT_PARAMS);
+ }
+ else
+ {
+ applyCursorParams(assetCursorZoomOut, CURSOR_ZOOM_OUT_PARAMS);
+ }
+
+ case Crosshair:
+ if (assetCursorCrosshair == null)
+ {
+ var bitmapData:BitmapData = Assets.getBitmapData(CURSOR_CROSSHAIR_PARAMS.graphic);
+ assetCursorCrosshair = bitmapData;
+ applyCursorParams(assetCursorCrosshair, CURSOR_CROSSHAIR_PARAMS);
+ }
+ else
+ {
+ applyCursorParams(assetCursorCrosshair, CURSOR_CROSSHAIR_PARAMS);
+ }
+
+ case Cell:
+ if (assetCursorCell == null)
+ {
+ var bitmapData:BitmapData = Assets.getBitmapData(CURSOR_CELL_PARAMS.graphic);
+ assetCursorCell = bitmapData;
+ applyCursorParams(assetCursorCell, CURSOR_CELL_PARAMS);
+ }
+ else
+ {
+ applyCursorParams(assetCursorCell, CURSOR_CELL_PARAMS);
+ }
+
+ default:
+ setCursorGraphic(null);
+ }
+ }
+
+ /**
+ * Asynchronous.
+ */
+ static function loadCursorGraphic(?value:CursorMode = null):Void
+ {
+ if (value == null)
+ {
+ FlxG.mouse.unload();
+ return;
+ }
+
switch (value)
{
case Default:
@@ -127,6 +329,7 @@ class Cursor
assetCursorDefault = bitmapData;
applyCursorParams(assetCursorDefault, CURSOR_DEFAULT_PARAMS);
});
+ future.onError(onCursorError.bind(Default));
}
else
{
@@ -141,6 +344,7 @@ class Cursor
assetCursorCross = bitmapData;
applyCursorParams(assetCursorCross, CURSOR_CROSS_PARAMS);
});
+ future.onError(onCursorError.bind(Cross));
}
else
{
@@ -155,6 +359,7 @@ class Cursor
assetCursorEraser = bitmapData;
applyCursorParams(assetCursorEraser, CURSOR_ERASER_PARAMS);
});
+ future.onError(onCursorError.bind(Eraser));
}
else
{
@@ -169,6 +374,7 @@ class Cursor
assetCursorGrabbing = bitmapData;
applyCursorParams(assetCursorGrabbing, CURSOR_GRABBING_PARAMS);
});
+ future.onError(onCursorError.bind(Grabbing));
}
else
{
@@ -183,6 +389,7 @@ class Cursor
assetCursorHourglass = bitmapData;
applyCursorParams(assetCursorHourglass, CURSOR_HOURGLASS_PARAMS);
});
+ future.onError(onCursorError.bind(Hourglass));
}
else
{
@@ -197,6 +404,7 @@ class Cursor
assetCursorPointer = bitmapData;
applyCursorParams(assetCursorPointer, CURSOR_POINTER_PARAMS);
});
+ future.onError(onCursorError.bind(Pointer));
}
else
{
@@ -211,6 +419,7 @@ class Cursor
assetCursorText = bitmapData;
applyCursorParams(assetCursorText, CURSOR_TEXT_PARAMS);
});
+ future.onError(onCursorError.bind(Text));
}
else
{
@@ -225,6 +434,7 @@ class Cursor
assetCursorZoomIn = bitmapData;
applyCursorParams(assetCursorZoomIn, CURSOR_ZOOM_IN_PARAMS);
});
+ future.onError(onCursorError.bind(ZoomIn));
}
else
{
@@ -239,14 +449,45 @@ class Cursor
assetCursorZoomOut = bitmapData;
applyCursorParams(assetCursorZoomOut, CURSOR_ZOOM_OUT_PARAMS);
});
+ future.onError(onCursorError.bind(ZoomOut));
}
else
{
applyCursorParams(assetCursorZoomOut, CURSOR_ZOOM_OUT_PARAMS);
}
+ case Crosshair:
+ if (assetCursorCrosshair == null)
+ {
+ var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_CROSSHAIR_PARAMS.graphic);
+ future.onComplete(function(bitmapData:BitmapData) {
+ assetCursorCrosshair = bitmapData;
+ applyCursorParams(assetCursorCrosshair, CURSOR_CROSSHAIR_PARAMS);
+ });
+ future.onError(onCursorError.bind(Crosshair));
+ }
+ else
+ {
+ applyCursorParams(assetCursorCrosshair, CURSOR_CROSSHAIR_PARAMS);
+ }
+
+ case Cell:
+ if (assetCursorCell == null)
+ {
+ var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_CELL_PARAMS.graphic);
+ future.onComplete(function(bitmapData:BitmapData) {
+ assetCursorCell = bitmapData;
+ applyCursorParams(assetCursorCell, CURSOR_CELL_PARAMS);
+ });
+ future.onError(onCursorError.bind(Cell));
+ }
+ else
+ {
+ applyCursorParams(assetCursorCell, CURSOR_CELL_PARAMS);
+ }
+
default:
- setCursorGraphic(null);
+ loadCursorGraphic(null);
}
}
@@ -254,6 +495,11 @@ class Cursor
{
FlxG.mouse.load(graphic, params.scale, params.offsetX, params.offsetY);
}
+
+ static function onCursorError(cursorMode:CursorMode, error:String):Void
+ {
+ trace("Failed to load cursor graphic for cursor mode " + cursorMode + ": " + error);
+ }
}
// https://developer.mozilla.org/en-US/docs/Web/CSS/cursor
@@ -268,6 +514,8 @@ enum CursorMode
Text;
ZoomIn;
ZoomOut;
+ Crosshair;
+ Cell;
}
/**
diff --git a/source/funkin/play/song/SongMigrator.hx b/source/funkin/play/song/SongMigrator.hx
index bb8718bb7..f33d9bbe9 100644
--- a/source/funkin/play/song/SongMigrator.hx
+++ b/source/funkin/play/song/SongMigrator.hx
@@ -179,7 +179,7 @@ class SongMigrator
songMetadata.playData.playableChars = {};
try
{
- Reflect.setField(songMetadata.playData.playableChars, songData.song.player1, new SongPlayableChar('', songData.song.player2));
+ songMetadata.playData.playableChars.set(songData.song.player1, new SongPlayableChar('', songData.song.player2));
}
catch (e)
{
diff --git a/source/funkin/ui/debug/charting/ChartEditorDialogHandler.hx b/source/funkin/ui/debug/charting/ChartEditorDialogHandler.hx
index 7391c3d16..eb75e31c5 100644
--- a/source/funkin/ui/debug/charting/ChartEditorDialogHandler.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorDialogHandler.hx
@@ -6,6 +6,7 @@ import funkin.util.SerializerUtil;
import funkin.play.song.SongData.SongChartData;
import funkin.play.song.SongData.SongMetadata;
import flixel.util.FlxTimer;
+import funkin.ui.haxeui.components.FunkinLink;
import funkin.util.SortUtil;
import funkin.input.Cursor;
import funkin.play.character.BaseCharacter;
@@ -134,7 +135,7 @@ class ChartEditorDialogHandler
continue;
}
- var linkTemplateSong:Link = new Link();
+ var linkTemplateSong:Link = new FunkinLink();
linkTemplateSong.text = songName;
linkTemplateSong.onClick = function(_event) {
dialog.hideDialog(DialogButton.CANCEL);
@@ -306,6 +307,7 @@ class ChartEditorDialogHandler
if (state.loadInstrumentalFromBytes(selectedFile.bytes))
{
trace('Selected file: ' + selectedFile.fullPath);
+ #if !mac
NotificationManager.instance.addNotification(
{
title: 'Success',
@@ -313,6 +315,7 @@ class ChartEditorDialogHandler
type: NotificationType.Success,
expiryMs: ChartEditorState.NOTIFICATION_DISMISS_TIME
});
+ #end
dialog.hideDialog(DialogButton.APPLY);
removeDropHandler(onDropFile);
@@ -321,6 +324,7 @@ class ChartEditorDialogHandler
{
trace('Failed to load instrumental (${selectedFile.fullPath})');
+ #if !mac
NotificationManager.instance.addNotification(
{
title: 'Failure',
@@ -328,6 +332,7 @@ class ChartEditorDialogHandler
type: NotificationType.Error,
expiryMs: ChartEditorState.NOTIFICATION_DISMISS_TIME
});
+ #end
}
}
});
@@ -339,6 +344,7 @@ class ChartEditorDialogHandler
if (state.loadInstrumentalFromPath(path))
{
// Tell the user the load was successful.
+ #if !mac
NotificationManager.instance.addNotification(
{
title: 'Success',
@@ -346,6 +352,7 @@ class ChartEditorDialogHandler
type: NotificationType.Success,
expiryMs: ChartEditorState.NOTIFICATION_DISMISS_TIME
});
+ #end
dialog.hideDialog(DialogButton.APPLY);
removeDropHandler(onDropFile);
@@ -362,6 +369,7 @@ class ChartEditorDialogHandler
}
// Tell the user the load was successful.
+ #if !mac
NotificationManager.instance.addNotification(
{
title: 'Failure',
@@ -369,6 +377,7 @@ class ChartEditorDialogHandler
type: NotificationType.Error,
expiryMs: ChartEditorState.NOTIFICATION_DISMISS_TIME
});
+ #end
}
};
@@ -383,6 +392,15 @@ class ChartEditorDialogHandler
handler:(String->Void)
}> = [];
+ /**
+ * Add a callback for when a file is dropped on a component.
+ *
+ * On OS X you can’t drop on the application window, but rather only the app icon
+ * (either in the dock while running or the icon on the hard drive) so this must be disabled
+ * and UI updated appropriately.
+ * @param component
+ * @param handler
+ */
static function addDropHandler(component:Component, handler:String->Void):Void
{
#if desktop
@@ -647,7 +665,11 @@ class ChartEditorDialogHandler
var vocalsEntryLabel:Null<Label> = vocalsEntry.findComponent('vocalsEntryLabel', Label);
if (vocalsEntryLabel == null) throw 'Could not locate vocalsEntryLabel in Upload Vocals dialog';
+ #if FILE_DROP_SUPPORTED
vocalsEntryLabel.text = 'Drag and drop vocals for $charName here, or click to browse.';
+ #else
+ vocalsEntryLabel.text = 'Click to browse for vocals for $charName.';
+ #end
var onDropFile:String->Void = function(pathStr:String) {
trace('Selected file: $pathStr');
@@ -656,6 +678,7 @@ class ChartEditorDialogHandler
if (state.loadVocalsFromPath(path, charKey))
{
// Tell the user the load was successful.
+ #if !mac
NotificationManager.instance.addNotification(
{
title: 'Success',
@@ -663,7 +686,12 @@ class ChartEditorDialogHandler
type: NotificationType.Success,
expiryMs: ChartEditorState.NOTIFICATION_DISMISS_TIME
});
+
vocalsEntryLabel.text = 'Vocals for $charName (drag and drop, or click to browse)\nSelected file: ${path.file}.${path.ext}';
+ #else
+ vocalsEntryLabel.text = 'Vocals for $charName (click to browse)\n${path.file}.${path.ext}';
+ #end
+
dialogNoVocals.hidden = true;
removeDropHandler(onDropFile);
}
@@ -679,6 +707,7 @@ class ChartEditorDialogHandler
}
// Vocals failed to load.
+ #if !mac
NotificationManager.instance.addNotification(
{
title: 'Failure',
@@ -686,8 +715,13 @@ class ChartEditorDialogHandler
type: NotificationType.Error,
expiryMs: ChartEditorState.NOTIFICATION_DISMISS_TIME
});
+ #end
+ #if FILE_DROP_SUPPORTED
vocalsEntryLabel.text = 'Drag and drop vocals for $charName here, or click to browse.';
+ #else
+ vocalsEntryLabel.text = 'Click to browse for vocals for $charName.';
+ #end
}
};
@@ -697,7 +731,11 @@ class ChartEditorDialogHandler
if (selectedFile != null && selectedFile.bytes != null)
{
trace('Selected file: ' + selectedFile.name);
+ #if FILE_DROP_SUPPORTED
+ vocalsEntryLabel.text = 'Vocals for $charName (drag and drop, or click to browse)\nSelected file: ${selectedFile.name}';
+ #else
vocalsEntryLabel.text = 'Vocals for $charName (click to browse)\n${selectedFile.name}';
+ #end
state.loadVocalsFromBytes(selectedFile.bytes, charKey);
dialogNoVocals.hidden = true;
removeDropHandler(onDropFile);
@@ -706,7 +744,9 @@ class ChartEditorDialogHandler
}
// onDropFile
+ #if FILE_DROP_SUPPORTED
addDropHandler(vocalsEntry, onDropFile);
+ #end
dialogContainer.addComponent(vocalsEntry);
}
@@ -770,7 +810,11 @@ class ChartEditorDialogHandler
var songDefaultChartDataEntry:Component = state.buildComponent(CHART_EDITOR_DIALOG_OPEN_CHART_ENTRY_LAYOUT);
var songDefaultChartDataEntryLabel:Null<Label> = songDefaultChartDataEntry.findComponent('chartEntryLabel', Label);
if (songDefaultChartDataEntryLabel == null) throw 'Could not locate chartEntryLabel in Open Chart dialog';
+ #if FILE_DROP_SUPPORTED
songDefaultChartDataEntryLabel.text = 'Drag and drop <song>-chart.json file, or click to browse.';
+ #else
+ songDefaultChartDataEntryLabel.text = 'Click to browse for <song>-chart.json file.';
+ #end
songDefaultChartDataEntry.onClick = onClickChartDataVariation.bind(Constants.DEFAULT_VARIATION).bind(songDefaultChartDataEntryLabel);
addDropHandler(songDefaultChartDataEntry, onDropFileChartDataVariation.bind(Constants.DEFAULT_VARIATION).bind(songDefaultChartDataEntryLabel));
@@ -782,20 +826,48 @@ class ChartEditorDialogHandler
var songVariationMetadataEntry:Component = state.buildComponent(CHART_EDITOR_DIALOG_OPEN_CHART_ENTRY_LAYOUT);
var songVariationMetadataEntryLabel:Null<Label> = songVariationMetadataEntry.findComponent('chartEntryLabel', Label);
if (songVariationMetadataEntryLabel == null) throw 'Could not locate chartEntryLabel in Open Chart dialog';
+ #if FILE_DROP_SUPPORTED
songVariationMetadataEntryLabel.text = 'Drag and drop <song>-metadata-${variation}.json file, or click to browse.';
+ #else
+ songVariationMetadataEntryLabel.text = 'Click to browse for <song>-metadata-${variation}.json file.';
+ #end
+ songVariationMetadataEntry.onMouseOver = function(_event) {
+ songVariationMetadataEntry.swapClass('upload-bg', 'upload-bg-hover');
+ Cursor.cursorMode = Pointer;
+ }
+ songVariationMetadataEntry.onMouseOut = function(_event) {
+ songVariationMetadataEntry.swapClass('upload-bg-hover', 'upload-bg');
+ Cursor.cursorMode = Default;
+ }
songVariationMetadataEntry.onClick = onClickMetadataVariation.bind(variation).bind(songVariationMetadataEntryLabel);
+ #if FILE_DROP_SUPPORTED
addDropHandler(songVariationMetadataEntry, onDropFileMetadataVariation.bind(variation).bind(songVariationMetadataEntryLabel));
+ #end
chartContainerB.addComponent(songVariationMetadataEntry);
// Build entries for -chart-<variation>.json.
var songVariationChartDataEntry:Component = state.buildComponent(CHART_EDITOR_DIALOG_OPEN_CHART_ENTRY_LAYOUT);
var songVariationChartDataEntryLabel:Null<Label> = songVariationChartDataEntry.findComponent('chartEntryLabel', Label);
if (songVariationChartDataEntryLabel == null) throw 'Could not locate chartEntryLabel in Open Chart dialog';
+ #if FILE_DROP_SUPPORTED
songVariationChartDataEntryLabel.text = 'Drag and drop <song>-chart-${variation}.json file, or click to browse.';
+ #else
+ songVariationChartDataEntryLabel.text = 'Click to browse for <song>-chart-${variation}.json file.';
+ #end
+ songVariationChartDataEntry.onMouseOver = function(_event) {
+ songVariationChartDataEntry.swapClass('upload-bg', 'upload-bg-hover');
+ Cursor.cursorMode = Pointer;
+ }
+ songVariationChartDataEntry.onMouseOut = function(_event) {
+ songVariationChartDataEntry.swapClass('upload-bg-hover', 'upload-bg');
+ Cursor.cursorMode = Default;
+ }
songVariationChartDataEntry.onClick = onClickChartDataVariation.bind(variation).bind(songVariationChartDataEntryLabel);
+ #if FILE_DROP_SUPPORTED
addDropHandler(songVariationChartDataEntry, onDropFileChartDataVariation.bind(variation).bind(songVariationChartDataEntryLabel));
+ #end
chartContainerB.addComponent(songVariationChartDataEntry);
}
}
@@ -811,6 +883,7 @@ class ChartEditorDialogHandler
if (songMetadataVariation == null)
{
// Tell the user the load was not successful.
+ #if !mac
NotificationManager.instance.addNotification(
{
title: 'Failure',
@@ -818,12 +891,14 @@ class ChartEditorDialogHandler
type: NotificationType.Error,
expiryMs: ChartEditorState.NOTIFICATION_DISMISS_TIME
});
+ #end
return;
}
songMetadata.set(variation, songMetadataVariation);
// Tell the user the load was successful.
+ #if !mac
NotificationManager.instance.addNotification(
{
title: 'Success',
@@ -831,8 +906,13 @@ class ChartEditorDialogHandler
type: NotificationType.Success,
expiryMs: ChartEditorState.NOTIFICATION_DISMISS_TIME
});
+ #end
+ #if FILE_DROP_SUPPORTED
label.text = 'Metadata file (drag and drop, or click to browse)\nSelected file: ${path.file}.${path.ext}';
+ #else
+ label.text = 'Metadata file (click to browse)\n${path.file}.${path.ext}';
+ #end
if (variation == Constants.DEFAULT_VARIATION) constructVariationEntries(songMetadataVariation.playData.songVariations);
};
@@ -852,6 +932,7 @@ class ChartEditorDialogHandler
songMetadata.set(variation, songMetadataVariation);
// Tell the user the load was successful.
+ #if !mac
NotificationManager.instance.addNotification(
{
title: 'Success',
@@ -859,8 +940,13 @@ class ChartEditorDialogHandler
type: NotificationType.Success,
expiryMs: ChartEditorState.NOTIFICATION_DISMISS_TIME
});
+ #end
+ #if FILE_DROP_SUPPORTED
label.text = 'Metadata file (drag and drop, or click to browse)\nSelected file: ${selectedFile.name}';
+ #else
+ label.text = 'Metadata file (click to browse)\n${selectedFile.name}';
+ #end
if (variation == Constants.DEFAULT_VARIATION) constructVariationEntries(songMetadataVariation.playData.songVariations);
}
@@ -881,6 +967,7 @@ class ChartEditorDialogHandler
state.noteDisplayDirty = true;
// Tell the user the load was successful.
+ #if !mac
NotificationManager.instance.addNotification(
{
title: 'Success',
@@ -888,8 +975,13 @@ class ChartEditorDialogHandler
type: NotificationType.Success,
expiryMs: ChartEditorState.NOTIFICATION_DISMISS_TIME
});
+ #end
+ #if FILE_DROP_SUPPORTED
label.text = 'Chart data file (drag and drop, or click to browse)\nSelected file: ${path.file}.${path.ext}';
+ #else
+ label.text = 'Chart data file (click to browse)\n${path.file}.${path.ext}';
+ #end
};
onClickChartDataVariation = function(variation:String, label:Label, _event:UIEvent) {
@@ -909,6 +1001,7 @@ class ChartEditorDialogHandler
state.noteDisplayDirty = true;
// Tell the user the load was successful.
+ #if !mac
NotificationManager.instance.addNotification(
{
title: 'Success',
@@ -916,8 +1009,13 @@ class ChartEditorDialogHandler
type: NotificationType.Success,
expiryMs: ChartEditorState.NOTIFICATION_DISMISS_TIME
});
+ #end
+ #if FILE_DROP_SUPPORTED
label.text = 'Chart data file (drag and drop, or click to browse)\nSelected file: ${selectedFile.name}';
+ #else
+ label.text = 'Chart data file (click to browse)\n${selectedFile.name}';
+ #end
}
});
}
@@ -925,10 +1023,23 @@ class ChartEditorDialogHandler
var metadataEntry:Component = state.buildComponent(CHART_EDITOR_DIALOG_OPEN_CHART_ENTRY_LAYOUT);
var metadataEntryLabel:Null<Label> = metadataEntry.findComponent('chartEntryLabel', Label);
if (metadataEntryLabel == null) throw 'Could not locate chartEntryLabel in Open Chart dialog';
+
+ #if FILE_DROP_SUPPORTED
metadataEntryLabel.text = 'Drag and drop <song>-metadata.json file, or click to browse.';
+ #else
+ metadataEntryLabel.text = 'Click to browse for <song>-metadata.json file.';
+ #end
metadataEntry.onClick = onClickMetadataVariation.bind(Constants.DEFAULT_VARIATION).bind(metadataEntryLabel);
addDropHandler(metadataEntry, onDropFileMetadataVariation.bind(Constants.DEFAULT_VARIATION).bind(metadataEntryLabel));
+ metadataEntry.onMouseOver = function(_event) {
+ metadataEntry.swapClass('upload-bg', 'upload-bg-hover');
+ Cursor.cursorMode = Pointer;
+ }
+ metadataEntry.onMouseOut = function(_event) {
+ metadataEntry.swapClass('upload-bg-hover', 'upload-bg');
+ Cursor.cursorMode = Default;
+ }
chartContainerA.addComponent(metadataEntry);
@@ -975,7 +1086,6 @@ class ChartEditorDialogHandler
importBox.swapClass('upload-bg', 'upload-bg-hover');
Cursor.cursorMode = Pointer;
}
-
importBox.onMouseOut = function(_event) {
importBox.swapClass('upload-bg-hover', 'upload-bg');
Cursor.cursorMode = Default;
@@ -995,6 +1105,7 @@ class ChartEditorDialogHandler
state.loadSong([Constants.DEFAULT_VARIATION => songMetadata], [Constants.DEFAULT_VARIATION => songChartData]);
dialog.hideDialog(DialogButton.APPLY);
+ #if !mac
NotificationManager.instance.addNotification(
{
title: 'Success',
@@ -1002,6 +1113,7 @@ class ChartEditorDialogHandler
type: NotificationType.Success,
expiryMs: ChartEditorState.NOTIFICATION_DISMISS_TIME
});
+ #end
}
});
}
@@ -1015,6 +1127,7 @@ class ChartEditorDialogHandler
state.loadSong([Constants.DEFAULT_VARIATION => songMetadata], [Constants.DEFAULT_VARIATION => songChartData]);
dialog.hideDialog(DialogButton.APPLY);
+ #if !mac
NotificationManager.instance.addNotification(
{
title: 'Success',
@@ -1022,6 +1135,7 @@ class ChartEditorDialogHandler
type: NotificationType.Success,
expiryMs: ChartEditorState.NOTIFICATION_DISMISS_TIME
});
+ #end
};
addDropHandler(importBox, onDropFile);
diff --git a/source/funkin/ui/debug/charting/ChartEditorNoteSprite.hx b/source/funkin/ui/debug/charting/ChartEditorNoteSprite.hx
index c0f65db40..10e0f9045 100644
--- a/source/funkin/ui/debug/charting/ChartEditorNoteSprite.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorNoteSprite.hx
@@ -143,7 +143,7 @@ class ChartEditorNoteSprite extends FlxSprite
return this.noteData;
}
- public function updateNotePosition(?origin:FlxObject)
+ public function updateNotePosition(?origin:FlxObject):Void
{
if (this.noteData == null) return;
@@ -173,9 +173,7 @@ class ChartEditorNoteSprite extends FlxSprite
if (this.noteData.stepTime >= 0)
{
// noteData.stepTime is a calculated value which accounts for BPM changes
- var stepTime:Float = this.noteData.stepTime;
- var roundedStepTime:Float = Math.floor(stepTime + 0.01); // Add epsilon to fix rounding issues
- this.y = roundedStepTime * ChartEditorState.GRID_SIZE;
+ this.y = this.noteData.stepTime * ChartEditorState.GRID_SIZE;
}
if (origin != null)
diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index 1fb3cadc1..479a9ee2f 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -179,14 +179,24 @@ class ChartEditorState extends HaxeUIState
*/
static final SNAP_QUANTS:Array<Int> = [4, 8, 12, 16, 20, 24, 32, 48, 64, 96, 192];
+ static final BASE_QUANT:Int = 16;
+
/**
* INSTANCE DATA
*/
// ==============================
public var currentZoomLevel:Float = 1.0;
- var noteSnapQuantIndex:Int = 3;
+ /**
+ * The internal index of what note snapping value is in use.
+ * Increment to make placement more preceise and decrement to make placement less precise.
+ */
+ var noteSnapQuantIndex:Int = 3; // default is 16
+ /**
+ * The current note snapping value.
+ * For example, `32` when snapping to 32nd notes.
+ */
public var noteSnapQuant(get, never):Int;
function get_noteSnapQuant():Int
@@ -194,6 +204,17 @@ class ChartEditorState extends HaxeUIState
return SNAP_QUANTS[noteSnapQuantIndex];
}
+ /**
+ * The ratio of the current note snapping value to the default.
+ * For example, `32` becomes `0.5` when snapping to 16th notes.
+ */
+ public var noteSnapRatio(get, never):Float;
+
+ function get_noteSnapRatio():Float
+ {
+ return BASE_QUANT / noteSnapQuant;
+ }
+
/**
* scrollPosition is the current position in the song, in pixels.
* One pixel is 1/40 of 1 step, and 1/160 of 1 beat.
@@ -1195,6 +1216,9 @@ class ChartEditorState extends HaxeUIState
// Set the z-index of the HaxeUI.
this.component.zIndex = 100;
+ // Show the mouse cursor.
+ Cursor.show();
+
fixCamera();
// Get rid of any music from the previous state.
@@ -1282,9 +1306,13 @@ class ChartEditorState extends HaxeUIState
buildNoteGroup();
- gridPlayheadScrollArea = new FlxSprite(gridTiledSprite.x - PLAYHEAD_SCROLL_AREA_WIDTH,
- MENU_BAR_HEIGHT).makeGraphic(PLAYHEAD_SCROLL_AREA_WIDTH, FlxG.height - MENU_BAR_HEIGHT, PLAYHEAD_SCROLL_AREA_COLOR);
+ gridPlayheadScrollArea = new FlxSprite(0, 0);
+ gridPlayheadScrollArea.makeGraphic(10, 10, PLAYHEAD_SCROLL_AREA_COLOR); // Make it 10x10px and then scale it as needed.
add(gridPlayheadScrollArea);
+ gridPlayheadScrollArea.setGraphicSize(PLAYHEAD_SCROLL_AREA_WIDTH, 3000);
+ gridPlayheadScrollArea.updateHitbox();
+ gridPlayheadScrollArea.x = gridTiledSprite.x - PLAYHEAD_SCROLL_AREA_WIDTH;
+ gridPlayheadScrollArea.y = MENU_BAR_HEIGHT + GRID_TOP_PAD;
gridPlayheadScrollArea.zIndex = 25;
// The playhead that show the current position in the song.
@@ -1769,7 +1797,7 @@ class ChartEditorState extends HaxeUIState
// These ones only happen if the modal dialog is not open.
handleScrollKeybinds();
// handleZoom();
- // handleSnap();
+ handleSnap();
handleCursor();
handleMenubar();
@@ -1845,14 +1873,21 @@ class ChartEditorState extends HaxeUIState
**/
function handleScrollKeybinds():Void
{
- // Don't scroll when the cursor is over the UI.
- if (isCursorOverHaxeUI) return;
+ // Don't scroll when the cursor is over the UI, unless a playbar button (the << >> ones) is pressed.
+ if (isCursorOverHaxeUI && playbarButtonPressed == null) return;
var scrollAmount:Float = 0; // Amount to scroll the grid.
var playheadAmount:Float = 0; // Amount to scroll the playhead relative to the grid.
var shouldPause:Bool = false; // Whether to pause the song when scrolling.
var shouldEase:Bool = false; // Whether to ease the scroll.
+ // Mouse Wheel = Scroll
+ if (FlxG.mouse.wheel != 0 && !FlxG.keys.pressed.CONTROL)
+ {
+ scrollAmount = -10 * FlxG.mouse.wheel;
+ shouldPause = true;
+ }
+
// Up Arrow = Scroll Up
if (upKeyHandler.activated && currentLiveInputStyle != LiveInputStyle.WASD)
{
@@ -1870,13 +1905,15 @@ class ChartEditorState extends HaxeUIState
if (pageUpKeyHandler.activated)
{
var measureHeight:Float = GRID_SIZE * 4 * Conductor.beatsPerMeasure;
- var targetScrollPosition:Float = Math.floor(scrollPositionInPixels / measureHeight) * measureHeight;
+ var playheadPos:Float = scrollPositionInPixels + playheadPositionInPixels;
+ var targetScrollPosition:Float = Math.floor(playheadPos / measureHeight) * measureHeight;
// If we would move less than one grid, instead move to the top of the previous measure.
- if (Math.abs(targetScrollPosition - scrollPositionInPixels) < GRID_SIZE)
+ var targetScrollAmount = Math.abs(targetScrollPosition - playheadPos);
+ if (targetScrollAmount < GRID_SIZE)
{
- targetScrollPosition -= GRID_SIZE * 4 * Conductor.beatsPerMeasure;
+ targetScrollPosition -= GRID_SIZE * Constants.STEPS_PER_BEAT * Conductor.beatsPerMeasure;
}
- scrollAmount = targetScrollPosition - scrollPositionInPixels;
+ scrollAmount = targetScrollPosition - playheadPos;
shouldPause = true;
}
@@ -1891,13 +1928,15 @@ class ChartEditorState extends HaxeUIState
if (pageDownKeyHandler.activated)
{
var measureHeight:Float = GRID_SIZE * 4 * Conductor.beatsPerMeasure;
- var targetScrollPosition:Float = Math.ceil(scrollPositionInPixels / measureHeight) * measureHeight;
+ var playheadPos:Float = scrollPositionInPixels + playheadPositionInPixels;
+ var targetScrollPosition:Float = Math.ceil(playheadPos / measureHeight) * measureHeight;
// If we would move less than one grid, instead move to the top of the next measure.
- if (Math.abs(targetScrollPosition - scrollPositionInPixels) < GRID_SIZE)
+ var targetScrollAmount = Math.abs(targetScrollPosition - playheadPos);
+ if (targetScrollAmount < GRID_SIZE)
{
- targetScrollPosition += GRID_SIZE * 4 * Conductor.beatsPerMeasure;
+ targetScrollPosition += GRID_SIZE * Constants.STEPS_PER_BEAT * Conductor.beatsPerMeasure;
}
- scrollAmount = targetScrollPosition - scrollPositionInPixels;
+ scrollAmount = targetScrollPosition - playheadPos;
shouldPause = true;
}
@@ -1908,13 +1947,6 @@ class ChartEditorState extends HaxeUIState
shouldPause = true;
}
- // Mouse Wheel = Scroll
- if (FlxG.mouse.wheel != 0 && !FlxG.keys.pressed.CONTROL)
- {
- scrollAmount = -10 * FlxG.mouse.wheel;
- shouldPause = true;
- }
-
// Middle Mouse + Drag = Scroll but move the playhead the same amount.
if (FlxG.mouse.pressedMiddle)
{
@@ -2046,6 +2078,11 @@ class ChartEditorState extends HaxeUIState
if (shouldHandleCursor)
{
+ // Over the course of this big conditional block,
+ // we determine what the cursor should look like,
+ // and fall back to the default cursor if none of the conditions are met.
+ var targetCursorMode:Null<CursorMode> = null;
+
if (gridTiledSprite == null) throw "ERROR: Tried to handle cursor, but gridTiledSprite is null! Check ChartEditorState.buildGrid()";
var overlapsGrid:Bool = FlxG.mouse.overlaps(gridTiledSprite);
@@ -2055,9 +2092,9 @@ class ChartEditorState extends HaxeUIState
var cursorY:Float = FlxG.mouse.screenY - gridTiledSprite.y;
var overlapsSelectionBorder:Bool = overlapsGrid
- && (cursorX % 40) < (GRID_SELECTION_BORDER_WIDTH / 2)
+ && ((cursorX % 40) < (GRID_SELECTION_BORDER_WIDTH / 2)
|| (cursorX % 40) > (40 - (GRID_SELECTION_BORDER_WIDTH / 2))
- || (cursorY % 40) < (GRID_SELECTION_BORDER_WIDTH / 2) || (cursorY % 40) > (40 - (GRID_SELECTION_BORDER_WIDTH / 2));
+ || (cursorY % 40) < (GRID_SELECTION_BORDER_WIDTH / 2) || (cursorY % 40) > (40 - (GRID_SELECTION_BORDER_WIDTH / 2)));
if (FlxG.mouse.justPressed)
{
@@ -2073,6 +2110,8 @@ class ChartEditorState extends HaxeUIState
else if (!overlapsGrid || overlapsSelectionBorder)
{
selectionBoxStartPos = new FlxPoint(FlxG.mouse.screenX, FlxG.mouse.screenY);
+ // Drawing selection box.
+ targetCursorMode = Crosshair;
}
else
{
@@ -2083,23 +2122,6 @@ class ChartEditorState extends HaxeUIState
}
}
- if (gridPlayheadScrollAreaPressed)
- {
- Cursor.cursorMode = Grabbing;
- }
- else if (notePreviewScrollAreaStartPos != null)
- {
- Cursor.cursorMode = Pointer;
- }
- else if (gridPlayheadScrollArea != null && FlxG.mouse.overlaps(gridPlayheadScrollArea))
- {
- Cursor.cursorMode = Pointer;
- }
- else
- {
- Cursor.cursorMode = Default;
- }
-
if (gridPlayheadScrollAreaPressed && FlxG.mouse.released)
{
gridPlayheadScrollAreaPressed = false;
@@ -2116,11 +2138,18 @@ class ChartEditorState extends HaxeUIState
// Move the playhead to the cursor position.
this.playheadPositionInPixels = FlxG.mouse.screenY - MENU_BAR_HEIGHT - GRID_TOP_PAD;
moveSongToScrollPosition();
+
+ // Cursor should be a grabby hand.
+ if (targetCursorMode == null) targetCursorMode = Grabbing;
}
// The song position of the cursor, in steps.
- var cursorFractionalStep:Float = cursorY / GRID_SIZE / (16 / noteSnapQuant);
+ var cursorFractionalStep:Float = cursorY / GRID_SIZE;
var cursorMs:Float = Conductor.getStepTimeInMs(cursorFractionalStep);
+ // Round the cursor step to the nearest snap quant.
+ var cursorSnappedStep:Float = Math.floor(cursorFractionalStep / noteSnapRatio) * noteSnapRatio;
+ var cursorSnappedMs:Float = Conductor.getStepTimeInMs(cursorSnappedStep);
+
// The direction value for the column at the cursor.
var cursorColumn:Int = Math.floor(cursorX / GRID_SIZE);
if (cursorColumn < 0) cursorColumn = 0;
@@ -2268,6 +2297,8 @@ class ChartEditorState extends HaxeUIState
selectionRect.width = Math.abs(FlxG.mouse.screenX - selectionBoxStartPos.x);
selectionRect.height = Math.abs(FlxG.mouse.screenY - selectionBoxStartPos.y);
setSelectionBoxBounds(selectionRect);
+
+ targetCursorMode = Crosshair;
}
}
else if (FlxG.mouse.justReleased)
@@ -2359,7 +2390,9 @@ class ChartEditorState extends HaxeUIState
}
else if (notePreviewScrollAreaStartPos != null)
{
- trace('Updating current song time while clicking and holding...');
+ // Player is clicking and holding on note preview to scrub around.
+ targetCursorMode = Grabbing;
+
var clickedPosInPixels:Float = FlxMath.remapToRange(FlxG.mouse.screenY, (notePreview?.y ?? 0.0),
(notePreview?.y ?? 0.0) + (notePreview?.height ?? 0.0), 0, songLengthInPixels);
@@ -2371,7 +2404,7 @@ class ChartEditorState extends HaxeUIState
// Handle extending the note as you drag.
// TODO: This should be beat snapped?
- var dragLengthSteps:Float = Conductor.getTimeInSteps(cursorMs) - currentPlaceNoteData.stepTime;
+ var dragLengthSteps:Float = Conductor.getTimeInSteps(cursorSnappedMs) - currentPlaceNoteData.stepTime;
// Without this, the newly placed note feels too short compared to the user's input.
var INCREMENT:Float = 1.0;
@@ -2465,14 +2498,14 @@ class ChartEditorState extends HaxeUIState
{
// Create an event and place it in the chart.
// TODO: Figure out configuring event data.
- var newEventData:SongEventData = new SongEventData(cursorMs, selectedEventKind, selectedEventData);
+ var newEventData:SongEventData = new SongEventData(cursorSnappedMs, selectedEventKind, selectedEventData);
performCommand(new AddEventsCommand([newEventData], FlxG.keys.pressed.CONTROL));
}
else
{
// Create a note and place it in the chart.
- var newNoteData:SongNoteData = new SongNoteData(cursorMs, cursorColumn, 0, selectedNoteKind);
+ var newNoteData:SongNoteData = new SongNoteData(cursorSnappedMs, cursorColumn, 0, selectedNoteKind);
performCommand(new AddNotesCommand([newNoteData], FlxG.keys.pressed.CONTROL));
@@ -2527,8 +2560,6 @@ class ChartEditorState extends HaxeUIState
// Handle grid cursor.
if (overlapsGrid && !overlapsSelectionBorder && !gridPlayheadScrollAreaPressed)
{
- Cursor.cursorMode = Pointer;
-
// Indicate that we can place a note here.
if (cursorColumn == eventColumn)
@@ -2543,11 +2574,13 @@ class ChartEditorState extends HaxeUIState
{
eventData.event = selectedEventKind;
}
- eventData.time = cursorMs;
+ eventData.time = cursorSnappedMs;
gridGhostEvent.visible = true;
gridGhostEvent.eventData = eventData;
gridGhostEvent.updateEventPosition(renderedEvents);
+
+ targetCursorMode = Cell;
}
else
{
@@ -2555,8 +2588,7 @@ class ChartEditorState extends HaxeUIState
if (gridGhostNote == null) throw "ERROR: Tried to handle cursor, but gridGhostNote is null! Check ChartEditorState.buildGrid()";
- var noteData:SongNoteData = gridGhostNote.noteData != null ? gridGhostNote.noteData : new SongNoteData(cursorMs, cursorColumn, 0,
- selectedNoteKind);
+ var noteData:SongNoteData = gridGhostNote.noteData != null ? gridGhostNote.noteData : new SongNoteData(cursorMs, cursorColumn, 0, selectedNoteKind);
if (cursorColumn != noteData.data || selectedNoteKind != noteData.kind)
{
@@ -2564,35 +2596,61 @@ class ChartEditorState extends HaxeUIState
noteData.data = cursorColumn;
gridGhostNote.playNoteAnimation();
}
- noteData.time = cursorMs;
+ noteData.time = cursorSnappedMs;
gridGhostNote.visible = true;
gridGhostNote.noteData = noteData;
gridGhostNote.updateNotePosition(renderedNotes);
- }
- // gridCursor.visible = true;
- // // X and Y are the cursor position relative to the grid, snapped to the top left of the grid square.
- // gridCursor.x = Math.floor(cursorX / GRID_SIZE) * GRID_SIZE + gridTiledSprite.x + (GRID_SELECTION_BORDER_WIDTH / 2);
- // gridCursor.y = cursorStep * GRID_SIZE + gridTiledSprite.y + (GRID_SELECTION_BORDER_WIDTH / 2);
+ targetCursorMode = Cell;
+ }
}
else
{
if (gridGhostNote != null) gridGhostNote.visible = false;
if (gridGhostEvent != null) gridGhostEvent.visible = false;
- Cursor.cursorMode = Default;
}
}
+
+ if (targetCursorMode == null)
+ {
+ if (FlxG.mouse.pressed)
+ {
+ if (overlapsSelectionBorder)
+ {
+ targetCursorMode = Crosshair;
+ }
+ }
+ else
+ {
+ if (FlxG.mouse.overlaps(notePreview))
+ {
+ targetCursorMode = Pointer;
+ }
+ else if (FlxG.mouse.overlaps(gridPlayheadScrollArea))
+ {
+ targetCursorMode = Pointer;
+ }
+ else if (overlapsSelectionBorder)
+ {
+ targetCursorMode = Crosshair;
+ }
+ else if (overlapsGrid)
+ {
+ targetCursorMode = Cell;
+ }
+ }
+ }
+
+ // Actually set the cursor mode to the one we specified earlier.
+ Cursor.cursorMode = targetCursorMode ?? Default;
}
else
{
if (gridGhostNote != null) gridGhostNote.visible = false;
if (gridGhostEvent != null) gridGhostEvent.visible = false;
- }
- if (isCursorOverHaxeUIButton && Cursor.cursorMode == Default)
- {
- Cursor.cursorMode = Pointer;
+ // Do not set Cursor.cursorMode here, because it will be set by the HaxeUI.
}
}
@@ -2720,7 +2778,8 @@ class ChartEditorState extends HaxeUIState
// The note sprite handles animation playback and positioning.
noteSprite.noteData = noteData;
- // Setting note data resets position relative to the grid so we fix that.
+ // Setting note data resets the position relative to the group!
+ // If we don't update the note position AFTER setting the note data, the note will be rendered offscreen at y=5000.
noteSprite.updateNotePosition(renderedNotes);
// Add hold notes that are now visible (and not already displayed).
@@ -2838,10 +2897,10 @@ class ChartEditorState extends HaxeUIState
}
// Sort the notes DESCENDING. This keeps the sustain behind the associated note.
- renderedNotes.sort(FlxSort.byY, FlxSort.DESCENDING);
+ renderedNotes.sort(FlxSort.byY, FlxSort.DESCENDING); // TODO: .group.insertionSort()
// Sort the events DESCENDING. This keeps the sustain behind the associated note.
- renderedEvents.sort(FlxSort.byY, FlxSort.DESCENDING);
+ renderedEvents.sort(FlxSort.byY, FlxSort.DESCENDING); // TODO: .group.insertionSort()
}
// Add a debug value which displays the current size of the note pool.
@@ -2899,6 +2958,18 @@ class ChartEditorState extends HaxeUIState
*/
function handleFileKeybinds():Void
{
+ // CTRL + N = New Chart
+ if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.N)
+ {
+ ChartEditorDialogHandler.openWelcomeDialog(this, true);
+ }
+
+ // CTRL + O = Open Chart
+ if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.O)
+ {
+ ChartEditorDialogHandler.openBrowseWizard(this, true);
+ }
+
// CTRL + Q = Quit to Menu
if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.Q)
{
@@ -3687,25 +3758,29 @@ class ChartEditorState extends HaxeUIState
this.scrollPositionInPixels = value;
// Move the grid sprite to the correct position.
- if (isViewDownscroll)
+ if (gridTiledSprite != null)
{
- if (gridTiledSprite != null) gridTiledSprite.y = -scrollPositionInPixels + (MENU_BAR_HEIGHT + GRID_TOP_PAD);
- }
- else
- {
- if (gridTiledSprite != null) gridTiledSprite.y = -scrollPositionInPixels + (MENU_BAR_HEIGHT + GRID_TOP_PAD);
+ if (isViewDownscroll)
+ {
+ gridTiledSprite.y = -scrollPositionInPixels + (MENU_BAR_HEIGHT + GRID_TOP_PAD);
+ gridPlayheadScrollArea.y = gridTiledSprite.y;
+ }
+ else
+ {
+ gridTiledSprite.y = -scrollPositionInPixels + (MENU_BAR_HEIGHT + GRID_TOP_PAD);
+ gridPlayheadScrollArea.y = gridTiledSprite.y;
+ }
}
+
// Move the rendered notes to the correct position.
renderedNotes.setPosition(gridTiledSprite?.x ?? 0.0, gridTiledSprite?.y ?? 0.0);
renderedHoldNotes.setPosition(gridTiledSprite?.x ?? 0.0, gridTiledSprite?.y ?? 0.0);
renderedEvents.setPosition(gridTiledSprite?.x ?? 0.0, gridTiledSprite?.y ?? 0.0);
renderedSelectionSquares.setPosition(gridTiledSprite?.x ?? 0.0, gridTiledSprite?.y ?? 0.0);
-
// Offset the selection box start position, if we are dragging.
if (selectionBoxStartPos != null) selectionBoxStartPos.y -= diff;
// Update the note preview viewport box.
setNotePreviewViewportBounds(calculateNotePreviewViewportBounds());
-
return this.scrollPositionInPixels;
}
@@ -3864,6 +3939,11 @@ class ChartEditorState extends HaxeUIState
songLengthInMs = audioInstTrack.length;
if (gridTiledSprite != null) gridTiledSprite.height = songLengthInPixels;
+ if (gridPlayheadScrollArea != null)
+ {
+ gridPlayheadScrollArea.setGraphicSize(Std.int(gridPlayheadScrollArea.width), songLengthInPixels);
+ gridPlayheadScrollArea.updateHitbox();
+ }
buildSpectrogram(audioInstTrack);
}
@@ -4005,6 +4085,7 @@ class ChartEditorState extends HaxeUIState
}
}
+ #if !mac
NotificationManager.instance.addNotification(
{
title: 'Success',
@@ -4012,6 +4093,7 @@ class ChartEditorState extends HaxeUIState
type: NotificationType.Success,
expiryMs: ChartEditorState.NOTIFICATION_DISMISS_TIME
});
+ #end
}
/**
@@ -4148,10 +4230,12 @@ class ChartEditorState extends HaxeUIState
function sortChartData():Void
{
+ // TODO: .insertionSort()
currentSongChartNoteData.sort(function(a:SongNoteData, b:SongNoteData):Int {
return FlxSort.byValues(FlxSort.ASCENDING, a.time, b.time);
});
+ // TODO: .insertionSort()
currentSongChartEventData.sort(function(a:SongEventData, b:SongEventData):Int {
return FlxSort.byValues(FlxSort.ASCENDING, a.time, b.time);
});
@@ -4199,6 +4283,9 @@ class ChartEditorState extends HaxeUIState
cleanupAutoSave();
+ // Hide the mouse cursor on other states.
+ Cursor.hide();
+
@:privateAccess
ChartEditorNoteSprite.noteFrameCollection = null;
}
diff --git a/source/funkin/ui/debug/charting/ChartEditorThemeHandler.hx b/source/funkin/ui/debug/charting/ChartEditorThemeHandler.hx
index e67df4ec5..0916a1bea 100644
--- a/source/funkin/ui/debug/charting/ChartEditorThemeHandler.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorThemeHandler.hx
@@ -51,6 +51,11 @@ class ChartEditorThemeHandler
static final GRID_MEASURE_DIVIDER_COLOR_DARK:FlxColor = 0xFFC4C4C4;
static final GRID_MEASURE_DIVIDER_WIDTH:Float = ChartEditorState.GRID_SELECTION_BORDER_WIDTH;
+ // Horizontal divider between beats.
+ static final GRID_BEAT_DIVIDER_COLOR_LIGHT:FlxColor = 0xFFC1C1C1;
+ static final GRID_BEAT_DIVIDER_COLOR_DARK:FlxColor = 0xFF848484;
+ static final GRID_BEAT_DIVIDER_WIDTH:Float = ChartEditorState.GRID_SELECTION_BORDER_WIDTH;
+
// Border on the square highlighting selected notes.
static final SELECTION_SQUARE_BORDER_COLOR_LIGHT:FlxColor = 0xFF339933;
static final SELECTION_SQUARE_BORDER_COLOR_DARK:FlxColor = 0xFF339933;
@@ -143,7 +148,7 @@ class ChartEditorThemeHandler
ChartEditorState.GRID_SELECTION_BORDER_WIDTH),
selectionBorderColor);
- // Selection borders in the middle.
+ // Selection borders horizontally along the middle.
for (i in 1...(Conductor.stepsPerMeasure))
{
state.gridBitmap.fillRect(new Rectangle(0, (ChartEditorState.GRID_SIZE * i) - (ChartEditorState.GRID_SELECTION_BORDER_WIDTH / 2),
@@ -161,7 +166,7 @@ class ChartEditorThemeHandler
state.gridBitmap.height),
selectionBorderColor);
- // Selection borders across the middle.
+ // Selection borders vertically along the middle.
for (i in 1...TOTAL_COLUMN_COUNT)
{
state.gridBitmap.fillRect(new Rectangle((ChartEditorState.GRID_SIZE * i) - (ChartEditorState.GRID_SELECTION_BORDER_WIDTH / 2), 0,
@@ -174,7 +179,7 @@ class ChartEditorThemeHandler
ChartEditorState.GRID_SELECTION_BORDER_WIDTH, state.gridBitmap.height),
selectionBorderColor);
- // Draw dividers between the measures.
+ // Draw horizontal dividers between the measures.
var gridMeasureDividerColor:FlxColor = switch (state.currentTheme)
{
@@ -189,7 +194,30 @@ class ChartEditorThemeHandler
var dividerLineBY:Float = state.gridBitmap.height - (GRID_MEASURE_DIVIDER_WIDTH / 2);
state.gridBitmap.fillRect(new Rectangle(0, dividerLineBY, state.gridBitmap.width, GRID_MEASURE_DIVIDER_WIDTH / 2), gridMeasureDividerColor);
- // Draw dividers between the strumlines.
+ // Draw horizontal dividers between the beats.
+
+ var gridBeatDividerColor:FlxColor = switch (state.currentTheme)
+ {
+ case Light: GRID_BEAT_DIVIDER_COLOR_LIGHT;
+ case Dark: GRID_BEAT_DIVIDER_COLOR_DARK;
+ default: GRID_BEAT_DIVIDER_COLOR_LIGHT;
+ };
+
+ // Selection borders horizontally in the middle.
+ for (i in 1...(Conductor.stepsPerMeasure))
+ {
+ if ((i % Conductor.beatsPerMeasure) == 0)
+ {
+ state.gridBitmap.fillRect(new Rectangle(0, (ChartEditorState.GRID_SIZE * i) - (GRID_BEAT_DIVIDER_WIDTH / 2), state.gridBitmap.width,
+ GRID_BEAT_DIVIDER_WIDTH),
+ gridBeatDividerColor);
+ }
+ }
+
+ // Divider at top
+ state.gridBitmap.fillRect(new Rectangle(0, 0, state.gridBitmap.width, GRID_MEASURE_DIVIDER_WIDTH / 2), gridMeasureDividerColor);
+
+ // Draw vertical dividers between the strumlines.
var gridStrumlineDividerColor:FlxColor = switch (state.currentTheme)
{
diff --git a/source/funkin/ui/haxeui/components/CharacterPlayer.hx b/source/funkin/ui/haxeui/components/CharacterPlayer.hx
index 18596ff77..66b94bfa2 100644
--- a/source/funkin/ui/haxeui/components/CharacterPlayer.hx
+++ b/source/funkin/ui/haxeui/components/CharacterPlayer.hx
@@ -30,7 +30,7 @@ typedef AnimationInfo =
@:composite(Layout)
class CharacterPlayer extends Box
{
- var character:BaseCharacter;
+ var character:Null<BaseCharacter>;
public function new(defaultToBf:Bool = true)
{
@@ -47,7 +47,7 @@ class CharacterPlayer extends Box
function get_charId():String
{
- return character.characterId;
+ return character?.characterId ?? '';
}
function set_charId(value:String):String
@@ -60,7 +60,7 @@ class CharacterPlayer extends Box
function get_charName():String
{
- return character.characterName;
+ return character?.characterName ?? "Unknown";
}
// possible haxeui bug: if listener is added after event is dispatched, event is "lost"... is it smart to "collect and redispatch"? Not sure
@@ -86,7 +86,11 @@ class CharacterPlayer extends Box
// Prevent script issues by fetching with debug=true.
var newCharacter:BaseCharacter = CharacterDataParser.fetchCharacter(id, true);
- if (newCharacter == null) return; // Fail if character doesn't exist.
+ if (newCharacter == null)
+ {
+ character = null;
+ return; // Fail if character doesn't exist.
+ }
// Assign character.
character = newCharacter;
diff --git a/source/funkin/ui/haxeui/components/FunkinButton.hx b/source/funkin/ui/haxeui/components/FunkinButton.hx
new file mode 100644
index 000000000..45987b9ec
--- /dev/null
+++ b/source/funkin/ui/haxeui/components/FunkinButton.hx
@@ -0,0 +1,30 @@
+package funkin.ui.haxeui.components;
+
+import funkin.input.Cursor;
+import haxe.ui.events.MouseEvent;
+import haxe.ui.components.Button;
+
+/**
+ * A HaxeUI button which:
+ * - Changes the current cursor when hovered over.
+ */
+class FunkinButton extends Button
+{
+ public function new()
+ {
+ super();
+
+ this.onMouseOver = handleMouseOver;
+ this.onMouseOut = handleMouseOut;
+ }
+
+ private function handleMouseOver(event:MouseEvent)
+ {
+ Cursor.cursorMode = Pointer;
+ }
+
+ private function handleMouseOut(event:MouseEvent)
+ {
+ Cursor.cursorMode = Default;
+ }
+}
diff --git a/source/funkin/ui/haxeui/components/FunkinHorizontalSlider.hx b/source/funkin/ui/haxeui/components/FunkinHorizontalSlider.hx
new file mode 100644
index 000000000..baf42aada
--- /dev/null
+++ b/source/funkin/ui/haxeui/components/FunkinHorizontalSlider.hx
@@ -0,0 +1,30 @@
+package funkin.ui.haxeui.components;
+
+import haxe.ui.components.HorizontalSlider;
+import funkin.input.Cursor;
+import haxe.ui.events.MouseEvent;
+
+/**
+ * A HaxeUI horizontal slider which:
+ * - Changes the current cursor when hovered over.
+ */
+class FunkinHorizontalSlider extends HorizontalSlider
+{
+ public function new()
+ {
+ super();
+
+ this.onMouseOver = handleMouseOver;
+ this.onMouseOut = handleMouseOut;
+ }
+
+ private function handleMouseOver(event:MouseEvent)
+ {
+ Cursor.cursorMode = Pointer;
+ }
+
+ private function handleMouseOut(event:MouseEvent)
+ {
+ Cursor.cursorMode = Default;
+ }
+}
diff --git a/source/funkin/ui/haxeui/components/FunkinLink.hx b/source/funkin/ui/haxeui/components/FunkinLink.hx
new file mode 100644
index 000000000..74eb6e7c4
--- /dev/null
+++ b/source/funkin/ui/haxeui/components/FunkinLink.hx
@@ -0,0 +1,30 @@
+package funkin.ui.haxeui.components;
+
+import funkin.input.Cursor;
+import haxe.ui.events.MouseEvent;
+import haxe.ui.components.Link;
+
+/**
+ * A HaxeUI link which:
+ * - Changes the current cursor when hovered over.
+ */
+class FunkinLink extends Link
+{
+ public function new()
+ {
+ super();
+
+ this.onMouseOver = handleMouseOver;
+ this.onMouseOut = handleMouseOut;
+ }
+
+ private function handleMouseOver(event:MouseEvent)
+ {
+ Cursor.cursorMode = Pointer;
+ }
+
+ private function handleMouseOut(event:MouseEvent)
+ {
+ Cursor.cursorMode = Default;
+ }
+}
diff --git a/source/funkin/ui/haxeui/components/FunkinMenuBar.hx b/source/funkin/ui/haxeui/components/FunkinMenuBar.hx
new file mode 100644
index 000000000..393372d74
--- /dev/null
+++ b/source/funkin/ui/haxeui/components/FunkinMenuBar.hx
@@ -0,0 +1,32 @@
+package funkin.ui.haxeui.components;
+
+import funkin.input.Cursor;
+import haxe.ui.events.MouseEvent;
+import haxe.ui.containers.menus.MenuBar;
+import haxe.ui.core.CompositeBuilder;
+
+/**
+ * A HaxeUI menu bar which:
+ * - Changes the current cursor when each button is hovered over.
+ */
+class FunkinMenuBar extends MenuBar
+{
+ public function new()
+ {
+ super();
+
+ registerListeners();
+ }
+
+ private function registerListeners():Void {}
+
+ private function handleMouseOver(event:MouseEvent)
+ {
+ Cursor.cursorMode = Pointer;
+ }
+
+ private function handleMouseOut(event:MouseEvent)
+ {
+ Cursor.cursorMode = Default;
+ }
+}
diff --git a/source/funkin/ui/haxeui/components/FunkinMenuCheckBox.hx b/source/funkin/ui/haxeui/components/FunkinMenuCheckBox.hx
new file mode 100644
index 000000000..263277c6f
--- /dev/null
+++ b/source/funkin/ui/haxeui/components/FunkinMenuCheckBox.hx
@@ -0,0 +1,30 @@
+package funkin.ui.haxeui.components;
+
+import funkin.input.Cursor;
+import haxe.ui.events.MouseEvent;
+import haxe.ui.containers.menus.MenuCheckBox;
+
+/**
+ * A HaxeUI menu checkbox which:
+ * - Changes the current cursor when hovered over.
+ */
+class FunkinMenuCheckBox extends MenuCheckBox
+{
+ public function new()
+ {
+ super();
+
+ this.onMouseOver = handleMouseOver;
+ this.onMouseOut = handleMouseOut;
+ }
+
+ private function handleMouseOver(event:MouseEvent)
+ {
+ Cursor.cursorMode = Pointer;
+ }
+
+ private function handleMouseOut(event:MouseEvent)
+ {
+ Cursor.cursorMode = Default;
+ }
+}
diff --git a/source/funkin/ui/haxeui/components/FunkinMenuItem.hx b/source/funkin/ui/haxeui/components/FunkinMenuItem.hx
new file mode 100644
index 000000000..2eb7db729
--- /dev/null
+++ b/source/funkin/ui/haxeui/components/FunkinMenuItem.hx
@@ -0,0 +1,30 @@
+package funkin.ui.haxeui.components;
+
+import funkin.input.Cursor;
+import haxe.ui.events.MouseEvent;
+import haxe.ui.containers.menus.MenuItem;
+
+/**
+ * A HaxeUI menu item which:
+ * - Changes the current cursor when hovered over.
+ */
+class FunkinMenuItem extends MenuItem
+{
+ public function new()
+ {
+ super();
+
+ this.onMouseOver = handleMouseOver;
+ this.onMouseOut = handleMouseOut;
+ }
+
+ private function handleMouseOver(event:MouseEvent)
+ {
+ Cursor.cursorMode = Pointer;
+ }
+
+ private function handleMouseOut(event:MouseEvent)
+ {
+ Cursor.cursorMode = Default;
+ }
+}
diff --git a/source/funkin/ui/haxeui/components/FunkinMenuOptionBox.hx b/source/funkin/ui/haxeui/components/FunkinMenuOptionBox.hx
new file mode 100644
index 000000000..d9985eede
--- /dev/null
+++ b/source/funkin/ui/haxeui/components/FunkinMenuOptionBox.hx
@@ -0,0 +1,30 @@
+package funkin.ui.haxeui.components;
+
+import haxe.ui.containers.menus.MenuOptionBox;
+import funkin.input.Cursor;
+import haxe.ui.events.MouseEvent;
+
+/**
+ * A HaxeUI menu option box which:
+ * - Changes the current cursor when hovered over.
+ */
+class FunkinMenuOptionBox extends MenuOptionBox
+{
+ public function new()
+ {
+ super();
+
+ this.onMouseOver = handleMouseOver;
+ this.onMouseOut = handleMouseOut;
+ }
+
+ private function handleMouseOver(event:MouseEvent)
+ {
+ Cursor.cursorMode = Pointer;
+ }
+
+ private function handleMouseOut(event:MouseEvent)
+ {
+ Cursor.cursorMode = Default;
+ }
+}
diff --git a/source/funkin/ui/story/Level.hx b/source/funkin/ui/story/Level.hx
index 1e5d60bf3..764606bf3 100644
--- a/source/funkin/ui/story/Level.hx
+++ b/source/funkin/ui/story/Level.hx
@@ -98,19 +98,40 @@ class Level implements IRegistryEntry<LevelData>
return true;
}
+ /**
+ * Build a sprite for the background of the level.
+ * Can be overriden by ScriptedLevel. Not used if `isBackgroundSimple` returns true.
+ */
public function buildBackground():FlxSprite
{
- if (_data.background.startsWith('#'))
- {
- // Color specified
- var color:FlxColor = FlxColor.fromString(_data.background);
- return new FlxSprite().makeGraphic(FlxG.width, 400, color);
- }
- else
+ if (!_data.background.startsWith('#'))
{
// Image specified
return new FlxSprite().loadGraphic(Paths.image(_data.background));
}
+
+ // Color specified
+ var result:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, 400, FlxColor.WHITE);
+ result.color = getBackgroundColor();
+ return result;
+ }
+
+ /**
+ * Returns true if the background is a solid color.
+ * If you have a ScriptedLevel with a fancy background, you may want to override this to false.
+ */
+ public function isBackgroundSimple():Bool
+ {
+ return _data.background.startsWith('#');
+ }
+
+ /**
+ * Returns true if the background is a solid color.
+ * If you have a ScriptedLevel with a fancy background, you may want to override this to false.
+ */
+ public function getBackgroundColor():FlxColor
+ {
+ return FlxColor.fromString(_data.background);
}
public function getDifficulties():Array<String>
diff --git a/source/funkin/ui/story/StoryMenuState.hx b/source/funkin/ui/story/StoryMenuState.hx
index 8276777ab..34dd49e22 100644
--- a/source/funkin/ui/story/StoryMenuState.hx
+++ b/source/funkin/ui/story/StoryMenuState.hx
@@ -135,10 +135,15 @@ class StoryMenuState extends MusicBeatState
this.bgColor = FlxColor.BLACK;
levelTitles = new FlxTypedGroup<LevelTitle>();
+ levelTitles.zIndex = 15;
add(levelTitles);
updateBackground();
+ var black:FlxSprite = new FlxSprite(levelBackground.x, 0).makeGraphic(FlxG.width, Std.int(400 + levelBackground.y), FlxColor.BLACK);
+ black.zIndex = levelBackground.zIndex - 1;
+ add(black);
+
levelProps = new FlxTypedGroup<LevelProp>();
levelProps.zIndex = 1000;
add(levelProps);
@@ -153,17 +158,20 @@ class StoryMenuState extends MusicBeatState
scoreText = new FlxText(10, 10, 0, 'HIGH SCORE: 42069420');
scoreText.setFormat("VCR OSD Mono", 32);
+ scoreText.zIndex = 1000;
add(scoreText);
modeText = new FlxText(10, 10, 0, 'Base Game Levels [TAB to switch]');
modeText.setFormat("VCR OSD Mono", 32);
modeText.screenCenter(X);
modeText.visible = hasModdedLevels();
+ modeText.zIndex = 1000;
add(modeText);
levelTitleText = new FlxText(FlxG.width * 0.7, 10, 0, 'LEVEL 1');
levelTitleText.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, RIGHT);
levelTitleText.alpha = 0.7;
+ levelTitleText.zIndex = 1000;
add(levelTitleText);
buildLevelTitles();
@@ -384,6 +392,7 @@ class StoryMenuState extends MusicBeatState
if (currentIndex < 0) currentIndex = levelList.length - 1;
if (currentIndex >= levelList.length) currentIndex = 0;
+ var previousLevelId:String = currentLevelId;
currentLevelId = levelList[currentIndex];
updateData();
@@ -399,18 +408,14 @@ class StoryMenuState extends MusicBeatState
currentLevelTitle = item;
item.alpha = 1.0;
}
- else if (index > currentIndex)
- {
- item.alpha = 0.6;
- }
else
{
- item.alpha = 0.0;
+ item.alpha = 0.6;
}
}
updateText();
- updateBackground();
+ updateBackground(previousLevelId);
updateProps();
refresh();
}
@@ -533,32 +538,66 @@ class StoryMenuState extends MusicBeatState
});
}
- function updateBackground():Void
+ function updateBackground(?previousLevelId:String = ''):Void
{
- if (levelBackground != null)
+ if (levelBackground == null || previousLevelId == '')
{
- var oldBackground:FlxSprite = levelBackground;
-
- FlxTween.tween(oldBackground, {alpha: 0.0}, 0.6,
- {
- ease: FlxEase.linear,
- onComplete: function(_) {
- remove(oldBackground);
- }
- });
+ // Build a new background and display it immediately.
+ levelBackground = currentLevel.buildBackground();
+ levelBackground.x = 0;
+ levelBackground.y = 56;
+ levelBackground.zIndex = 100;
+ levelBackground.alpha = 1.0; // Not hidden.
+ add(levelBackground);
}
+ else
+ {
+ var previousLevel = LevelRegistry.instance.fetchEntry(previousLevelId);
- levelBackground = currentLevel.buildBackground();
- levelBackground.x = 0;
- levelBackground.y = 56;
- levelBackground.alpha = 0.0;
- levelBackground.zIndex = 100;
- add(levelBackground);
-
- FlxTween.tween(levelBackground, {alpha: 1.0}, 0.6,
+ if (currentLevel.isBackgroundSimple() && previousLevel.isBackgroundSimple())
{
- ease: FlxEase.linear
- });
+ var previousColor:FlxColor = previousLevel.getBackgroundColor();
+ var currentColor:FlxColor = currentLevel.getBackgroundColor();
+ if (previousColor != currentColor)
+ {
+ // Both the previous and current level were simple backgrounds.
+ // Fade between colors directly, rather than fading one background out and another in.
+ FlxTween.color(levelBackground, 0.4, previousColor, currentColor);
+ }
+ else
+ {
+ // Do no fade at all if the colors aren't different.
+ }
+ }
+ else
+ {
+ // Either the previous or current level has a complex background.
+ // We need to fade the old background out and the new one in.
+
+ // Reference the old background and fade it out.
+ var oldBackground:FlxSprite = levelBackground;
+ FlxTween.tween(oldBackground, {alpha: 0.0}, 0.6,
+ {
+ ease: FlxEase.linear,
+ onComplete: function(_) {
+ remove(oldBackground);
+ }
+ });
+
+ // Build a new background and fade it in.
+ levelBackground = currentLevel.buildBackground();
+ levelBackground.x = 0;
+ levelBackground.y = 56;
+ levelBackground.alpha = 0.0; // Hidden to start.
+ levelBackground.zIndex = 100;
+ add(levelBackground);
+
+ FlxTween.tween(levelBackground, {alpha: 1.0}, 0.6,
+ {
+ ease: FlxEase.linear
+ });
+ }
+ }
}
function updateProps():Void
diff --git a/source/funkin/util/FileUtil.hx b/source/funkin/util/FileUtil.hx
index 21c2920d9..3a6f4e330 100644
--- a/source/funkin/util/FileUtil.hx
+++ b/source/funkin/util/FileUtil.hx
@@ -240,6 +240,10 @@ class FileUtil
onSaveAll(paths);
}
+ trace('Browsing for directory to save individual files to...');
+ #if mac
+ defaultPath = null;
+ #end
browseForDirectory(null, onSelectDir, onCancel, defaultPath, 'Choose directory to save all files to...');
return true;