diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ec4d9787..443bf6e76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file. ### Fixed - GFX - DefineExternalImage2 display and correct handling if standalone - [#1931] DefineSprite rectange calculation (incorrect export dimensions) -- [#1929] Wrong subsprite frames display +- [#1929], [#1932] Wrong subsprite frames display ## [18.3.0] - 2023-01-01 ### Added @@ -2843,6 +2843,7 @@ All notable changes to this project will be documented in this file. [alpha 7]: https://github.com/jindrapetrik/jpexs-decompiler/releases/tag/alpha7 [#1931]: https://www.free-decompiler.com/flash/issues/1931 [#1929]: https://www.free-decompiler.com/flash/issues/1929 +[#1932]: https://www.free-decompiler.com/flash/issues/1932 [#1913]: https://www.free-decompiler.com/flash/issues/1913 [#1905]: https://www.free-decompiler.com/flash/issues/1905 [#1915]: https://www.free-decompiler.com/flash/issues/1915 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 62f5d90a4..c74df06ee 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 @@ -741,8 +741,8 @@ public class Timeline { if (cacheAsBitmap && renderContext.displayObjectCache != null) { DisplayObjectCacheKey key = new DisplayObjectCacheKey(layer.placeObjectTag, unzoom, viewRect); img = renderContext.displayObjectCache.get(key); - } - + } + int stateCount = renderContext.stateUnderCursor == null ? 0 : renderContext.stateUnderCursor.size(); int dframe; if (fontFrameNum != -1) { @@ -750,8 +750,7 @@ public class Timeline { } else { dframe = time % drawableFrameCount; } - int dtime = 0; - + int dtime = time - dframe; ExportRectangle viewRect2 = new ExportRectangle(viewRect); if (filters != null && filters.size() > 0) { diff --git a/libsrc/ffdec_lib/testdata/timeline/timeline.html b/libsrc/ffdec_lib/testdata/timeline/timeline.html new file mode 100644 index 000000000..60337bfef --- /dev/null +++ b/libsrc/ffdec_lib/testdata/timeline/timeline.html @@ -0,0 +1,49 @@ + + + + timeline + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + Get Adobe Flash player + + + + + +
+ + diff --git a/libsrc/ffdec_lib/testdata/timeline/timeline.swd b/libsrc/ffdec_lib/testdata/timeline/timeline.swd new file mode 100644 index 000000000..b978b12fd Binary files /dev/null and b/libsrc/ffdec_lib/testdata/timeline/timeline.swd differ diff --git a/libsrc/ffdec_lib/testdata/timeline/timeline.swf b/libsrc/ffdec_lib/testdata/timeline/timeline.swf new file mode 100644 index 000000000..911c2df7d Binary files /dev/null and b/libsrc/ffdec_lib/testdata/timeline/timeline.swf differ diff --git a/libsrc/ffdec_lib/testdata/timeline/timeline/DOMDocument.xml b/libsrc/ffdec_lib/testdata/timeline/timeline/DOMDocument.xml new file mode 100644 index 000000000..bda4c61fd --- /dev/null +++ b/libsrc/ffdec_lib/testdata/timeline/timeline/DOMDocument.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/timeline/timeline/LIBRARY/Symbol 1.xml b/libsrc/ffdec_lib/testdata/timeline/timeline/LIBRARY/Symbol 1.xml new file mode 100644 index 000000000..bc74e0061 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/timeline/timeline/LIBRARY/Symbol 1.xml @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + 2 + + + + + + + + + + + + + + + + + 3 + + + + + + + + + + + + + + + + + 4 + + + + + + + + + + + + + + + + + 5 + + + + + + + + + + + + + + + + + 6 + + + + + + + + + + + + + + + + + 7 + + + + + + + + + + + + + + + + + 8 + + + + + + + + + + + + + + + + + 9 + + + + + + + + + + + + + + + + + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/timeline/timeline/LIBRARY/Symbol 2.xml b/libsrc/ffdec_lib/testdata/timeline/timeline/LIBRARY/Symbol 2.xml new file mode 100644 index 000000000..b46ff505e --- /dev/null +++ b/libsrc/ffdec_lib/testdata/timeline/timeline/LIBRARY/Symbol 2.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/timeline/timeline/LIBRARY/Symbol 3.xml b/libsrc/ffdec_lib/testdata/timeline/timeline/LIBRARY/Symbol 3.xml new file mode 100644 index 000000000..c0845ba96 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/timeline/timeline/LIBRARY/Symbol 3.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/timeline/timeline/LIBRARY/Symbol 4.xml b/libsrc/ffdec_lib/testdata/timeline/timeline/LIBRARY/Symbol 4.xml new file mode 100644 index 000000000..d2f00d943 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/timeline/timeline/LIBRARY/Symbol 4.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/timeline/timeline/META-INF/metadata.xml b/libsrc/ffdec_lib/testdata/timeline/timeline/META-INF/metadata.xml new file mode 100644 index 000000000..3eada6ef1 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/timeline/timeline/META-INF/metadata.xml @@ -0,0 +1,55 @@ + + + + + Adobe Flash Professional CS6 - build 481 + 2023-01-06T09:47:59-08:00 + 2023-01-06T09:48:13-08:00 + 2023-01-06T09:48:13-08:00 + + + application/vnd.adobe.fla + + + xmp.iid:D2783472B889ED11A232E2213777BE6E + xmp.did:D2783472B889ED11A232E2213777BE6E + xmp.did:D2783472B889ED11A232E2213777BE6E + + + + created + xmp.iid:D2783472B889ED11A232E2213777BE6E + 2023-01-06T09:47:59-08:00 + Adobe Flash Professional CS6 - build 481 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/timeline/timeline/MobileSettings.xml b/libsrc/ffdec_lib/testdata/timeline/timeline/MobileSettings.xml new file mode 100644 index 000000000..e69de29bb diff --git a/libsrc/ffdec_lib/testdata/timeline/timeline/PublishSettings.xml b/libsrc/ffdec_lib/testdata/timeline/timeline/PublishSettings.xml new file mode 100644 index 000000000..2bee9cb16 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/timeline/timeline/PublishSettings.xml @@ -0,0 +1,206 @@ + + + + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + timeline.swf + timeline.exe + timeline.app + timeline.html + timeline.gif + timeline.jpg + timeline.png + timeline.mov + timeline.smil + timeline.swc + + + 0 + 12,0,0,0;11,2,0,0;11,1,0,0;10,3,0,0;10,2,153,0;10,1,52,0;9,0,124,0;8,0,24,0;7,0,14,0;6,0,79,0;5,0,58,0;4,0,32,0;3,0,8,0;2,0,1,12;1,0,0,1; + 1 + 1 + timeline.xfl_content.html + timeline.xfl_alternate.html + 0 + + 550 + 400 + 0 + 0 + 1 + 0 + 0 + 1 + 1 + 4 + 0 + 0 + 1 + 0 + C:\Users\MyUser\AppData\Local\Adobe\Flash CS6\en_US\Configuration\HTML\Default.html + 1 + + + + + 0 + 0 + 0 + 80 + 0 + 0 + 7 + 0 + 7 + 0 + 15 + FlashPlayer11.2 + 2 + 1 + + . + CONFIG::FLASH_AUTHORING="true"; + 0 + + 1 + 0 + 1 + 0 + 0 + 0 + 0 + + 2 + 4 + 4096 + AS3 + 1 + 1 + 0 + 15 + 1 + 0 + 4102 + rsl + wrap + $(AppConfig)/ActionScript 3.0/rsls/loader_animation.swf + + + $(AppConfig)/ActionScript 3.0/libs + merge + + + $(AppConfig)/ActionScript 3.0/libs/11.0/textLayout.swc + rsl + http://fpdownload.adobe.com/pub/swz/tlf/2.0.0.232/textLayout_2.0.0.232.swz + http://fpdownload.adobe.com/pub/swz/crossdomain.xml + textLayout_2.0.0.232.swz + + + + + $(AppConfig)/ActionScript 3.0/libs/11.0/textLayout.swc + + http://fpdownload.adobe.com/pub/swz/tlf/2.0.0.232/textLayout_2.0.0.232.swz + http://fpdownload.adobe.com/pub/swz/crossdomain.xml + textLayout_2.0.0.232.swz + + + + + 550 + 400 + 0 + 4718592 + 0 + 80 + 1 + + + 1 + 0 + 1 + 0 + 0 + 100000 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + + + 550 + 400 + 0 + 1 + 1 + + 1 + 0 + 1 + 0 + 0 + + 128 + + + 255 + + + + 550 + 400 + 1 + 0 + 0 + 1 + 0 + 0 + 1 + + + + 24-bit with Alpha + 255 + + + + 550 + 400 + 1 + 0 + + + 00000000 + 0 + 0 + 0 + 0 + 1 + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/timeline/timeline/bin/SymDepend.cache b/libsrc/ffdec_lib/testdata/timeline/timeline/bin/SymDepend.cache new file mode 100644 index 000000000..78eae208a Binary files /dev/null and b/libsrc/ffdec_lib/testdata/timeline/timeline/bin/SymDepend.cache differ diff --git a/libsrc/ffdec_lib/testdata/timeline/timeline/timeline.xfl b/libsrc/ffdec_lib/testdata/timeline/timeline/timeline.xfl new file mode 100644 index 000000000..860a820ec --- /dev/null +++ b/libsrc/ffdec_lib/testdata/timeline/timeline/timeline.xfl @@ -0,0 +1 @@ +PROXY-CS5 \ No newline at end of file