cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-04-04 02:54:21 +00:00
Code Issues Releases Wiki Activity

Merge branch 'rewrite/master' into note-move-fix

Browse source
This commit is contained in:
Eric 2024-01-03 20:13:06 -05:00 committed by GitHub
parent 07bd2e44cd be64417785
commit 7b219d1a38
3 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/funkin/play/notes/SustainTrail.hx
View file

@ -149,9 +149,9 @@ class SustainTrail extends FlxSprite
if (sustainLength == s) return s; if (sustainLength == s) return s;
height = sustainHeight(s, getScrollSpeed()); height = sustainHeight(s, getScrollSpeed());
// updateColorTransform(); this.sustainLength = s;
updateClipping(); updateClipping();
return sustainLength = s; return this.sustainLength;
} }
/** /**
@ -162,13 +162,15 @@ class SustainTrail extends FlxSprite
public function updateClipping(songTime:Float = 0):Void public function updateClipping(songTime:Float = 0):Void
{ {
var clipHeight:Float = FlxMath.bound(sustainHeight(sustainLength - (songTime - strumTime), getScrollSpeed()), 0, height); var clipHeight:Float = FlxMath.bound(sustainHeight(sustainLength - (songTime - strumTime), getScrollSpeed()), 0, height);
if (clipHeight == 0) if (clipHeight <= 0.1)
{ {
visible = false; visible = false;
return; return;
} }
else else
{
visible = true; visible = true;
}
var bottomHeight:Float = graphic.height * zoom * endOffset; var bottomHeight:Float = graphic.height * zoom * endOffset;
var partHeight:Float = clipHeight - bottomHeight; var partHeight:Float = clipHeight - bottomHeight;

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

@ -124,6 +124,7 @@ import flixel.group.FlxGroup.FlxTypedGroup;
import funkin.audio.visualize.PolygonVisGroup; import funkin.audio.visualize.PolygonVisGroup;
import flixel.input.mouse.FlxMouseEvent; import flixel.input.mouse.FlxMouseEvent;
import flixel.text.FlxText; import flixel.text.FlxText;
import flixel.system.debug.log.LogStyle;
using Lambda; using Lambda;
@ -544,6 +545,11 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
*/ */
var playtestPracticeMode:Bool = false; var playtestPracticeMode:Bool = false;
/**
* Enables or disables the "debugger" popup that appears when you run into a flixel error.
*/
var enabledDebuggerPopup:Bool = true;
// Visuals // Visuals
/** /**
@ -4808,6 +4814,9 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
return; return;
} }
LogStyle.WARNING.openConsole = enabledDebuggerPopup;
LogStyle.ERROR.openConsole = enabledDebuggerPopup;
// TODO: Rework asset system so we can remove this. // TODO: Rework asset system so we can remove this.
switch (currentSongStage) switch (currentSongStage)
{ {

10
source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx
View file

@ -488,6 +488,16 @@ class ChartEditorToolboxHandler
state.playtestStartTime = checkboxStartTime.selected; state.playtestStartTime = checkboxStartTime.selected;
}; };
var checkboxDebugger:Null<CheckBox> = toolbox.findComponent('playtestDebuggerCheckbox', CheckBox);
if (checkboxDebugger == null) throw 'ChartEditorToolboxHandler.buildToolboxPlaytestPropertiesLayout() - Could not find playtestDebuggerCheckbox component.';
state.enabledDebuggerPopup = checkboxDebugger.selected;
checkboxDebugger.onClick = _ -> {
state.enabledDebuggerPopup = checkboxDebugger.selected;
};
return toolbox; return toolbox;
} }