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

Add new (key)frame.

Browse Source 
Button add to stage fix.
getCharacters sync fix
This commit is contained in:
Jindra Petřík
2024-10-29 16:55:43 +01:00
parent 875b9c17d3
commit c43769410c
11 changed files with 604 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
+8 -4
View File
@@ -952,8 +952,10 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
* @return Character id to character map
*/
public Map<Integer, CharacterTag> getCharacters(boolean withImported) {
Map<Integer, CharacterTag> newCharacters = characters;
Map<Integer, CharacterTag> newCharactersWithImported = charactersWithImported;
synchronized (charactersLock) {
if (characters == null || charactersWithImported == null) {
if (newCharacters == null || newCharactersWithImported == null) {
if (destroyed) {
return new HashMap<>();
}
@@ -988,14 +990,16 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
}
}
characters = Collections.unmodifiableMap(chars);
charactersWithImported = Collections.unmodifiableMap(charsWithImported);
newCharacters = Collections.unmodifiableMap(chars);
newCharactersWithImported = Collections.unmodifiableMap(charsWithImported);
characters = newCharacters;
charactersWithImported = newCharactersWithImported;
characterToId = Collections.unmodifiableMap(charToId);
characterIdTags = Collections.unmodifiableMap(charIdtags);
externalImages2 = Collections.unmodifiableMap(eimages);
}
return withImported ? charactersWithImported : characters;
return withImported ? newCharactersWithImported : newCharacters;
}
}
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/ButtonTag.java
+1 -1
View File
@@ -64,7 +64,7 @@ public abstract class ButtonTag extends DrawableTag implements Timelined {
*/
public static int FRAME_HITTEST = 3;
private Timeline timeline;
private transient Timeline timeline;
private boolean isSingleFrameInitialized;
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/TweenDetector.java
+3 -2
View File
@@ -28,12 +28,13 @@ import java.util.List;
public class TweenDetector {
public static List<TweenRange> detectRanges(List<DepthState> depthStates) {
return new ArrayList<>();
//TODO: make this working :-(
if (depthStates.size() < 2 || depthStates.get(0).placeObjectTag == depthStates.get(1).placeObjectTag) {
/*if (depthStates.size() < 2 || depthStates.get(0).placeObjectTag == depthStates.get(1).placeObjectTag) {
return new ArrayList<>();
}
return new ArrayList<>(Arrays.asList(new TweenRange(0, depthStates.size() - 1)));
return new ArrayList<>(Arrays.asList(new TweenRange(0, depthStates.size() - 1)));*/
/*
List<TweenRange> ret = new ArrayList<>();