cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-11-26 14:16:00 +00:00
Code Issues Releases Wiki Activity

Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into polish/chart-intro-screen

Browse source
This commit is contained in:
Cameron Taylor 2023-11-21 15:11:12 -05:00
parent 621e18f273 620cd50c1d
commit 64b028baee
4 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/funkin/ui/debug/DebugMenuSubState.hx
View file

@ -7,6 +7,7 @@ import funkin.ui.MusicBeatSubState;
import funkin.ui.TextMenuList; import funkin.ui.TextMenuList;
import funkin.ui.debug.charting.ChartEditorState; import funkin.ui.debug.charting.ChartEditorState;
import funkin.ui.MusicBeatSubState; import funkin.ui.MusicBeatSubState;
import funkin.util.logging.CrashHandler;
class DebugMenuSubState extends MusicBeatSubState class DebugMenuSubState extends MusicBeatSubState
{ {
@ -50,7 +51,9 @@ class DebugMenuSubState extends MusicBeatSubState
createItem("ANIMATION EDITOR", openAnimationEditor); createItem("ANIMATION EDITOR", openAnimationEditor);
createItem("STAGE EDITOR", openStageEditor); createItem("STAGE EDITOR", openStageEditor);
createItem("TEST STICKERS", testStickers); createItem("TEST STICKERS", testStickers);
#if sys
createItem("OPEN CRASH LOG FOLDER", openLogFolder);
#end
FlxG.camera.focusOn(new FlxPoint(camFocusPoint.x, camFocusPoint.y)); FlxG.camera.focusOn(new FlxPoint(camFocusPoint.x, camFocusPoint.y));
FlxG.camera.focusOn(new FlxPoint(camFocusPoint.x, camFocusPoint.y + 500)); FlxG.camera.focusOn(new FlxPoint(camFocusPoint.x, camFocusPoint.y + 500));
} }
@ -101,6 +104,22 @@ class DebugMenuSubState extends MusicBeatSubState
trace('Stage Editor'); trace('Stage Editor');
} }
#if sys
function openLogFolder()
{
#if windows
Sys.command('explorer', [CrashHandler.LOG_FOLDER]);
#elseif mac
// mac could be fuckie with where the log folder is relative to the game file...
// if this comment is still here... it means it has NOT been verified on mac yet!
Sys.command('open', [CrashHandler.LOG_FOLDER]);
#end
// TODO: implement linux
// some shit with xdg-open :thinking: emoji...
}
#end
function exitDebugMenu() function exitDebugMenu()
{ {
// TODO: Add a transition? // TODO: Add a transition?

3
source/funkin/ui/debug/charting/ChartEditorState.hx
View file

@ -3399,13 +3399,14 @@ class ChartEditorState extends HaxeUIState
gridGhostHoldNote.noteData = gridGhostNote.noteData; gridGhostHoldNote.noteData = gridGhostNote.noteData;
gridGhostHoldNote.noteDirection = gridGhostNote.noteData.getDirection(); gridGhostHoldNote.noteDirection = gridGhostNote.noteData.getDirection();
gridGhostHoldNote.setHeightDirectly(dragLengthPixels); gridGhostHoldNote.setHeightDirectly(dragLengthPixels, true);
gridGhostHoldNote.updateHoldNotePosition(renderedHoldNotes); gridGhostHoldNote.updateHoldNotePosition(renderedHoldNotes);
} }
else else
{ {
gridGhostHoldNote.visible = false; gridGhostHoldNote.visible = false;
gridGhostHoldNote.setHeightDirectly(0);
} }
} }

8
source/funkin/ui/debug/charting/components/ChartEditorHoldNoteSprite.hx
View file

@ -9,6 +9,7 @@ import flixel.graphics.frames.FlxTileFrames;
import flixel.math.FlxPoint; import flixel.math.FlxPoint;
import funkin.play.notes.SustainTrail; import funkin.play.notes.SustainTrail;
import funkin.data.song.SongData.SongNoteData; import funkin.data.song.SongData.SongNoteData;
import flixel.math.FlxMath;
/** /**
* A sprite that can be used to display the trail of a hold note in a chart. * A sprite that can be used to display the trail of a hold note in a chart.
@ -42,9 +43,12 @@ class ChartEditorHoldNoteSprite extends SustainTrail
* Set the height directly, to a value in pixels. * Set the height directly, to a value in pixels.
* @param h The desired height in pixels. * @param h The desired height in pixels.
*/ */
public function setHeightDirectly(h:Float) public function setHeightDirectly(h:Float, ?lerp:Bool = false)
{ {
sustainLength = h / (getScrollSpeed() * Constants.PIXELS_PER_MS); if (lerp != null && lerp) sustainLength = FlxMath.lerp(sustainLength, h / (getScrollSpeed() * Constants.PIXELS_PER_MS), 0.25);
else
sustainLength = h / (getScrollSpeed() * Constants.PIXELS_PER_MS);
fullSustainLength = sustainLength; fullSustainLength = sustainLength;
} }

2
source/funkin/util/logging/CrashHandler.hx
View file

@ -9,7 +9,7 @@ import openfl.events.UncaughtErrorEvent;
@:nullSafety @:nullSafety
class CrashHandler class CrashHandler
{ {
static final LOG_FOLDER = 'logs'; public static final LOG_FOLDER = 'logs';
/** /**
* Initializes * Initializes