closer match to json output

Author: PongoEngine

Sources/aseprite/Aseprite.hx

@@ -1,52 +1,39 @@
 package aseprite;
 
+@:allow(aseprite.Parser)
 class Aseprite<Texture>
 {
-    public var header :Header;
-    public var frames :Array<Frame<Texture>>;
-
-    public function new(header :Header, frames :Array<Frame<Texture>>) : Void
-    {
-        this.header = header;
-        this.frames = frames;
-    }
-}
-
-class Header
-{
-    public var frames (default, null):Int;
     public var width (default, null):Int;
     public var height (default, null):Int;
     public var colorDepth (default, null):ColorDepth;
-    public var flags (default, null):Int;
     public var transparentColor (default, null):Int;
     public var numberOfColors (default, null):Int;
     public var pixelWidth (default, null):Int;
     public var pixelHeight (default, null):Int;
+    public var frameTags (default, null):Array<FrameTag>;
+    public var frames :Array<Frame<Texture>>;
+    public var colorProfile (default, null):ColorProfile;
+    public var palette (default, null):Palette;
 
-    public function new(frames :Int, width :Int, height :Int, colorDepth :Int, flags :Int, transparentColor :Int, numberOfColors :Int, pixelWidth :Int, pixelHeight :Int) : Void
+    public function new(width :Int, height :Int, colorDepth :Int, transparentColor :Int, numberOfColors :Int, pixelWidth :Int, pixelHeight :Int) : Void
     {
-        this.frames = frames;
         this.width = width;
         this.height = height;
         this.colorDepth = colorDepth;
-        this.flags = flags;
         this.transparentColor = transparentColor;
         this.numberOfColors = numberOfColors;
         this.pixelWidth = pixelWidth;
         this.pixelHeight = pixelHeight;
+        this.frames = [];
     }
 }
 
 @:allow(aseprite.Parser)
 class Frame<Texture>
 {
     public var duration (default, null) :Float;
-    public var colorProfile (default, null):ColorProfile;
-    public var palette (default, null):Palette;
     public var layers (default, null):Array<Layer>;
     public var cels (default, null):Array<Cel<Texture>>;
-    public var frameTags (default, null):Array<FrameTag>;
 
     public function new(duration :Float) : Void
     {

Sources/aseprite/Parser.hx

@@ -11,13 +11,7 @@ class Parser
     public static function parse<Texture>(bytes :Bytes) : Aseprite<Texture>
     {
         var reader = new Reader(bytes);
-        var header = readHeader(reader);
-        var frames = [for(i in 0...header.frames) readFrame(reader)];
-        return new Aseprite(header, frames);
-    }
 
-    static function readHeader(reader :Reader) : Header
-    {
         var fileSize :Int = reader.getDWord();
         var magicNumber :Int = reader.getWord();
         assert(magicNumber == 0xA5E0, "FILE NOT ASE");
@@ -36,10 +30,14 @@ class Parser
         var pixelHeight :Int = reader.getByte();
         reader.seek(92);
 
-        return new Header(frames, width, height, colorDepth, flags, transparentColor, numberOfColors, pixelWidth, pixelHeight);
+        var sprite = new Aseprite(width, height, colorDepth, transparentColor, numberOfColors, pixelWidth, pixelHeight);
+        for(i in 0...frames) {
+            sprite.frames.push(readFrame(sprite, reader));
+        }
+        return sprite;
     }
 
-    static function readFrame<Texture>(reader :Reader) : Frame<Texture>
+    static function readFrame<Texture>(sprite :Aseprite<Texture>, reader :Reader) : Frame<Texture>
     {
         var bytesLength :Int = reader.getDWord();
         var magicNumber :Int = reader.getWord();
@@ -53,13 +51,13 @@ class Parser
         var frame = new Frame(frameDuration/1000);
 
         for(i in 0...length) {
-            getChunk(frame, reader);
+            getChunk(sprite, frame, reader);
         }
 
         return frame;
     }
 
-    static function getChunk<Texture>(frame :Frame<Texture>, reader :Reader) : Void
+    static function getChunk<Texture>(sprite :Aseprite<Texture>, frame :Frame<Texture>, reader :Reader) : Void
     {
         var chunkSize = reader.getDWord();
         var chunkType :ChunkType = reader.getWord();
@@ -71,12 +69,12 @@ class Parser
                 assert(false, "CEL_EXTRA_CHUNK");
 
             case COLOR_PROFILE_CHUNK:
-                assert(frame.colorProfile == null, "frame profile is already set");
-                frame.colorProfile = readColorProfile(reader);
+                assert(sprite.colorProfile == null, "color profile is already set");
+                sprite.colorProfile = readColorProfile(reader);
 
             case FRAME_TAGS_CHUNK:
-                assert(frame.frameTags == null, "frame tags are already set");
-                frame.frameTags = readFrameTags(reader);
+                assert(sprite.frameTags == null, "frame tags are already set");
+                sprite.frameTags = readFrameTags(reader);
 
             case LAYER_CHUNK:
                 frame.layers.push(readLayer(reader));
@@ -88,8 +86,8 @@ class Parser
                 assert(false, "OLD_PALETTE_CHUNK_B");
 
             case PALETTE_CHUNK:
-                assert(frame.palette == null, "frame palette is already set");
-                frame.palette = readPalette(reader);
+                assert(sprite.palette == null, "palette is already set");
+                sprite.palette = readPalette(reader);
 
             case PATH_CHUNK: 
                 assert(false, "PATH_CHUNK");