LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-29 16:46:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed: #2642 Sprite SWF export - do not export as SWF timeline, use DefineSprite tag and PlaceObject of it

Browse Source
This commit is contained in:
Jindra Petřík
2026-02-23 21:11:54 +01:00
parent 47b4dfa4a1
commit 42ac10e468
2 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/PreviewExporter.java
View File

@@ -451,9 +451,7 @@ public class PreviewExporter {
}
}
if (!isSprite) {
writeTag((Tag) treeItem, sos2, doneCharacters);
}
writeTag((Tag) treeItem, sos2, doneCharacters);
MATRIX mat = new MATRIX();
mat.hasRotate = false;
@@ -650,29 +648,30 @@ public class PreviewExporter {
new ShowFrameTag(swf).writeTag(sos2);
first = false;
}
} else if (treeItem instanceof DefineSpriteTag) {
DefineSpriteTag s = (DefineSpriteTag) treeItem;
Tag lastTag = null;
for (Tag t : s.getTags()) {
if (t instanceof EndTag) {
break;
} else if (t instanceof PlaceObjectTypeTag) {
PlaceObjectTypeTag pt = (PlaceObjectTypeTag) t;
MATRIX m = pt.getMatrix();
MATRIX m2 = new Matrix(m).preConcatenate(new Matrix(mat)).toMATRIX();
pt.writeTagWithMatrix(sos2, m2);
lastTag = t;
} else if (t instanceof DoActionTag) {
//ignore
} else {
t.writeTagNoScripts(sos2);
lastTag = t;
}
}
if (!s.getTags().isEmpty() && (lastTag != null) && (!(lastTag instanceof ShowFrameTag))) {
new ShowFrameTag(swf).writeTag(sos2);
}
} else {
/* else if (treeItem instanceof DefineSpriteTag) {
DefineSpriteTag s = (DefineSpriteTag) treeItem;
Tag lastTag = null;
for (Tag t : s.getTags()) {
if (t instanceof EndTag) {
break;
} else if (t instanceof PlaceObjectTypeTag) {
PlaceObjectTypeTag pt = (PlaceObjectTypeTag) t;
MATRIX m = pt.getMatrix();
MATRIX m2 = new Matrix(m).preConcatenate(new Matrix(mat)).toMATRIX();
pt.writeTagWithMatrix(sos2, m2);
lastTag = t;
} else if (t instanceof DoActionTag) {
//ignore
} else {
t.writeTagNoScripts(sos2);
lastTag = t;
}
}
if (!s.getTags().isEmpty() && (lastTag != null) && (!(lastTag instanceof ShowFrameTag))) {
new ShowFrameTag(swf).writeTag(sos2);
}
}*/
new PlaceObject2Tag(swf, false, 1, chtId, mat, null, 0, null, -1, null).writeTag(sos2);
new ShowFrameTag(swf).writeTag(sos2);
}
@@ -721,7 +720,10 @@ public class PreviewExporter {
List<CharacterIdTag> chIdTags = t.getSwf().getCharacterIdTags(((CharacterIdTag) t).getCharacterId());
if (chIdTags != null) {
for (CharacterIdTag chIdTag : chIdTags) {
if (!(chIdTag instanceof PlaceObjectTypeTag || chIdTag instanceof RemoveTag)) {
if (!(chIdTag instanceof PlaceObjectTypeTag
|| chIdTag instanceof RemoveTag
|| chIdTag instanceof DoInitActionTag
)) {
Set<Integer> needed = new LinkedHashSet<>();
((Tag) chIdTag).getNeededCharactersDeep(needed, new HashSet<>());