2008-04-25 13:37:36 +00:00
|
|
|
#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
|
|
|
|
{
|
|
|
|
GLuint gl_handle;
|
|
|
|
CoglHandle cogl_handle;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 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.3f, 0.3f, 0.7f, 0.7f };
|
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);
|
2008-04-29 15:41:34 +00:00
|
|
|
cogl_rectangle (0,0,400,400);
|
2008-04-25 13:37:36 +00:00
|
|
|
|
|
|
|
cogl_push_matrix ();
|
|
|
|
|
|
|
|
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_handle);
|
2009-03-09 17:34:23 +00:00
|
|
|
cogl_rectangle_with_texture_coords (0, 0, 200, 200,
|
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_handle);
|
2008-04-25 13:37:36 +00:00
|
|
|
glDeleteTextures (1, &priv->gl_handle);
|
|
|
|
|
|
|
|
G_OBJECT_CLASS (test_coglbox_parent_class)->dispose (object);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
test_coglbox_init (TestCoglbox *self)
|
|
|
|
{
|
|
|
|
TestCoglboxPrivate *priv;
|
|
|
|
guchar data[12];
|
2010-04-26 15:30:25 +00:00
|
|
|
GLint prev_unpack_alignment;
|
|
|
|
GLint prev_2d_texture_binding;
|
2008-04-25 13:37:36 +00:00
|
|
|
|
|
|
|
self->priv = priv = TEST_COGLBOX_GET_PRIVATE(self);
|
|
|
|
|
|
|
|
/* Prepare a 2x2 pixels texture */
|
|
|
|
|
|
|
|
data[0] = 255; data[1] = 0; data[2] = 0;
|
|
|
|
data[3] = 0; data[4] = 255; data[5] = 0;
|
|
|
|
data[6] = 0; data[7] = 0; data[8] = 255;
|
|
|
|
data[9] = 0; data[10] = 0; data[11] = 0;
|
2010-04-26 15:30:25 +00:00
|
|
|
|
|
|
|
/* We are about to use OpenGL directly to create a TEXTURE_2D
|
|
|
|
* texture so we need to save the state that we modify so we can
|
|
|
|
* restore it afterwards and be sure not to interfere with any state
|
|
|
|
* caching that Cogl may do internally.
|
|
|
|
*/
|
|
|
|
glGetIntegerv (GL_UNPACK_ALIGNMENT, &prev_unpack_alignment);
|
|
|
|
glGetIntegerv (GL_TEXTURE_BINDING_2D, &prev_2d_texture_binding);
|
|
|
|
|
2008-04-25 13:37:36 +00:00
|
|
|
glGenTextures (1, &priv->gl_handle);
|
|
|
|
glBindTexture (GL_TEXTURE_2D, priv->gl_handle);
|
|
|
|
|
|
|
|
glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
|
|
|
|
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGB,
|
|
|
|
2, 2, 0, GL_RGB, GL_UNSIGNED_BYTE, data);
|
2010-04-26 15:30:25 +00:00
|
|
|
|
|
|
|
/* Now restore the original GL state as Cogl had left it */
|
|
|
|
glPixelStorei (GL_UNPACK_ALIGNMENT, prev_unpack_alignment);
|
|
|
|
glBindTexture (GL_TEXTURE_2D, prev_2d_texture_binding);
|
2008-04-25 13:37:36 +00:00
|
|
|
|
|
|
|
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
|
|
|
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
|
|
|
|
|
|
|
/* Create texture from foreign */
|
|
|
|
|
|
|
|
priv->cogl_handle =
|
|
|
|
cogl_texture_new_from_foreign (priv->gl_handle,
|
|
|
|
GL_TEXTURE_2D,
|
|
|
|
2, 2, 0, 0,
|
|
|
|
COGL_PIXEL_FORMAT_RGB_888);
|
|
|
|
|
|
|
|
if (priv->cogl_handle == COGL_INVALID_HANDLE)
|
|
|
|
{
|
|
|
|
printf ("Failed creating texture from foreign!\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
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_foreign_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;
|
|
|
|
}
|