2008-04-25 13:37:36 +00:00
|
|
|
#include <config.h>
|
|
|
|
#include <glib.h>
|
2008-11-07 19:32:28 +00:00
|
|
|
#include <gmodule.h>
|
2008-04-25 13:37:36 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <clutter/clutter.h>
|
|
|
|
#include <cogl/cogl.h>
|
|
|
|
|
|
|
|
/* Coglbox declaration
|
|
|
|
*--------------------------------------------------*/
|
|
|
|
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
|
|
|
|
#define TEST_TYPE_COGLBOX test_coglbox_get_type()
|
|
|
|
|
|
|
|
#define TEST_COGLBOX(obj) \
|
|
|
|
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
|
|
|
|
TEST_TYPE_COGLBOX, TestCoglboxClass))
|
|
|
|
|
|
|
|
#define TEST_COGLBOX_CLASS(klass) \
|
|
|
|
(G_TYPE_CHECK_CLASS_CAST ((klass), \
|
|
|
|
TEST_TYPE_COGLBOX, TestCoglboxClass))
|
|
|
|
|
|
|
|
#define TEST_IS_COGLBOX(obj) \
|
|
|
|
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
|
|
|
|
TEST_TYPE_COGLBOX))
|
|
|
|
|
|
|
|
#define TEST_IS_COGLBOX_CLASS(klass) \
|
|
|
|
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
|
|
|
|
TEST_TYPE_COGLBOX))
|
|
|
|
|
|
|
|
#define TEST_COGLBOX_GET_CLASS(obj) \
|
|
|
|
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
|
|
|
|
TEST_TYPE_COGLBOX, TestCoglboxClass))
|
|
|
|
|
|
|
|
typedef struct _TestCoglbox TestCoglbox;
|
|
|
|
typedef struct _TestCoglboxClass TestCoglboxClass;
|
|
|
|
typedef struct _TestCoglboxPrivate TestCoglboxPrivate;
|
|
|
|
|
|
|
|
struct _TestCoglbox
|
|
|
|
{
|
|
|
|
ClutterActor parent;
|
|
|
|
|
|
|
|
/*< private >*/
|
|
|
|
TestCoglboxPrivate *priv;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct _TestCoglboxClass
|
|
|
|
{
|
|
|
|
ClutterActorClass parent_class;
|
|
|
|
|
|
|
|
/* padding for future expansion */
|
|
|
|
void (*_test_coglbox1) (void);
|
|
|
|
void (*_test_coglbox2) (void);
|
|
|
|
void (*_test_coglbox3) (void);
|
|
|
|
void (*_test_coglbox4) (void);
|
|
|
|
};
|
|
|
|
|
2008-11-07 19:32:28 +00:00
|
|
|
static GType test_coglbox_get_type (void) G_GNUC_CONST;
|
2008-04-25 13:37:36 +00:00
|
|
|
|
|
|
|
G_END_DECLS
|
|
|
|
|
|
|
|
/* Coglbox private declaration
|
|
|
|
*--------------------------------------------------*/
|
|
|
|
|
|
|
|
G_DEFINE_TYPE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
|
|
|
|
|
|
|
|
#define TEST_COGLBOX_GET_PRIVATE(obj) \
|
|
|
|
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
|
|
|
|
|
|
|
|
struct _TestCoglboxPrivate
|
|
|
|
{
|
|
|
|
CoglHandle cogl_tex_id[4];
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Coglbox implementation
|
|
|
|
*--------------------------------------------------*/
|
|
|
|
|
|
|
|
static void
|
|
|
|
test_coglbox_paint(ClutterActor *self)
|
|
|
|
{
|
|
|
|
TestCoglboxPrivate *priv = TEST_COGLBOX_GET_PRIVATE (self);
|
2009-03-09 17:34:23 +00:00
|
|
|
gfloat texcoords[4] = { 0.0f, 0.0f, 1.0f, 1.0f };
|
2008-11-12 13:57:58 +00:00
|
|
|
|
2008-04-25 13:37:36 +00:00
|
|
|
priv = TEST_COGLBOX_GET_PRIVATE (self);
|
|
|
|
|
2008-11-12 13:57:58 +00:00
|
|
|
cogl_set_source_color4ub (0x66, 0x66, 0xdd, 0xff);
|
|
|
|
cogl_rectangle (0, 0, 400, 400);
|
|
|
|
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_push_matrix ();
|
2008-11-12 13:57:58 +00:00
|
|
|
|
|
|
|
cogl_translate (100, 100, 0);
|
Fully integrates CoglMaterial throughout the rest of Cogl
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.
2009-01-23 16:15:40 +00:00
|
|
|
cogl_set_source_texture (priv->cogl_tex_id[1]);
|
2009-03-09 17:34:23 +00:00
|
|
|
cogl_rectangle_with_texture_coords (0, 0, 200, 213,
|
Fully integrates CoglMaterial throughout the rest of Cogl
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.
2009-01-23 16:15:40 +00:00
|
|
|
texcoords[0], texcoords[1],
|
|
|
|
texcoords[2], texcoords[3]);
|
2008-04-25 13:37:36 +00:00
|
|
|
|
|
|
|
cogl_pop_matrix();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
test_coglbox_finalize (GObject *object)
|
|
|
|
{
|
|
|
|
G_OBJECT_CLASS (test_coglbox_parent_class)->finalize (object);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
test_coglbox_dispose (GObject *object)
|
|
|
|
{
|
|
|
|
TestCoglboxPrivate *priv;
|
|
|
|
|
|
|
|
priv = TEST_COGLBOX_GET_PRIVATE (object);
|
2009-04-01 16:16:44 +00:00
|
|
|
cogl_handle_unref (priv->cogl_tex_id);
|
2008-04-25 13:37:36 +00:00
|
|
|
|
|
|
|
G_OBJECT_CLASS (test_coglbox_parent_class)->dispose (object);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
test_coglbox_init (TestCoglbox *self)
|
|
|
|
{
|
|
|
|
TestCoglboxPrivate *priv;
|
|
|
|
guint width;
|
|
|
|
guint height;
|
2008-06-10 06:37:46 +00:00
|
|
|
guint rowstride;
|
2008-04-25 13:37:36 +00:00
|
|
|
CoglPixelFormat format;
|
|
|
|
gint size;
|
|
|
|
guchar *data;
|
|
|
|
gint x,y,t;
|
|
|
|
guchar *pixel;
|
|
|
|
|
|
|
|
self->priv = priv = TEST_COGLBOX_GET_PRIVATE(self);
|
|
|
|
|
|
|
|
/* Load image from file */
|
|
|
|
|
|
|
|
priv->cogl_tex_id[0] =
|
[cogl] Remove max_waste argument from Texture ctors
The CoglTexture constructors expose the "max-waste" argument for
controlling the maximum amount of wasted areas for slicing or,
if set to -1, disables slicing.
Slicing is really relevant only for large images that are never
repeated, so it's a useful feature only in controlled use cases.
Specifying the amount of wasted area is, on the other hand, just
a way to mess up this feature; 99% the times, you either pull this
number out of thin air, hoping it's right, or you try to do the
right thing and you choose the wrong number anyway.
Instead, we can use the CoglTextureFlags to control whether the
texture should not be sliced (useful for Clutter-GST and for the
texture-from-pixmap actors) and provide a reasonable value for
enabling the slicing ourself. At some point, we might even
provide a way to change the default at compile time or at run time,
for particular platforms.
Since max_waste is gone, the :tile-waste property of ClutterTexture
becomes read-only, and it proxies the cogl_texture_get_max_waste()
function.
Inside Clutter, the only cases where the max_waste argument was
not set to -1 are in the Pango glyph cache (which is a POT texture
anyway) and inside the test cases where we want to force slicing;
for the latter we can create larger textures that will be bigger than
the threshold we set.
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
Signed-off-by: Robert Bragg <robert@linux.intel.com>
Signed-off-by: Neil Roberts <neil@linux.intel.com>
2009-05-23 18:18:18 +00:00
|
|
|
cogl_texture_new_from_file ("redhand.png",
|
2009-01-18 15:00:18 +00:00
|
|
|
COGL_TEXTURE_NONE,
|
2008-05-07 16:12:54 +00:00
|
|
|
COGL_PIXEL_FORMAT_ANY, NULL);
|
2008-04-25 13:37:36 +00:00
|
|
|
|
|
|
|
if (priv->cogl_tex_id[0] == COGL_INVALID_HANDLE)
|
|
|
|
{
|
|
|
|
printf ("Failed loading redhand.png image!\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
printf("Texture loaded from file.\n");
|
|
|
|
|
|
|
|
/* Obtain pixel data */
|
|
|
|
|
2008-06-10 06:37:46 +00:00
|
|
|
format = cogl_texture_get_format (priv->cogl_tex_id[0]);
|
2009-06-15 23:45:44 +00:00
|
|
|
g_assert(format == COGL_PIXEL_FORMAT_RGBA_8888_PRE ||
|
|
|
|
format == COGL_PIXEL_FORMAT_ARGB_8888_PRE);
|
2008-06-10 06:37:46 +00:00
|
|
|
|
2008-04-25 13:37:36 +00:00
|
|
|
width = cogl_texture_get_width (priv->cogl_tex_id[0]);
|
|
|
|
height = cogl_texture_get_height (priv->cogl_tex_id[0]);
|
|
|
|
size = cogl_texture_get_data (priv->cogl_tex_id[0],
|
|
|
|
format, 0, NULL);
|
|
|
|
|
|
|
|
printf("size: %dx%d\n", width, height);
|
|
|
|
printf("format: 0x%x\n", format);
|
|
|
|
printf("bytesize: %d\n", size);
|
|
|
|
|
|
|
|
data = (guchar*) g_malloc (sizeof(guchar) * size);
|
|
|
|
|
|
|
|
cogl_texture_get_data (priv->cogl_tex_id[0],
|
|
|
|
format, 0, data);
|
2008-06-10 06:37:46 +00:00
|
|
|
rowstride = cogl_texture_get_rowstride (priv->cogl_tex_id[0]);
|
2008-04-25 13:37:36 +00:00
|
|
|
|
|
|
|
/* Create new texture from modified data */
|
|
|
|
|
|
|
|
priv->cogl_tex_id[1] =
|
[cogl] Remove max_waste argument from Texture ctors
The CoglTexture constructors expose the "max-waste" argument for
controlling the maximum amount of wasted areas for slicing or,
if set to -1, disables slicing.
Slicing is really relevant only for large images that are never
repeated, so it's a useful feature only in controlled use cases.
Specifying the amount of wasted area is, on the other hand, just
a way to mess up this feature; 99% the times, you either pull this
number out of thin air, hoping it's right, or you try to do the
right thing and you choose the wrong number anyway.
Instead, we can use the CoglTextureFlags to control whether the
texture should not be sliced (useful for Clutter-GST and for the
texture-from-pixmap actors) and provide a reasonable value for
enabling the slicing ourself. At some point, we might even
provide a way to change the default at compile time or at run time,
for particular platforms.
Since max_waste is gone, the :tile-waste property of ClutterTexture
becomes read-only, and it proxies the cogl_texture_get_max_waste()
function.
Inside Clutter, the only cases where the max_waste argument was
not set to -1 are in the Pango glyph cache (which is a POT texture
anyway) and inside the test cases where we want to force slicing;
for the latter we can create larger textures that will be bigger than
the threshold we set.
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
Signed-off-by: Robert Bragg <robert@linux.intel.com>
Signed-off-by: Neil Roberts <neil@linux.intel.com>
2009-05-23 18:18:18 +00:00
|
|
|
cogl_texture_new_from_data (width, height,
|
2009-01-18 15:00:18 +00:00
|
|
|
COGL_TEXTURE_NONE,
|
2008-05-07 16:12:54 +00:00
|
|
|
format, format,
|
2008-06-10 06:37:46 +00:00
|
|
|
rowstride, data);
|
2008-04-25 13:37:36 +00:00
|
|
|
|
|
|
|
if (priv->cogl_tex_id[1] == COGL_INVALID_HANDLE)
|
|
|
|
{
|
|
|
|
printf ("Failed creating image from data!\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
printf ("Texture created from data.\n");
|
|
|
|
|
|
|
|
/* Modify data (swap red and green) */
|
|
|
|
|
|
|
|
for (y=0; y<height; ++y)
|
|
|
|
{
|
|
|
|
for (x=0; x<width; ++x)
|
|
|
|
{
|
2008-06-10 06:37:46 +00:00
|
|
|
pixel = data + y * rowstride + x * 4;
|
2009-06-15 23:45:44 +00:00
|
|
|
if (format == COGL_PIXEL_FORMAT_RGBA_8888_PRE)
|
2008-06-10 06:37:46 +00:00
|
|
|
{
|
|
|
|
t = pixel[0];
|
|
|
|
pixel[0] = pixel[1];
|
|
|
|
pixel[1] = t;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
t = pixel[1];
|
|
|
|
pixel[1] = pixel[2];
|
|
|
|
pixel[2] = t;
|
|
|
|
}
|
2008-04-25 13:37:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
cogl_texture_set_region (priv->cogl_tex_id[1],
|
|
|
|
0, 0, 0, 0,
|
|
|
|
100, 100, width, height,
|
|
|
|
format, 0, data);
|
|
|
|
|
|
|
|
cogl_texture_set_region (priv->cogl_tex_id[1],
|
|
|
|
100, 100, 100, 100,
|
|
|
|
100, 100, width, height,
|
|
|
|
format, 0, data);
|
|
|
|
|
|
|
|
printf ("Subregion data updated.\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
test_coglbox_class_init (TestCoglboxClass *klass)
|
|
|
|
{
|
|
|
|
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
|
|
|
ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
|
|
|
|
|
|
|
|
gobject_class->finalize = test_coglbox_finalize;
|
|
|
|
gobject_class->dispose = test_coglbox_dispose;
|
|
|
|
actor_class->paint = test_coglbox_paint;
|
|
|
|
|
|
|
|
g_type_class_add_private (gobject_class, sizeof (TestCoglboxPrivate));
|
|
|
|
}
|
|
|
|
|
2008-11-07 19:32:28 +00:00
|
|
|
static ClutterActor*
|
2008-04-25 13:37:36 +00:00
|
|
|
test_coglbox_new (void)
|
|
|
|
{
|
|
|
|
return g_object_new (TEST_TYPE_COGLBOX, NULL);
|
|
|
|
}
|
|
|
|
|
2008-11-07 19:32:28 +00:00
|
|
|
G_MODULE_EXPORT int
|
|
|
|
test_cogl_tex_getset_main (int argc, char *argv[])
|
2008-04-25 13:37:36 +00:00
|
|
|
{
|
|
|
|
ClutterActor *stage;
|
|
|
|
ClutterActor *coglbox;
|
|
|
|
|
|
|
|
clutter_init(&argc, &argv);
|
|
|
|
|
|
|
|
/* Stage */
|
|
|
|
stage = clutter_stage_get_default ();
|
|
|
|
clutter_actor_set_size (stage, 400, 400);
|
|
|
|
clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Test");
|
|
|
|
|
|
|
|
/* Cogl Box */
|
|
|
|
coglbox = test_coglbox_new ();
|
|
|
|
clutter_container_add_actor (CLUTTER_CONTAINER (stage), coglbox);
|
|
|
|
|
|
|
|
clutter_actor_show_all (stage);
|
|
|
|
|
|
|
|
clutter_main ();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|