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

Fix some variable naming issues caused by HaxeUI (Ideally revert this in the future)

Browse Source
This commit is contained in:
EliteMasterEric
2025-01-06 22:32:12 -08:00
committed by Cameron Taylor
parent 533876680b
commit c4749636d3
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/ui/debug/charting/toolboxes/ChartEditorFreeplayToolbox.hx
+3 -3
View File
@@ -382,7 +382,7 @@ class ChartEditorFreeplayToolbox extends ChartEditorBaseToolbox
// Determine the position of the mouse relative to the
var mouseXPos = FlxG.mouse.x;
var relativeMouseXPos = mouseXPos - waveformScrollview.screenX;
var relativeMouseXPos = mouseXPos - waveformScrollview.cachedScreenX;
var targetPlayheadPos = relativeMouseXPos + waveformScrollview.hscrollPos;
// Move the playhead to the mouse position.
@@ -415,8 +415,8 @@ class ChartEditorFreeplayToolbox extends ChartEditorBaseToolbox
var currentAbsMousePos = FlxG.mouse.x;
var dragDiff = currentAbsMousePos - waveformDragStartPos;
var currentRelativeMousePos = currentAbsMousePos - waveformScrollview.screenX;
var relativeStartPos = waveformDragStartPos - waveformScrollview.screenX;
var currentRelativeMousePos = currentAbsMousePos - waveformScrollview.cachedScreenX;
var relativeStartPos = waveformDragStartPos - waveformScrollview.cachedScreenX;
var isDraggingRight = dragDiff > 0;
var hasDraggedEnough = Math.abs(dragDiff) > 10;
source/funkin/ui/debug/charting/toolboxes/ChartEditorOffsetsToolbox.hx
+1 -1
View File
@@ -368,7 +368,7 @@ class ChartEditorOffsetsToolbox extends ChartEditorBaseToolbox
// Determine the position of the mouse relative to the
var mouseXPos = FlxG.mouse.x;
var relativeMouseXPos = mouseXPos - waveformScrollview.screenX;
var relativeMouseXPos = mouseXPos - waveformScrollview.cachedScreenX;
var targetPlayheadPos = relativeMouseXPos + waveformScrollview.hscrollPos;
// Move the playhead to the mouse position.
source/funkin/ui/haxeui/components/CharacterPlayer.hx
+2 -2
View File
@@ -177,8 +177,8 @@ class CharacterPlayer extends Box
override function repositionChildren():Void
{
super.repositionChildren();
character.x = this.screenX;
character.y = this.screenY;
character.x = this.cachedScreenX;
character.y = this.cachedScreenY;
// Apply animation offsets, so the character is positioned correctly based on the animation.
@:privateAccess var animOffsets:Array<Float> = character.animOffsets;