Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Class Flipbook #160

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}


Expand Down
2 changes: 1 addition & 1 deletion exporter/src/main/as/flump/xfl/XflMovie.as
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
1 change: 1 addition & 0 deletions exporter/src/main/as/flump/xfl/XflSymbol.as
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down