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

Merge origin/master

Browse Source
This commit is contained in:
Jindra Petřík
2014-11-04 22:15:31 +01:00
parent cba8f6fc41 49765d71b7
commit 05b5bcaa2f
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,7 @@ public class Timeline {
private void ensureInitialized() {
if (!initialized) {
initialize();
initialized = true;
}
}
@@ -246,8 +247,11 @@ public class Timeline {
frames.add(frame);
}
detectTweens();
for (int d = 1; d <= getMaxDepthInternal(); d++) {
// todo: enable again after TweenDetector.detectRanges implemented
//detectTweens();
int maxDepth = getMaxDepthInternal();
for (int d = 1; d <= maxDepth; d++) {
for (int f = frames.size() - 1; f >= 0; f--) {
if (frames.get(f).layers.get(d) != null) {
depthMaxFrame.put(d, f + 1);
@@ -266,7 +270,8 @@ public class Timeline {
}
private void detectTweens() {
for (int d = 1; d <= getMaxDepthInternal(); d++) {
int maxDepth = getMaxDepthInternal();
for (int d = 1; d <= maxDepth; d++) {
int characterId = -1;
int len = 0;
for (int f = 0; f <= frames.size(); f++) {
@@ -282,10 +287,10 @@ public class Timeline {
}
List<TweenRange> ranges = TweenDetector.detectRanges(matrices);
for (TweenRange r : ranges) {
System.out.println("" + r);
for (int t = r.startPosition; t <= r.endPosition; t++) {
frames.get(f - len + t).layers.get(d).motionTween = true;
frames.get(f - len + t).layers.get(d).key = false;
DepthState layer = frames.get(f - len + t).layers.get(d);
layer.motionTween = true;
layer.key = false;
}
frames.get(r.startPosition).layers.get(d).key = true;
}