[Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/10 15:10:42

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: Makefile.am displaylist_depths_test2.c 
Added files:
        testsuite/misc-ming.all: displaylist_depths_test3.c 

Log message:
                * testsuite/misc-ming.all/: Makefile.am, 
displaylist_depths_test2.c,
                  displaylist_depths_test3.c: Cleanup comments for test2 and add
                  new scenario for Timeline Control (see wiki for more details).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3155&r2=1.3156
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.106&r2=1.107
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/displaylist_depths_test2.c?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/displaylist_depths_test3.c?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3155
retrieving revision 1.3156
diff -u -b -r1.3155 -r1.3156
--- ChangeLog   10 May 2007 13:50:44 -0000      1.3155
+++ ChangeLog   10 May 2007 15:10:42 -0000      1.3156
@@ -1,5 +1,11 @@
 2007-05-10 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/: Makefile.am, displaylist_depths_test2.c,
+         displaylist_depths_test3.c: Cleanup comments for test2 and add
+         new scenario for Timeline Control (see wiki for more details).
+
+2007-05-10 Sandro Santilli <address@hidden>
+
        * testsuite/misc-ming.all/: Makefile.am,
          SpriteButtonEventsTest-Runner.cpp, SpriteButtonEventsTest.c:
          Produced a MovieClip versio of the ButtonEventTest.swf movie.

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- testsuite/misc-ming.all/Makefile.am 10 May 2007 13:50:44 -0000      1.106
+++ testsuite/misc-ming.all/Makefile.am 10 May 2007 15:10:42 -0000      1.107
@@ -80,6 +80,7 @@
        place_and_remove_object_insane_test \
        displaylist_depths_test \
        displaylist_depths_test2 \
+       displaylist_depths_test3 \
        masks_test \
        attachMovieTest \
        attachMovieTestRunner \
@@ -157,6 +158,7 @@
        reverse_execute_PlaceObject2_test2runner \
        displaylist_depths_testrunner \
        displaylist_depths_test2runner \
+       displaylist_depths_test3runner \
        get_frame_number_testrunner \
        frame_label_testrunner \
        path_format_testrunner \
@@ -437,6 +439,20 @@
        sh $< -f20 $(top_builddir) displaylist_depths_test2.swf > $@
        chmod 755 $@
 
+displaylist_depths_test3_SOURCES =     \
+       displaylist_depths_test3.c      \
+       ming_utils.h            \
+       ming_utils.c            \
+       $(NULL)
+displaylist_depths_test3_LDADD = $(MING_LIBS)
+
+displaylist_depths_test3.swf: displaylist_depths_test3
+       ./displaylist_depths_test3 $(top_srcdir)/testsuite/media
+
+displaylist_depths_test3runner: $(srcdir)/../generic-testrunner.sh 
displaylist_depths_test3.swf
+       sh $< -f20 $(top_builddir) displaylist_depths_test3.swf > $@
+       chmod 755 $@
+
 masks_test_SOURCES =   \
        masks_test.c    \
        ming_utils.h            \
@@ -1140,6 +1156,7 @@
        reverse_execute_PlaceObject2_test2runner \
        displaylist_depths_testrunner \
        displaylist_depths_test2runner \
+       displaylist_depths_test3runner \
        matrix_testrunner \
        get_frame_number_testrunner \
        frame_label_testrunner \

Index: testsuite/misc-ming.all/displaylist_depths_test2.c
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/displaylist_depths_test2.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/displaylist_depths_test2.c  10 May 2007 14:35:06 
-0000      1.3
+++ testsuite/misc-ming.all/displaylist_depths_test2.c  10 May 2007 15:10:42 
-0000      1.4
@@ -48,8 +48,9 @@
  *  After the jump we have two instances:
  *         - one at depth 10 and position 100,200
  *           (the same we had before, with its state intact)
- *         - another at depth -16381 and position 20,300
+ *         - another at depth -16381 and position 20,200
  *           (newly created and placed accordingly to the PlaceObject2 tag on 
frame4)
+ *  Two distinct instances have been constructed in total.
  * 
  */
 
@@ -164,9 +165,7 @@
                );
        SWFMovie_nextFrame(mo); 
 
