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

#1122 SVG import - relative coordinates - test pservers-grad-10-b

Browse Source
This commit is contained in:
Jindra Petřík
2021-03-12 22:12:39 +01:00
parent b3954e7ec9
commit 6c671ab6ca
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/svg/SvgImporter.java
+15 -18
View File
@@ -1456,10 +1456,11 @@ public class SvgImporter {
double x2 = parseCoordinate(lgfill.x2, 1);
double y2 = parseCoordinate(lgfill.y2, 1);
x1 = x1 * SWF.unitDivisor;
y1 = y1 * SWF.unitDivisor;
x2 = x2 * SWF.unitDivisor;
y2 = y2 * SWF.unitDivisor;
Matrix xyMatrix = new Matrix();
xyMatrix.scaleX = (x2 - x1) * SWF.unitDivisor;
xyMatrix.rotateSkew0 = (y2 - y1) * SWF.unitDivisor;
xyMatrix.rotateSkew1 = -xyMatrix.rotateSkew0;
xyMatrix.scaleY = xyMatrix.scaleX;
Matrix gmatrix = new Matrix();
if (lgfill.gradientUnits == SvgGradientUnits.OBJECT_BOUNDING_BOX) {
@@ -1469,29 +1470,25 @@ public class SvgImporter {
gmatrix.scaleY = (bounds.Ymax - bounds.Ymin) / SWF.unitDivisor;
gmatrix.translateX = bounds.Xmin;
gmatrix.translateY = bounds.Ymin;
x1 *= bounds.getWidth();
y1 *= bounds.getHeight();
} else {
gmatrix = new Matrix(fillStyle.gradientMatrix);
x1 *= SWF.unitDivisor;
y1 *= SWF.unitDivisor;
}
Matrix xyMatrix = new Matrix();
xyMatrix.scaleX = x2 - x1;
xyMatrix.rotateSkew0 = y2 - y1;
xyMatrix.rotateSkew1 = -xyMatrix.rotateSkew0;
xyMatrix.scaleY = xyMatrix.scaleX;
xyMatrix = xyMatrix.preConcatenate(gmatrix);
Matrix zeroStartMatrix = Matrix.getTranslateInstance(0.5, 0);
Matrix scaleMatrix = Matrix.getScaleInstance(1 / 16384.0 / 2);
Matrix transMatrix = Matrix.getTranslateInstance(x1, y1);
Matrix tMatrix = new Matrix();
tMatrix = tMatrix.preConcatenate(scaleMatrix);
tMatrix = tMatrix.preConcatenate(zeroStartMatrix);
tMatrix = tMatrix.preConcatenate(xyMatrix);
tMatrix = tMatrix.preConcatenate(transMatrix);
tMatrix = tMatrix
.concatenate(transMatrix)
.concatenate(gmatrix)
.concatenate(xyMatrix)
.concatenate(zeroStartMatrix)
.concatenate(scaleMatrix);
fillStyle.gradientMatrix = tMatrix.toMATRIX();
} else if (fill instanceof SvgRadialGradient) {
SvgRadialGradient rgfill = (SvgRadialGradient) fill;