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

actor: Add paint_node virtual function

Browse Source 
The ::paint-node virtual inside ClutterActor is what we want people to
use when painting their actors.

Right now, it's a new code path, that gets called while painting; the
paint_node() implementation should only paint the actor itself, and not
its children — they will get their own paint_node() called when needed.

Internally, ClutterActor will automatically create a dummy PaintNode and
paint the background color; then control will be handed out to the
implementation on the class. This is required to maintain compatibility
with the old ::paint signal emission.

Once we are able to get rid of the paint (and pick) sequences, we'll
switch to a fully retained render tree.
This commit is contained in:
Emmanuele Bassi 2012-02-01 17:47:15 +00:00
parent b83dc6abfa
commit 6f0782e0a4
2 changed files with 64 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
clutter/clutter-actor.c
View File

@ -388,6 +388,8 @@
#include "clutter-interval.h"
#include "clutter-main.h"
#include "clutter-marshal.h"
#include "clutter-paint-nodes.h"
#include "clutter-paint-node-private.h"
#include "clutter-paint-volume-private.h"
#include "clutter-private.h"
#include "clutter-profile.h"
@ -3084,32 +3086,44 @@ add_or_remove_flatten_effect (ClutterActor *self)
}
}
static void
clutter_actor_paint_node (ClutterActor *actor,
ClutterPaintNode *root)
{
ClutterActorPrivate *priv = actor->priv;
if (priv->bg_color_set)
{
ClutterPaintNode *node;
ClutterColor bg_color;
bg_color = priv->bg_color;
bg_color.alpha = clutter_actor_get_paint_opacity_internal (actor)
* priv->bg_color.alpha
/ 255;
node = clutter_color_node_new (&bg_color);
clutter_paint_node_set_name (node, "backgroundColor");
clutter_paint_node_add_rectangle (node, &priv->allocation);
clutter_paint_node_add_child (root, node);
clutter_paint_node_unref (node);
}
if (CLUTTER_ACTOR_GET_CLASS (actor)->paint_node != NULL)
CLUTTER_ACTOR_GET_CLASS (actor)->paint_node (actor, root);
if (clutter_paint_node_get_n_children (root) == 0)
return;
_clutter_paint_node_paint (root);
}
static void
clutter_actor_real_paint (ClutterActor *actor)
{
ClutterActorPrivate *priv = actor->priv;
ClutterActor *iter;
/* paint the background color, if set */
if (priv->bg_color_set)
{
float width, height;
guint8 real_alpha;
clutter_actor_box_get_size (&priv->allocation, &width, &height);
real_alpha = clutter_actor_get_paint_opacity_internal (actor)
* priv->bg_color.alpha
/ 255;
cogl_set_source_color4ub (priv->bg_color.red,
priv->bg_color.green,
priv->bg_color.blue,
real_alpha);
cogl_rectangle (0, 0, width, height);
}
for (iter = priv->first_child;
iter != NULL;
iter = iter->priv->next_sibling)
@ -3401,6 +3415,31 @@ clutter_actor_continue_paint (ClutterActor *self)
{
if (_clutter_context_get_pick_mode () == CLUTTER_PICK_NONE)
{
ClutterPaintNode *dummy;
/* XXX - this will go away in 2.0, when we can get rid of this
* stuff and switch to a pure retained render tree of PaintNodes
* for the entire frame, starting from the Stage.
*/
dummy = _clutter_dummy_node_new ();
clutter_paint_node_set_name (dummy, "Root");
clutter_actor_paint_node (self, dummy);
if (clutter_paint_node_get_n_children (dummy) != 0)
{
#ifdef CLUTTER_ENABLE_DEBUG
if (CLUTTER_HAS_DEBUG (PAINT))
{
/* dump the tree only if we have one */
_clutter_paint_node_dump_tree (dummy);
}
#endif /* CLUTTER_ENABLE_DEBUG */
_clutter_paint_node_paint (dummy);
}
clutter_paint_node_unref (dummy);
g_signal_emit (self, actor_signals[PAINT], 0);
}
else

7
clutter/clutter-actor.h
View File

@ -253,14 +253,17 @@ struct _ClutterActorClass
/* accessibility support */
AtkObject * (* get_accessible) (ClutterActor *self);
gboolean (* get_paint_volume) (ClutterActor *actor,
gboolean (* get_paint_volume) (ClutterActor *actor,
ClutterPaintVolume *volume);
gboolean (* has_overlaps) (ClutterActor *self);
void (* paint_node) (ClutterActor *self,
ClutterPaintNode *root);
/*< private >*/
/* padding for future expansion */
gpointer _padding_dummy[28];
gpointer _padding_dummy[27];
};
/**