mirror of
https://github.com/brl/mutter.git
synced 2024-12-24 12:02:04 +00:00
5985eef44c
This glues CoglMaterial in as the fundamental way that Cogl describes how to fill in geometry. It adds cogl_set_source (), which is used to set the material which will be used by all subsequent drawing functions It adds cogl_set_source_texture as a convenience for setting up a default material with a single texture layer, and cogl_set_source_color is now also a convenience for setting up a material with a solid fill. "drawing functions" include, cogl_rectangle, cogl_texture_rectangle, cogl_texture_multiple_rectangles, cogl_texture_polygon (though the cogl_texture_* funcs have been renamed; see below for details), cogl_path_fill/stroke and cogl_vertex_buffer_draw*. cogl_texture_rectangle, cogl_texture_multiple_rectangles and cogl_texture_polygon no longer take a texture handle; instead the current source material is referenced. The functions have also been renamed to: cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords and cogl_polygon respectivly. Most code that previously did: cogl_texture_rectangle (tex_handle, x, y,...); needs to be changed to now do: cogl_set_source_texture (tex_handle); cogl_rectangle_with_texture_coords (x, y,....); In the less likely case where you were blending your source texture with a color like: cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */ cogl_texture_rectangle (tex_handle, x, y,...); you will need your own material to do that: mat = cogl_material_new (); cogl_material_set_color4ub (r,g,b,a); cogl_material_set_layer (mat, 0, tex_handle)); cogl_set_source_material (mat); Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use cog_rectangle_with_texure_coords since these are the coordinates that cogl_rectangle will use. For cogl_texture_polygon; as well as dropping the texture handle, the n_vertices and vertices arguments were transposed for consistency. So code previously written as: cogl_texture_polygon (tex_handle, 3, verts, TRUE); need to be written as: cogl_set_source_texture (tex_handle); cogl_polygon (verts, 3, TRUE); All of the unit tests have been updated to now use the material API and test-cogl-material has been renamed to test-cogl-multitexture since any textured quad is now technically a test of CoglMaterial but this test specifically creates a material with multiple texture layers. Note: The GLES backend has not been updated yet; that will be done in a following commit.
339 lines
8.9 KiB
C
339 lines
8.9 KiB
C
#include <clutter/clutter.h>
|
|
#include <gmodule.h>
|
|
|
|
typedef struct _CallbackData CallbackData;
|
|
typedef struct _Clip Clip;
|
|
|
|
typedef enum
|
|
{
|
|
CLIP_NONE,
|
|
CLIP_RECTANGLE,
|
|
CLIP_ELLIPSE,
|
|
CLIP_SHAPES
|
|
} ClipType;
|
|
|
|
struct _Clip
|
|
{
|
|
ClipType type;
|
|
gint x1, y1, x2, y2;
|
|
};
|
|
|
|
struct _CallbackData
|
|
{
|
|
ClutterActor *stage;
|
|
CoglHandle hand;
|
|
|
|
Clip current_clip;
|
|
|
|
GSList *clips;
|
|
};
|
|
|
|
static const char
|
|
instructions[] =
|
|
"Press and drag any of the three mouse buttons to add a clip with different "
|
|
"shapes. Press 'r' to reset or 'u' to undo the last clip.";
|
|
|
|
static void
|
|
path_shapes (gint x, gint y, gint width, gint height)
|
|
{
|
|
cogl_path_move_to (CLUTTER_INT_TO_FIXED (x), CLUTTER_INT_TO_FIXED (y));
|
|
cogl_path_line_to (CLUTTER_INT_TO_FIXED (x),
|
|
CLUTTER_INT_TO_FIXED (y + height * 4 / 5));
|
|
cogl_path_line_to (CLUTTER_INT_TO_FIXED (x + width * 4 / 15),
|
|
CLUTTER_INT_TO_FIXED (y + height * 4 / 5));
|
|
cogl_path_close ();
|
|
|
|
cogl_path_rectangle (CLUTTER_INT_TO_FIXED (x + width / 3),
|
|
CLUTTER_INT_TO_FIXED (y),
|
|
CLUTTER_INT_TO_FIXED (width * 4 / 15),
|
|
CLUTTER_INT_TO_FIXED (height * 4 / 5));
|
|
|
|
cogl_path_ellipse (CLUTTER_INT_TO_FIXED (x + width * 4 / 5),
|
|
CLUTTER_INT_TO_FIXED (y + height * 2 / 5),
|
|
CLUTTER_INT_TO_FIXED (width * 2 / 15),
|
|
CLUTTER_INT_TO_FIXED (height * 2 / 5));
|
|
}
|
|
|
|
static void
|
|
draw_shapes (gint x, gint y)
|
|
{
|
|
path_shapes (x, y, 300, 100);
|
|
cogl_set_source_color4ub (0x00, 0x00, 0xff, 0xff);
|
|
cogl_path_fill_preserve ();
|
|
cogl_set_source_color4ub (0xff, 0x00, 0x00, 0xff);
|
|
cogl_path_stroke ();
|
|
}
|
|
|
|
static void
|
|
make_clip_path (Clip *clip)
|
|
{
|
|
switch (clip->type)
|
|
{
|
|
case CLIP_NONE:
|
|
break;
|
|
|
|
case CLIP_RECTANGLE:
|
|
cogl_path_rectangle (CLUTTER_INT_TO_FIXED (clip->x1),
|
|
CLUTTER_INT_TO_FIXED (clip->y1),
|
|
CLUTTER_INT_TO_FIXED (clip->x2 - clip->x1),
|
|
CLUTTER_INT_TO_FIXED (clip->y2 - clip->y1));
|
|
break;
|
|
|
|
case CLIP_ELLIPSE:
|
|
cogl_path_ellipse (CLUTTER_INT_TO_FIXED (clip->x1 + clip->x2) / 2,
|
|
CLUTTER_INT_TO_FIXED (clip->y1 + clip->y2) / 2,
|
|
CLUTTER_INT_TO_FIXED (clip->x2 - clip->x1) / 2,
|
|
CLUTTER_INT_TO_FIXED (clip->y2 - clip->y1) / 2);
|
|
break;
|
|
|
|
case CLIP_SHAPES:
|
|
{
|
|
int x, y, width, height;
|
|
|
|
if (clip->x1 < clip->x2)
|
|
{
|
|
x = clip->x1;
|
|
width = clip->x2 - x;
|
|
}
|
|
else
|
|
{
|
|
x = clip->x2;
|
|
width = clip->x1 - x;
|
|
}
|
|
if (clip->y1 < clip->y2)
|
|
{
|
|
y = clip->y1;
|
|
height = clip->y2 - y;
|
|
}
|
|
else
|
|
{
|
|
y = clip->y2;
|
|
height = clip->y1 - y;
|
|
}
|
|
|
|
path_shapes (x, y, width, height);
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
on_paint (ClutterActor *actor, CallbackData *data)
|
|
{
|
|
int i;
|
|
ClutterGeometry stage_size;
|
|
gint hand_width, hand_height;
|
|
GSList *node;
|
|
|
|
clutter_actor_get_allocation_geometry (data->stage, &stage_size);
|
|
|
|
hand_width = cogl_texture_get_width (data->hand);
|
|
hand_height = cogl_texture_get_height (data->hand);
|
|
|
|
/* Setup the clipping */
|
|
for (node = data->clips; node; node = node->next)
|
|
{
|
|
Clip *clip = (Clip *) node->data;
|
|
|
|
if (clip->type == CLIP_RECTANGLE)
|
|
cogl_clip_set (CLUTTER_INT_TO_FIXED (clip->x1),
|
|
CLUTTER_INT_TO_FIXED (clip->y1),
|
|
CLUTTER_INT_TO_FIXED (clip->x2 - clip->x1),
|
|
CLUTTER_INT_TO_FIXED (clip->y2 - clip->y1));
|
|
else
|
|
{
|
|
make_clip_path (clip);
|
|
cogl_clip_set_from_path ();
|
|
}
|
|
}
|
|
|
|
/* Draw a rectangle filling the entire stage */
|
|
cogl_set_source_color4ub (0x80, 0x80, 0xff, 0xff);
|
|
cogl_rectangle (0, 0, stage_size.width, stage_size.height);
|
|
|
|
draw_shapes (10, 10);
|
|
|
|
/* Draw the hand at different rotations */
|
|
for (i = -2; i <= 2; i++)
|
|
{
|
|
cogl_push_matrix ();
|
|
|
|
cogl_translate (stage_size.width / 2 + stage_size.width / 6 * i,
|
|
stage_size.height / 2, 0);
|
|
|
|
cogl_rotate (i * 40, 0, 1, 0);
|
|
|
|
cogl_set_source_color4ub (0xff, 0xff, 0xff, 0xff);
|
|
|
|
cogl_set_source_texture (data->hand);
|
|
cogl_rectangle_with_texture_coords (CLUTTER_INT_TO_FIXED (-hand_width / 2),
|
|
CLUTTER_INT_TO_FIXED (-hand_height / 2),
|
|
CLUTTER_INT_TO_FIXED (hand_width / 2),
|
|
CLUTTER_INT_TO_FIXED (hand_height / 2),
|
|
0, 0, CFX_ONE, CFX_ONE);
|
|
|
|
cogl_pop_matrix ();
|
|
}
|
|
|
|
draw_shapes (stage_size.width - 310, stage_size.height - 110);
|
|
|
|
/* Remove all of the clipping */
|
|
g_slist_foreach (data->clips, (GFunc) cogl_clip_unset, NULL);
|
|
|
|
/* Draw the bounding box for each of the clips */
|
|
for (node = data->clips; node; node = node->next)
|
|
{
|
|
Clip *clip = (Clip *) node->data;
|
|
|
|
make_clip_path (clip);
|
|
cogl_set_source_color4ub (0x00, 0x00, 0xff, 0xff);
|
|
cogl_path_stroke ();
|
|
}
|
|
|
|
/* Draw the bounding box for the pending new clip */
|
|
if (data->current_clip.type != CLIP_NONE)
|
|
{
|
|
make_clip_path (&data->current_clip);
|
|
cogl_set_source_color4ub (0xff, 0x00, 0x00, 0xff);
|
|
cogl_path_stroke ();
|
|
}
|
|
}
|
|
|
|
static gboolean
|
|
on_button_press (ClutterActor *stage, ClutterButtonEvent *event,
|
|
CallbackData *data)
|
|
{
|
|
data->current_clip.x1 = data->current_clip.x2 = event->x;
|
|
data->current_clip.y1 = data->current_clip.y2 = event->y;
|
|
|
|
data->current_clip.type
|
|
= event->button == 1 ? CLIP_RECTANGLE
|
|
: event->button == 2 ? CLIP_SHAPES
|
|
: CLIP_ELLIPSE;
|
|
|
|
clutter_actor_queue_redraw (stage);
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
static gboolean
|
|
on_button_release (ClutterActor *stage, ClutterButtonEvent *event,
|
|
CallbackData *data)
|
|
{
|
|
if (data->current_clip.type != CLIP_NONE)
|
|
{
|
|
data->clips = g_slist_prepend (data->clips,
|
|
g_slice_copy (sizeof (Clip),
|
|
&data->current_clip));
|
|
|
|
data->current_clip.type = CLIP_NONE;
|
|
}
|
|
|
|
clutter_actor_queue_redraw (stage);
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
static gboolean
|
|
on_motion (ClutterActor *stage, ClutterMotionEvent *event,
|
|
CallbackData *data)
|
|
{
|
|
if (data->current_clip.type != CLIP_NONE)
|
|
{
|
|
data->current_clip.x2 = event->x;
|
|
data->current_clip.y2 = event->y;
|
|
|
|
clutter_actor_queue_redraw (stage);
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
static void
|
|
free_clips (CallbackData *data)
|
|
{
|
|
GSList *node;
|
|
|
|
for (node = data->clips; node; node = node->next)
|
|
g_slice_free (Clip, node->data);
|
|
|
|
g_slist_free (data->clips);
|
|
|
|
data->clips = NULL;
|
|
}
|
|
|
|
static gpointer
|
|
on_key_press (ClutterActor *stage, ClutterKeyEvent *event,
|
|
CallbackData *data)
|
|
{
|
|
switch (event->keyval)
|
|
{
|
|
case CLUTTER_r:
|
|
free_clips (data);
|
|
clutter_actor_queue_redraw (stage);
|
|
break;
|
|
|
|
case CLUTTER_u:
|
|
if (data->clips)
|
|
{
|
|
g_slice_free (Clip, data->clips->data);
|
|
data->clips = g_slist_delete_link (data->clips, data->clips);
|
|
clutter_actor_queue_redraw (stage);
|
|
}
|
|
break;
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
G_MODULE_EXPORT int
|
|
test_clip_main (int argc, char **argv)
|
|
{
|
|
CallbackData data;
|
|
ClutterActor *stub_actor, *label;
|
|
|
|
clutter_init (&argc, &argv);
|
|
|
|
data.current_clip.type = CLIP_NONE;
|
|
data.clips = NULL;
|
|
|
|
data.stage = clutter_stage_get_default ();
|
|
|
|
stub_actor = clutter_rectangle_new ();
|
|
clutter_container_add (CLUTTER_CONTAINER (data.stage), stub_actor, NULL);
|
|
|
|
data.hand = cogl_texture_new_from_file ("redhand.png", 64,
|
|
COGL_TEXTURE_NONE,
|
|
COGL_PIXEL_FORMAT_ANY,
|
|
NULL);
|
|
|
|
label = clutter_text_new_with_text ("Sans 12px", instructions);
|
|
clutter_text_set_line_wrap (CLUTTER_TEXT (label), TRUE);
|
|
clutter_actor_set_width (label, clutter_actor_get_width (data.stage) - 310);
|
|
clutter_actor_set_y (label,
|
|
clutter_actor_get_height (data.stage)
|
|
- clutter_actor_get_height (label));
|
|
clutter_container_add (CLUTTER_CONTAINER (data.stage), label, NULL);
|
|
|
|
g_signal_connect (stub_actor, "paint", G_CALLBACK (on_paint), &data);
|
|
|
|
g_signal_connect (data.stage, "button-press-event",
|
|
G_CALLBACK (on_button_press), &data);
|
|
g_signal_connect (data.stage, "button-release-event",
|
|
G_CALLBACK (on_button_release), &data);
|
|
g_signal_connect (data.stage, "motion-event",
|
|
G_CALLBACK (on_motion), &data);
|
|
g_signal_connect (data.stage, "key-press-event",
|
|
G_CALLBACK (on_key_press), &data);
|
|
|
|
clutter_actor_show (data.stage);
|
|
|
|
clutter_main ();
|
|
|
|
cogl_texture_unref (data.hand);
|
|
|
|
free_clips (&data);
|
|
|
|
return 0;
|
|
}
|