From 1a8b48e6bc1719b00ebf68ff25deede7efd48dd0 Mon Sep 17 00:00:00 2001 From: MaybeMaru <97055307+MaybeMaru@users.noreply.github.com> Date: Mon, 1 Jan 2024 18:09:05 +0100 Subject: [PATCH] forgor to update funkbar draw complex --- source/funkin/objects/funkui/FunkBar.hx | 18 ++++++++++-------- .../states/editors/chart/ChartGridBase.hx | 1 + 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/source/funkin/objects/funkui/FunkBar.hx b/source/funkin/objects/funkui/FunkBar.hx index 6a415f49..1077c75d 100644 --- a/source/funkin/objects/funkui/FunkBar.hx +++ b/source/funkin/objects/funkui/FunkBar.hx @@ -64,20 +64,22 @@ class FunkBar extends FlxSpriteExt { _matrix.translate(-origin.x, -origin.y); _matrix.scale(scale.x, scale.y); - if (bakedRotationAngle <= 0) { - updateTrig(); - if (angle != 0) _matrix.rotateWithTrig(_cosAngle, _sinAngle); + if (angle != 0) { + __updateTrig(); + _matrix.rotateWithTrig(_cosAngle, _sinAngle); + } + + if (skew.x != 0 || skew.y != 0) { + inline _skewMatrix.identity(); + _skewMatrix.b = Math.tan(skew.y * FlxAngle.TO_RAD); + _skewMatrix.c = Math.tan(skew.x * FlxAngle.TO_RAD); + inline _matrix.concat(_skewMatrix); } getScreenPosition(_point, camera).subtractPoint(offset); _point.add(origin.x, origin.y); _matrix.translate(_point.x, _point.y); - if (isPixelPerfectRender(camera)) { - _matrix.tx = Math.floor(_matrix.tx); - _matrix.ty = Math.floor(_matrix.ty); - } - /* * This isn't pretty too look at but shhhhhh it works **/ diff --git a/source/funkin/states/editors/chart/ChartGridBase.hx b/source/funkin/states/editors/chart/ChartGridBase.hx index eaf06b42..49c22957 100644 --- a/source/funkin/states/editors/chart/ChartGridBase.hx +++ b/source/funkin/states/editors/chart/ChartGridBase.hx @@ -246,6 +246,7 @@ class ChartSustain extends Sustain { super(); scrollFactor.set(1,1); angle = 0; + flipX = false; active = false; boundsOffsetY = -FlxG.height; }