LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-01 11:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

#773 scripts associated with ClipActions are not shown anymore fixed

Browse Source
This commit is contained in:
honfika@gmail.com
2015-01-20 21:24:21 +01:00
parent 526edda6fa
commit 25bd81f2f9
6 changed files with 128 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Frame.java
View File

@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.tags.DoActionTag;
import com.jpexs.decompiler.flash.tags.ShowFrameTag;
import com.jpexs.decompiler.flash.tags.Tag;
import com.jpexs.decompiler.flash.tags.base.ASMSourceContainer;
import com.jpexs.decompiler.flash.treeitems.TreeItem;
import com.jpexs.decompiler.flash.types.RGB;
import com.jpexs.decompiler.flash.types.RGBA;
@@ -47,6 +48,8 @@ public class Frame implements TreeItem {
public List<DoActionTag> actions = new ArrayList<>();
public List<ASMSourceContainer> actionContainers = new ArrayList<>();
public List<Tag> innerTags = new ArrayList<>();
public ShowFrameTag showFrameTag = null; // can be null for the last frame

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

@@ -26,6 +26,7 @@ import com.jpexs.decompiler.flash.tags.StartSound2Tag;
import com.jpexs.decompiler.flash.tags.StartSoundTag;
import com.jpexs.decompiler.flash.tags.Tag;
import com.jpexs.decompiler.flash.tags.base.ASMSource;
import com.jpexs.decompiler.flash.tags.base.ASMSourceContainer;
import com.jpexs.decompiler.flash.tags.base.ButtonTag;
import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
import com.jpexs.decompiler.flash.tags.base.CharacterTag;
@@ -74,11 +75,13 @@ public class Timeline {
private final List<ASMSource> asmSources = new ArrayList<>();
private final List<ASMSourceContainer> asmSourceContainers = new ArrayList<>();
private final Map<ASMSource, Integer> actionFrames = new HashMap<>();
private AS2Package as2RootPackage;
private final List<Tag> otherTags = new ArrayList<>();
public final List<Tag> otherTags = new ArrayList<>();
private boolean initialized = false;
@@ -109,6 +112,7 @@ public class Timeline {
frames.clear();
depthMaxFrame.clear();
asmSources.clear();
asmSourceContainers.clear();
actionFrames.clear();
otherTags.clear();
as2RootPackage = new AS2Package(null, null, swf);
@@ -168,10 +172,23 @@ public class Timeline {
frame.layersChanged = true;
boolean newFrameNeeded = false;
for (Tag t : tags) {
if (ShowFrameTag.isNestedTagType(t.getId())) {
boolean isNested = ShowFrameTag.isNestedTagType(t.getId());
if (isNested) {
newFrameNeeded = true;
frame.innerTags.add(t);
}
if (t instanceof ASMSourceContainer) {
ASMSourceContainer asmSourceContainer = (ASMSourceContainer) t;
if (!asmSourceContainer.getSubItems().isEmpty()) {
if (isNested) {
frame.actionContainers.add(asmSourceContainer);
} else {
asmSourceContainers.add(asmSourceContainer);
}
}
}
if (t instanceof StartSoundTag) {
newFrameNeeded = true;
frame.sounds.add(((StartSoundTag) t).soundId);