added typed optional texture field to cel

Author: PongoEngine

Sources/aseprite/Aseprite.hx

@@ -2,12 +2,12 @@ package aseprite;
 
 // import aseprite.Parser;
 
-class Aseprite
+class Aseprite<Texture>
 {
     public var header :Header;
-    public var frames :Array<Frame>;
+    public var frames :Array<Frame<Texture>>;
 
-    public function new(header :Header, frames :Array<Frame>) : Void
+    public function new(header :Header, frames :Array<Frame<Texture>>) : Void
     {
         this.header = header;
         this.frames = frames;
@@ -41,13 +41,13 @@ class Header
 }
 
 @:allow(aseprite.Parser)
-class Frame
+class Frame<Texture>
 {
     public var duration (default, null) :Int;
     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>;
+    public var cels (default, null):Array<Cel<Texture>>;
     public var frameTags (default, null):Array<FrameTag>;
 
     public function new(duration :Int) : Void
@@ -92,13 +92,14 @@ typedef Layer =
     var name (default, null):String;
 }
 
-typedef Cel =
+typedef Cel<Texture> =
 {
     var layerIndex (default, null):Int;
     var x (default, null):Int;
     var y (default, null):Int;
     var opacityLevel (default, null):Int;
     var data (default, null):CelData;
+    @:optional var texture :Texture;
 }
 
 enum CelData {

Sources/aseprite/Parser.hx

@@ -8,7 +8,7 @@ import aseprite.Aseprite;
 
 class Parser
 {
-    public static function parse(bytes :Bytes) : Aseprite
+    public static function parse<Texture>(bytes :Bytes) : Aseprite<Texture>
     {
         var reader = new Reader(bytes);
         var header = readHeader(reader);
@@ -39,7 +39,7 @@ class Parser
         return new Header(frames, width, height, colorDepth, flags, transparentColor, numberOfColors, pixelWidth, pixelHeight);
     }
 
-    static function readFrame(reader :Reader) : Frame
+    static function readFrame<Texture>(reader :Reader) : Frame<Texture>
     {
         var bytesLength :Int = reader.getDWord();
         var magicNumber :Int = reader.getWord();
@@ -59,15 +59,16 @@ class Parser
         return frame;
     }
 
-    static function getChunk(frame :Frame, reader :Reader) : Void
+    static function getChunk<Texture>(frame :Frame<Texture>, reader :Reader) : Void
     {
         var chunkSize = reader.getDWord();
         var chunkType :ChunkType = reader.getWord();
         switch chunkType {
             case CEL_CHUNK:
                 frame.cels.push(readCel(reader));
 
-            case CEL_EXTRA_CHUNK: assert(false, "CEL_EXTRA_CHUNK");
+            case CEL_EXTRA_CHUNK: 
+                assert(false, "CEL_EXTRA_CHUNK");
 
             case COLOR_PROFILE_CHUNK:
                 assert(frame.colorProfile == null, "frame profile is already set");
@@ -80,21 +81,27 @@ class Parser
             case LAYER_CHUNK:
                 frame.layers.push(readLayer(reader));
 
-            case OLD_PALETTE_CHUNK_A: readOldPaletteA(reader);
+            case OLD_PALETTE_CHUNK_A: 
+                readOldPaletteA(reader);
 
-            case OLD_PALETTE_CHUNK_B: assert(false, "OLD_PALETTE_CHUNK_B");
+            case OLD_PALETTE_CHUNK_B: 
+                assert(false, "OLD_PALETTE_CHUNK_B");
 
             case PALETTE_CHUNK:
                 assert(frame.palette == null, "frame palette is already set");
                 frame.palette = readPalette(reader);
 
-            case PATH_CHUNK: assert(false, "PATH_CHUNK");
+            case PATH_CHUNK: 
+                assert(false, "PATH_CHUNK");
 
-            case SLICE_CHUNK: assert(false, "SLICE_CHUNK");
+            case SLICE_CHUNK: 
+                assert(false, "SLICE_CHUNK");
 
-            case USER_DATA_CHUNK: assert(false, "USER_DATA_CHUNK");
+            case USER_DATA_CHUNK: 
+                assert(false, "USER_DATA_CHUNK");
 
-            case _: assert(false, "CHUNK NOT FOUND: " + chunkType);
+            case _: 
+                assert(false, "CHUNK NOT FOUND: " + chunkType);
         }
     }
 
@@ -164,7 +171,7 @@ class Parser
         return {flags:flags, type:type, childLevel:childLevel, blendMode:blendMode, opacity:opacity, name:name};
     }
 
-    static function readCel(reader :Reader) : Cel
+    static function readCel<Texture>(reader :Reader) : Cel<Texture>
     {
         var layerIndex :Int = reader.getWord();
         var x :Int = reader.getShort();