fixed offsets & rotation for animate atlases

2023-01-07 22:48:01 +01:00
parent 9064560065
commit fcc4f03936
4 changed files with 83 additions and 12 deletions
@@ -0,0 +1,72 @@
+package funkin.system;
+
+import openfl.geom.ColorTransform;
+import flixel.math.FlxMatrix;
+import flixel.math.FlxAngle;
+import flixel.math.FlxRect;
+import flixel.graphics.frames.FlxFrame;
+import flixel.math.FlxPoint;
+
+class FlxAnimate extends flxanimate.FlxAnimate {
+    public override function drawLimb(limb:FlxFrame, _matrix:FlxMatrix, ?colorTransform:ColorTransform)
+    {
+        if (alpha == 0 || colorTransform != null && (colorTransform.alphaMultiplier == 0 || colorTransform.alphaOffset == -255) || limb == null || limb.type == EMPTY)
+            return;
+        var matrix = new FlxMatrix();
+        matrix.concat(_matrix);
+        for (camera in cameras)
+        {
+            if (!camera.visible || !camera.exists || !limbOnScreen(limb, _matrix, camera))
+                return;
+            
+            getScreenPosition(_point, camera).subtractPoint(offset);
+            matrix.translate(-origin.x, -origin.y);
+            if (limb.name != "pivot") {
+                if (rotOffsetAngle != null && rotOffsetAngle != angle)
+                {
+                    var angleOff = (-angle + rotOffsetAngle) * FlxAngle.TO_RAD;
+                    matrix.rotate(-angleOff);
+                    if (useOffsetAsRotOffset)
+                        matrix.translate(-offset.x, -offset.y);
+                    else
+                        matrix.translate(-rotOffset.x, -rotOffset.y);
+                    matrix.rotate(angleOff);
+                }
+                else
+                {
+                    if (useOffsetAsRotOffset)
+                        matrix.translate(-offset.x, -offset.y);
+                    else
+                        matrix.translate(-rotOffset.x, -rotOffset.y);
+                }
+                matrix.scale(scale.x, scale.y);
+
+                if (bakedRotationAngle <= 0)
+                {
+                    updateTrig();
+        
+                    if (angle != 0)
+                        matrix.rotateWithTrig(_cosAngle, _sinAngle);
+                }
+            }
+            else 
+                matrix.a = matrix.d = 0.7 / camera.zoom;
+            _point.addPoint(origin);
+            if (isPixelPerfectRender(camera))
+            {
+                _point.floor();
+            }
+            
+            matrix.translate(_point.x, _point.y);
+            camera.drawPixels(limb, null, matrix, colorTransform, blend, antialiasing);
+            #if FLX_DEBUG
+            FlxBasic.visibleCount++;
+            #end
+        }
+
+        #if FLX_DEBUG
+        if (FlxG.debugger.drawDebug)
+            drawDebug();
+        #end
+    }
+}
@@ -2,7 +2,6 @@ package funkin.system;

 import flixel.FlxG;
 import openfl.utils.Assets;
-import flxanimate.FlxAnimate;
 import haxe.io.Path;
 import funkin.scripting.events.PlayAnimEvent.PlayAnimContext;
 import funkin.interfaces.IOffsetCompatible;