From 4cbe994426a54b085e695449db5338db350646cc Mon Sep 17 00:00:00 2001 From: mathieuanthoine Date: Thu, 13 Oct 2016 17:04:40 +0200 Subject: [PATCH 1/2] Class Flipbook --- exporter/src/main/as/flump/xfl/XflMovie.as | 2 +- exporter/src/main/as/flump/xfl/XflSymbol.as | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/exporter/src/main/as/flump/xfl/XflMovie.as b/exporter/src/main/as/flump/xfl/XflMovie.as index 8e6475e..8095fe9 100644 --- a/exporter/src/main/as/flump/xfl/XflMovie.as +++ b/exporter/src/main/as/flump/xfl/XflMovie.as @@ -46,7 +46,7 @@ public class XflMovie extends XflSymbol const location :String = lib.location + ":" + movie.id; const layerEls :XMLList = xml.timeline.DOMTimeline[0].layers.DOMLayer; - if (XmlUtil.getStringAttr(layerEls[0], XflLayer.NAME) == "flipbook") { + if (XmlUtil.getStringAttr(xml, EXPORT_BASE_CLASS_NAME, null)=="Flipbook" || XmlUtil.getStringAttr(layerEls[0], XflLayer.NAME) == "flipbook") { movie.layers.push(XflLayer.parse(lib, location, layerEls[0], true)); if (exportName == null) { lib.addError(location, ParseError.CRIT, "Flipbook movie '" + movie.id + "' not exported"); diff --git a/exporter/src/main/as/flump/xfl/XflSymbol.as b/exporter/src/main/as/flump/xfl/XflSymbol.as index 3a52a4d..dc3624f 100644 --- a/exporter/src/main/as/flump/xfl/XflSymbol.as +++ b/exporter/src/main/as/flump/xfl/XflSymbol.as @@ -16,6 +16,7 @@ public class XflSymbol public static const EXPORT_FOR_ACTIONSCRIPT :String = "linkageExportForAS"; public static const EXPORT_IN_FIRST_FRAME :String = "linkageExportInFirstFrame"; public static const EXPORT_CLASS_NAME :String = "linkageClassName"; + public static const EXPORT_BASE_CLASS_NAME :String = "linkageBaseClass"; public static const SYMBOL_ITEM :String = "DOMSymbolItem"; From 34e04efcbdf09f1c66c54c18c09adb3fc142d7e7 Mon Sep 17 00:00:00 2001 From: mathieuanthoine Date: Sun, 16 Oct 2016 21:07:09 +0200 Subject: [PATCH 2/2] conveert tabs to spaces --- .gitignore | 9 +++++++++ .../as/flump/export/texturepacker/MaxRectPackerImpl.as | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fd70c71..343ecaf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,10 @@ +airsdk +flex exporter/src/test/export +exporter/buildWithAnt.bat +exporter/debugWithAdl.bat +exporter/dist +exporter/flump-exporter.as3proj +runtime/dist +runtime/buildWithAnt.bat +runtime/Flump-runtime.as3proj \ No newline at end of file diff --git a/exporter/src/main/as/flump/export/texturepacker/MaxRectPackerImpl.as b/exporter/src/main/as/flump/export/texturepacker/MaxRectPackerImpl.as index f4942b4..5c34acb 100644 --- a/exporter/src/main/as/flump/export/texturepacker/MaxRectPackerImpl.as +++ b/exporter/src/main/as/flump/export/texturepacker/MaxRectPackerImpl.as @@ -158,7 +158,7 @@ public class MaxRectPackerImpl { [Inline] final protected function isContainedIn(a:Rectangle, b:Rectangle):Boolean { - return a.x >= b.x && a.y >= b.y && a.x + a.width <= b.x + b.width && a.y + a.height <= b.y + b.height; + return a.x >= b.x && a.y >= b.y && a.x + a.width <= b.x + b.width && a.y + a.height <= b.y + b.height; }