From 470f0e8a990a6f948ba47a275ad136be993713ba Mon Sep 17 00:00:00 2001 From: SrtHero278 Date: Thu, 20 Jun 2024 19:04:09 -0700 Subject: [PATCH] fixed rotation somehow not intializing an offset makes it work although thinking about it it makes sense --- source/funkin/menus/ui/NewAlphabet.hx | 11 ++++------- source/funkin/menus/ui/NewAlphabetTest.hx | 18 ------------------ 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/source/funkin/menus/ui/NewAlphabet.hx b/source/funkin/menus/ui/NewAlphabet.hx index e2230408..cd0ae9c9 100644 --- a/source/funkin/menus/ui/NewAlphabet.hx +++ b/source/funkin/menus/ui/NewAlphabet.hx @@ -54,15 +54,13 @@ class NewAlphabet extends FlxSprite { var ogOffX = frameOffset.x; var ogOffY = frameOffset.y; - frameOffset.addPoint(origin); frameOffset.x -= (textWidth - __laneWidths[0]) * alignment.getMultiplier(); - offset.subtract(origin.x * scale.x, origin.y * scale.y); for (i in 0...daText.length) { var letter = daText.charAt(i); if (letter == "\n") { curLine++; - frameOffset.x = textWidth * 0.5 - (textWidth - __laneWidths[curLine]) * alignment.getMultiplier(); + frameOffset.x = ogOffX - (textWidth - __laneWidths[curLine]) * alignment.getMultiplier(); frameOffset.y -= lineGap; continue; } @@ -73,16 +71,15 @@ class NewAlphabet extends FlxSprite { } else { var frameToGet = Math.floor(__animTime * fps) % anim.numFrames; frame = frames.frames[anim.frames[frameToGet]]; - var offsetY = frame.sourceSize.y - lineGap; - frameOffset.y += offsetY + (yOffset.exists(letter) ? yOffset.get(letter) : 0); + var offsetY = frame.sourceSize.y - lineGap + (yOffset.exists(letter) ? yOffset.get(letter) : 0); + frameOffset.y += offsetY; super.draw(); - frameOffset.y -= offsetY + (yOffset.exists(letter) ? yOffset.get(letter) : 0); + frameOffset.y -= offsetY; frameOffset.x -= frame.sourceSize.x; } } frameOffset.set(ogOffX, ogOffY); - offset.add(origin.x * scale.x, origin.y * scale.y); } override function updateHitbox() { diff --git a/source/funkin/menus/ui/NewAlphabetTest.hx b/source/funkin/menus/ui/NewAlphabetTest.hx index ead653a4..1989d90d 100644 --- a/source/funkin/menus/ui/NewAlphabetTest.hx +++ b/source/funkin/menus/ui/NewAlphabetTest.hx @@ -16,23 +16,5 @@ class NewAlphabetTest extends MusicBeatState { alphabet.alignment = CENTER; add(alphabet); } - - override function update(elapsed:Float) { - super.update(elapsed); - - if (controls.ACCEPT) { - switch (alphabet.alignment) { - case LEFT: - alphabet.text = "hey dont put me\non center."; - alphabet.alignment = CENTER; - case CENTER: - alphabet.text = "hey put me\nback! >:("; - alphabet.alignment = RIGHT; - case RIGHT: - alphabet.text = "Thank you.\nJeez some people."; - alphabet.alignment = LEFT; - } - } - } } #end \ No newline at end of file