LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-08-02 15:22:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1584 SVG Import - paths with horizontal/vertical lines and rotation

Browse Source
This commit is contained in:
Jindra Petřík
2021-03-13 12:26:36 +01:00
parent fbf7019f1a
commit f874d21327
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/svg/SvgImporter.java
View File

@@ -433,7 +433,11 @@ public class SvgImporter {
p = transform2.transform(x, y);
serh.deltaX = (int) Math.round(p.x - prevPoint.x);
prevPoint = new Point(prevPoint.x + serh.deltaX, prevPoint.y/* + serh.deltaY*/);
//deltaX is not enough as transformation can make deltaY difference
serh.deltaY = (int) Math.round(p.y - prevPoint.y);
prevPoint = new Point(prevPoint.x + serh.deltaX, prevPoint.y + serh.deltaY);
serh.generalLineFlag = true;
serh.simplify();
newRecords.add(serh);
break;
case 'V':
@@ -441,9 +445,13 @@ public class SvgImporter {
y = command.params[0];
p = transform2.transform(x, y);
//deltaY is not enough as transformation can make deltaX difference
serv.deltaX = (int) Math.round(p.x - prevPoint.x);
serv.deltaY = (int) Math.round(p.y - prevPoint.y);
prevPoint = new Point(prevPoint.x/* + serv.deltaX*/, prevPoint.y + serv.deltaY);
serv.vertLineFlag = true;
prevPoint = new Point(prevPoint.x + serv.deltaX, prevPoint.y + serv.deltaY);
serv.generalLineFlag = true;
serv.simplify();
newRecords.add(serv);
break;
case 'Q':
@@ -487,11 +495,6 @@ public class SvgImporter {
p = transform2.transform(x, y);
//StraightEdgeRecord serc = new StraightEdgeRecord();
//serc.generalLineFlag = true;
//serc.deltaX = (int) Math.round(p.x - prevPoint.x);
//serc.deltaY = (int) Math.round(p.y - prevPoint.y);
//newRecords.add(serc);
List<Double> quadCoordinates = new CubicToQuad().cubicToQuad(pStart.x, pStart.y, pControl1.x, pControl1.y, pControl2.x, pControl2.y, p.x, p.y, 1);
for (int i = 2; i < quadCoordinates.size();) {
CurvedEdgeRecord cerc = new CurvedEdgeRecord();