my mango is to blow up

MaybeMaru · Dec 21, 2023 · 22330c1 · 22330c1
1 parent 7ce7800
commit 22330c1
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 6 deletions.
diff --git a/source/funkin/graphics/FlxRepeatSprite.hx b/source/funkin/graphics/FlxRepeatSprite.hx
@@ -8,7 +8,6 @@ import flixel.graphics.frames.FlxFrame;
 enum RepeatDrawStyle {
     TOP_BOTTOM;
     BOTTOM_TOP;
-    //FAST_BOTTOM_TOP; maybe later
 }
 
 /**
@@ -204,10 +203,10 @@ class FlxRepeatSprite extends FlxSpriteExt {
     }
 
     inline function matrixOutOfBounds(matrix:FlxMatrix, frame:FlxRect, cam:FlxCamera):Bool {
-        return  ((_matrix.ty + frame.height) < cam.viewY) ||
-                ((_matrix.ty - frame.height) > cam.viewHeight) ||
-                ((_matrix.tx + frame.width) < cam.viewX) ||
-                ((_matrix.tx - frame.width) > cam.viewWidth);
+        return  ((_matrix.ty + (frame.height * scale.y)) < cam.viewY) ||
+                ((_matrix.ty - (frame.height * scale.y)) > cam.viewHeight) ||
+                ((_matrix.tx + (frame.width * scale.x)) < cam.viewX) ||
+                ((_matrix.tx - (frame.width * scale.x)) > cam.viewWidth);
     }
 
     function handleClipRect(tileFrame:FlxFrame, baseFrame:FlxFrame, tilePos:FlxPoint) {

diff --git a/source/funkin/graphics/FlxSkewRepeatSprite.hx b/source/funkin/graphics/FlxSkewRepeatSprite.hx
@@ -0,0 +1,47 @@
+package funkin.graphics;
+
+import flixel.math.FlxMatrix;
+import flixel.graphics.frames.FlxFrame;
+import openfl.display.BitmapData;
+
+/*
+    TODO: add skew y support (_matrix.b) and fix problems with dynamically sized tiles
+*/
+
+class FlxSkewRepeatSprite extends FlxRepeatSprite {
+
+    static final tempMatrix:FlxMatrix = new FlxMatrix();
+
+    public var wigglePower:Float = 50.0;
+
+
+    var elp:Float = 0.0;
+
+    override function update(elapsed:Float) {
+        super.update(elapsed);
+        elp += elapsed * 10;
+        wigglePower = Math.sin(elp) * 50;
+    }
+
+    static var matX:Float = 0.0;
+
+    override function drawTile(tileX:Int, tileY:Int, tileFrame:FlxFrame, baseFrame:FlxFrame, bitmap:BitmapData, tilePos:FlxPoint) {
+        if (wigglePower == 0) {
+            super.drawTile(tileX, tileY, tileFrame, baseFrame, bitmap, tilePos);
+            return;
+        } 
+
+        tempMatrix.copyFrom(_matrix);
+
+        final wiggleX = wigglePower * ((baseFrame.frame.height * scale.y) * 0.01); // Value outta my ass but trust me bro
+
+        final skewX = wiggleX * (tileY % 2 == 0 ? -1 : 1);
+        _matrix.c = Math.tan(skewX * FlxAngle.TO_RAD);
+
+        if (tileY % 2 == 0) _matrix.translate(matX, 0);
+        matX = _matrix.c * baseFrame.frame.width;
+
+        super.drawTile(tileX, tileY, tileFrame, baseFrame, bitmap, tilePos);
+        _matrix.copyFrom(tempMatrix);
+    }
+}
diff --git a/source/funkin/graphics/SmartSprite.hx b/source/funkin/graphics/SmartSprite.hx
@@ -5,7 +5,7 @@ enum RenderMode {
     REPEAT;
 }
 
-class SmartSprite extends FlxRepeatSprite {
+class SmartSprite extends FlxSkewRepeatSprite {
     public var renderMode:RenderMode = QUAD;
     public function setRenderMode(value:String) {
         renderMode = switch (value.toLowerCase().trim()) {