LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-19 13:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added SVG Sprite export - blend modes

Browse Source
This commit is contained in:
Jindra Petřík
2023-10-10 20:57:45 +02:00
parent 6c874da140
commit 1d7fecac50
3 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/commonshape/SVGExporter.java
View File

@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.exporters.modes.FontExportMode;
import com.jpexs.decompiler.flash.tags.Tag;
import com.jpexs.decompiler.flash.types.BlendMode;
import com.jpexs.decompiler.flash.types.RECT;
import com.jpexs.decompiler.flash.types.RGBA;
import com.jpexs.helpers.Helper;
@@ -238,7 +239,7 @@ public class SVGExporter {
}
private void addScalingGridUse(Matrix transform, RECT boundRect, String href, String instanceName, RECT scalingRect, String characterId, String characterName) {
private void addScalingGridUse(Matrix transform, RECT boundRect, String href, String instanceName, RECT scalingRect, String characterId, String characterName, int blendMode) {
Element image = _svg.createElement("g");
@@ -419,16 +420,17 @@ public class SVGExporter {
if (characterName != null) {
image.setAttribute("data-characterName", characterName);
}
setBlendMode(image, blendMode);
_svgGs.peek().appendChild(image);
}
public Element addUse(Matrix transform, RECT boundRect, String href, String instanceName, RECT scalingRect) {
return addUse(transform, boundRect, href, instanceName, scalingRect, null, null);
return addUse(transform, boundRect, href, instanceName, scalingRect, null, null, BlendMode.NORMAL);
}
public Element addUse(Matrix transform, RECT boundRect, String href, String instanceName, RECT scalingRect, String characterId, String characterName) {
public Element addUse(Matrix transform, RECT boundRect, String href, String instanceName, RECT scalingRect, String characterId, String characterName, int blendMode) {
if (scalingRect != null && (transform == null || (Double.compare(transform.rotateSkew0, 0.0) == 0 && Double.compare(transform.rotateSkew1, 0.0) == 0))) {
addScalingGridUse(transform, boundRect, href, instanceName, scalingRect, characterId, characterName);
addScalingGridUse(transform, boundRect, href, instanceName, scalingRect, characterId, characterName, blendMode);
return null; //??
}
Element image = _svg.createElement("use");
@@ -446,10 +448,47 @@ public class SVGExporter {
if (characterName != null) {
image.setAttribute("data-characterName", characterName);
}
setBlendMode(image, blendMode);
image.setAttribute("xlink:href", "#" + href);
_svgGs.peek().appendChild(image);
return image;
}
private void setBlendMode(Element element, int blendMode) {
switch(blendMode) {
case BlendMode.MULTIPLY:
element.setAttribute("style", "mix-blend-mode: multiply");
break;
case BlendMode.SCREEN:
element.setAttribute("style", "mix-blend-mode: screen");
break;
case BlendMode.OVERLAY:
element.setAttribute("style", "mix-blend-mode: overlay");
break;
case BlendMode.DARKEN:
element.setAttribute("style", "mix-blend-mode: darken");
break;
case BlendMode.LIGHTEN:
element.setAttribute("style", "mix-blend-mode: lighten");
break;
case BlendMode.HARDLIGHT:
element.setAttribute("style", "mix-blend-mode: hard-light");
break;
case BlendMode.DIFFERENCE:
element.setAttribute("style", "mix-blend-mode: difference");
break;
case BlendMode.ADD:
case BlendMode.ALPHA:
case BlendMode.ERASE:
case BlendMode.INVERT:
case BlendMode.LAYER:
case BlendMode.SUBTRACT:
//unsupported
break;
}
}
public void addStyle(String fontFace, byte[] data, FontExportMode mode) {
if (!fontFaces.contains(fontFace)) {

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java
View File

@@ -1284,7 +1284,7 @@ public class Timeline {
exporter.endGroup();
}
Matrix mat = Matrix.getTranslateInstance(rect.xMin, rect.yMin).preConcatenate(new Matrix(layer.matrix));
exporter.addUse(mat, boundRect, assetName, layer.instanceName, scalingGrid == null ? null : scalingGrid.splitter, String.valueOf(drawable.getCharacterId()), String.join("___", drawable.getClassNames()));
exporter.addUse(mat, boundRect, assetName, layer.instanceName, scalingGrid == null ? null : scalingGrid.splitter, String.valueOf(drawable.getCharacterId()), String.join("___", drawable.getClassNames()), layer.blendMode);
}
}
}