LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 22:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

SVG Shapes import - non-scaling strokes

Browse Source
This commit is contained in:
Jindra Petřík
2023-10-16 09:36:06 +02:00
parent e9fc7b2c9a
commit 16c91e1b98
4 changed files with 31 additions and 0 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
+22
View File
@@ -102,6 +102,12 @@ public class SvgImporter {
public Tag importSvg(ShapeTag st, String svgXml, boolean fill) {
shapeTag = st;
if (st instanceof DefineShape4Tag) {
DefineShape4Tag shape4 = (DefineShape4Tag) st;
shape4.usesNonScalingStrokes = false;
shape4.usesScalingStrokes = false;
}
SHAPEWITHSTYLE shapes = new SHAPEWITHSTYLE();
shapes.fillStyles = new FILLSTYLEARRAY();
shapes.lineStyles = new LINESTYLEARRAY();
@@ -1685,6 +1691,22 @@ public class SvgImporter {
SvgLineJoin lineJoin = style.getStrokeLineJoin();
if (lineStyle instanceof LINESTYLE2) {
LINESTYLE2 lineStyle2 = (LINESTYLE2) lineStyle;
String vectorEffect = style.getVectorEffect();
if ("non-scaling-stroke".equals(vectorEffect)) {
lineStyle2.noHScaleFlag = true;
lineStyle2.noVScaleFlag = true;
if (shapeTag instanceof DefineShape4Tag) {
DefineShape4Tag shape4 = (DefineShape4Tag) shapeTag;
shape4.usesNonScalingStrokes = true;
}
} else {
if (shapeTag instanceof DefineShape4Tag) {
DefineShape4Tag shape4 = (DefineShape4Tag) shapeTag;
shape4.usesScalingStrokes = true;
}
}
int swfCap = lineCap == SvgLineCap.BUTT ? LINESTYLE2.NO_CAP
: lineCap == SvgLineCap.ROUND ? LINESTYLE2.ROUND_CAP
: lineCap == SvgLineCap.SQUARE ? LINESTYLE2.SQUARE_CAP : 0;
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/svg/SvgStyle.java
+7
View File
@@ -204,6 +204,10 @@ class SvgStyle {
public double getStopOpacity() {
return getValue(element, "stop-opacity");
}
public String getVectorEffect() {
return getValue(element, "vector-effect");
}
public SvgFill getFillWithOpacity() {
SvgFill fill = getFill();
@@ -704,6 +708,9 @@ class SvgStyle {
double stopOpacity = Double.parseDouble(value);
return stopOpacity;
}
case "vector-effect": {
return value;
}
}
} catch (NumberFormatException ex) {
//ignore
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/svg/SvgStyleProperty.java
+1
View File
@@ -67,6 +67,7 @@ public class SvgStyleProperty {
p.put("opacity", new SvgStyleProperty("opacity", false, 1.0));
p.put("stop-color", new SvgStyleProperty("stop-color", false, Color.BLACK));
p.put("stop-opacity", new SvgStyleProperty("stop-opacity", false, 1.0));
p.put("vector-effect", new SvgStyleProperty("vector-effect", false, "none"));
properties = p;
}