diff --git a/AnimatedSkeletonGenerator.as b/AnimatedSkeletonGenerator.as index c4b6409..bd560c1 100644 --- a/AnimatedSkeletonGenerator.as +++ b/AnimatedSkeletonGenerator.as @@ -20,7 +20,46 @@ } public function GetData() { - return {}; + var usedPieces:Array = library.GetAllUsedPieces(); + var pieces:Array = usedPieces.map(function(p:Piece, i, arr) + { + var r = {x:p.Frame.rect.x, y:p.Frame.rect.y, w:p.Frame.rect.width, h:p.Frame.rect.height}; + var c = {x:p.CenterPoint.x, y:p.CenterPoint.y}; + return {rect:r, center:c, resource:p.Frame.sheetIndex}; + }); + return { + pieces:pieces, + scale:def.scale, + sequences:sequences.map( + function(s:Sequence, i, arr) + { + return { + length:s.Length, + pieces:s.PieceSequences.map( + function (ps:PieceSequence, i, arr) + { + var frames:Array = new Array(); + for (var i = 0; i < s.Length; i++) + { + var pfi:PieceFrameInfo = ps.GetFrame(i + 1); + var frame = + { + present:pfi.Present, + depth:pfi.Depth + }; + if (pfi.Present) + { + frame.transform = [pfi.Transform.a, pfi.Transform.b, pfi.Transform.c, pfi.Transform.d, pfi.Transform.tx, pfi.Transform.ty]; + } + frames.push(frame); + } + return {piece_index:usedPieces.indexOf(ps.GetPiece()), frames:frames}; + } + ) + }; + } + ) + }; } public function AnimatedSkeletonGenerator(src:MovieClip, def:GraphicExportDef) { @@ -96,9 +135,11 @@ private var pieces:Array = new Array(); private var pieceSequences:Array = new Array(); + public function get PieceSequences():Array { return pieceSequences; } private var src:MovieClip; private var seq:int; private var seqLength:int; + public function get Length():int { return seqLength; } private var library:PieceLibrary; private var generator:AnimatedSkeletonGenerator; diff --git a/AnimatedSkeletonGenerator.as b/AnimatedSkeletonGenerator.as index c4b6409..bd560c1 100644 --- a/AnimatedSkeletonGenerator.as +++ b/AnimatedSkeletonGenerator.as @@ -20,7 +20,46 @@ } public function GetData() { - return {}; + var usedPieces:Array = library.GetAllUsedPieces(); + var pieces:Array = usedPieces.map(function(p:Piece, i, arr) + { + var r = {x:p.Frame.rect.x, y:p.Frame.rect.y, w:p.Frame.rect.width, h:p.Frame.rect.height}; + var c = {x:p.CenterPoint.x, y:p.CenterPoint.y}; + return {rect:r, center:c, resource:p.Frame.sheetIndex}; + }); + return { + pieces:pieces, + scale:def.scale, + sequences:sequences.map( + function(s:Sequence, i, arr) + { + return { + length:s.Length, + pieces:s.PieceSequences.map( + function (ps:PieceSequence, i, arr) + { + var frames:Array = new Array(); + for (var i = 0; i < s.Length; i++) + { + var pfi:PieceFrameInfo = ps.GetFrame(i + 1); + var frame = + { + present:pfi.Present, + depth:pfi.Depth + }; + if (pfi.Present) + { + frame.transform = [pfi.Transform.a, pfi.Transform.b, pfi.Transform.c, pfi.Transform.d, pfi.Transform.tx, pfi.Transform.ty]; + } + frames.push(frame); + } + return {piece_index:usedPieces.indexOf(ps.GetPiece()), frames:frames}; + } + ) + }; + } + ) + }; } public function AnimatedSkeletonGenerator(src:MovieClip, def:GraphicExportDef) { @@ -96,9 +135,11 @@ private var pieces:Array = new Array(); private var pieceSequences:Array = new Array(); + public function get PieceSequences():Array { return pieceSequences; } private var src:MovieClip; private var seq:int; private var seqLength:int; + public function get Length():int { return seqLength; } private var library:PieceLibrary; private var generator:AnimatedSkeletonGenerator; diff --git a/AnimatedSpriteGenerator.as b/AnimatedSpriteGenerator.as index d104218..17585e9 100755 --- a/AnimatedSpriteGenerator.as +++ b/AnimatedSpriteGenerator.as @@ -22,6 +22,7 @@ public function GetData() { return { + scale:def.scale, sequences:sequences.map( function(s:Array, i, sArr) { @@ -31,7 +32,7 @@ { var r = {x:f.info.rect.x, y:f.info.rect.y, w:f.info.rect.width, h:f.info.rect.height}; var c = {x:f.offset.x, y:f.offset.y}; - return {rect:r, center:c, scale:def.scale, resource:f.info.sheetIndex}; + return {rect:r, center:c, resource:f.info.sheetIndex}; } ) }; diff --git a/AnimatedSkeletonGenerator.as b/AnimatedSkeletonGenerator.as index c4b6409..bd560c1 100644 --- a/AnimatedSkeletonGenerator.as +++ b/AnimatedSkeletonGenerator.as @@ -20,7 +20,46 @@ } public function GetData() { - return {}; + var usedPieces:Array = library.GetAllUsedPieces(); + var pieces:Array = usedPieces.map(function(p:Piece, i, arr) + { + var r = {x:p.Frame.rect.x, y:p.Frame.rect.y, w:p.Frame.rect.width, h:p.Frame.rect.height}; + var c = {x:p.CenterPoint.x, y:p.CenterPoint.y}; + return {rect:r, center:c, resource:p.Frame.sheetIndex}; + }); + return { + pieces:pieces, + scale:def.scale, + sequences:sequences.map( + function(s:Sequence, i, arr) + { + return { + length:s.Length, + pieces:s.PieceSequences.map( + function (ps:PieceSequence, i, arr) + { + var frames:Array = new Array(); + for (var i = 0; i < s.Length; i++) + { + var pfi:PieceFrameInfo = ps.GetFrame(i + 1); + var frame = + { + present:pfi.Present, + depth:pfi.Depth + }; + if (pfi.Present) + { + frame.transform = [pfi.Transform.a, pfi.Transform.b, pfi.Transform.c, pfi.Transform.d, pfi.Transform.tx, pfi.Transform.ty]; + } + frames.push(frame); + } + return {piece_index:usedPieces.indexOf(ps.GetPiece()), frames:frames}; + } + ) + }; + } + ) + }; } public function AnimatedSkeletonGenerator(src:MovieClip, def:GraphicExportDef) { @@ -96,9 +135,11 @@ private var pieces:Array = new Array(); private var pieceSequences:Array = new Array(); + public function get PieceSequences():Array { return pieceSequences; } private var src:MovieClip; private var seq:int; private var seqLength:int; + public function get Length():int { return seqLength; } private var library:PieceLibrary; private var generator:AnimatedSkeletonGenerator; diff --git a/AnimatedSpriteGenerator.as b/AnimatedSpriteGenerator.as index d104218..17585e9 100755 --- a/AnimatedSpriteGenerator.as +++ b/AnimatedSpriteGenerator.as @@ -22,6 +22,7 @@ public function GetData() { return { + scale:def.scale, sequences:sequences.map( function(s:Array, i, sArr) { @@ -31,7 +32,7 @@ { var r = {x:f.info.rect.x, y:f.info.rect.y, w:f.info.rect.width, h:f.info.rect.height}; var c = {x:f.offset.x, y:f.offset.y}; - return {rect:r, center:c, scale:def.scale, resource:f.info.sheetIndex}; + return {rect:r, center:c, resource:f.info.sheetIndex}; } ) }; diff --git a/DebugExporter-app.xml b/DebugExporter-app.xml index c490d87..e2ff06e 100755 --- a/DebugExporter-app.xml +++ b/DebugExporter-app.xml @@ -16,7 +16,7 @@ Japanese App name goes here --> - + DebugExporter 1.0 DebugExporter diff --git a/AnimatedSkeletonGenerator.as b/AnimatedSkeletonGenerator.as index c4b6409..bd560c1 100644 --- a/AnimatedSkeletonGenerator.as +++ b/AnimatedSkeletonGenerator.as @@ -20,7 +20,46 @@ } public function GetData() { - return {}; + var usedPieces:Array = library.GetAllUsedPieces(); + var pieces:Array = usedPieces.map(function(p:Piece, i, arr) + { + var r = {x:p.Frame.rect.x, y:p.Frame.rect.y, w:p.Frame.rect.width, h:p.Frame.rect.height}; + var c = {x:p.CenterPoint.x, y:p.CenterPoint.y}; + return {rect:r, center:c, resource:p.Frame.sheetIndex}; + }); + return { + pieces:pieces, + scale:def.scale, + sequences:sequences.map( + function(s:Sequence, i, arr) + { + return { + length:s.Length, + pieces:s.PieceSequences.map( + function (ps:PieceSequence, i, arr) + { + var frames:Array = new Array(); + for (var i = 0; i < s.Length; i++) + { + var pfi:PieceFrameInfo = ps.GetFrame(i + 1); + var frame = + { + present:pfi.Present, + depth:pfi.Depth + }; + if (pfi.Present) + { + frame.transform = [pfi.Transform.a, pfi.Transform.b, pfi.Transform.c, pfi.Transform.d, pfi.Transform.tx, pfi.Transform.ty]; + } + frames.push(frame); + } + return {piece_index:usedPieces.indexOf(ps.GetPiece()), frames:frames}; + } + ) + }; + } + ) + }; } public function AnimatedSkeletonGenerator(src:MovieClip, def:GraphicExportDef) { @@ -96,9 +135,11 @@ private var pieces:Array = new Array(); private var pieceSequences:Array = new Array(); + public function get PieceSequences():Array { return pieceSequences; } private var src:MovieClip; private var seq:int; private var seqLength:int; + public function get Length():int { return seqLength; } private var library:PieceLibrary; private var generator:AnimatedSkeletonGenerator; diff --git a/AnimatedSpriteGenerator.as b/AnimatedSpriteGenerator.as index d104218..17585e9 100755 --- a/AnimatedSpriteGenerator.as +++ b/AnimatedSpriteGenerator.as @@ -22,6 +22,7 @@ public function GetData() { return { + scale:def.scale, sequences:sequences.map( function(s:Array, i, sArr) { @@ -31,7 +32,7 @@ { var r = {x:f.info.rect.x, y:f.info.rect.y, w:f.info.rect.width, h:f.info.rect.height}; var c = {x:f.offset.x, y:f.offset.y}; - return {rect:r, center:c, scale:def.scale, resource:f.info.sheetIndex}; + return {rect:r, center:c, resource:f.info.sheetIndex}; } ) }; diff --git a/DebugExporter-app.xml b/DebugExporter-app.xml index c490d87..e2ff06e 100755 --- a/DebugExporter-app.xml +++ b/DebugExporter-app.xml @@ -16,7 +16,7 @@ Japanese App name goes here --> - + DebugExporter 1.0 DebugExporter diff --git a/DebugExporter.swf b/DebugExporter.swf index 6ee2a87..9a1be6e 100755 --- a/DebugExporter.swf +++ b/DebugExporter.swf Binary files differ diff --git a/AnimatedSkeletonGenerator.as b/AnimatedSkeletonGenerator.as index c4b6409..bd560c1 100644 --- a/AnimatedSkeletonGenerator.as +++ b/AnimatedSkeletonGenerator.as @@ -20,7 +20,46 @@ } public function GetData() { - return {}; + var usedPieces:Array = library.GetAllUsedPieces(); + var pieces:Array = usedPieces.map(function(p:Piece, i, arr) + { + var r = {x:p.Frame.rect.x, y:p.Frame.rect.y, w:p.Frame.rect.width, h:p.Frame.rect.height}; + var c = {x:p.CenterPoint.x, y:p.CenterPoint.y}; + return {rect:r, center:c, resource:p.Frame.sheetIndex}; + }); + return { + pieces:pieces, + scale:def.scale, + sequences:sequences.map( + function(s:Sequence, i, arr) + { + return { + length:s.Length, + pieces:s.PieceSequences.map( + function (ps:PieceSequence, i, arr) + { + var frames:Array = new Array(); + for (var i = 0; i < s.Length; i++) + { + var pfi:PieceFrameInfo = ps.GetFrame(i + 1); + var frame = + { + present:pfi.Present, + depth:pfi.Depth + }; + if (pfi.Present) + { + frame.transform = [pfi.Transform.a, pfi.Transform.b, pfi.Transform.c, pfi.Transform.d, pfi.Transform.tx, pfi.Transform.ty]; + } + frames.push(frame); + } + return {piece_index:usedPieces.indexOf(ps.GetPiece()), frames:frames}; + } + ) + }; + } + ) + }; } public function AnimatedSkeletonGenerator(src:MovieClip, def:GraphicExportDef) { @@ -96,9 +135,11 @@ private var pieces:Array = new Array(); private var pieceSequences:Array = new Array(); + public function get PieceSequences():Array { return pieceSequences; } private var src:MovieClip; private var seq:int; private var seqLength:int; + public function get Length():int { return seqLength; } private var library:PieceLibrary; private var generator:AnimatedSkeletonGenerator; diff --git a/AnimatedSpriteGenerator.as b/AnimatedSpriteGenerator.as index d104218..17585e9 100755 --- a/AnimatedSpriteGenerator.as +++ b/AnimatedSpriteGenerator.as @@ -22,6 +22,7 @@ public function GetData() { return { + scale:def.scale, sequences:sequences.map( function(s:Array, i, sArr) { @@ -31,7 +32,7 @@ { var r = {x:f.info.rect.x, y:f.info.rect.y, w:f.info.rect.width, h:f.info.rect.height}; var c = {x:f.offset.x, y:f.offset.y}; - return {rect:r, center:c, scale:def.scale, resource:f.info.sheetIndex}; + return {rect:r, center:c, resource:f.info.sheetIndex}; } ) }; diff --git a/DebugExporter-app.xml b/DebugExporter-app.xml index c490d87..e2ff06e 100755 --- a/DebugExporter-app.xml +++ b/DebugExporter-app.xml @@ -16,7 +16,7 @@ Japanese App name goes here --> - + DebugExporter 1.0 DebugExporter diff --git a/DebugExporter.swf b/DebugExporter.swf index 6ee2a87..9a1be6e 100755 --- a/DebugExporter.swf +++ b/DebugExporter.swf Binary files differ diff --git a/Exporter.exe b/Exporter.exe index b0d1063..b818c2a 100755 --- a/Exporter.exe +++ b/Exporter.exe Binary files differ diff --git a/AnimatedSkeletonGenerator.as b/AnimatedSkeletonGenerator.as index c4b6409..bd560c1 100644 --- a/AnimatedSkeletonGenerator.as +++ b/AnimatedSkeletonGenerator.as @@ -20,7 +20,46 @@ } public function GetData() { - return {}; + var usedPieces:Array = library.GetAllUsedPieces(); + var pieces:Array = usedPieces.map(function(p:Piece, i, arr) + { + var r = {x:p.Frame.rect.x, y:p.Frame.rect.y, w:p.Frame.rect.width, h:p.Frame.rect.height}; + var c = {x:p.CenterPoint.x, y:p.CenterPoint.y}; + return {rect:r, center:c, resource:p.Frame.sheetIndex}; + }); + return { + pieces:pieces, + scale:def.scale, + sequences:sequences.map( + function(s:Sequence, i, arr) + { + return { + length:s.Length, + pieces:s.PieceSequences.map( + function (ps:PieceSequence, i, arr) + { + var frames:Array = new Array(); + for (var i = 0; i < s.Length; i++) + { + var pfi:PieceFrameInfo = ps.GetFrame(i + 1); + var frame = + { + present:pfi.Present, + depth:pfi.Depth + }; + if (pfi.Present) + { + frame.transform = [pfi.Transform.a, pfi.Transform.b, pfi.Transform.c, pfi.Transform.d, pfi.Transform.tx, pfi.Transform.ty]; + } + frames.push(frame); + } + return {piece_index:usedPieces.indexOf(ps.GetPiece()), frames:frames}; + } + ) + }; + } + ) + }; } public function AnimatedSkeletonGenerator(src:MovieClip, def:GraphicExportDef) { @@ -96,9 +135,11 @@ private var pieces:Array = new Array(); private var pieceSequences:Array = new Array(); + public function get PieceSequences():Array { return pieceSequences; } private var src:MovieClip; private var seq:int; private var seqLength:int; + public function get Length():int { return seqLength; } private var library:PieceLibrary; private var generator:AnimatedSkeletonGenerator; diff --git a/AnimatedSpriteGenerator.as b/AnimatedSpriteGenerator.as index d104218..17585e9 100755 --- a/AnimatedSpriteGenerator.as +++ b/AnimatedSpriteGenerator.as @@ -22,6 +22,7 @@ public function GetData() { return { + scale:def.scale, sequences:sequences.map( function(s:Array, i, sArr) { @@ -31,7 +32,7 @@ { var r = {x:f.info.rect.x, y:f.info.rect.y, w:f.info.rect.width, h:f.info.rect.height}; var c = {x:f.offset.x, y:f.offset.y}; - return {rect:r, center:c, scale:def.scale, resource:f.info.sheetIndex}; + return {rect:r, center:c, resource:f.info.sheetIndex}; } ) }; diff --git a/DebugExporter-app.xml b/DebugExporter-app.xml index c490d87..e2ff06e 100755 --- a/DebugExporter-app.xml +++ b/DebugExporter-app.xml @@ -16,7 +16,7 @@ Japanese App name goes here --> - + DebugExporter 1.0 DebugExporter diff --git a/DebugExporter.swf b/DebugExporter.swf index 6ee2a87..9a1be6e 100755 --- a/DebugExporter.swf +++ b/DebugExporter.swf Binary files differ diff --git a/Exporter.exe b/Exporter.exe index b0d1063..b818c2a 100755 --- a/Exporter.exe +++ b/Exporter.exe Binary files differ diff --git a/Exporter.swf b/Exporter.swf index 292e795..a249f37 100644 --- a/Exporter.swf +++ b/Exporter.swf Binary files differ diff --git a/AnimatedSkeletonGenerator.as b/AnimatedSkeletonGenerator.as index c4b6409..bd560c1 100644 --- a/AnimatedSkeletonGenerator.as +++ b/AnimatedSkeletonGenerator.as @@ -20,7 +20,46 @@ } public function GetData() { - return {}; + var usedPieces:Array = library.GetAllUsedPieces(); + var pieces:Array = usedPieces.map(function(p:Piece, i, arr) + { + var r = {x:p.Frame.rect.x, y:p.Frame.rect.y, w:p.Frame.rect.width, h:p.Frame.rect.height}; + var c = {x:p.CenterPoint.x, y:p.CenterPoint.y}; + return {rect:r, center:c, resource:p.Frame.sheetIndex}; + }); + return { + pieces:pieces, + scale:def.scale, + sequences:sequences.map( + function(s:Sequence, i, arr) + { + return { + length:s.Length, + pieces:s.PieceSequences.map( + function (ps:PieceSequence, i, arr) + { + var frames:Array = new Array(); + for (var i = 0; i < s.Length; i++) + { + var pfi:PieceFrameInfo = ps.GetFrame(i + 1); + var frame = + { + present:pfi.Present, + depth:pfi.Depth + }; + if (pfi.Present) + { + frame.transform = [pfi.Transform.a, pfi.Transform.b, pfi.Transform.c, pfi.Transform.d, pfi.Transform.tx, pfi.Transform.ty]; + } + frames.push(frame); + } + return {piece_index:usedPieces.indexOf(ps.GetPiece()), frames:frames}; + } + ) + }; + } + ) + }; } public function AnimatedSkeletonGenerator(src:MovieClip, def:GraphicExportDef) { @@ -96,9 +135,11 @@ private var pieces:Array = new Array(); private var pieceSequences:Array = new Array(); + public function get PieceSequences():Array { return pieceSequences; } private var src:MovieClip; private var seq:int; private var seqLength:int; + public function get Length():int { return seqLength; } private var library:PieceLibrary; private var generator:AnimatedSkeletonGenerator; diff --git a/AnimatedSpriteGenerator.as b/AnimatedSpriteGenerator.as index d104218..17585e9 100755 --- a/AnimatedSpriteGenerator.as +++ b/AnimatedSpriteGenerator.as @@ -22,6 +22,7 @@ public function GetData() { return { + scale:def.scale, sequences:sequences.map( function(s:Array, i, sArr) { @@ -31,7 +32,7 @@ { var r = {x:f.info.rect.x, y:f.info.rect.y, w:f.info.rect.width, h:f.info.rect.height}; var c = {x:f.offset.x, y:f.offset.y}; - return {rect:r, center:c, scale:def.scale, resource:f.info.sheetIndex}; + return {rect:r, center:c, resource:f.info.sheetIndex}; } ) }; diff --git a/DebugExporter-app.xml b/DebugExporter-app.xml index c490d87..e2ff06e 100755 --- a/DebugExporter-app.xml +++ b/DebugExporter-app.xml @@ -16,7 +16,7 @@ Japanese App name goes here --> - + DebugExporter 1.0 DebugExporter diff --git a/DebugExporter.swf b/DebugExporter.swf index 6ee2a87..9a1be6e 100755 --- a/DebugExporter.swf +++ b/DebugExporter.swf Binary files differ diff --git a/Exporter.exe b/Exporter.exe index b0d1063..b818c2a 100755 --- a/Exporter.exe +++ b/Exporter.exe Binary files differ diff --git a/Exporter.swf b/Exporter.swf index 292e795..a249f37 100644 --- a/Exporter.swf +++ b/Exporter.swf Binary files differ diff --git a/job.py b/job.py index 665d9f0..619ff79 100644 --- a/job.py +++ b/job.py @@ -71,7 +71,6 @@ path = os.path.join(base_path, "%s_%04d.png" % (self.name, i)) with open(path, "wb") as f: f.write(base64.b64decode(r)) - print "resource file: " + path if len(data) == 1: graphic_and_asset = {} (name, graphic_data) = data.items()[0]