[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/button_character_instanc...
|
From: |
Udo Giacomozzi |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/button_character_instanc... |
|
Date: |
Mon, 11 Feb 2008 12:55:22 +0000 |
CVSROOT: /cvsroot/gnash
Module name: gnash
Changes by: Udo Giacomozzi <udog> 08/02/11 12:55:22
Modified files:
. : ChangeLog
server : button_character_instance.cpp
edit_text_character.cpp sprite_instance.cpp
video_stream_instance.cpp character.h dlist.cpp
generic_character.cpp
Log message:
* server/button_character_instance.cpp, server/edit_text_character.cpp,
server/sprite_instance.cpp, server/video_stream_instance.cpp,
server/character.h: drop XXX_display_callback methods
* server/dlist.cpp: generally check characters bounds before calling
it's
display() method
* server/generic_character.cpp, server/edit_text_character.cpp,
server/sprite_instance.cpp: don't check boundsInClippingArea() as it
is
done in DisplayList now
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5613&r2=1.5614
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.152&r2=1.153
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.468&r2=1.469
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/gnash/server/generic_character.cpp?cvsroot=gnash&r1=1.12&r2=1.13
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.5613
retrieving revision 1.5614
diff -u -b -r1.5613 -r1.5614
--- ChangeLog 11 Feb 2008 12:11:14 -0000 1.5613
+++ ChangeLog 11 Feb 2008 12:55:21 -0000 1.5614
@@ -1,3 +1,14 @@
+2008-02-11 Udo Giacomozzi <address@hidden>
+
+ * server/button_character_instance.cpp, server/edit_text_character.cpp,
+ server/sprite_instance.cpp, server/video_stream_instance.cpp,
+ server/character.h: drop XXX_display_callback methods
+ * server/dlist.cpp: generally check characters bounds before calling
it's
+ display() method
+ * server/generic_character.cpp, server/edit_text_character.cpp,
+ server/sprite_instance.cpp: don't check boundsInClippingArea() as it
is
+ done in DisplayList now
+
2008-02-11 Sandro Santilli <address@hidden>
* server/asobj/Stage.cpp: warn only once about unimplemented calls.
Index: server/button_character_instance.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- server/button_character_instance.cpp 5 Feb 2008 12:01:51 -0000
1.80
+++ server/button_character_instance.cpp 11 Feb 2008 12:55:21 -0000
1.81
@@ -386,7 +386,6 @@
std::for_each(actChars.begin(), actChars.end(),
std::mem_fun(&character::display));
clear_invalidated();
- do_display_callback();
}
Index: server/edit_text_character.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -b -r1.152 -r1.153
--- server/edit_text_character.cpp 11 Feb 2008 10:24:57 -0000 1.152
+++ server/edit_text_character.cpp 11 Feb 2008 12:55:21 -0000 1.153
@@ -493,8 +493,6 @@
//rect def_bounds = m_def->get_bounds();
- if (boundsInClippingArea()) {
-
bool drawBorder = getDrawBorder();
bool drawBackground = getDrawBackground();
@@ -554,10 +552,7 @@
show_cursor(m);
}
- } //if boundsInClippingArea
-
clear_invalidated();
- do_display_callback();
}
Index: server/sprite_instance.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -b -r1.468 -r1.469
--- server/sprite_instance.cpp 11 Feb 2008 10:28:10 -0000 1.468
+++ server/sprite_instance.cpp 11 Feb 2008 12:55:21 -0000 1.469
@@ -3018,11 +3018,6 @@
// buffer even it is invisible.
//
- // check if either the drawable or the display list intersect with the
- // rendering clipping area. Note that we just want to do a simple bounds
check
- // (which does not guarantee that rendering is really necessary) because it's
- // much simpler than a check using add_invalidated_ranges().
- if (boundsInClippingArea()) {
// render drawable (ActionScript generated graphics)
@@ -3041,11 +3036,9 @@
// descend the display list
m_display_list.display();
- }
clear_invalidated();
- do_display_callback();
}
bool
Index: server/video_stream_instance.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/video_stream_instance.cpp 21 Jan 2008 20:55:53 -0000 1.46
+++ server/video_stream_instance.cpp 11 Feb 2008 12:55:22 -0000 1.47
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: video_stream_instance.cpp,v 1.46 2008/01/21 20:55:53 rsavoye Exp $
+// $Id: video_stream_instance.cpp,v 1.47 2008/02/11 12:55:22 udog Exp $
#include "sprite_instance.h"
#include "video_stream_instance.h"
@@ -217,7 +217,6 @@
}
clear_invalidated();
- //do_display_callback(); <-- are we still relying on this ?
}
void
Index: server/character.h
===================================================================
RCS file: /cvsroot/gnash/gnash/server/character.h,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- server/character.h 11 Feb 2008 10:24:57 -0000 1.125
+++ server/character.h 11 Feb 2008 12:55:22 -0000 1.126
@@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: character.h,v 1.125 2008/02/11 10:24:57 udog Exp $ */
+/* $Id: character.h,v 1.126 2008/02/11 12:55:22 udog Exp $ */
#ifndef GNASH_CHARACTER_H
#define GNASH_CHARACTER_H
@@ -78,8 +78,6 @@
int m_ratio;
int m_clip_depth;
Events _event_handlers;
- void (*m_display_callback)(void*);
- void* m_display_callback_user_ptr;
/// Used to assign a name to unnamed instances
static unsigned int _lastUnnamedInstanceNum;
@@ -369,8 +367,6 @@
m_depth(0),
m_ratio(0),
m_clip_depth(noClipDepthValue),
- m_display_callback(NULL),
- m_display_callback_user_ptr(NULL),
_unloaded(false),
_destroyed(false),
_mask(0),
@@ -852,22 +848,6 @@
// Return true if this character should be rendered
bool get_visible() const { return m_visible; }
- virtual void set_display_callback(void (*callback)(void*), void*
user_ptr)
- {
- m_display_callback = callback;
- m_display_callback_user_ptr = user_ptr;
- }
-
- virtual void do_display_callback()
- {
-// GNASH_REPORT_FUNCTION;
-
- if (m_display_callback)
- {
- (*m_display_callback)(m_display_callback_user_ptr);
- }
- }
-
/// Return mouse state in given variables
//
/// Use this to retrieve the last state of the mouse, as set via
Index: server/dlist.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- server/dlist.cpp 23 Jan 2008 14:03:14 -0000 1.112
+++ server/dlist.cpp 11 Feb 2008 12:55:22 -0000 1.113
@@ -654,10 +654,17 @@
if ( mask && ch->get_visible() && ! mask->isUnloaded() )
{
render::begin_submit_mask();
+
+ if (mask->boundsInClippingArea())
mask->display();
+
render::end_submit_mask();
+
+ if (ch->boundsInClippingArea())
ch->display();
+
render::disable_mask();
+
continue;
}
@@ -706,6 +713,7 @@
render::begin_submit_mask();
}
+ if (ch->boundsInClippingArea())
ch->display();
// Notify the renderer that mask drawing has finished.
Index: server/generic_character.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/generic_character.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/generic_character.cpp 11 Feb 2008 10:24:57 -0000 1.12
+++ server/generic_character.cpp 11 Feb 2008 12:55:22 -0000 1.13
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: generic_character.cpp,v 1.12 2008/02/11 10:24:57 udog Exp $ */
+/* $Id: generic_character.cpp,v 1.13 2008/02/11 12:55:22 udog Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -62,12 +62,9 @@
void
generic_character::display()
{
-
- if (boundsInClippingArea())
m_def->display(this); // pass in transform info
clear_invalidated();
- do_display_callback();
}
} // namespace gnash