fix some bugs

Author: mikolka9144

src/formats/AtlasAnimFile.hx

@@ -36,14 +36,23 @@ class AtlasAnimFile{
         }
     }
     public function makeJson():String {
-        return Json.stringify(this,null,'\t');
+        return Json.stringify(this);
     }
     private function makeAtlasSparrowLayer(anims:Array<AnimationManifest>):Layer {
         var frames = new Array<OneOfTwo<Frame,Label>>();
         var curFrame = 0;
         for (anim in anims){
             for (item in anim.frames){
-                frames.push(new Frame(item.name,curFrame,1,anim.matrix));
+                var final_matrix = anim.matrix;
+                if(item.frameX != null){
+                    // var frameDiff_x = Std.parseFloat(item.frameWidth)-Std.parseFloat(item.width);
+                    // var frameDiff_y = Std.parseFloat(item.frameHeight)-Std.parseFloat(item.height);
+
+                    var frameX = anim.matrix.offsetX - Std.parseFloat(item.frameX);
+                    var frameY = anim.matrix.offsetY - Std.parseFloat(item.frameY);
+                    final_matrix = new Matrix(frameX,frameY,anim.matrix.scaleX,anim.matrix.scaleY);
+                }
+                frames.push(new Frame(item.name,curFrame,1,final_matrix));
                 curFrame++;
             }
         }

src/formats/AtlasSpritemap.hx

@@ -17,7 +17,7 @@ class AtlasSpritemap {
         };
     }
     public function makeJson():String {
-        return Json.stringify(core,null,'\t');
+        return Json.stringify(core);
     }
     private function makeMeta(resolution:MetaResolution):Meta {
         return {

src/formats/CsvAnimData.hx

@@ -3,7 +3,7 @@ package formats;
 class CsvAnimData {
     public static final TEMPLATE:String = 
         "Animation name,Prefix,Offset X,Offset Y,Scale X,Scale Y\n"+
-        "GLOBAL,global,0,0,0,0";
+        "GLOBAL,global,0,0,1,1";
     public function new(csvData:String) {
         var lines = csvData.split('\n');
         lines.remove("");

src/formats/Sparrow.hx

@@ -15,6 +15,10 @@ class Sparrow {
                 y: frame.get("y"),
                 width: frame.get("width"),
                 height: frame.get("height"),
+                frameY: frame.get("frameY"),
+                frameX: frame.get("frameX"),
+                frameHeight: frame.get("frameHeight"),
+                frameWidth: frame.get("frameWidth")
             });
         }
     }
@@ -27,4 +31,9 @@ typedef SparrowFrame = {
     var y:String;
     var width:String;
     var height:String;
+
+    var frameX:String;
+    var frameY:String;
+    var frameWidth:String;
+    var frameHeight:String;
 }

src/utill/Matrix.hx

@@ -4,7 +4,15 @@ import formats.CsvAnimData.CsvLine;
 
 class Matrix {
     public var matrix:Array<Float>;
+    public var offsetX:Float;
+    public var offsetY:Float;
+    public var scaleX:Float;
+    public var scaleY:Float;
     public function new(offsetX:Float = 0.0,offsetY:Float = 0.0,scaleX:Float = 1.0,scaleY:Float = 1.0) {
+        this.offsetX = offsetX;
+        this.offsetY = offsetY;
+        this.scaleX = scaleX;
+        this.scaleY = scaleY;
         matrix = [
             scaleX,0.0,0.0,0.0,
             0.0,scaleY,0.0,0.0,