diff --git a/.gitignore b/.gitignore index 6a51108..5ad0b9e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ *.p12 *.airi air*.tmp +*.air diff --git a/.gitignore b/.gitignore index 6a51108..5ad0b9e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ *.p12 *.airi air*.tmp +*.air diff --git a/GraphicExport-app.xml b/GraphicExport-app.xml index 5144634..e210f14 100755 --- a/GraphicExport-app.xml +++ b/GraphicExport-app.xml @@ -16,7 +16,7 @@ Japanese App name goes here --> - + GraphicExport 1.0 GraphicExport diff --git a/.gitignore b/.gitignore index 6a51108..5ad0b9e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ *.p12 *.airi air*.tmp +*.air diff --git a/GraphicExport-app.xml b/GraphicExport-app.xml index 5144634..e210f14 100755 --- a/GraphicExport-app.xml +++ b/GraphicExport-app.xml @@ -16,7 +16,7 @@ Japanese App name goes here --> - + GraphicExport 1.0 GraphicExport diff --git a/GraphicExport.as b/GraphicExport.as index 09edae0..5bf366e 100644 --- a/GraphicExport.as +++ b/GraphicExport.as @@ -105,7 +105,9 @@ wrapper = e.target as Socket; Log("Wrapper Connected"); _strace("Wrapper Connected"); - wrapper.addEventListener(ProgressEvent.SOCKET_DATA, WrapperData); + wrapper.addEventListener(ProgressEvent.SOCKET_DATA, WrapperData); + + FlashConsole.Instance().Show(); } private function WrapperData(e:ProgressEvent) @@ -114,15 +116,20 @@ DispatchCommand(com.adobe.serialization.json.JSON.decode(data)); } + private var inJob = false; + private var jobs:Array = new Array(); + private function DispatchCommand(msg) { + Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); if (msg.hasOwnProperty("command")) { var cmd = msg.command; switch (cmd) { case "job": - + jobs.push(msg); + CheckNewJob(); break; case "quit": Log("Quitting"); @@ -133,12 +140,38 @@ Log(cmd.string); break; default: - Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); + //Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); break; } } } + private function CheckNewJob() + { + if (!inJob && jobs.length > 0) + { + var job = jobs.shift(); + inJob = true; + + NewGraphicDialog.fakeID++; + + var graphicData = {id:NewGraphicDialog.fakeID,graphic:job.input,v:1,fs:0,p:0,type:job.type}; + + //"export_params":{"uses":["background"],"available_sizes":["default"],"compress":false}} + + var graphicDef = new Defs.GraphicDef(graphicData); + + ExportItem(graphicDef.ID, + function() + { + SendCommand({command:"done", job_num:parseInt(job.job_num)}); + inJob = false; + CheckNewJob(); + } + ); + } + } + public static function SendCommand(obj) { if (wrapper != null) @@ -458,9 +491,10 @@ protected var lastCallback; protected function ExportItem(graphicId, callback = null) - { + { this.lastCallback = callback; var def:Defs.GraphicDef = GameData.Instance().GetGraphicDefByID(graphicId); + Log("Exporting " + graphicId + " " + def != null); var graphicDefs:Array = [def]; var type = def.Type; diff --git a/.gitignore b/.gitignore index 6a51108..5ad0b9e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ *.p12 *.airi air*.tmp +*.air diff --git a/GraphicExport-app.xml b/GraphicExport-app.xml index 5144634..e210f14 100755 --- a/GraphicExport-app.xml +++ b/GraphicExport-app.xml @@ -16,7 +16,7 @@ Japanese App name goes here --> - + GraphicExport 1.0 GraphicExport diff --git a/GraphicExport.as b/GraphicExport.as index 09edae0..5bf366e 100644 --- a/GraphicExport.as +++ b/GraphicExport.as @@ -105,7 +105,9 @@ wrapper = e.target as Socket; Log("Wrapper Connected"); _strace("Wrapper Connected"); - wrapper.addEventListener(ProgressEvent.SOCKET_DATA, WrapperData); + wrapper.addEventListener(ProgressEvent.SOCKET_DATA, WrapperData); + + FlashConsole.Instance().Show(); } private function WrapperData(e:ProgressEvent) @@ -114,15 +116,20 @@ DispatchCommand(com.adobe.serialization.json.JSON.decode(data)); } + private var inJob = false; + private var jobs:Array = new Array(); + private function DispatchCommand(msg) { + Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); if (msg.hasOwnProperty("command")) { var cmd = msg.command; switch (cmd) { case "job": - + jobs.push(msg); + CheckNewJob(); break; case "quit": Log("Quitting"); @@ -133,12 +140,38 @@ Log(cmd.string); break; default: - Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); + //Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); break; } } } + private function CheckNewJob() + { + if (!inJob && jobs.length > 0) + { + var job = jobs.shift(); + inJob = true; + + NewGraphicDialog.fakeID++; + + var graphicData = {id:NewGraphicDialog.fakeID,graphic:job.input,v:1,fs:0,p:0,type:job.type}; + + //"export_params":{"uses":["background"],"available_sizes":["default"],"compress":false}} + + var graphicDef = new Defs.GraphicDef(graphicData); + + ExportItem(graphicDef.ID, + function() + { + SendCommand({command:"done", job_num:parseInt(job.job_num)}); + inJob = false; + CheckNewJob(); + } + ); + } + } + public static function SendCommand(obj) { if (wrapper != null) @@ -458,9 +491,10 @@ protected var lastCallback; protected function ExportItem(graphicId, callback = null) - { + { this.lastCallback = callback; var def:Defs.GraphicDef = GameData.Instance().GetGraphicDefByID(graphicId); + Log("Exporting " + graphicId + " " + def != null); var graphicDefs:Array = [def]; var type = def.Type; diff --git a/GraphicExport.exe b/GraphicExport.exe index e0c5e49..df2c899 100755 --- a/GraphicExport.exe +++ b/GraphicExport.exe Binary files differ diff --git a/.gitignore b/.gitignore index 6a51108..5ad0b9e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ *.p12 *.airi air*.tmp +*.air diff --git a/GraphicExport-app.xml b/GraphicExport-app.xml index 5144634..e210f14 100755 --- a/GraphicExport-app.xml +++ b/GraphicExport-app.xml @@ -16,7 +16,7 @@ Japanese App name goes here --> - + GraphicExport 1.0 GraphicExport diff --git a/GraphicExport.as b/GraphicExport.as index 09edae0..5bf366e 100644 --- a/GraphicExport.as +++ b/GraphicExport.as @@ -105,7 +105,9 @@ wrapper = e.target as Socket; Log("Wrapper Connected"); _strace("Wrapper Connected"); - wrapper.addEventListener(ProgressEvent.SOCKET_DATA, WrapperData); + wrapper.addEventListener(ProgressEvent.SOCKET_DATA, WrapperData); + + FlashConsole.Instance().Show(); } private function WrapperData(e:ProgressEvent) @@ -114,15 +116,20 @@ DispatchCommand(com.adobe.serialization.json.JSON.decode(data)); } + private var inJob = false; + private var jobs:Array = new Array(); + private function DispatchCommand(msg) { + Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); if (msg.hasOwnProperty("command")) { var cmd = msg.command; switch (cmd) { case "job": - + jobs.push(msg); + CheckNewJob(); break; case "quit": Log("Quitting"); @@ -133,12 +140,38 @@ Log(cmd.string); break; default: - Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); + //Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); break; } } } + private function CheckNewJob() + { + if (!inJob && jobs.length > 0) + { + var job = jobs.shift(); + inJob = true; + + NewGraphicDialog.fakeID++; + + var graphicData = {id:NewGraphicDialog.fakeID,graphic:job.input,v:1,fs:0,p:0,type:job.type}; + + //"export_params":{"uses":["background"],"available_sizes":["default"],"compress":false}} + + var graphicDef = new Defs.GraphicDef(graphicData); + + ExportItem(graphicDef.ID, + function() + { + SendCommand({command:"done", job_num:parseInt(job.job_num)}); + inJob = false; + CheckNewJob(); + } + ); + } + } + public static function SendCommand(obj) { if (wrapper != null) @@ -458,9 +491,10 @@ protected var lastCallback; protected function ExportItem(graphicId, callback = null) - { + { this.lastCallback = callback; var def:Defs.GraphicDef = GameData.Instance().GetGraphicDefByID(graphicId); + Log("Exporting " + graphicId + " " + def != null); var graphicDefs:Array = [def]; var type = def.Type; diff --git a/GraphicExport.exe b/GraphicExport.exe index e0c5e49..df2c899 100755 --- a/GraphicExport.exe +++ b/GraphicExport.exe Binary files differ diff --git a/GraphicExport.swf b/GraphicExport.swf index bbd1a5d..2050547 100644 --- a/GraphicExport.swf +++ b/GraphicExport.swf Binary files differ diff --git a/.gitignore b/.gitignore index 6a51108..5ad0b9e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ *.p12 *.airi air*.tmp +*.air diff --git a/GraphicExport-app.xml b/GraphicExport-app.xml index 5144634..e210f14 100755 --- a/GraphicExport-app.xml +++ b/GraphicExport-app.xml @@ -16,7 +16,7 @@ Japanese App name goes here --> - + GraphicExport 1.0 GraphicExport diff --git a/GraphicExport.as b/GraphicExport.as index 09edae0..5bf366e 100644 --- a/GraphicExport.as +++ b/GraphicExport.as @@ -105,7 +105,9 @@ wrapper = e.target as Socket; Log("Wrapper Connected"); _strace("Wrapper Connected"); - wrapper.addEventListener(ProgressEvent.SOCKET_DATA, WrapperData); + wrapper.addEventListener(ProgressEvent.SOCKET_DATA, WrapperData); + + FlashConsole.Instance().Show(); } private function WrapperData(e:ProgressEvent) @@ -114,15 +116,20 @@ DispatchCommand(com.adobe.serialization.json.JSON.decode(data)); } + private var inJob = false; + private var jobs:Array = new Array(); + private function DispatchCommand(msg) { + Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); if (msg.hasOwnProperty("command")) { var cmd = msg.command; switch (cmd) { case "job": - + jobs.push(msg); + CheckNewJob(); break; case "quit": Log("Quitting"); @@ -133,12 +140,38 @@ Log(cmd.string); break; default: - Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); + //Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); break; } } } + private function CheckNewJob() + { + if (!inJob && jobs.length > 0) + { + var job = jobs.shift(); + inJob = true; + + NewGraphicDialog.fakeID++; + + var graphicData = {id:NewGraphicDialog.fakeID,graphic:job.input,v:1,fs:0,p:0,type:job.type}; + + //"export_params":{"uses":["background"],"available_sizes":["default"],"compress":false}} + + var graphicDef = new Defs.GraphicDef(graphicData); + + ExportItem(graphicDef.ID, + function() + { + SendCommand({command:"done", job_num:parseInt(job.job_num)}); + inJob = false; + CheckNewJob(); + } + ); + } + } + public static function SendCommand(obj) { if (wrapper != null) @@ -458,9 +491,10 @@ protected var lastCallback; protected function ExportItem(graphicId, callback = null) - { + { this.lastCallback = callback; var def:Defs.GraphicDef = GameData.Instance().GetGraphicDefByID(graphicId); + Log("Exporting " + graphicId + " " + def != null); var graphicDefs:Array = [def]; var type = def.Type; diff --git a/GraphicExport.exe b/GraphicExport.exe index e0c5e49..df2c899 100755 --- a/GraphicExport.exe +++ b/GraphicExport.exe Binary files differ diff --git a/GraphicExport.swf b/GraphicExport.swf index bbd1a5d..2050547 100644 --- a/GraphicExport.swf +++ b/GraphicExport.swf Binary files differ diff --git a/GraphicExport/IconPacker.as b/GraphicExport/IconPacker.as index 8b13f57..b313e01 100644 --- a/GraphicExport/IconPacker.as +++ b/GraphicExport/IconPacker.as @@ -61,7 +61,7 @@ } public function ExportSingle(def:GraphicDef) - { + { this.defs = [def]; var g = GraphicFactory.Instance().GetGraphicByID(def.ID, null, CheckSizesForSingle); if (GraphicFactory.Instance().LoadedOK(g)) @@ -133,6 +133,7 @@ protected function ExportNext() { + _strace("Exporting " + defs.length); if (defs.length == 0) { Done(); diff --git a/.gitignore b/.gitignore index 6a51108..5ad0b9e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ *.p12 *.airi air*.tmp +*.air diff --git a/GraphicExport-app.xml b/GraphicExport-app.xml index 5144634..e210f14 100755 --- a/GraphicExport-app.xml +++ b/GraphicExport-app.xml @@ -16,7 +16,7 @@ Japanese App name goes here --> - + GraphicExport 1.0 GraphicExport diff --git a/GraphicExport.as b/GraphicExport.as index 09edae0..5bf366e 100644 --- a/GraphicExport.as +++ b/GraphicExport.as @@ -105,7 +105,9 @@ wrapper = e.target as Socket; Log("Wrapper Connected"); _strace("Wrapper Connected"); - wrapper.addEventListener(ProgressEvent.SOCKET_DATA, WrapperData); + wrapper.addEventListener(ProgressEvent.SOCKET_DATA, WrapperData); + + FlashConsole.Instance().Show(); } private function WrapperData(e:ProgressEvent) @@ -114,15 +116,20 @@ DispatchCommand(com.adobe.serialization.json.JSON.decode(data)); } + private var inJob = false; + private var jobs:Array = new Array(); + private function DispatchCommand(msg) { + Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); if (msg.hasOwnProperty("command")) { var cmd = msg.command; switch (cmd) { case "job": - + jobs.push(msg); + CheckNewJob(); break; case "quit": Log("Quitting"); @@ -133,12 +140,38 @@ Log(cmd.string); break; default: - Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); + //Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); break; } } } + private function CheckNewJob() + { + if (!inJob && jobs.length > 0) + { + var job = jobs.shift(); + inJob = true; + + NewGraphicDialog.fakeID++; + + var graphicData = {id:NewGraphicDialog.fakeID,graphic:job.input,v:1,fs:0,p:0,type:job.type}; + + //"export_params":{"uses":["background"],"available_sizes":["default"],"compress":false}} + + var graphicDef = new Defs.GraphicDef(graphicData); + + ExportItem(graphicDef.ID, + function() + { + SendCommand({command:"done", job_num:parseInt(job.job_num)}); + inJob = false; + CheckNewJob(); + } + ); + } + } + public static function SendCommand(obj) { if (wrapper != null) @@ -458,9 +491,10 @@ protected var lastCallback; protected function ExportItem(graphicId, callback = null) - { + { this.lastCallback = callback; var def:Defs.GraphicDef = GameData.Instance().GetGraphicDefByID(graphicId); + Log("Exporting " + graphicId + " " + def != null); var graphicDefs:Array = [def]; var type = def.Type; diff --git a/GraphicExport.exe b/GraphicExport.exe index e0c5e49..df2c899 100755 --- a/GraphicExport.exe +++ b/GraphicExport.exe Binary files differ diff --git a/GraphicExport.swf b/GraphicExport.swf index bbd1a5d..2050547 100644 --- a/GraphicExport.swf +++ b/GraphicExport.swf Binary files differ diff --git a/GraphicExport/IconPacker.as b/GraphicExport/IconPacker.as index 8b13f57..b313e01 100644 --- a/GraphicExport/IconPacker.as +++ b/GraphicExport/IconPacker.as @@ -61,7 +61,7 @@ } public function ExportSingle(def:GraphicDef) - { + { this.defs = [def]; var g = GraphicFactory.Instance().GetGraphicByID(def.ID, null, CheckSizesForSingle); if (GraphicFactory.Instance().LoadedOK(g)) @@ -133,6 +133,7 @@ protected function ExportNext() { + _strace("Exporting " + defs.length); if (defs.length == 0) { Done(); diff --git a/NewGraphicDialog.as b/NewGraphicDialog.as index c2d896d..aa2ec1f 100644 --- a/NewGraphicDialog.as +++ b/NewGraphicDialog.as @@ -82,7 +82,7 @@ var usesInputDefaultText = "Comma Seperated List of Uses Here"; - var fakeID = 9999999; + public static var fakeID = 9999999; public function TestFile() { fakeID++; diff --git a/.gitignore b/.gitignore index 6a51108..5ad0b9e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ *.p12 *.airi air*.tmp +*.air diff --git a/GraphicExport-app.xml b/GraphicExport-app.xml index 5144634..e210f14 100755 --- a/GraphicExport-app.xml +++ b/GraphicExport-app.xml @@ -16,7 +16,7 @@ Japanese App name goes here --> - + GraphicExport 1.0 GraphicExport diff --git a/GraphicExport.as b/GraphicExport.as index 09edae0..5bf366e 100644 --- a/GraphicExport.as +++ b/GraphicExport.as @@ -105,7 +105,9 @@ wrapper = e.target as Socket; Log("Wrapper Connected"); _strace("Wrapper Connected"); - wrapper.addEventListener(ProgressEvent.SOCKET_DATA, WrapperData); + wrapper.addEventListener(ProgressEvent.SOCKET_DATA, WrapperData); + + FlashConsole.Instance().Show(); } private function WrapperData(e:ProgressEvent) @@ -114,15 +116,20 @@ DispatchCommand(com.adobe.serialization.json.JSON.decode(data)); } + private var inJob = false; + private var jobs:Array = new Array(); + private function DispatchCommand(msg) { + Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); if (msg.hasOwnProperty("command")) { var cmd = msg.command; switch (cmd) { case "job": - + jobs.push(msg); + CheckNewJob(); break; case "quit": Log("Quitting"); @@ -133,12 +140,38 @@ Log(cmd.string); break; default: - Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); + //Log("Sent command: " + com.adobe.serialization.json.JSON.encode(msg)); break; } } } + private function CheckNewJob() + { + if (!inJob && jobs.length > 0) + { + var job = jobs.shift(); + inJob = true; + + NewGraphicDialog.fakeID++; + + var graphicData = {id:NewGraphicDialog.fakeID,graphic:job.input,v:1,fs:0,p:0,type:job.type}; + + //"export_params":{"uses":["background"],"available_sizes":["default"],"compress":false}} + + var graphicDef = new Defs.GraphicDef(graphicData); + + ExportItem(graphicDef.ID, + function() + { + SendCommand({command:"done", job_num:parseInt(job.job_num)}); + inJob = false; + CheckNewJob(); + } + ); + } + } + public static function SendCommand(obj) { if (wrapper != null) @@ -458,9 +491,10 @@ protected var lastCallback; protected function ExportItem(graphicId, callback = null) - { + { this.lastCallback = callback; var def:Defs.GraphicDef = GameData.Instance().GetGraphicDefByID(graphicId); + Log("Exporting " + graphicId + " " + def != null); var graphicDefs:Array = [def]; var type = def.Type; diff --git a/GraphicExport.exe b/GraphicExport.exe index e0c5e49..df2c899 100755 --- a/GraphicExport.exe +++ b/GraphicExport.exe Binary files differ diff --git a/GraphicExport.swf b/GraphicExport.swf index bbd1a5d..2050547 100644 --- a/GraphicExport.swf +++ b/GraphicExport.swf Binary files differ diff --git a/GraphicExport/IconPacker.as b/GraphicExport/IconPacker.as index 8b13f57..b313e01 100644 --- a/GraphicExport/IconPacker.as +++ b/GraphicExport/IconPacker.as @@ -61,7 +61,7 @@ } public function ExportSingle(def:GraphicDef) - { + { this.defs = [def]; var g = GraphicFactory.Instance().GetGraphicByID(def.ID, null, CheckSizesForSingle); if (GraphicFactory.Instance().LoadedOK(g)) @@ -133,6 +133,7 @@ protected function ExportNext() { + _strace("Exporting " + defs.length); if (defs.length == 0) { Done(); diff --git a/NewGraphicDialog.as b/NewGraphicDialog.as index c2d896d..aa2ec1f 100644 --- a/NewGraphicDialog.as +++ b/NewGraphicDialog.as @@ -82,7 +82,7 @@ var usesInputDefaultText = "Comma Seperated List of Uses Here"; - var fakeID = 9999999; + public static var fakeID = 9999999; public function TestFile() { fakeID++; diff --git a/exporter.py b/exporter.py index d565b65..32dd978 100755 --- a/exporter.py +++ b/exporter.py @@ -174,7 +174,7 @@ msg = json.loads(msg_str) if "command" in msg: cmd = msg["command"] - if cmd == "done": + if cmd == "exit": quit = True if cmd == "print" and "string" in msg: sys.stdout.write(msg["string"])