diff --git a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed.air.swf b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed.air.swf deleted file mode 100644 index 348feacb6..000000000 Binary files a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed.air.swf and /dev/null differ diff --git a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed.flex.swf b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed.flex.swf deleted file mode 100644 index 0c7b0774c..000000000 Binary files a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed.flex.swf and /dev/null differ diff --git a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_attrib.air.swf b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_attrib.air.swf new file mode 100644 index 000000000..8a3038719 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_attrib.air.swf differ diff --git a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_attrib.flex.swf b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_attrib.flex.swf new file mode 100644 index 000000000..d8b39db21 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_attrib.flex.swf differ diff --git a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_classes.air.swf b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_classes.air.swf new file mode 100644 index 000000000..02a321770 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_classes.air.swf differ diff --git a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_classes.flex.swf b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_classes.flex.swf new file mode 100644 index 000000000..0434e2130 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_classes.flex.swf differ diff --git a/libsrc/ffdec_lib/testdata/as3_embed/build_air_debug.bat b/libsrc/ffdec_lib/testdata/as3_embed/build_air_debug.bat index 0ee0643ea..11ec9ddd0 100644 --- a/libsrc/ffdec_lib/testdata/as3_embed/build_air_debug.bat +++ b/libsrc/ffdec_lib/testdata/as3_embed/build_air_debug.bat @@ -1,5 +1,6 @@ @echo off set COMPILERKIND=air -set SWFNAME=as3_embed -call c:\air\bin\mxmlc.bat -debug=true -output bin/%SWFNAME%.%COMPILERKIND%.swf src/MainAir.as 1> buildlog.%COMPILERKIND%.txt 2>&1 -rem -warnings=false \ No newline at end of file +call c:\air\bin\mxmlc.bat -debug=true -output bin/as3_embed_attrib.%COMPILERKIND%.swf src/MainAttributesAir.as 1> buildlog.attrib.%COMPILERKIND%.txt 2>&1 +call c:\air\bin\mxmlc.bat -debug=true -output bin/as3_embed_classes.%COMPILERKIND%.swf src/MainClassesAir.as 1> buildlog.classes.%COMPILERKIND%.txt 2>&1 + +rem -warnings=false diff --git a/libsrc/ffdec_lib/testdata/as3_embed/build_flex_debug.bat b/libsrc/ffdec_lib/testdata/as3_embed/build_flex_debug.bat index 126a524a0..a56073ec7 100644 --- a/libsrc/ffdec_lib/testdata/as3_embed/build_flex_debug.bat +++ b/libsrc/ffdec_lib/testdata/as3_embed/build_flex_debug.bat @@ -1,5 +1,6 @@ @echo off set COMPILERKIND=flex -set SWFNAME=as3_embed -c:\flex\bin\mxmlc.exe -debug=true -output bin/%SWFNAME%.%COMPILERKIND%.swf src/MainFlex.as 1> buildlog.%COMPILERKIND%.txt 2>&1 -rem -warnings=false \ No newline at end of file +c:\flex\bin\mxmlc.exe -debug=true -output bin/as3_embed_attrib.%COMPILERKIND%.swf src/MainAttributesFlex.as 1> buildlog.attrib.%COMPILERKIND%.txt 2>&1 +c:\flex\bin\mxmlc.exe -debug=true -output bin/as3_embed_classes.%COMPILERKIND%.swf src/MainClassesFlex.as 1> buildlog.classes.%COMPILERKIND%.txt 2>&1 + +rem -warnings=false diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/MainAir.as b/libsrc/ffdec_lib/testdata/as3_embed/src/MainAttributesAir.as similarity index 77% rename from libsrc/ffdec_lib/testdata/as3_embed/src/MainAir.as rename to libsrc/ffdec_lib/testdata/as3_embed/src/MainAttributesAir.as index a8b716cf1..9a2c80ad7 100644 --- a/libsrc/ffdec_lib/testdata/as3_embed/src/MainAir.as +++ b/libsrc/ffdec_lib/testdata/as3_embed/src/MainAttributesAir.as @@ -2,18 +2,18 @@ package { import flash.display.Sprite; import flash.events.Event; - import tests_classes.TestEmbedAir; + import embed_attributes.TestEmbedAir; /** * ... * @author JPEXS */ - public class MainAir extends Sprite + public class MainAttributesAir extends Sprite { TestEmbedAir; - public function MainAir() + public function MainAttributesAir() { if (stage) init(); else addEventListener(Event.ADDED_TO_STAGE, init); @@ -27,4 +27,4 @@ package } -} \ No newline at end of file +} diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/MainFlex.as b/libsrc/ffdec_lib/testdata/as3_embed/src/MainAttributesFlex.as similarity index 77% rename from libsrc/ffdec_lib/testdata/as3_embed/src/MainFlex.as rename to libsrc/ffdec_lib/testdata/as3_embed/src/MainAttributesFlex.as index e00fdbfec..bcf963cb4 100644 --- a/libsrc/ffdec_lib/testdata/as3_embed/src/MainFlex.as +++ b/libsrc/ffdec_lib/testdata/as3_embed/src/MainAttributesFlex.as @@ -2,18 +2,18 @@ package { import flash.display.Sprite; import flash.events.Event; - import tests_classes.TestEmbedFlex; + import embed_attributes.TestEmbedFlex; /** * ... * @author JPEXS */ - public class MainFlex extends Sprite + public class MainAttributesFlex extends Sprite { TestEmbedFlex; - public function MainFlex() + public function MainAttributesFlex() { if (stage) init(); else addEventListener(Event.ADDED_TO_STAGE, init); @@ -27,4 +27,4 @@ package } -} \ No newline at end of file +} diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/MainClassesAir.as b/libsrc/ffdec_lib/testdata/as3_embed/src/MainClassesAir.as new file mode 100644 index 000000000..cd25bd8d3 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as3_embed/src/MainClassesAir.as @@ -0,0 +1,35 @@ +package +{ + import flash.display.Sprite; + import flash.events.Event; + import embed_classes.*; + + /** + * ... + * @author JPEXS + */ + public class MainClassesAir extends Sprite + { + TestBinaryData; + TestFont; + TestImage; + TestImageGrid; + //TestImageSvg; + TestSameImage; + TestSound; + + public function MainClassesAir() + { + if (stage) init(); + else addEventListener(Event.ADDED_TO_STAGE, init); + } + + private function init(e:Event = null):void + { + removeEventListener(Event.ADDED_TO_STAGE, init); + // entry point + } + + } + +} diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/MainClassesFlex.as b/libsrc/ffdec_lib/testdata/as3_embed/src/MainClassesFlex.as new file mode 100644 index 000000000..bf3abae82 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as3_embed/src/MainClassesFlex.as @@ -0,0 +1,35 @@ +package +{ + import flash.display.Sprite; + import flash.events.Event; + import embed_classes.*; + + /** + * ... + * @author JPEXS + */ + public class MainClassesFlex extends Sprite + { + TestBinaryData; + //TestFont; + TestImage; + TestImageGrid; + TestImageSvg; + TestSameImage; + TestSound; + + public function MainClassesFlex() + { + if (stage) init(); + else addEventListener(Event.ADDED_TO_STAGE, init); + } + + private function init(e:Event = null):void + { + removeEventListener(Event.ADDED_TO_STAGE, init); + // entry point + } + + } + +} diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/tests_classes/TestEmbedAir.as b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_attributes/TestEmbedAir.as similarity index 98% rename from libsrc/ffdec_lib/testdata/as3_embed/src/tests_classes/TestEmbedAir.as rename to libsrc/ffdec_lib/testdata/as3_embed/src/embed_attributes/TestEmbedAir.as index 6e2516a29..b77388848 100644 --- a/libsrc/ffdec_lib/testdata/as3_embed/src/tests_classes/TestEmbedAir.as +++ b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_attributes/TestEmbedAir.as @@ -1,4 +1,4 @@ -package tests_classes +package embed_attributes { import flash.display.Sprite; import flash.media.Sound; diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/tests_classes/TestEmbedFlex.as b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_attributes/TestEmbedFlex.as similarity index 98% rename from libsrc/ffdec_lib/testdata/as3_embed/src/tests_classes/TestEmbedFlex.as rename to libsrc/ffdec_lib/testdata/as3_embed/src/embed_attributes/TestEmbedFlex.as index eeb4e496d..fb3f5ae47 100644 --- a/libsrc/ffdec_lib/testdata/as3_embed/src/tests_classes/TestEmbedFlex.as +++ b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_attributes/TestEmbedFlex.as @@ -1,4 +1,4 @@ -package tests_classes +package embed_attributes { import flash.display.Sprite; import flash.media.Sound; diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestBinaryData.as b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestBinaryData.as new file mode 100644 index 000000000..850279694 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestBinaryData.as @@ -0,0 +1,10 @@ +package embed_classes +{ + import flash.utils.ByteArray; + + + [Embed(source="../../assets/data.bin", mimeType="application/octet-stream")] + public class TestBinaryData extends ByteArray + { + } +} diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestFont.as b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestFont.as new file mode 100644 index 000000000..f31510443 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestFont.as @@ -0,0 +1,10 @@ +package embed_classes +{ + import flash.text.Font; + + //not supported in Flex, AIR only + [Embed(source="../../assets/font.ttf", fontFamily="Great Vibes", fontWeight= "normal", fontStyle = "normal", mimeType="application/x-font-truetype")] + public class TestFont extends Font + { + } +} diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestImage.as b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestImage.as new file mode 100644 index 000000000..7614dddee --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestImage.as @@ -0,0 +1,10 @@ +package embed_classes +{ + import flash.display.Bitmap; + + + [Embed(source="../../assets/image.png")] + public class TestImage extends Bitmap + { + } +} diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestImageGrid.as b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestImageGrid.as new file mode 100644 index 000000000..6dd6d0a3b --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestImageGrid.as @@ -0,0 +1,11 @@ +package embed_classes +{ + import flash.display.Sprite; + + + [Embed(source="../../assets/image_grid.png", scaleGridTop="10", scaleGridBottom="40", + scaleGridLeft="10", scaleGridRight="70")] + public class TestImageGrid extends Sprite + { + } +} diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestImageSvg.as b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestImageSvg.as new file mode 100644 index 000000000..a0edd81c8 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestImageSvg.as @@ -0,0 +1,10 @@ +package embed_classes +{ + import flash.display.Sprite; + + //deprecated in Flex, not supported in AIR + [Embed(source="../../assets/image.svg")] + public class TestImageSvg extends Sprite + { + } +} diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestSameImage.as b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestSameImage.as new file mode 100644 index 000000000..b94f5b8dc --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestSameImage.as @@ -0,0 +1,10 @@ +package embed_classes +{ + import flash.display.Bitmap; + + + [Embed(source="../../assets/image.png")] + public class TestSameImage extends Bitmap + { + } +} diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestSound.as b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestSound.as new file mode 100644 index 000000000..43313b6e8 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestSound.as @@ -0,0 +1,9 @@ +package embed_classes +{ + import flash.media.Sound; + + [Embed(source="../../assets/sound.mp3")] + public class TestSound extends Sound + { + } +}