LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-26 06:50:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #503, #1011, #1257, #1902, #1903, #2048 FLA export - shapes with overlapping edges

Browse Source 
Do not show depths in FLA layer name
This commit is contained in:
Jindra Petřík
2023-11-05 21:11:10 +01:00
parent e00865ed6f
commit 659dd45045
12 changed files with 2007 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
+180 -198
View File
@@ -141,6 +141,7 @@ import com.jpexs.decompiler.flash.types.sound.MP3FRAME;
import com.jpexs.decompiler.flash.types.sound.MP3SOUNDDATA;
import com.jpexs.decompiler.flash.types.sound.SoundFormat;
import com.jpexs.decompiler.flash.xfl.shapefixer.CurvedEdgeRecordAdvanced;
import com.jpexs.decompiler.flash.xfl.shapefixer.ShapeFixer;
import com.jpexs.decompiler.flash.xfl.shapefixer.ShapeRecordAdvanced;
import com.jpexs.decompiler.flash.xfl.shapefixer.StraightEdgeRecordAdvanced;
import com.jpexs.decompiler.flash.xfl.shapefixer.StyleChangeRecordAdvanced;
@@ -229,58 +230,53 @@ public class XFLConverter {
/**
* Adds "(depht xxx)" to layer name
*/
private final boolean DEBUG_EXPORT_LAYER_DEPTHS = true;
private final boolean DEBUG_EXPORT_LAYER_DEPTHS = false;
private static final DecimalFormat EDGE_DECIMAL_FORMAT = new DecimalFormat("0.#", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
static {
EDGE_DECIMAL_FORMAT.setGroupingUsed(false);
}
private static String formatEdgeDouble(double value, boolean curved, boolean morphshape) {
if (value % 1 == 0) {
return "" + (int) value;
}
if (morphshape) {
value = Math.round(value * 2.0) / 2.0;
}
DecimalFormat df = new DecimalFormat(morphshape ? "0.#" : "0.##", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
df.setGroupingUsed(false);
String strValue = "" + df.format(value);
if (curved) {
String[] parts = strValue.split("\\.");
return ("#" + Integer.toHexString(Integer.parseInt(parts[0])) + "." + Integer.toHexString(Integer.parseInt(parts[1]))).toUpperCase(Locale.ENGLISH);
}
return "" + strValue;
value = Math.round(value * 2.0) / 2.0;
return EDGE_DECIMAL_FORMAT.format(value);
}
private static String convertShapeEdge(MATRIX mat, ShapeRecordAdvanced record, double x, double y, boolean morphshape) {
if (record instanceof StyleChangeRecordAdvanced) {
StyleChangeRecordAdvanced scr = (StyleChangeRecordAdvanced) record;
Point2D p = new Point2D.Double(scr.moveDeltaX, scr.moveDeltaY);
//p = new Matrix(mat).transform(p);
p = new Matrix(mat).transform(p);
if (scr.stateMoveTo) {
//return "! " + formatEdgeDouble(p.getX(), false) + " " + formatEdgeDouble(p.getY(), false);
return "";
return "! " + formatEdgeDouble(p.getX(), false, morphshape) + " " + formatEdgeDouble(p.getY(), false, morphshape);
}
} else if (record instanceof StraightEdgeRecordAdvanced) {
StraightEdgeRecordAdvanced ser = (StraightEdgeRecordAdvanced) record;
Point2D p1 = new Point2D.Double(x, y);
Point2D p1 = new Point2D.Double(x, y);
Point2D p = new Point2D.Double(x + ser.deltaX, y + ser.deltaY);
p = new Matrix(mat).transform(p);
p1 = new Matrix(mat).transform(p1);
return "! " + formatEdgeDouble(p1.getX(), false, morphshape) + " " + formatEdgeDouble(p1.getY(), false, morphshape)
+ "| " + formatEdgeDouble(p.getX(), false, morphshape) + " " + formatEdgeDouble(p.getY(), false, morphshape);
return /*"! " + formatEdgeDouble(p1.getX(), false, morphshape) + " " + formatEdgeDouble(p1.getY(), false, morphshape)
+*/ "| " + formatEdgeDouble(p.getX(), false, morphshape) + " " + formatEdgeDouble(p.getY(), false, morphshape);
} else if (record instanceof CurvedEdgeRecordAdvanced) {
CurvedEdgeRecordAdvanced cer = (CurvedEdgeRecordAdvanced) record;
double controlX = cer.controlDeltaX + x;
double controlY = cer.controlDeltaY + y;
double anchorX = cer.anchorDeltaX + controlX;
double anchorY = cer.anchorDeltaY + controlY;
Point2D p1 = new Point2D.Double(x, y);
Point2D p1 = new Point2D.Double(x, y);
Point2D control = new Point2D.Double(controlX, controlY);
Point2D anchor = new Point.Double(anchorX, anchorY);
p1 = new Matrix(mat).transform(p1);
control = new Matrix(mat).transform(control);
anchor = new Matrix(mat).transform(anchor);
return "! " + formatEdgeDouble(p1.getX(), false, morphshape) + " " + formatEdgeDouble(p1.getY(), false, morphshape)
+ "[ " + formatEdgeDouble(control.getX(), true, morphshape) + " " + formatEdgeDouble(control.getY(), true, morphshape) + " " + formatEdgeDouble(anchor.getX(), true, morphshape) + " " + formatEdgeDouble(anchor.getY(), true, morphshape);
return /*"! " + formatEdgeDouble(p1.getX(), false, morphshape) + " " + formatEdgeDouble(p1.getY(), false, morphshape)
+*/ "[ " + formatEdgeDouble(control.getX(), true, morphshape) + " " + formatEdgeDouble(control.getY(), true, morphshape) + " " + formatEdgeDouble(anchor.getX(), true, morphshape) + " " + formatEdgeDouble(anchor.getY(), true, morphshape);
}
return "";
}
@@ -299,7 +295,7 @@ public class XFLConverter {
}
}
if (!hasMove) {
//ret.append("! ").append(formatEdgeDouble(startX, false)).append(" ").append(formatEdgeDouble(startY, false));
ret.append("! ").append(formatEdgeDouble(startX, false, morphshape)).append(" ").append(formatEdgeDouble(startY, false, morphshape));
}
double lastMoveToX = startX;
double lastMoveToY = startY;
@@ -321,7 +317,7 @@ public class XFLConverter {
lineStyle = 0;
}
if (scr.stateLineStyle) {
lineStyle = scr.lineStyle;
lineStyle = scr.lineStyle;
}
if (scr.stateFillStyle0) {
fillStyle0 = scr.fillStyle0;
@@ -330,21 +326,21 @@ public class XFLConverter {
fillStyle1 = scr.fillStyle1;
}
}
String edge = convertShapeEdge(mat, rec, x, y, morphshape);
String curPos = "! " + formatEdgeDouble(x, false, morphshape) + " " + formatEdgeDouble(y, false, morphshape);
//ignore duplicated edges with only strokes #2031
if (fillStyle0 == 0 && fillStyle1 == 0 && lineStyle != 0) {
if (!edges.contains(edge)) {
edges.add(edge);
if (!edges.contains(curPos + edge)) {
edges.add(curPos + edge);
ret.append(edge);
}
} else {
edges.add(edge);
edges.add(curPos + edge);
ret.append(edge);
}
x = rec.changeX(x);
y = rec.changeY(y);
}
@@ -473,7 +469,7 @@ public class XFLConverter {
writer.writeAttribute("bitmapIsClipped", true);
}
writer.writeStartElement("matrix");
writer.writeStartElement("matrix");
MATRIX bitmapMatrix = fs.bitmapMatrix;
bitmapMatrix = (new Matrix(mat)).concatenate(new Matrix(bitmapMatrix)).toMATRIX();
convertMatrix(bitmapMatrix, writer);
@@ -526,10 +522,10 @@ public class XFLConverter {
}
writer.writeStartElement("matrix");
MATRIX gradientMatrix = fs.gradientMatrix;
gradientMatrix = (new Matrix(mat)).concatenate(new Matrix(gradientMatrix)).toMATRIX();
gradientMatrix = (new Matrix(mat)).concatenate(new Matrix(gradientMatrix)).toMATRIX();
convertMatrix(gradientMatrix, writer);
writer.writeEndElement();
GRADRECORD[] records;
@@ -573,13 +569,13 @@ public class XFLConverter {
writer.writeEndElement();
}
private static boolean shapeHasMultiLayers(HashMap<Integer, CharacterTag> characters, MATRIX mat, int shapeNum, List<SHAPERECORD> shapeRecords, FILLSTYLEARRAY fillStyles, LINESTYLEARRAY lineStyles) throws XMLStreamException {
List<String> layers = getShapeLayers(characters, mat, shapeNum, shapeRecords, fillStyles, lineStyles, false);
private static boolean shapeHasMultiLayers(SWF swf, HashMap<Integer, CharacterTag> characters, MATRIX mat, int shapeNum, List<SHAPERECORD> shapeRecords, FILLSTYLEARRAY fillStyles, LINESTYLEARRAY lineStyles) throws XMLStreamException {
List<String> layers = getShapeLayers(swf, characters, mat, shapeNum, shapeRecords, fillStyles, lineStyles, false);
return layers.size() > 1;
}
private static void convertShape(HashMap<Integer, CharacterTag> characters, MATRIX mat, int shapeNum, List<SHAPERECORD> shapeRecords, FILLSTYLEARRAY fillStyles, LINESTYLEARRAY lineStyles, boolean morphshape, boolean useLayers, XFLXmlWriter writer) throws XMLStreamException {
List<String> layers = getShapeLayers(characters, mat, shapeNum, shapeRecords, fillStyles, lineStyles, morphshape);
private static void convertShape(SWF swf, HashMap<Integer, CharacterTag> characters, MATRIX mat, int shapeNum, List<SHAPERECORD> shapeRecords, FILLSTYLEARRAY fillStyles, LINESTYLEARRAY lineStyles, boolean morphshape, boolean useLayers, XFLXmlWriter writer) throws XMLStreamException {
List<String> layers = getShapeLayers(swf, characters, mat, shapeNum, shapeRecords, fillStyles, lineStyles, morphshape);
if (!useLayers) {
for (int l = layers.size() - 1; l >= 0; l--) {
writer.writeCharactersRaw(layers.get(l));
@@ -771,22 +767,27 @@ public class XFLConverter {
return ret;
}
private static List<String> getShapeLayers(HashMap<Integer, CharacterTag> characters, MATRIX mat, int shapeNum, List<SHAPERECORD> shapeRecords, FILLSTYLEARRAY fillStyles, LINESTYLEARRAY lineStyles, boolean morphshape) throws XMLStreamException {
private static List<String> getShapeLayers(SWF swf, HashMap<Integer, CharacterTag> characters, MATRIX mat, int shapeNum, List<SHAPERECORD> shapeRecords, FILLSTYLEARRAY fillStyles, LINESTYLEARRAY lineStyles, boolean morphshape) throws XMLStreamException {
if (mat == null) {
mat = new MATRIX();
}
List<ShapeRecordAdvanced> shapeRecordsAdvanced = new ArrayList<>();
for (SHAPERECORD rec : shapeRecords) {
ShapeRecordAdvanced arec = ShapeRecordAdvanced.createFromSHAPERECORD(rec);
if (arec != null) {
shapeRecordsAdvanced.add(arec);
boolean doFix = true;
List<ShapeRecordAdvanced> shapeRecordsAdvanced;
if (doFix) {
ShapeFixer fixer = new ShapeFixer();
shapeRecordsAdvanced = fixer.fix(shapeRecords);
} else {
shapeRecordsAdvanced = new ArrayList<>();
for (SHAPERECORD rec : shapeRecords) {
ShapeRecordAdvanced arec = ShapeRecordAdvanced.createFromSHAPERECORD(rec);
if (arec != null) {
shapeRecordsAdvanced.add(arec);
}
}
}
//#1903, #503, #1257 This is not working at all :-(
//ShapeFixer fixer = new ShapeFixer();
//shapeRecordsAdvanced = fixer.fixShape(shapeRecordsAdvanced);
List<ShapeRecordAdvanced> edges = new ArrayList<>();
int lineStyleCount = 0;
int fillStyle0 = -1;
@@ -877,6 +878,7 @@ public class XFLConverter {
currentLayer.writeAttribute("edges", edgesSb.toString());
currentLayer.writeEndElement();
hasEdge = true;
//edges.clear();
}
}
if (currentLayer.length() > 0) {
@@ -1145,7 +1147,7 @@ public class XFLConverter {
}
}
}
private static void walkMorphShapeUsages(ReadOnlyTagList timeLineTags, Map<Integer, CharacterTag> characters, Map<Integer, Integer> usages) {
Map<Integer, Integer> depthMap = new HashMap<>();
for (Tag t : timeLineTags) {
@@ -1171,24 +1173,23 @@ public class XFLConverter {
if (ch == -1) {
continue;
}
CharacterTag ct = characters.get(ch);
if (ct instanceof MorphShapeTag) {
if (!usages.containsKey(ch)) {
usages.put(ch, 0);
}
int usageCount = usages.get(ch);
if (po.getRatio() <= 0) {
usageCount++;
if (po.getRatio() <= 0) {
usageCount++;
usages.put(ch, usageCount);
}
}
}
}
}
}
}
}
private static List<Integer> getMultiUsageMorphShapes(ReadOnlyTagList tags, HashMap<Integer, CharacterTag> characters) {
List<Integer> ret = new ArrayList<>();
Map<Integer, Integer> usages = new TreeMap<>();
@@ -1200,8 +1201,8 @@ public class XFLConverter {
}
return ret;
}
private static List<Integer> getNonLibraryShapes(ReadOnlyTagList tags, HashMap<Integer, CharacterTag> characters) {
private static List<Integer> getNonLibraryShapes(SWF swf, ReadOnlyTagList tags, HashMap<Integer, CharacterTag> characters) {
HashMap<Integer, Integer> usages = new HashMap<>();
walkShapeUsages(tags, characters, usages);
List<Integer> ret = new ArrayList<>();
@@ -1210,7 +1211,7 @@ public class XFLConverter {
if (usages.get(ch) < 2) {
if (characters.get(ch) instanceof ShapeTag) {
ShapeTag shp = (ShapeTag) characters.get(ch);
if (!shapeHasMultiLayers(characters, null, shp.getShapeNum(), shp.getShapes().shapeRecords, shp.getShapes().fillStyles, shp.getShapes().lineStyles)) {
if (!shapeHasMultiLayers(swf, characters, null, shp.getShapeNum(), shp.getShapes().shapeRecords, shp.getShapes().fillStyles, shp.getShapes().lineStyles)) {
ret.add(ch);
}
}
@@ -1631,7 +1632,7 @@ public class XFLConverter {
}
private void convertSymbols(SWF swf, Map<Integer, String> characterVariables, Map<Integer, String> characterClasses, Map<Integer, ScriptPack> characterScriptPacks, List<Integer> nonLibraryShapes, String backgroundColor, ReadOnlyTagList tags, HashMap<Integer, CharacterTag> characters, HashMap<String, byte[]> files, HashMap<String, byte[]> datfiles, FLAVersion flaVersion, XFLXmlWriter writer, Map<PlaceObjectTypeTag, MultiLevelClip> placeToMaskedSymbol, List<Integer> multiUsageMorphShapes) throws XMLStreamException {
boolean hasSymbol = false;
boolean hasSymbol = false;
Reference<Integer> nextClipId = new Reference<>(-1);
writer.writeStartElement("symbols");
for (int ch : characters.keySet()) {
@@ -1639,10 +1640,6 @@ public class XFLConverter {
if ((symbol instanceof ShapeTag) && nonLibraryShapes.contains(symbol.getCharacterId())) {
continue; //shapes with 1 ocurrence and single layer are not added to library
}
/*if (!hasSymbol) {
}*/
if ((symbol instanceof ShapeTag) || (symbol instanceof DefineSpriteTag) || (symbol instanceof ButtonTag)) {
XFLXmlWriter symbolStr = new XFLXmlWriter();
@@ -1794,7 +1791,7 @@ public class XFLConverter {
int characterId = character.getCharacterId();
if ((character instanceof ShapeTag) && (nonLibraryShapes.contains(characterId))) {
ShapeTag shape = (ShapeTag) character;
convertShape(characters, matrix, shape.getShapeNum(), shape.getShapes().shapeRecords, shape.getShapes().fillStyles, shape.getShapes().lineStyles, false, false, recCharWriter);
convertShape(swf, characters, matrix, shape.getShapeNum(), shape.getShapes().shapeRecords, shape.getShapes().fillStyles, shape.getShapes().lineStyles, false, false, recCharWriter);
} else if (character instanceof TextTag) {
convertText(null, (TextTag) character, matrix, filters, null, recCharWriter);
} else if (character instanceof DefineVideoStreamTag) {
@@ -1842,10 +1839,10 @@ public class XFLConverter {
continue;
}
final ScriptPack spriteScriptPack = characterScriptPacks.containsKey(sprite.spriteId) ? characterScriptPacks.get(sprite.spriteId) : null;
extractMultilevelClips(sprite.getTags(), writer, swf, nextClipId, nonLibraryShapes, backgroundColor, characters, flaVersion, files, placeToMaskedSymbol, multiUsageMorphShapes);
convertTimeline(swf.getAbcIndex(), sprite.spriteId, characterVariables.get(sprite.spriteId), nonLibraryShapes, backgroundColor, tags, sprite.getTags(), characters, "Symbol " + symbol.getCharacterId(), flaVersion, files, symbolStr, spriteScriptPack, placeToMaskedSymbol, multiUsageMorphShapes);
convertTimeline(swf, swf.getAbcIndex(), sprite.spriteId, characterVariables.get(sprite.spriteId), nonLibraryShapes, backgroundColor, tags, sprite.getTags(), characters, "Symbol " + symbol.getCharacterId(), flaVersion, files, symbolStr, spriteScriptPack, placeToMaskedSymbol, multiUsageMorphShapes);
} else if (symbol instanceof ShapeTag) {
symbolStr.writeStartElement("timeline");
@@ -1855,7 +1852,7 @@ public class XFLConverter {
symbolStr.writeStartElement("layers");
SHAPEWITHSTYLE shapeWithStyle = shape.getShapes();
if (shapeWithStyle != null) {
convertShape(characters, null, shape.getShapeNum(), shapeWithStyle.shapeRecords, shapeWithStyle.fillStyles, shapeWithStyle.lineStyles, false, true, symbolStr);
convertShape(swf, characters, null, shape.getShapeNum(), shapeWithStyle.shapeRecords, shapeWithStyle.fillStyles, shapeWithStyle.lineStyles, false, true, symbolStr);
}
symbolStr.writeEndElement(); // layers
@@ -1866,7 +1863,7 @@ public class XFLConverter {
symbolStr.writeEndElement(); // DOMSymbolItem
String symbolStr2 = prettyFormatXML(symbolStr.toString());
String symbolFile = "Symbol " + symbol.getCharacterId() + ".xml";
files.put(symbolFile, Utf8Helper.getBytes(symbolStr2));
files.put(symbolFile, Utf8Helper.getBytes(symbolStr2));
// write symbLink
writer.writeStartElement("Include", new String[]{"href", symbolFile});
@@ -1890,8 +1887,6 @@ public class XFLConverter {
}*/
writer.writeEndElement();
}
private void convertMedia(SWF swf, Map<Integer, String> characterVariables, Map<Integer, String> characterClasses, List<Integer> nonLibraryShapes, String backgroundColor, ReadOnlyTagList tags, HashMap<Integer, CharacterTag> characters, HashMap<String, byte[]> files, HashMap<String, byte[]> datfiles, FLAVersion flaVersion, XFLXmlWriter writer) throws XMLStreamException {
boolean hasMedia = false;
@@ -2356,7 +2351,7 @@ public class XFLConverter {
writer.writeEndElement(); // SoundEnvelope
}
}
private static void convertFrame(boolean shapeTween, SoundStreamHeadTypeTag soundStreamHead, StartSoundTag startSound, int frame, int duration, String actionScript, String elements, HashMap<String, byte[]> files, XFLXmlWriter writer) throws XMLStreamException {
DefineSoundTag sound = null;
if (startSound != null) {
@@ -2434,7 +2429,7 @@ public class XFLConverter {
writer.writeEndElement();
}
private static void convertFrames(List<Integer> onlyFrames, int startFrame, int endFrame, String prevStr, String afterStr, List<Integer> nonLibraryShapes, ReadOnlyTagList tags, ReadOnlyTagList timelineTags, HashMap<Integer, CharacterTag> characters, int depth, FLAVersion flaVersion, HashMap<String, byte[]> files, XFLXmlWriter writer, List<Integer> multiUsageMorphShapes) throws XMLStreamException {
private static void convertFrames(SWF swf, List<Integer> onlyFrames, int startFrame, int endFrame, String prevStr, String afterStr, List<Integer> nonLibraryShapes, ReadOnlyTagList tags, ReadOnlyTagList timelineTags, HashMap<Integer, CharacterTag> characters, int depth, FLAVersion flaVersion, HashMap<String, byte[]> files, XFLXmlWriter writer, List<Integer> multiUsageMorphShapes) throws XMLStreamException {
boolean lastIn = true;
XFLXmlWriter writer2 = new XFLXmlWriter();
prevStr += "<frames>";
@@ -2463,14 +2458,12 @@ public class XFLConverter {
//Add ShowFrameTag to the end when there is one last missing
List<Tag> timTags = timelineTags.toArrayList();
boolean needsFrameAdd = false;
SWF swf = null;
for (int i = timTags.size() - 1; i >= 0; i--) {
if (timTags.get(i) instanceof ShowFrameTag) {
break;
}
if (timTags.get(i) instanceof PlaceObjectTypeTag) {
needsFrameAdd = true;
swf = timTags.get(i).getSwf();
break;
}
}
@@ -2551,7 +2544,7 @@ public class XFLConverter {
}
}
}
/*if (t instanceof ShowFrameTag) {
if (t == timTags.get(timTags.size() - 1)) {
if (shapeTween && character != null && (character instanceof MorphShapeTag)) {
@@ -2563,7 +2556,6 @@ public class XFLConverter {
}
}
}*/
if (t instanceof RemoveTag) {
RemoveTag rt = (RemoveTag) t;
if (rt.getDepth() == depth) {
@@ -2588,13 +2580,12 @@ public class XFLConverter {
}
}
if (t instanceof ShowFrameTag) {
/*if (prevWasShapeTween) {
prevWasShapeTween = false;
continue;
}*/
boolean shapeTweenNow = false;
if (frame + 1 >= startFrame && (onlyFrames == null || onlyFrames.contains(frame + 1))) {
@@ -2606,7 +2597,7 @@ public class XFLConverter {
MorphShapeTag m = shapeTweener;
XFLXmlWriter addLastWriter = new XFLXmlWriter();
SHAPEWITHSTYLE endShape = m.getShapeAtRatio(65535); //lastTweenRatio);
convertShape(characters, matrix, m.getShapeNum() == 1 ? 3 : 4, endShape.shapeRecords, m.getFillStyles().getFillStylesAt(lastTweenRatio), m.getLineStyles().getLineStylesAt(m.getShapeNum(), lastTweenRatio), true, false, addLastWriter);
convertShape(swf, characters, matrix, m.getShapeNum() == 1 ? 3 : 4, endShape.shapeRecords, m.getFillStyles().getFillStylesAt(lastTweenRatio), m.getLineStyles().getLineStylesAt(m.getShapeNum(), lastTweenRatio), true, false, addLastWriter);
//duration--;
convertFrame(true, null, null, frame - duration, duration, "", lastElements, files, writer2);
duration = 1;
@@ -2620,10 +2611,10 @@ public class XFLConverter {
standaloneShapeTweener = null;
} else if ((character instanceof ShapeTag) && (nonLibraryShapes.contains(characterId))) { // || shapeTweener != null)) {
ShapeTag shape = (ShapeTag) character;
convertShape(characters, matrix, shape.getShapeNum(), shape.getShapes().shapeRecords, shape.getShapes().fillStyles, shape.getShapes().lineStyles, false, false, elementsWriter);
convertShape(swf, characters, matrix, shape.getShapeNum(), shape.getShapes().shapeRecords, shape.getShapes().fillStyles, shape.getShapes().lineStyles, false, false, elementsWriter);
shapeTween = false;
shapeTweener = null;
shapeTweener = null;
} else if (character != null) {
if (character instanceof MorphShapeTag) {
MorphShapeTag m = (MorphShapeTag) character;
@@ -2634,11 +2625,11 @@ public class XFLConverter {
standaloneShapeTweenerMatrix = matrix;
convertSymbolInstance(instanceName, matrix, colorTransForm, cacheAsBitmap, blendMode, filters, isVisible, backGroundColor, clipActions, metadata, character, characters, tags, flaVersion, elementsWriter);
} else {
convertShape(characters, matrix, m.getShapeNum() == 1 ? 3 : 4, m.getStartEdges().shapeRecords, m.getFillStyles().getStartFillStyles(), m.getLineStyles().getStartLineStyles(m.getShapeNum()), true, false, elementsWriter);
shapeTween = true;
convertShape(swf, characters, matrix, m.getShapeNum() == 1 ? 3 : 4, m.getStartEdges().shapeRecords, m.getFillStyles().getStartFillStyles(), m.getLineStyles().getStartLineStyles(m.getShapeNum()), true, false, elementsWriter);
shapeTween = true;
}
} else {
shapeTween = false;
shapeTween = false;
if (character instanceof TextTag) {
convertText(instanceName, (TextTag) character, matrix, filters, clipActions, elementsWriter);
} else if (character instanceof DefineVideoStreamTag) {
@@ -2650,7 +2641,7 @@ public class XFLConverter {
}
}
}
}
}
}
if (!shapeTweenNow) {
frame++;
@@ -2663,7 +2654,7 @@ public class XFLConverter {
} else {
duration++;
}
lastElements = elements;
if (frame > endFrame) {
if (lastIn) {
@@ -3175,32 +3166,30 @@ public class XFLConverter {
ret.add(0, varName);
return String.join(".", ret);
}
private void addExtractedClip(
ReadOnlyTagList timelineTags,
XFLXmlWriter writer,
SWF swf,
Reference<Integer> nextClipId,
List<Integer> nonLibraryShapes,
String backgroundColor,
HashMap<Integer, CharacterTag> characters,
FLAVersion flaVersion,
HashMap<String, byte[]> files,
Map<PlaceObjectTypeTag, MultiLevelClip> placeToMaskedSymbol,
List<Integer> multiUsageMorphShapes
ReadOnlyTagList timelineTags,
XFLXmlWriter writer,
SWF swf,
Reference<Integer> nextClipId,
List<Integer> nonLibraryShapes,
String backgroundColor,
HashMap<Integer, CharacterTag> characters,
FLAVersion flaVersion,
HashMap<String, byte[]> files,
Map<PlaceObjectTypeTag, MultiLevelClip> placeToMaskedSymbol,
List<Integer> multiUsageMorphShapes
) throws XMLStreamException {
XFLXmlWriter symbolStr = new XFLXmlWriter();
if (nextClipId.getVal() < 0) {
nextClipId.setVal(swf.getNextCharacterId());
} else {
nextClipId.setVal(nextClipId.getVal() + 1);
}
int objectId = nextClipId.getVal();
symbolStr.writeStartElement("DOMSymbolItem", new String[]{
"xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance",
"xmlns", "http://ns.adobe.com/xfl/2008/",
@@ -3208,14 +3197,13 @@ public class XFLConverter {
"lastModified", Long.toString(getTimestamp(swf))});
symbolStr.writeAttribute("symbolType", "graphic");
convertTimeline(swf.getAbcIndex(), objectId, "", nonLibraryShapes, backgroundColor, timelineTags, timelineTags, characters, generateMaskedSymbolName(objectId), flaVersion, files, symbolStr, null, placeToMaskedSymbol, multiUsageMorphShapes);
convertTimeline(swf, swf.getAbcIndex(), objectId, "", nonLibraryShapes, backgroundColor, timelineTags, timelineTags, characters, generateMaskedSymbolName(objectId), flaVersion, files, symbolStr, null, placeToMaskedSymbol, multiUsageMorphShapes);
symbolStr.writeEndElement(); // DOMSymbolItem
String symbolStr2 = prettyFormatXML(symbolStr.toString());
String symbolFile = generateMaskedSymbolName(objectId) + ".xml";
files.put(symbolFile, Utf8Helper.getBytes(symbolStr2));
writer.writeStartElement("Include", new String[]{"href", symbolFile});
writer.writeAttribute("itemIcon", "1");
writer.writeAttribute("loadImmediate", false);
@@ -3224,15 +3212,14 @@ public class XFLConverter {
//TODO: itemID="518de416-00000341"
}
writer.writeEndElement();
extractMultilevelClips(timelineTags, writer, swf, nextClipId, nonLibraryShapes, backgroundColor, characters, flaVersion, files, placeToMaskedSymbol, multiUsageMorphShapes);
}
private String generateMaskedSymbolName(int symbolId) {
return (DEBUG_EXPORT_LAYER_DEPTHS ? "MaskedSymbol " : "Symbol ") + symbolId;
}
private boolean getMorphshapeTimeline(int morphShapeId, ReadOnlyTagList tags, List<Tag> outTimelineTags) {
int morphDepth = -2;
boolean onTrack = false;
@@ -3251,8 +3238,7 @@ public class XFLConverter {
PlaceObjectTypeTag place = (PlaceObjectTypeTag) t;
if (morphDepth == place.getDepth()
&& place.getCharacterId() != -1
&& place.getCharacterId() != morphShapeId
) {
&& place.getCharacterId() != morphShapeId) {
outTimelineTags.add(t);
onTrack = false;
} else if ((morphDepth == -2 && place.getCharacterId() == morphShapeId) || morphDepth == place.getDepth()) {
@@ -3281,18 +3267,18 @@ public class XFLConverter {
outTimelineTags.add(t);
break;
}
}
}
}
if (!outTimelineTags.isEmpty()) {
return true;
}
}
return false;
}
private void extractMultiUsageMorphShapes(
XFLXmlWriter writer,
SWF swf,
SWF swf,
List<Integer> nonLibraryShapes,
String backgroundColor,
HashMap<Integer, CharacterTag> characters,
@@ -3300,9 +3286,9 @@ public class XFLConverter {
HashMap<String, byte[]> files,
List<Integer> multiUsageMorphShapes
) throws XMLStreamException {
for (int objectId : multiUsageMorphShapes) {
XFLXmlWriter symbolStr = new XFLXmlWriter();
XFLXmlWriter symbolStr = new XFLXmlWriter();
symbolStr.writeStartElement("DOMSymbolItem", new String[]{
"xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance",
"xmlns", "http://ns.adobe.com/xfl/2008/",
@@ -3313,10 +3299,10 @@ public class XFLConverter {
List<Tag> timelineTags = new ArrayList<>();
getMorphshapeTimeline(objectId, swf.getTags(), timelineTags);
timelineTags = Helper.deepCopy(timelineTags);
for (Tag t : timelineTags) {
for (Tag t : timelineTags) {
t.setSwf(swf);
if (t instanceof PlaceObjectTypeTag) {
PlaceObjectTypeTag place = (PlaceObjectTypeTag) t;
@@ -3325,9 +3311,8 @@ public class XFLConverter {
}
}
}
convertTimeline(swf.getAbcIndex(), objectId, "", nonLibraryShapes, backgroundColor, swf.getTags(), new ReadOnlyTagList(timelineTags), characters, "Symbol " + objectId, flaVersion, files, symbolStr, null, new HashMap<>(), new ArrayList<>());
convertTimeline(swf, swf.getAbcIndex(), objectId, "", nonLibraryShapes, backgroundColor, swf.getTags(), new ReadOnlyTagList(timelineTags), characters, "Symbol " + objectId, flaVersion, files, symbolStr, null, new HashMap<>(), new ArrayList<>());
symbolStr.writeEndElement(); // DOMSymbolItem
String symbolStr2 = prettyFormatXML(symbolStr.toString());
@@ -3344,10 +3329,10 @@ public class XFLConverter {
writer.writeEndElement();
}
}
private void extractMultilevelClips(ReadOnlyTagList timelineTags,
XFLXmlWriter writer,
SWF swf,
SWF swf,
Reference<Integer> nextClipId,
List<Integer> nonLibraryShapes,
String backgroundColor,
@@ -3363,7 +3348,7 @@ public class XFLConverter {
Map<Integer, PlaceObjectTypeTag> depthToClipPlace = new HashMap<>();
Map<PlaceObjectTypeTag, Integer> clipFinishFrames = new HashMap<>();
Map<PlaceObjectTypeTag, Integer> clipStartFrames = new HashMap<>();
int maxDepth = getMaxDepth(timelineTags);
Tag lastTag = null;
for (Tag t : timelineTags) {
@@ -3399,7 +3384,7 @@ public class XFLConverter {
if (clipPlaces.isEmpty()) {
return;
}
//Some sprites do not end with ShowFrame:
if (lastTag != null && !(lastTag instanceof ShowFrameTag)) {
f++;
@@ -3420,10 +3405,10 @@ public class XFLConverter {
depthToFramesList.get(d).add(i);
}
}
Map<Integer, Map<Integer, List<PlaceObjectTypeTag>>> frameToDepthToClips = new TreeMap<>();
for (f = 0; f < frameCount; f++) {
for (f = 0; f < frameCount; f++) {
for (int d = 0; d < maxDepth; d++) {
for (int p = 0; p < clipPlaces.size(); p++) {
PlaceObjectTypeTag po = clipPlaces.get(p);
@@ -3443,27 +3428,27 @@ public class XFLConverter {
}
}
}
Set<PlaceObjectTypeTag> delegatedPlaces = new HashSet<>();
Set<PlaceObjectTypeTag> delegatedPlaces = new HashSet<>();
for (int fr : frameToDepthToClips.keySet()) {
for (int d : frameToDepthToClips.get(fr).keySet()) {
List<PlaceObjectTypeTag> places = frameToDepthToClips.get(fr).get(d);
if (places.size() > 1) {
depthToFramesList.get(d).remove((Integer) fr);
depthToFramesList.get(d).remove((Integer) fr);
PlaceObjectTypeTag secondPlace = places.get(1);
if (delegatedPlaces.contains(secondPlace)) {
continue;
}
delegatedPlaces.add(secondPlace);
List<Tag> delegatedTimeline = new ArrayList<>();
f = 0;
List<Tag> delegatedTimeline = new ArrayList<>();
f = 0;
boolean removed = false;
int numFrames = 0;
lastTag = null;
Map<Integer, Integer> depthStates = new HashMap<>();
Map<Integer, Integer> depthStates = new HashMap<>();
for (Tag t : timelineTags) {
if (f < fr) {
if (t instanceof PlaceObjectTypeTag) {
@@ -3473,7 +3458,7 @@ public class XFLConverter {
}
if (place.getCharacterId() != -1) {
depthStates.put(place.getDepth(), place.getCharacterId());
}
}
}
if (t instanceof RemoveTag) {
depthStates.remove(((RemoveTag) t).getDepth());
@@ -3482,7 +3467,7 @@ public class XFLConverter {
if (f >= fr) {
if (t instanceof PlaceObjectTypeTag) {
PlaceObjectTypeTag place = (PlaceObjectTypeTag) t;
if (place.getDepth() == secondPlace.getDepth()) {
if (place.getDepth() == secondPlace.getDepth()) {
if (place.flagMove()) {
removed = false;
} else if (place.getClipDepth() == secondPlace.getClipDepth()) {
@@ -3513,15 +3498,15 @@ public class XFLConverter {
break;
}
f++;
}
}
}
if (!(lastTag instanceof ShowFrameTag)) {
numFrames++;
ShowFrameTag showFrame = new ShowFrameTag(swf);
//set timelined?
delegatedTimeline.add(showFrame);
}
delegatedTimeline.add(showFrame);
}
/*
List<Tag> delegatedTimeline2 = Helper.deepCopy(delegatedTimeline);
for (int i = 0; i < delegatedTimeline2.size(); i++) {
@@ -3627,8 +3612,8 @@ public class XFLConverter {
}
}
}
private void convertTimeline(AbcIndexing abcIndex, int spriteId, String linkageIdentifier, List<Integer> nonLibraryShapes, String backgroundColor, ReadOnlyTagList tags, ReadOnlyTagList timelineTags, HashMap<Integer, CharacterTag> characters, String name, FLAVersion flaVersion, HashMap<String, byte[]> files, XFLXmlWriter writer, ScriptPack scriptPack, Map<PlaceObjectTypeTag, MultiLevelClip> placeToMaskedSymbol, List<Integer> multiUsageMorphShapes) throws XMLStreamException {
private void convertTimeline(SWF swf, AbcIndexing abcIndex, int spriteId, String linkageIdentifier, List<Integer> nonLibraryShapes, String backgroundColor, ReadOnlyTagList tags, ReadOnlyTagList timelineTags, HashMap<Integer, CharacterTag> characters, String name, FLAVersion flaVersion, HashMap<String, byte[]> files, XFLXmlWriter writer, ScriptPack scriptPack, Map<PlaceObjectTypeTag, MultiLevelClip> placeToMaskedSymbol, List<Integer> multiUsageMorphShapes) throws XMLStreamException {
List<String> classNames = new ArrayList<>();
//Searches for Object.registerClass("linkageIdentifier",mypkg.MyClass);
@@ -3741,12 +3726,12 @@ public class XFLConverter {
clipFrameSplitters.add(f);
clipStartFrames.put(po, f);
clipPlaces.add(po);
if (depthToClipPlace.containsKey(po.getDepth())) {
clipFinishFrames.put(depthToClipPlace.get(po.getDepth()), f - 1);
}
depthToClipPlace.put(po.getDepth(), po);
depthToClipPlace.put(po.getDepth(), po);
for (int j = tpos + 1; j <= timelineTags.size(); j++) {
Tag t2 = timelineTags.get(j);
if (t2 instanceof PlaceObject2Tag) {
@@ -3759,7 +3744,7 @@ public class XFLConverter {
if (t2 instanceof ShowFrameTag) {
break;
}
}
} else {
if (!po.flagMove() && depthToClipPlace.containsKey(po.getDepth())) {
@@ -3807,10 +3792,10 @@ public class XFLConverter {
depthToFramesList.get(d).add(i);
}
}
Map<Integer, Map<Integer, List<PlaceObjectTypeTag>>> frameToDepthToClips = new TreeMap<>();
for (f = 0; f < frameCount; f++) {
for (f = 0; f < frameCount; f++) {
for (int d = 0; d < maxDepth; d++) {
for (int p = 0; p < clipPlaces.size() - 1; p++) {
PlaceObjectTypeTag po = clipPlaces.get(p);
@@ -3833,9 +3818,9 @@ public class XFLConverter {
}
}
}
Set<PlaceObjectTypeTag> multiLevelsPlaces = new HashSet<>();
Set<PlaceObjectTypeTag> secondLevelPlaces = new HashSet<>();
Map<PlaceObjectTypeTag, PlaceObjectTypeTag> secondToFirstLevelPlace = new HashMap<>();
for (int fr : frameToDepthToClips.keySet()) {
@@ -3851,12 +3836,11 @@ public class XFLConverter {
}
}
}
Set<PlaceObjectTypeTag> handledClips = new HashSet<>();
for (int d = maxDepth; d >= 0; d--) {
loopp: for (int p = 0; p < clipPlaces.size() - 1; p++) {
loopp:
for (int p = 0; p < clipPlaces.size() - 1; p++) {
PlaceObjectTypeTag po = clipPlaces.get(p);
/* if (po != null && po.getClipDepth() == d && secondLevelPlaces.contains(po)) {
int clipFrame = clipFrameSplitters.get(p);
@@ -3873,39 +3857,37 @@ public class XFLConverter {
}
if (po != null && po.getClipDepth() == d) {
int clipFrame = clipFrameSplitters.get(p);
int nextFrame = clipFinishFrames.get(po);
int nextFrame = clipFinishFrames.get(po);
handledClips.add(po);
int lastFrame = nextFrame;
for (int p2 = 0; p2 < clipPlaces.size() - 1; p2++) {
PlaceObjectTypeTag po2 = clipPlaces.get(p2);
if (po2 == null) {
continue;
}
}
int clipFrame2 = clipFrameSplitters.get(p2);
int nextFrame2 = clipFinishFrames.get(po2);
if (lastFrame + 1 == clipFrame2
&& po.getDepth() == po2.getDepth()
if (lastFrame + 1 == clipFrame2
&& po.getDepth() == po2.getDepth()
&& po.getClipDepth() == po2.getClipDepth()
&& !multiLevelsPlaces.contains(po2)
) {
&& !multiLevelsPlaces.contains(po2)) {
lastFrame = nextFrame2;
handledClips.add(po2);
}
}
writer.writeStartElement("DOMLayer", new String[]{
"name", "Layer " + (index + 1) + (DEBUG_EXPORT_LAYER_DEPTHS ? " (depth " + po.getDepth() + " clipdepth:" + po.getClipDepth() + ")" : ""),
"color", randomOutlineColor(),
"layerType", "mask",
"locked", "true"});
convertFrames(depthToFramesList.get(po.getDepth()), clipFrame, lastFrame, "", "", nonLibraryShapes, tags, timelineTags, characters, po.getDepth(), flaVersion, files, writer, multiUsageMorphShapes);
convertFrames(swf, depthToFramesList.get(po.getDepth()), clipFrame, lastFrame, "", "", nonLibraryShapes, tags, timelineTags, characters, po.getDepth(), flaVersion, files, writer, multiUsageMorphShapes);
writer.writeEndElement();
int parentIndex = index;
index++;
for (int fx = clipFrame; fx <= lastFrame; fx++) {
for (int nd = po.getClipDepth() - 1; nd > po.getDepth(); nd--) {
if (!depthToFramesList.containsKey(nd) || !depthToFramesList.get(nd).contains(fx)) {
@@ -3914,13 +3896,13 @@ public class XFLConverter {
if (frameToDepthToClips.containsKey(fx)
&& frameToDepthToClips.get(fx).containsKey(nd)) {
List<PlaceObjectTypeTag> clips = frameToDepthToClips.get(fx).get(nd);
if (clips.size() > 1) {
if (clips.size() > 1) {
PlaceObjectTypeTag po2 = clips.get(1);
if (handledClips.contains(po2)) {
continue;
}
handledClips.add(po2);
MultiLevelClip mlc = placeToMaskedSymbol.get(po2);
writer.writeStartElement("DOMLayer", new String[]{
@@ -3946,11 +3928,9 @@ public class XFLConverter {
"keyMode", "" + KEY_MODE_NORMAL
});
writer.writeEmptyElement("elements");
writer.writeEndElement();
writer.writeEndElement();
}
writer.writeStartElement("DOMFrame", new String[]{
"index", "" + clipFrame2,
"duration", "" + mlc.numFrames,
@@ -3975,24 +3955,23 @@ public class XFLConverter {
writer.writeEndElement(); //elements
writer.writeEndElement(); //DOMFrame
writer.writeEndElement(); //frames
writer.writeEndElement();
index++;
index++;
for (int nd2 = po2.getDepth(); nd2 <= po2.getClipDepth(); nd2++) {
for (int i = clipFrame2; i < clipFrame2 + mlc.numFrames; i++) {
depthToFramesList.get(nd2).remove((Integer) i);
}
}
}
}
}
}
}
}
for (int nd = po.getClipDepth() - 1; nd > po.getDepth(); nd--) {
boolean nonEmpty = writeLayer(index, depthToFramesList.get(nd), nd, clipFrame, lastFrame, parentIndex, writer, nonLibraryShapes, tags, timelineTags, characters, flaVersion, files, multiUsageMorphShapes);
}
for (int nd = po.getClipDepth() - 1; nd > po.getDepth(); nd--) {
boolean nonEmpty = writeLayer(swf, index, depthToFramesList.get(nd), nd, clipFrame, lastFrame, parentIndex, writer, nonLibraryShapes, tags, timelineTags, characters, flaVersion, files, multiUsageMorphShapes);
for (int i = clipFrame; i <= lastFrame; i++) {
depthToFramesList.get(nd).remove((Integer) i);
}
@@ -4006,7 +3985,7 @@ public class XFLConverter {
}
}
boolean nonEmpty = writeLayer(index, depthToFramesList.get(d), d, 0, Integer.MAX_VALUE, -1, writer, nonLibraryShapes, tags, timelineTags, characters, flaVersion, files, multiUsageMorphShapes);
boolean nonEmpty = writeLayer(swf, index, depthToFramesList.get(d), d, 0, Integer.MAX_VALUE, -1, writer, nonLibraryShapes, tags, timelineTags, characters, flaVersion, files, multiUsageMorphShapes);
if (nonEmpty) {
index++;
}
@@ -4044,7 +4023,7 @@ public class XFLConverter {
writer.writeEndElement(); //DOMLayer
}
private boolean writeLayer(int index, List<Integer> onlyFrames, int d, int startFrame, int endFrame, int parentLayer, XFLXmlWriter writer, List<Integer> nonLibraryShapes, ReadOnlyTagList tags, ReadOnlyTagList timelineTags, HashMap<Integer, CharacterTag> characters, FLAVersion flaVersion, HashMap<String, byte[]> files, List<Integer> multiUsageMorphShapes) throws XMLStreamException {
private boolean writeLayer(SWF swf, int index, List<Integer> onlyFrames, int d, int startFrame, int endFrame, int parentLayer, XFLXmlWriter writer, List<Integer> nonLibraryShapes, ReadOnlyTagList tags, ReadOnlyTagList timelineTags, HashMap<Integer, CharacterTag> characters, FLAVersion flaVersion, HashMap<String, byte[]> files, List<Integer> multiUsageMorphShapes) throws XMLStreamException {
XFLXmlWriter layerPrev = new XFLXmlWriter();
layerPrev.writeStartElement("DOMLayer", new String[]{
"name", "Layer " + (index + 1) + (DEBUG_EXPORT_LAYER_DEPTHS ? " (depth " + d + ")" : ""),
@@ -4056,12 +4035,12 @@ public class XFLConverter {
}
if (parentLayer != -1) {
layerPrev.writeAttribute("parentLayerIndex", parentLayer);
layerPrev.writeAttribute("locked", true);
layerPrev.writeAttribute("locked", true);
}
layerPrev.writeCharacters(""); // todo honfika: hack to close start tag
String layerAfter = "</DOMLayer>";
int prevLength = writer.length();
convertFrames(onlyFrames, startFrame, endFrame, layerPrev.toString(), layerAfter, nonLibraryShapes, tags, timelineTags, characters, d, flaVersion, files, writer, multiUsageMorphShapes);
convertFrames(swf, onlyFrames, startFrame, endFrame, layerPrev.toString(), layerAfter, nonLibraryShapes, tags, timelineTags, characters, d, flaVersion, files, writer, multiUsageMorphShapes);
return writer.length() != prevLength;
}
@@ -4549,7 +4528,7 @@ public class XFLConverter {
final HashMap<String, byte[]> datfiles = new HashMap<>();
HashMap<Integer, CharacterTag> characters = getCharacters(swf.getTags());
List<Integer> multiUsageMorphShapes = getMultiUsageMorphShapes(swf.getTags(), characters);
List<Integer> nonLibraryShapes = getNonLibraryShapes(swf.getTags(), characters);
List<Integer> nonLibraryShapes = getNonLibraryShapes(swf, swf.getTags(), characters);
Map<Integer, String> characterClasses = getCharacterClasses(swf.getTags());
Map<Integer, ScriptPack> characterScriptPacks = getCharacterScriptPacks(swf, characterClasses);
Map<Integer, String> characterVariables = getCharacterVariables(swf.getTags());
@@ -4594,13 +4573,13 @@ public class XFLConverter {
}
Map<PlaceObjectTypeTag, MultiLevelClip> placeToMaskedSymbol = new HashMap<>();
convertFonts(characterClasses, swf.getTags(), domDocument);
convertFonts(characterClasses, swf.getTags(), domDocument);
convertLibrary(swf, characterVariables, characterClasses, characterScriptPacks, nonLibraryShapes, backgroundColor, swf.getTags(), characters, files, datfiles, flaVersion, domDocument, placeToMaskedSymbol, multiUsageMorphShapes);
//domDocument.writeStartElement("timelines");
ScriptPack documentScriptPack = characterScriptPacks.containsKey(0) ? characterScriptPacks.get(0) : null;
convertTimeline(swf.getAbcIndex(), -1, null, nonLibraryShapes, backgroundColor, swf.getTags(), swf.getTags(), characters, "Scene 1", flaVersion, files, domDocument, documentScriptPack, placeToMaskedSymbol, multiUsageMorphShapes);
convertTimeline(swf, swf.getAbcIndex(), -1, null, nonLibraryShapes, backgroundColor, swf.getTags(), swf.getTags(), characters, "Scene 1", flaVersion, files, domDocument, documentScriptPack, placeToMaskedSymbol, multiUsageMorphShapes);
//domDocument.writeEndElement();
if (hasAmfMetadata) {
@@ -4618,6 +4597,8 @@ public class XFLConverter {
domDocument.writeEndElement();
} catch (XMLStreamException ex) {
logger.log(Level.SEVERE, null, ex);
} catch (Throwable ex) {
logger.log(Level.SEVERE, null, ex);
}
String domDocumentStr = prettyFormatXML(domDocument.toString());
@@ -5377,8 +5358,9 @@ public class XFLConverter {
}
}
}
private class MultiLevelClip {
public PlaceObjectTypeTag startClipPlaceTag;
public int symbol;
public int numFrames;
@@ -5387,6 +5369,6 @@ public class XFLConverter {
this.startClipPlaceTag = startClipPlaceTag;
this.symbol = symbol;
this.numFrames = numFrames;
}
}
}
}
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/shapefixer/ShapeFixer.java
+357 -291
View File
@@ -17,46 +17,111 @@
package com.jpexs.decompiler.flash.xfl.shapefixer;
import com.jpexs.decompiler.flash.math.BezierEdge;
import com.jpexs.decompiler.flash.types.FILLSTYLEARRAY;
import com.jpexs.decompiler.flash.types.LINESTYLEARRAY;
import com.jpexs.decompiler.flash.types.shaperecords.CurvedEdgeRecord;
import com.jpexs.decompiler.flash.types.shaperecords.EndShapeRecord;
import com.jpexs.decompiler.flash.types.shaperecords.SHAPERECORD;
import com.jpexs.decompiler.flash.types.shaperecords.StraightEdgeRecord;
import com.jpexs.decompiler.flash.types.shaperecords.StyleChangeRecord;
import com.jpexs.helpers.Helper;
import com.jpexs.helpers.Reference;
import java.awt.geom.Point2D;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
/**
*
* @author JPEXS
*/
public class ShapeFixer {
final boolean DEBUG_PRINT = false;
private void addToEdgeMap(Map<Point2D, List<Edge>> edgeMap, Edge edge) {
if (!edgeMap.containsKey(edge.getFrom())) {
edgeMap.put(edge.getFrom(), new ArrayList<>());
}
if (!edgeMap.containsKey(edge.getTo())) {
edgeMap.put(edge.getTo(), new ArrayList<>());
}
edgeMap.get(edge.getFrom()).add(edge);
edgeMap.get(edge.getTo()).add(edge.invert());
private boolean isOnRight(Point2D a, Point2D b, Point2D c) {
return ((b.getX() - a.getX()) * (c.getY() - a.getY()) - (b.getY() - a.getY()) * (c.getX() - a.getX())) > 0;
}
private boolean fixSingleEdge(List<ShapeRecordAdvanced> records) {
Map<Point2D, List<Edge>> edgeMap = new LinkedHashMap<>();
double x = 0;
double y = 0;
private class BezierPair {
BezierEdge be1;
BezierEdge be2;
public BezierPair(BezierEdge be1, BezierEdge be2) {
this.be1 = be1;
this.be2 = be2;
}
@Override
public int hashCode() {
return Objects.hashCode(this.be1) + Objects.hashCode(this.be2);
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
return false;
}
final BezierPair other = (BezierPair) obj;
if ((Objects.equals(this.be1, other.be1) && Objects.equals(this.be2, other.be2))
|| (Objects.equals(this.be1, other.be2) && Objects.equals(this.be2, other.be1))) {
return true;
}
return false;
}
}
public List<ShapeRecordAdvanced> fix(
List<SHAPERECORD> records
) {
List<List<BezierEdge>> shapes = new ArrayList<>();
List<BezierEdge> currentShape = new ArrayList<>();
List<Integer> fillStyles0 = new ArrayList<>();
List<Integer> fillStyles1 = new ArrayList<>();
List<Integer> lineStyles = new ArrayList<>();
List<Integer> layers = new ArrayList<>();
List<FILLSTYLEARRAY> fillStyleLayers = new ArrayList<>();
List<LINESTYLEARRAY> lineStyleLayers = new ArrayList<>();
int fillStyle0 = 0;
int fillStyle1 = 0;
for (int r = 0; r < records.size(); r++) {
ShapeRecordAdvanced rec = records.get(r);
if (rec instanceof StyleChangeRecordAdvanced) {
StyleChangeRecordAdvanced scr = (StyleChangeRecordAdvanced) rec;
int lineStyle = 0;
int layer = -1;
int x = 0;
int y = 0;
for (SHAPERECORD rec : records) {
if (rec instanceof StyleChangeRecord) {
StyleChangeRecord scr = (StyleChangeRecord) rec;
if (scr.stateMoveTo
|| scr.stateNewStyles
|| scr.stateFillStyle0
|| scr.stateFillStyle1
|| scr.stateLineStyle) {
if (!currentShape.isEmpty()) {
shapes.add(currentShape);
fillStyles0.add(fillStyle0);
fillStyles1.add(fillStyle1);
lineStyles.add(lineStyle);
layers.add(layer);
currentShape = new ArrayList<>();
}
}
if (scr.stateNewStyles) {
layer++;
fillStyle0 = 0;
fillStyle1 = 0;
lineStyle = 0;
fillStyleLayers.add(scr.fillStyles);
lineStyleLayers.add(scr.lineStyles);
}
if (scr.stateFillStyle0) {
fillStyle0 = scr.fillStyle0;
@@ -64,297 +129,298 @@ public class ShapeFixer {
if (scr.stateFillStyle1) {
fillStyle1 = scr.fillStyle1;
}
if (scr.stateLineStyle) {
lineStyle = scr.lineStyle;
}
}
if (rec instanceof StraightEdgeRecordAdvanced) {
StraightEdgeRecordAdvanced ser = (StraightEdgeRecordAdvanced) rec;
addToEdgeMap(edgeMap, new Edge(fillStyle0, fillStyle1, r, false, x, y, x + ser.deltaX, y + ser.deltaY));
if (rec instanceof StraightEdgeRecord) {
int x2 = rec.changeX(x);
int y2 = rec.changeY(y);
BezierEdge be = new BezierEdge(x, y, x2, y2);
currentShape.add(be);
}
if (rec instanceof CurvedEdgeRecordAdvanced) {
CurvedEdgeRecordAdvanced cer = (CurvedEdgeRecordAdvanced) rec;
addToEdgeMap(edgeMap, new Edge(fillStyle0, fillStyle1, r, false,
x, y,
x + cer.controlDeltaX, y + cer.controlDeltaY,
x + cer.controlDeltaX + cer.anchorDeltaX, y + cer.controlDeltaY + cer.anchorDeltaY
));
if (rec instanceof CurvedEdgeRecord) {
CurvedEdgeRecord cer = (CurvedEdgeRecord) rec;
int cx = x + cer.controlDeltaX;
int cy = y + cer.controlDeltaY;
int ax = cx + cer.anchorDeltaX;
int ay = cy + cer.anchorDeltaY;
BezierEdge be = new BezierEdge(x, y, cx, cy, ax, ay);
currentShape.add(be);
}
if (rec instanceof EndShapeRecord) {
if (!currentShape.isEmpty()) {
shapes.add(currentShape);
fillStyles0.add(fillStyle0);
fillStyles1.add(fillStyle1);
lineStyles.add(lineStyle);
layers.add(layer);
currentShape = new ArrayList<>();
}
}
x = rec.changeX(x);
y = rec.changeY(y);
}
for (Point2D p : edgeMap.keySet()) {
List<Edge> edges = edgeMap.get(p);
for (int i = 0; i < edges.size(); i++) {
for (int j = 0; j < edges.size(); j++) {
if (i == j) {
continue;
}
Edge edge1 = edges.get(i);
Edge edge2 = edges.get(j);
List<Edge> newEdges1 = new ArrayList<>();
List<Edge> newEdges2 = new ArrayList<>();
List<BezierPair> splittedPairs = new ArrayList<>();
if (edge1.intersection(edge2, newEdges1, newEdges2)) {
loopi1:
for (int i1 = 0; i1 < shapes.size(); i1++) {
layer = layers.get(i1);
loopj1:
for (int j1 = 0; j1 < shapes.get(i1).size(); j1++) {
BezierEdge be1 = shapes.get(i1).get(j1);
for (int i2 = 0; i2 < shapes.size(); i2++) {
if (layers.get(i2) == layer) {
loopj2:
for (int j2 = 0; j2 < shapes.get(i2).size(); j2++) {
BezierEdge be2 = shapes.get(i2).get(j2);
/*System.out.println("---------------------------------------");
System.out.println("intersection edge "+edge1 + " and " +edge2);
System.out.println("newEdges1:");
for(Edge e:newEdges1) {
System.out.println("..."+e);
if (i1 == i2 && j1 == j2) {
continue;
}
if (be1.isEmpty()) {
shapes.get(i1).remove(j1);
j1--;
continue loopj1;
}
if (be2.isEmpty()) {
shapes.get(i2).remove(j2);
j2--;
continue loopj2;
}
//duplicated edge
if (be1.equals(be2) || be1.equals(be2.reverse())) {
shapes.get(i2).remove(j2);
j2--;
if (DEBUG_PRINT) {
System.err.println("removing duplicate " + be1.toSvg() + " and " + be2.toSvg());
}
continue;
}
BezierPair pair = new BezierPair(be1, be2);
if (splittedPairs.contains(pair)) {
continue;
}
List<Double> t1Ref = new ArrayList<>();
List<Double> t2Ref = new ArrayList<>();
List<Point2D> intPoints = new ArrayList<>();
if (DEBUG_PRINT) {
System.err.print("checking shape[" + i1 + "][" + j1 + "] to shape[" + i2 + "][" + j2 + "] : " + be1.toSvg() + " and " + be2.toSvg());
}
boolean isint = be1.intersects(be2, t1Ref, t2Ref, intPoints);
if (DEBUG_PRINT) {
System.err.println(" " + isint);
if (isint) {
System.err.println("xxx");
}
}
//List<Point2D> inters = be.getIntersections(be2);
if (!t1Ref.isEmpty()) {
if (DEBUG_PRINT) {
System.err.println("be1 " + be1);
System.err.println("be2 " + be2);
System.err.println("intersects " + be1.toSvg() + " " + be2.toSvg());
System.err.println(" fillstyle0: " + fillStyles0.get(i1) + " , " + fillStyles0.get(i2));
System.err.println(" fillstyle1: " + fillStyles1.get(i1) + " , " + fillStyles1.get(i2));
System.err.println(" linestyle: " + lineStyles.get(i1) + " , " + lineStyles.get(i2));
for (int n = 0; n < t1Ref.size(); n++) {
System.err.println("- " + t1Ref.get(n) + " , " + t2Ref.get(n) + " : " + intPoints.get(n));
}
}
if ((be1.getBeginPoint().equals(be2.getBeginPoint())
|| be1.getBeginPoint().equals(be2.getEndPoint())
|| be1.getEndPoint().equals(be2.getBeginPoint())
|| be1.getEndPoint().equals(be2.getEndPoint())) && (t1Ref.size() == 1)) {
if (DEBUG_PRINT) {
System.err.println("Same begin/end - continued");
}
continue;
}
if ((t1Ref.size() == 2) && !((t1Ref.get(0) == 0 || t1Ref.get(0) == 1)
&& (t2Ref.get(0) == 0 || t2Ref.get(0) == 1))) {
t1Ref.add(0, t1Ref.remove(1));
t2Ref.add(0, t2Ref.remove(1));
intPoints.add(0, intPoints.remove(1));
}
int splitPointIndex = 0;
if (intPoints.size() > 1) {
splitPointIndex = 1;
}
splittedPairs.add(pair);
Reference<BezierEdge> be1LRef = new Reference<>(null);
Reference<BezierEdge> be1RRef = new Reference<>(null);
be1.split(t1Ref.get(splitPointIndex), be1LRef, be1RRef);
Reference<BezierEdge> be2LRef = new Reference<>(null);
Reference<BezierEdge> be2RRef = new Reference<>(null);
be2.split(t2Ref.get(splitPointIndex), be2LRef, be2RRef);
BezierEdge be1L = be1LRef.getVal();
BezierEdge be1R = be1RRef.getVal();
BezierEdge be2L = be2LRef.getVal();
BezierEdge be2R = be2RRef.getVal();
Point2D intP = intPoints.get(splitPointIndex);
be1L.setEndPoint(intP);
be1R.setBeginPoint(intP);
be2L.setEndPoint(intP);
be2R.setBeginPoint(intP);
be1L.roundHalf();
be1R.roundHalf();
be2L.roundHalf();
be2R.roundHalf();
if (i1 == i2 && j1 < j2) {
shapes.get(i1).remove(j2);
shapes.get(i2).remove(j1);
j2--;
} else {
shapes.get(i1).remove(j1);
shapes.get(i2).remove(j2);
if (i1 == i2) {
j1--;
}
}
int n1 = j1;
int n2 = j2;
if (!be1L.isEmpty()) {
shapes.get(i1).add(n1, be1L);
if (i1 == i2 && n2 > n1) {
n2++;
}
n1++;
if (DEBUG_PRINT) {
System.err.println("added " + be1L.toSvg());
}
}
if (!be1R.isEmpty()) {
shapes.get(i1).add(n1, be1R);
if (i1 == i2 && n2 > n1) {
n2++;
}
n1++;
if (DEBUG_PRINT) {
System.err.println("added " + be1R.toSvg());
}
}
if (!be2L.isEmpty()) {
shapes.get(i2).add(n2, be2L);
if (i1 == i2 && n1 > n2) {
n1++;
}
n2++;
if (DEBUG_PRINT) {
System.err.println("added " + be2L.toSvg());
}
}
if (!be2R.isEmpty()) {
shapes.get(i2).add(n2, be2R);
if (i1 == i2 && n1 > n2) {
n1++;
}
n2++;
if (DEBUG_PRINT) {
System.err.println("added " + be2R.toSvg());
}
}
j1--;
continue loopj1;
}
}
System.out.println("newEdges2:");
for(Edge e:newEdges2) {
System.out.println("..."+e);
}*/
Point2D a = edge1.getFrom();
Point2D b = edge1.getTo();
Point2D c = edge2.getTo();
boolean edge2isRight = ((b.getX() - a.getX()) * (c.getY() - a.getY())) - ((b.getY() - a.getY()) * (c.getX() - a.getX())) > 0;
//edge2isRight = !edge2isRight;
fillStyle0 = edge2isRight ? edge1.fillStyle0 : edge2.fillStyle0;
fillStyle1 = edge2isRight ? edge2.fillStyle1 : edge1.fillStyle1;
StyleChangeRecordAdvanced moveCenter = new StyleChangeRecordAdvanced();
moveCenter.stateMoveTo = true;
moveCenter.moveDeltaX = edge1.getFrom().getX();
moveCenter.moveDeltaY = edge1.getFrom().getY();
moveCenter.stateFillStyle0 = true;
moveCenter.stateFillStyle1 = true;
moveCenter.fillStyle0 = fillStyle0;
moveCenter.fillStyle1 = fillStyle1;
//common line
StraightEdgeRecordAdvanced ser = new StraightEdgeRecordAdvanced();
ser.deltaX = newEdges1.get(0).getTo().getX() - edge1.getFrom().getX();
ser.deltaY = newEdges1.get(0).getTo().getY() - edge1.getFrom().getY();
StyleChangeRecordAdvanced scrStart1 = new StyleChangeRecordAdvanced();
scrStart1.stateMoveTo = false;
scrStart1.stateFillStyle0 = true;
scrStart1.stateFillStyle1 = true;
scrStart1.fillStyle0 = newEdges1.get(1).fillStyle0;
scrStart1.fillStyle1 = newEdges1.get(1).fillStyle1;
StyleChangeRecordAdvanced moveBack1 = new StyleChangeRecordAdvanced();
moveBack1.stateMoveTo = true;
Edge edge1NotInverted = edge1.inverted ? edge1.invert() : edge1;
moveBack1.moveDeltaX = edge1NotInverted.getTo().getX();
moveBack1.moveDeltaY = edge1NotInverted.getTo().getY();
moveBack1.stateFillStyle0 = true;
moveBack1.stateFillStyle1 = true;
moveBack1.fillStyle0 = edge1NotInverted.fillStyle0;
moveBack1.fillStyle1 = edge1NotInverted.fillStyle1;
records.remove(edge1.recordIndex);
records.add(edge1.recordIndex, moveCenter);
records.add(edge1.recordIndex + 1, ser);
records.add(edge1.recordIndex + 2, scrStart1);
records.add(edge1.recordIndex + 3, newEdges1.get(1).toShapeRecordAdvanced());
records.add(edge1.recordIndex + 4, moveBack1);
if (edge2.recordIndex > edge1.recordIndex) {
edge2.recordIndex += 4;
}
StyleChangeRecordAdvanced moveStart2 = new StyleChangeRecordAdvanced();
moveStart2.stateMoveTo = true;
moveStart2.moveDeltaX = newEdges2.get(1).getFrom().getX();
moveStart2.moveDeltaY = newEdges2.get(1).getFrom().getY();
moveStart2.stateFillStyle0 = true;
moveStart2.stateFillStyle1 = true;
moveStart2.fillStyle0 = newEdges2.get(1).fillStyle0;
moveStart2.fillStyle1 = newEdges2.get(1).fillStyle1;
StyleChangeRecordAdvanced moveBack2 = new StyleChangeRecordAdvanced();
moveBack2.stateMoveTo = true;
Edge edge2NotInverted = edge2.inverted ? edge2.invert() : edge2;
moveBack2.moveDeltaX = edge2NotInverted.getTo().getX();
moveBack2.moveDeltaY = edge2NotInverted.getTo().getY();
moveBack2.stateFillStyle0 = true;
moveBack2.stateFillStyle1 = true;
moveBack2.fillStyle0 = edge2NotInverted.fillStyle0;
moveBack2.fillStyle1 = edge2NotInverted.fillStyle1;
records.remove(edge2.recordIndex);
records.add(edge2.recordIndex, moveStart2);
records.add(edge2.recordIndex + 1, newEdges2.get(1).toShapeRecordAdvanced());
records.add(edge2.recordIndex + 2, moveBack2);
return true;
}
}
}
}
return false;
}
public List<ShapeRecordAdvanced> fixShape(List<ShapeRecordAdvanced> records) {
List<ShapeRecordAdvanced> ret = Helper.deepCopy(records);
while (fixSingleEdge(ret)) {
//nothing
}
for (ShapeRecordAdvanced rec : ret) {
rec.round();
List<ShapeRecordAdvanced> ret = new ArrayList<>();
layer = -1;
double dx = 0;
double dy = 0;
for (int i = 0; i < shapes.size(); i++) {
List<BezierEdge> bes = shapes.get(i);
if (bes.isEmpty()) {
continue;
}
StyleChangeRecordAdvanced scr = new StyleChangeRecordAdvanced();
scr.stateMoveTo = true;
dx = scr.moveDeltaX = bes.get(0).points.get(0).getX();
dy = scr.moveDeltaY = bes.get(0).points.get(0).getY();
int newLayer = layers.get(i);
if (newLayer != layer) {
scr.stateNewStyles = true;
scr.fillStyles = fillStyleLayers.get(newLayer);
scr.lineStyles = lineStyleLayers.get(newLayer);
}
layer = newLayer;
scr.stateFillStyle0 = true;
scr.fillStyle0 = fillStyles0.get(i);
scr.stateFillStyle1 = true;
scr.fillStyle1 = fillStyles1.get(i);
scr.stateLineStyle = true;
scr.lineStyle = lineStyles.get(i);
ret.add(scr);
for (BezierEdge be : bes) {
if (!be.getBeginPoint().equals(new Point2D.Double(dx, dy))) {
StyleChangeRecordAdvanced sm = new StyleChangeRecordAdvanced();
sm.stateMoveTo = true;
sm.moveDeltaX = be.getBeginPoint().getX();
sm.moveDeltaY = be.getBeginPoint().getY();
ret.add(sm);
}
dx = be.getEndPoint().getX();
dy = be.getEndPoint().getY();
ShapeRecordAdvanced sra = bezierToAdvancedRecord(be);
ret.add(sra);
}
}
return ret;
}
class Edge {
int recordIndex;
boolean inverted;
int fillStyle0 = 0;
int fillStyle1 = 0;
List<Point2D> points = new ArrayList<>();
public Point2D getFrom() {
return points.get(0);
}
public Point2D getTo() {
return points.get(points.size() - 1);
}
public BezierEdge toBezierEdge() {
return new BezierEdge(new ArrayList<>(points));
}
public boolean intersection(Edge otherEdge, List<Edge> newThisEdges, List<Edge> newOtherEdges) {
List<Double> t1s = new ArrayList<>();
List<Double> t2s = new ArrayList<>();
BezierEdge be1 = this.toBezierEdge();
BezierEdge be2 = otherEdge.toBezierEdge();
if (!be1.intersects(be2, t1s, t2s)) {
return false;
}
Reference<BezierEdge> be1aRef = new Reference<>(null);
Reference<BezierEdge> be1bRef = new Reference<>(null);
Reference<BezierEdge> be2aRef = new Reference<>(null);
Reference<BezierEdge> be2bRef = new Reference<>(null);
t1s.sort(new Comparator<Double>() {
@Override
public int compare(Double o1, Double o2) {
return Double.compare(o1, o2);
}
});
t2s.sort(new Comparator<Double>() {
@Override
public int compare(Double o1, Double o2) {
return Double.compare(o1, o2);
}
});
if (t1s.size() == 1) {
return false;
}
double t1 = t1s.get(t1s.size() - 1);
double t2 = t2s.get(t2s.size() - 1);
/*System.out.println("t1 = "+t1);
System.out.println("t2 = "+t2);*/
be1.split(t1, be1aRef, be1bRef);
be2.split(t2, be2aRef, be2bRef);
newThisEdges.add(new Edge(this.fillStyle0, this.fillStyle1, -1, this.inverted, be1aRef.getVal()));
newThisEdges.add(new Edge(this.fillStyle0, this.fillStyle1, -1, this.inverted, be1bRef.getVal()));
newOtherEdges.add(new Edge(otherEdge.fillStyle0, otherEdge.fillStyle1, -1, otherEdge.inverted, be2aRef.getVal()));
newOtherEdges.add(new Edge(otherEdge.fillStyle0, otherEdge.fillStyle1, -1, otherEdge.inverted, be2bRef.getVal()));
if (newThisEdges.get(0).isEmpty() || newOtherEdges.get(0).isEmpty()) {
newThisEdges.clear();
newOtherEdges.clear();
return false;
}
return true;
}
public Point2D pointAt(double t) {
return toBezierEdge().pointAt(t);
}
public Edge invert() {
List<Point2D> newPoints = new ArrayList<>();
for (int i = points.size() - 1; i >= 0; i--) {
newPoints.add(points.get(i));
}
return new Edge(fillStyle1, fillStyle0, recordIndex, !inverted, newPoints);
}
public Edge(int fillStyle0, int fillStyle1, int recordIndex, boolean inverted, BezierEdge be) {
List<Point2D> points2D = be.points;
List<Point2D> points = new ArrayList<>();
for (Point2D p : points2D) {
points.add(new Point2D.Double(p.getX(), p.getY()));
}
this.points = points;
this.recordIndex = recordIndex;
this.inverted = inverted;
this.fillStyle0 = fillStyle0;
this.fillStyle1 = fillStyle1;
}
public Edge(int fillStyle0, int fillStyle1, int recordIndex, boolean inverted, List<Point2D> points) {
this.points = points;
this.recordIndex = recordIndex;
this.inverted = inverted;
this.fillStyle0 = fillStyle0;
this.fillStyle1 = fillStyle1;
}
public Edge(int fillStyle0, int fillStyle1, int recordIndex, boolean inverted, double fromX, double fromY, double toX, double toY) {
points.add(new Point2D.Double(fromX, fromY));
points.add(new Point2D.Double(toX, toY));
this.recordIndex = recordIndex;
this.inverted = inverted;
this.fillStyle0 = fillStyle0;
this.fillStyle1 = fillStyle1;
}
public Edge(int fillStyle0, int fillStyle1, int recordIndex, boolean inverted, double fromX, double fromY, double controlX, double controlY, double toX, double toY) {
points.add(new Point2D.Double(fromX, fromY));
points.add(new Point2D.Double(controlX, controlY));
points.add(new Point2D.Double(toX, toY));
this.recordIndex = recordIndex;
this.inverted = inverted;
this.fillStyle0 = fillStyle0;
this.fillStyle1 = fillStyle1;
}
@Override
public String toString() {
List<String> list = new ArrayList<>();
for (Point2D p : points) {
list.add("[" + p.getX() + "," + p.getY() + "]");
}
return "{" + String.join("-", list) + "}";
}
public boolean isEmpty() {
return getFrom().equals(getTo());
}
public ShapeRecordAdvanced toShapeRecordAdvanced() {
if (points.size() == 3) {
CurvedEdgeRecordAdvanced cer = new CurvedEdgeRecordAdvanced();
cer.controlDeltaX = points.get(1).getX() - points.get(0).getX();
cer.controlDeltaY = points.get(1).getY() - points.get(0).getY();
cer.anchorDeltaX = points.get(2).getX() - points.get(1).getX();
cer.anchorDeltaY = points.get(2).getY() - points.get(1).getY();
return cer;
}
private ShapeRecordAdvanced bezierToAdvancedRecord(BezierEdge be) {
if (be.points.size() == 2) {
StraightEdgeRecordAdvanced ser = new StraightEdgeRecordAdvanced();
ser.deltaX = points.get(1).getX() - points.get(0).getX();
ser.deltaY = points.get(1).getY() - points.get(0).getY();
ser.deltaX = be.points.get(1).getX() - be.points.get(0).getX();
ser.deltaY = be.points.get(1).getY() - be.points.get(0).getY();
return ser;
}
if (be.points.size() == 3) {
CurvedEdgeRecordAdvanced cer = new CurvedEdgeRecordAdvanced();
cer.controlDeltaX = be.points.get(1).getX() - be.points.get(0).getX();
cer.controlDeltaY = be.points.get(1).getY() - be.points.get(0).getY();
cer.anchorDeltaX = be.points.get(2).getX() - be.points.get(1).getX();
cer.anchorDeltaY = be.points.get(2).getY() - be.points.get(1).getY();
return cer;
}
return null;
}
}