isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-14 01:09:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

2008-02-01 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/clutter-feature.h:
        * clutter/clutter-texture.c:
        * clutter/clutter-texture.h:
        * clutter/cogl/cogl.h:
        * clutter/cogl/gl/cogl.c:
        * clutter/cogl/gles/cogl.c:
        * tests/Makefile.am:
        * tests/test.fbo.c:
        Add initial support for FBO's in Clutter (OpenGL only so far).
        See new clutter_texture_new_from_actor()
        Initial implementation, needs work.

        * clutter/x11/clutter-stage-x11.c:
        (clutter_stage_x11_set_cursor_visible):
        Fall back to again not relying on xfixes to hide cursor. *sigh*

        * clutter/clutter-deprecated.h:
        Add clutter_group_find_child_by_id
This commit is contained in:
Matthew Allum
2008-02-01 15:29:00 +00:00
parent 6bb998f25f
commit 8366a906e2
11 changed files with 438 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
clutter/clutter-texture.c
View File

@ -96,6 +96,9 @@ struct _ClutterTexturePrivate
gint n_x_tiles;
gint n_y_tiles;
COGLuint *tiles;
ClutterActor *fbo_source;
COGLuint fbo_handle;
};
enum
@ -668,6 +671,9 @@ clutter_texture_realize (ClutterActor *actor)
texture = CLUTTER_TEXTURE(actor);
priv = texture->priv;
if (priv->fbo_handle)
return; /* handle better */
CLUTTER_MARK();
if (priv->local_pixbuf != NULL)
@ -751,6 +757,19 @@ clutter_texture_paint (ClutterActor *self)
return;
}
if (priv->fbo_handle)
{
cogl_offscreen_redirect_start (priv->fbo_handle,
priv->width, priv->height);
clutter_actor_paint (priv->fbo_source);
cogl_offscreen_redirect_end (priv->fbo_handle,
CLUTTER_STAGE_WIDTH(),
CLUTTER_STAGE_HEIGHT());
glBindTexture(CGL_TEXTURE_RECTANGLE_ARB, priv->tiles[0]);
}
CLUTTER_NOTE (PAINT,
"painting texture '%s'",
clutter_actor_get_name (self) ? clutter_actor_get_name (self)
@ -2083,3 +2102,90 @@ clutter_texture_set_area_from_rgb_data (ClutterTexture *texture,
return TRUE;
}
/**
* clutter_texture_new_from_actor:
* @actor: A #ClutterActor
*
* Creates a new #ClutterTexture object with its source a prexisting
* actor (and associated children).
*
* Note this function is intented as a utility call for uniformly applying
* shaders to groups and other potentail visual effects. It requires the
* #CLUTTER_FEATURE_TEXTURE_RECTANGLE & #CLUTTER_FEATURE_OFFSCREEN features
* are supported by both the current backend and target system
*
* Return value: A newly created #ClutterTexture object or NULL on fail.
**/
ClutterActor *
clutter_texture_new_from_actor (ClutterActor *actor)
{
ClutterTexture *texture;
ClutterTexturePrivate *priv;
guint w, h;
/* TODO (before 0.6 release):
*
* - Figure out getting source actor size correctly.
* - Figure out refing/reparenting source actor.
* - Handle source actor resizing.
* - Handle failure better.
* - Handle cleanup on destruction.
* - Beef up test-fbo.
* - Have the source actor as a prop?
*/
if (clutter_feature_available (CLUTTER_FEATURE_TEXTURE_RECTANGLE) == FALSE)
return NULL;
if (clutter_feature_available (CLUTTER_FEATURE_OFFSCREEN) == FALSE)
return NULL;
texture = g_object_new (CLUTTER_TYPE_TEXTURE, NULL);
priv = texture->priv;
priv->fbo_source = actor;
if (!CLUTTER_ACTOR_IS_REALIZED (priv->fbo_source))
clutter_actor_realize (priv->fbo_source);
/* FIXME: just ref ? */
clutter_actor_set_parent (actor, CLUTTER_ACTOR(texture));
/* FIXME abs size */
/*clutter_actor_get_abs_size (priv->fbo_source, &w, &h);*/
clutter_actor_get_size (actor, &w, &h);
/* FIXME: Check we can actually create a texture this large */
priv->width = w;
priv->height = h;
priv->target_type = CGL_TEXTURE_RECTANGLE_ARB;
priv->pixel_format = CGL_RGBA;
priv->pixel_type = PIXEL_TYPE;
priv->is_tiled = 0;
priv->tiles = g_new (COGLuint, 1);
/* FIXME: needs a cogl wrapper */
glGenTextures (1, priv->tiles);
cogl_texture_bind (priv->target_type, priv->tiles[0]);
cogl_texture_image_2d (priv->target_type,
CGL_RGBA,
w,
h,
priv->pixel_format,
priv->pixel_type,
NULL);
priv->fbo_handle = cogl_offscreen_create (priv->tiles[0]);
clutter_actor_set_size (actor, w, h);
return CLUTTER_ACTOR(texture);
}