From 6aba08bd31a6311b5cb3c646a9d76165018700f8 Mon Sep 17 00:00:00 2001 From: NoobTracker <63962365+NoobTracker@users.noreply.github.com> Date: Tue, 6 Sep 2022 11:15:34 +0200 Subject: [PATCH] tell the exporter the ID and name of the drawable tag --- .../decompiler/flash/exporters/commonshape/SVGExporter.java | 5 ++++- .../src/com/jpexs/decompiler/flash/timeline/Timeline.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/commonshape/SVGExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/commonshape/SVGExporter.java index 6e71496ee..9383b1b97 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/commonshape/SVGExporter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/commonshape/SVGExporter.java @@ -405,8 +405,11 @@ public class SVGExporter { } _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); + } + public Element addUse(Matrix transform, RECT boundRect, String href, String instanceName, RECT scalingRect, String characterId, String characterName) { 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); return null; //?? diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java index 060902951..910216efb 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java @@ -1219,7 +1219,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); + exporter.addUse(mat, boundRect, assetName, layer.instanceName, scalingGrid == null ? null : scalingGrid.splitter, drawable.getCharacterId(), drawable.getClassName()); } } }