LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-03 18:44:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

#503, #1257 FLA export - removed shape smoothing as it causes problems in some cases

Browse Source
This commit is contained in:
Jindra Petřík
2021-03-04 17:32:22 +01:00
parent 74bb5ea5a2
commit ed4af6e96e
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
View File

@@ -228,7 +228,18 @@ public class XFLConverter {
private static void convertShapeEdges(int startX, int startY, MATRIX mat, List<SHAPERECORD> records, StringBuilder ret) {
int x = startX;
int y = startY;
ret.append("!").append(startX).append(" ").append(startY);
boolean hasMove = false;
if (!records.isEmpty()) {
if (records.get(0) instanceof StyleChangeRecord) {
StyleChangeRecord scr = (StyleChangeRecord) records.get(0);
if (scr.stateMoveTo) {
hasMove = true;
}
}
}
if (!hasMove) {
ret.append("!").append(startX).append(" ").append(startY);
}
for (SHAPERECORD rec : records) {
convertShapeEdge(mat, rec, x, y, ret);
x = rec.changeX(x);
@@ -715,8 +726,9 @@ public class XFLConverter {
if (mat == null) {
mat = new MATRIX();
}
//TODO: insert some magic methods here to fix issue #1257
shapeRecords = smoothShape(shapeRecords);
//smoothing fixes some shapes in #503, but also breaks some shapes of #1257
//shapeRecords = smoothShape(shapeRecords);
List<SHAPERECORD> edges = new ArrayList<>();
int lineStyleCount = 0;
int fillStyle0 = -1;
@@ -3841,7 +3853,7 @@ public class XFLConverter {
XMLReader parser;
try {
SAXParserFactory factory = SAXParserFactory.newInstance();
SAXParser sparser = factory.newSAXParser();
SAXParser sparser = factory.newSAXParser();
parser = sparser.getXMLReader();
parser.setContentHandler(tparser);
parser.setErrorHandler(tparser);
@@ -3855,7 +3867,7 @@ public class XFLConverter {
System.out.println(html);
System.err.println(tparser.result);
}
} catch (SAXException | IOException| ParserConfigurationException e) {
} catch (SAXException | IOException | ParserConfigurationException e) {
logger.log(Level.SEVERE, "Error while converting HTML", e);
}
return tparser.result.toString();