-       // Frame 7: go to frame 3 and see if the PlaceObject2 in frame 4
-       //          is able to change the position back to 50,200
-       //          (it's at 100,200 now!)
+       // Frame 7: go to frame 3 
        add_actions(mo,
 
                "check_equals(static3.myThing, 'guess');"

Index: testsuite/misc-ming.all/displaylist_depths_test3.c
===================================================================
RCS file: testsuite/misc-ming.all/displaylist_depths_test3.c
diff -N testsuite/misc-ming.all/displaylist_depths_test3.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/displaylist_depths_test3.c  10 May 2007 15:10:42 
-0000      1.1
@@ -0,0 +1,205 @@
+/* 
+ *   Copyright (C) 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+ * Sandro Santilli, address@hidden
+ *
+ * Test how swapDepth affects DisplayList refresh on gotoAndPlay(current-X).
+ *
+ * run as ./displaylist_depths_test3
+ *
+ * Timeline:
+ * 
+ *   Frame  | 1 | 2 | 3 | 4 | 5 | 6 | 7 |
+ *  --------+---+---+---+---+---+---+---+
+ *   Event  |   | P |   | M | M | S | J |
+ * 
+ *  P = place (by PlaceObject2)
+ *  M = move (matrix transform by PlaceObject2)
+ *  S = swapDepth
+ *  J = jump
+ * 
+ * Description:
+ * 
+ *  frame2: character placed at depth -16381 at position (10,200)
+ *  frame4: position of instance at depth -16381 shifted to the right (50,200)
+ *  frame5: position of instance at depth -16381 shifted to the right (100,200)
+ *  frame6: depth of instance changed to -10 (static zone) and stop.
+ *  frame7: jump back to frame 4
+ * 
+ * Expected behaviour on jump back:
+ * 
+ *  Before the jump we have a single instance at depth -10 and position 
100,200.
+ *  After the jump we have a single instances at depth -16381 and position 
20,200.
+ *  Two distinct instances have been constructed in total.
+ *  Soft references to the old instance created before the jump-back now point 
to the new instance.
+ * 
+ */
+
+#include "ming_utils.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+// We need version 7 to use getInstanceAtDepth()
+#define OUTPUT_VERSION 7
+#define OUTPUT_FILENAME "displaylist_depths_test3.swf"
+
+SWFDisplayItem add_static_mc(SWFMovie mo, const char* name, int depth, int x, 
int y, int width, int height);
+
+SWFDisplayItem
+add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int 
width, int height)
+{
+       SWFShape sh;
+       SWFMovieClip mc, mc2;
+       SWFDisplayItem it;
+
+       sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 
0, 255, 0, 0);
+       mc = newSWFMovieClip();
+       SWFMovieClip_add(mc, (SWFBlock)sh);
+
+       SWFMovieClip_nextFrame(mc);
+
+       it = SWFMovie_add(mo, (SWFBlock)mc);
+       SWFDisplayItem_setDepth(it, depth); 
+       SWFDisplayItem_moveTo(it, x, y); 
+       SWFDisplayItem_setName(it, name);
+       SWFDisplayItem_addAction(it, newSWFAction(
+                       "_root.note(this+' onClipConstruct');"
+                       " _root.check_equals(typeof(_root), 'movieclip');"
+                       " if ( isNaN(_root.depth3Constructed) ) {"
+                       "       _root.depth3Constructed=1; "
+                       "       _root.note('_root.depth3Constructed set to 
'+_root.depth3Constructed);"
+                       " } else {"
+                       "       _root.depth3Constructed++;"
+                       "       _root.note('_root.depth3Constructed set to 
'+_root.depth3Constructed);"
+                       " }"
+                       ), SWFACTION_CONSTRUCT);
+
+       return it;
+}
+
+
+int
+main(int argc, char** argv)
+{
+       SWFMovie mo;
+       SWFMovieClip dejagnuclip;
+       int i;
+       SWFDisplayItem it1,it2,it3,it4;
+
+
+       const char *srcdir=".";
+       if ( argc>1 ) 
+               srcdir=argv[1];
+       else
+       {
+               //fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+               //return 1;
+       }
+
+       Ming_init();
+       mo = newSWFMovieWithVersion(OUTPUT_VERSION);
+       SWFMovie_setDimension(mo, 800, 600);
+       SWFMovie_setRate (mo, 2);
+
+       dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 
0, 0, 800, 600);
+       SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+       SWFMovie_nextFrame(mo); 
+
+       // Frame 2: Add a static movieclip at depth 3 with origin at 10,200
+       it1 = add_static_mc(mo, "static3", 3, 10, 200, 20, 20);
+       add_actions(mo,
+               "static3.myThing = 'guess';"
+               "check_equals(static3._x, 10);"
+               "check_equals(static3.myThing, 'guess');"
+               "check_equals(static3.getDepth(), -16381);" 
+               );
+       SWFMovie_nextFrame(mo); 
+
+       // Frame 3: nothing new
+       SWFMovie_nextFrame(mo); 
+
+       // Frame 4: move character at depth 3 to position 50,200
+       SWFDisplayItem_moveTo(it1, 50, 200); 
+       add_actions(mo,
+               "check_equals(static3._x, 50);"
+               "check_equals(static3.getDepth(), -16381);" 
+               );
+       SWFMovie_nextFrame(mo); 
+
+       // Frame 5: move character at depth 3 to position 100,200
+       SWFDisplayItem_moveTo(it1, 200, 200); 
+       add_actions(mo,
+               "check_equals(static3.myThing, 'guess');"
+               "check_equals(static3._x, 200);"
+               "check_equals(static3.getDepth(), -16381);" 
+               );
+       SWFMovie_nextFrame(mo); 
+
+       // Frame 6: change depth character at depth 3 to depth 10 (dynamic zone)
+       add_actions(mo,
+               "static3.swapDepths(-10);"
+               "check_equals(static3.getDepth(), -10);" 
+               "static3._rotation = 45;"
+               "check_equals(static3.myThing, 'guess');"
+               );
+       SWFMovie_nextFrame(mo); 
+
+       // Frame 7: go to frame 3 
+       add_actions(mo,
+
+               "check_equals(static3.myThing, 'guess');"
+
+               // Store a reference to the static3 instance
+               // before overriding its name
+               "dynRef = static3;"
+
+               // this repopulates depth -16381 with a *new* instance 
+               "gotoAndStop(4);"
+
+               // Static3 doesn't refer to the moved object anymore !
+               "check_equals(typeof(static3.myThing), 'undefined');"
+
+               // And neither the reference does !!
+               "check_equals(typeof(dynRef.myThing), 'undefined');"
+
+               //  ... Rather, the reference now points to the newly created 
instance !!
+               //  (see http://www.gnashdev.org/wiki/index.php/SoftReferences)
+               "check_equals(typeof(dynRef), 'movieclip');"
+               "check_equals(dynRef._x, 50);"
+               "check_equals(dynRef, static3);"
+
+               // We can verify nothing is at depth -10 with getInstanceAtDepth
+               "check_equals(typeof(getInstanceAtDepth(-16381)), 'movieclip');"
+               "check_equals(typeof(getInstanceAtDepth(-10)), 'undefined');"
+
+               "check_equals(static3.getDepth(), -16381);" 
+               "check_equals(static3._x, 50);" 
+               "check_equals(depth3Constructed, 2);" 
+               "totals();"
+               );
+       SWFMovie_nextFrame(mo); 
+
+       //Output movie
+       puts("Saving " OUTPUT_FILENAME );
+       SWFMovie_save(mo, OUTPUT_FILENAME);
+
+       return 0;
+}