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

percent calculation simplified

Browse Source
This commit is contained in:
[email protected]
2015-12-28 09:03:01 +01:00
parent 78147540f4
commit 68401e2c4e
2 changed files with 28 additions and 63 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
+27 -57
View File
@@ -1303,33 +1303,11 @@ public class SvgImporter {
SvgLinearGradient lgfill = (SvgLinearGradient) fill;
fillStyle.fillStyleType = FILLSTYLE.LINEAR_GRADIENT;
fillStyle.gradient = new GRADIENT();
double x1;
if (lgfill.x1.endsWith("%")) {
x1 = Double.parseDouble(lgfill.x1.substring(0, lgfill.x1.length() - 1)) / 100;
} else {
x1 = Double.parseDouble(lgfill.x1);
}
//x1 = x1 - (-819.2);
double x1 = parseCoordinate(lgfill.x1, 1/* todo: how much is 100%? */);
double y1 = parseCoordinate(lgfill.y1, 1/* todo: how much is 100%? */);
double x2 = parseCoordinate(lgfill.x2, 1/* todo: how much is 100%? */);
double y2 = parseCoordinate(lgfill.y2, 1/* todo: how much is 100%? */);
double y1;
if (lgfill.y1.endsWith("%")) {
y1 = Double.parseDouble(lgfill.y1.substring(0, lgfill.y1.length() - 1)) / 100;
} else {
y1 = Double.parseDouble(lgfill.y1);
}
double x2;
if (lgfill.x2.endsWith("%")) {
x2 = Double.parseDouble(lgfill.x2.substring(0, lgfill.x2.length() - 1)) / 100;
} else {
x2 = Double.parseDouble(lgfill.x2);
}
//x2 = x2 - 819.2;
double y2;
if (lgfill.y2.endsWith("%")) {
y2 = Double.parseDouble(lgfill.y2.substring(0, lgfill.y2.length() - 1)) / 100;
} else {
y2 = Double.parseDouble(lgfill.y2);
}
x1 = x1 * SWF.unitDivisor;
y1 = y1 * SWF.unitDivisor;
x2 = x2 * SWF.unitDivisor;
@@ -1371,25 +1349,9 @@ public class SvgImporter {
fillStyle.gradientMatrix = tMatrix.toMATRIX();
} else if (fill instanceof SvgRadialGradient) {
SvgRadialGradient rgfill = (SvgRadialGradient) fill;
double cx;
if (rgfill.cx.endsWith("%")) {
cx = Double.parseDouble(rgfill.cx.substring(0, rgfill.cx.length() - 1)) / 100;
} else {
cx = Double.parseDouble(rgfill.cx);
}
double cy;
if (rgfill.cy.endsWith("%")) {
cy = Double.parseDouble(rgfill.cy.substring(0, rgfill.cy.length() - 1)) / 100;
} else {
cy = Double.parseDouble(rgfill.cy);
}
double r;
if (rgfill.r.endsWith("%")) {
r = Double.parseDouble(rgfill.r.substring(0, rgfill.r.length() - 1)) / 100;
} else {
r = Double.parseDouble(rgfill.r);
}
double cx = parseCoordinate(rgfill.cx, 1/* todo: how much is 100%? */);
double cy = parseCoordinate(rgfill.cy, 1/* todo: how much is 100%? */);
double r = parseLength(rgfill.r, 1/* todo: how much is 100%? */);
Matrix boundingBoxMatrix = new Matrix();
if (rgfill.gradientUnits == SvgGradientUnits.OBJECT_BOUNDING_BOX) {
@@ -1403,18 +1365,8 @@ public class SvgImporter {
fillStyle.gradientMatrix = Matrix.getTranslateInstance(SWF.unitDivisor * cx, SWF.unitDivisor * cy).concatenate(new Matrix(fillStyle.gradientMatrix)).concatenate(Matrix.getScaleInstance(r / 819.2)).preConcatenate(boundingBoxMatrix).toMATRIX();
double fx;
if (rgfill.fx.endsWith("%")) {
fx = Double.parseDouble(rgfill.fx.substring(0, rgfill.fx.length() - 1)) / 100;
} else {
fx = Double.parseDouble(rgfill.fx);
}
double fy;
if (rgfill.fy.endsWith("%")) {
fy = Double.parseDouble(rgfill.fy.substring(0, rgfill.fy.length() - 1)) / 100;
} else {
fy = Double.parseDouble(rgfill.fy);
}
double fx = parseCoordinate(rgfill.fx, 1/* todo: how much is 100%? */);
double fy = parseCoordinate(rgfill.fy, 1/* todo: how much is 100%? */);
if (!rgfill.fx.equals(rgfill.cx) || !rgfill.fy.equals(rgfill.cy)) {
fillStyle.fillStyleType = FILLSTYLE.FOCAL_RADIAL_GRADIENT;
fillStyle.gradient = new FOCALGRADIENT();
@@ -1623,6 +1575,24 @@ public class SvgImporter {
return result;
}
public double parseNumberOrPercent(String value) {
if (value == null) {
throw new NumberFormatException();
}
boolean percent = value.endsWith("%");
if (percent) {
value = value.substring(0, value.length() - 1);
}
double result = Double.parseDouble(value);
if (percent) {
result /= 100;
}
return result;
}
private double getDpi() {
return 96;
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/svg/SvgStyle.java
+1 -6
View File
@@ -428,12 +428,7 @@ class SvgStyle {
SvgStyle newStyle = new SvgStyle(importer, idMap, stopEl);
String offsetStr = stopEl.getAttribute("offset");
double offset;
if (offsetStr.endsWith("%")) {
offset = Double.parseDouble(offsetStr.substring(0, offsetStr.length() - 1)) / 100;
} else {
offset = Double.parseDouble(offsetStr);
}
double offset = importer.parseNumberOrPercent(offsetStr);
Color color = newStyle.getStopColor();
if (color == null) {
color = Color.BLACK;