brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2008-06-06 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-texture.c:
	(clutter_texture_class_init): Do not unrealize on hide(), and
	do not realize() on show. By default, clutter_actor_show() will
	realize ourselves, and we don't want to unrealize when hidden
	to avoid paying the penalty of reading back the texture data
	from the video memory.

	* tests/test-actors.c: Show all textures again when pressing
	the 'r' key.
This commit is contained in:
Emmanuele Bassi 2008-06-06 16:22:55 +00:00
parent d66fe947a0
commit eb990a853a
3 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2008-06-06 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-texture.c:
(clutter_texture_class_init): Do not unrealize on hide(), and
do not realize() on show. By default, clutter_actor_show() will
realize ourselves, and we don't want to unrealize when hidden
to avoid paying the penalty of reading back the texture data
from the video memory.
* tests/test-actors.c: Show all textures again when pressing
the 'r' key.
2008-06-06 Neil Roberts <neil@o-hand.com> 2008-06-06 Neil Roberts <neil@o-hand.com>
* tests/test-shader.c: Use the special wrapper vars when building * tests/test-shader.c: Use the special wrapper vars when building

28
clutter/clutter-texture.c
View File

@ -270,32 +270,6 @@ clutter_texture_realize (ClutterActor *actor)
CLUTTER_NOTE (TEXTURE, "Texture realized"); CLUTTER_NOTE (TEXTURE, "Texture realized");
} }
static void
clutter_texture_show (ClutterActor *self)
{
ClutterActorClass *parent_class;
/* chain up parent show */
parent_class = CLUTTER_ACTOR_CLASS (clutter_texture_parent_class);
if (parent_class->show)
parent_class->show (self);
clutter_actor_realize (self);
}
static void
clutter_texture_hide (ClutterActor *self)
{
ClutterActorClass *parent_class;
/* chain up parent hide */
parent_class = CLUTTER_ACTOR_CLASS (clutter_texture_parent_class);
if (parent_class->hide)
parent_class->hide (self);
clutter_actor_unrealize (self);
}
static void static void
clutter_texture_paint (ClutterActor *self) clutter_texture_paint (ClutterActor *self)
{ {
@ -535,8 +509,6 @@ clutter_texture_class_init (ClutterTextureClass *klass)
actor_class->paint = clutter_texture_paint; actor_class->paint = clutter_texture_paint;
actor_class->realize = clutter_texture_realize; actor_class->realize = clutter_texture_realize;
actor_class->unrealize = clutter_texture_unrealize; actor_class->unrealize = clutter_texture_unrealize;
actor_class->show = clutter_texture_show;
actor_class->hide = clutter_texture_hide;
actor_class->request_coords = clutter_texture_request_coords; actor_class->request_coords = clutter_texture_request_coords;
gobject_class->dispose = clutter_texture_dispose; gobject_class->dispose = clutter_texture_dispose;

17
tests/test-actors.c
View File

@ -40,10 +40,12 @@ get_radius (void)
/* input handler */ /* input handler */
static gboolean static gboolean
input_cb (ClutterStage *stage, input_cb (ClutterActor *stage,
ClutterEvent *event, ClutterEvent *event,
gpointer data) gpointer data)
{ {
SuperOH *oh = data;
if (event->type == CLUTTER_BUTTON_PRESS) if (event->type == CLUTTER_BUTTON_PRESS)
{ {
ClutterButtonEvent *button_event; ClutterButtonEvent *button_event;
@ -56,7 +58,7 @@ input_cb (ClutterStage *stage,
g_print ("*** button press event (button:%d) ***\n", g_print ("*** button press event (button:%d) ***\n",
button_event->button); button_event->button);
e = clutter_stage_get_actor_at_pos (stage, x, y); e = clutter_stage_get_actor_at_pos (CLUTTER_STAGE (stage), x, y);
if (e && (CLUTTER_IS_TEXTURE (e) || CLUTTER_IS_CLONE_TEXTURE (e))) if (e && (CLUTTER_IS_TEXTURE (e) || CLUTTER_IS_CLONE_TEXTURE (e)))
{ {
@ -76,6 +78,15 @@ input_cb (ClutterStage *stage,
clutter_main_quit (); clutter_main_quit ();
return TRUE; return TRUE;
} }
else if (clutter_key_event_symbol (kev) == CLUTTER_r)
{
gint i;
for (i = 0; i < n_hands; i++)
clutter_actor_show (oh->hand[i]);
return TRUE;
}
} }
return FALSE; return FALSE;
@ -88,7 +99,7 @@ frame_cb (ClutterTimeline *timeline,
gint frame_num, gint frame_num,
gpointer data) gpointer data)
{ {
SuperOH *oh = (SuperOH *)data; SuperOH *oh = data;
gint i; gint i;
/* Rotate everything clockwise about stage center*/ /* Rotate everything clockwise about stage center*/