[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test... |
Date: |
Fri, 04 Aug 2006 13:24:47 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/08/04 13:24:47
Modified files:
. : ChangeLog
server : sprite_instance.cpp
testsuite/misc-ming.all: spritehier.c
Log message:
* testsuite/misc-ming.all/spritehier.c: updated to test
framesloaded/currentframe.
* server/sprite_instance.cpp: fixed _framesloaded member to return
loaded (not total) frames.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.581&r2=1.582
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/spritehier.c?cvsroot=gnash&r1=1.1&r2=1.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -b -r1.581 -r1.582
--- ChangeLog 4 Aug 2006 13:10:35 -0000 1.581
+++ ChangeLog 4 Aug 2006 13:24:47 -0000 1.582
@@ -1,5 +1,9 @@
2006-08-04 Sandro Santilli <address@hidden>
+ * testsuite/misc-ming.all/spritehier.c: updated to test
+ framesloaded/currentframe.
+ * server/sprite_instance.cpp: fixed _framesloaded
+ member to return loaded (not total) frames.
* server/sprite_definition.cpp: added check for
nested DefineSprite (malformed SWF).
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/sprite_instance.cpp 3 Aug 2006 22:19:59 -0000 1.23
+++ server/sprite_instance.cpp 4 Aug 2006 13:24:47 -0000 1.24
@@ -565,7 +565,7 @@
case M_FRAMESLOADED:
//else if (name == "_framesloaded")
{
- val->set_int(m_def->get_frame_count());
+ val->set_int(m_def->get_loading_frame());
return true;
}
case M_NAME:
Index: testsuite/misc-ming.all/spritehier.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/spritehier.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/spritehier.c 9 May 2006 13:53:30 -0000
1.1
+++ testsuite/misc-ming.all/spritehier.c 4 Aug 2006 13:24:47 -0000
1.2
@@ -38,7 +38,12 @@
*
***********************************************************************
*
- * Test case for hierachical sprites
+ * Test case for hierachical sprites:
+ *
+ * Main movie has 1 frames
+ * mc1 has 3 frame
+ *
+ * ActionScript code will print current frame and loaded frames
*
***********************************************************************/
@@ -48,11 +53,24 @@
#define OUTPUT_FILENAME "spritehier.swf"
+SWFAction
+frame_print()
+{
+ SWFAction ac;
+ ac = compileSWFActionCode("\
+trace(\"Current frame: \"+this._currentframe); \
+trace(\"Frames loaded: \"+this._framesloaded); \
+");
+
+ return ac;
+}
+
int
main()
{
SWFMovie mo;
SWFShape sh;
+ SWFAction ac;
SWFMovieClip mc1, mc2, mc3;
/*SWFDisplayItem it;*/
@@ -62,18 +80,15 @@
mc2 = newSWFMovieClip();
mc3 = newSWFMovieClip();
sh = newSWFShape();
+ ac = frame_print();
- /* Add shape to mc3 */
- SWFMovieClip_add(mc3, (SWFBlock)sh);
- SWFMovieClip_nextFrame(mc3);
-
- /* Add mc3 to mc2 */
- SWFMovieClip_add(mc2, (SWFBlock)mc3);
- SWFMovieClip_nextFrame(mc2);
-
- /* Add mc2 to mc1 */
- SWFMovieClip_add(mc1, (SWFBlock)mc2);
+ // Add frame code to frames
+ SWFMovieClip_add(mc1, (SWFBlock)ac);
+ SWFMovieClip_nextFrame(mc1);
+ SWFMovieClip_add(mc1, (SWFBlock)ac);
+ SWFMovieClip_nextFrame(mc1);
+ SWFMovieClip_add(mc1, (SWFBlock)ac);
SWFMovieClip_nextFrame(mc1);
/* Add mc1 to movie */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...,
Sandro Santilli <=