brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5985eef44c
mutter/clutter
History
Robert Bragg 5985eef44c 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-27 14:26:39 +00:00
..
cogl Fully integrates CoglMaterial throughout the rest of Cogl 2009-01-27 14:26:39 +00:00
eglnative [eglnative] Set the SYNC_MATRICES on stage realization 2009-01-16 22:13:44 +00:00
eglx 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
fruity 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
glx Fix compile warning for a possible uninitialized variable 2009-01-14 15:04:28 +00:00
json 2008-04-09 Emmanuele Bassi <ebassi@openedhand.com> 2008-04-09 14:18:42 +00:00
osx 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
pango Fully integrates CoglMaterial throughout the rest of Cogl 2009-01-27 14:26:39 +00:00
sdl 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
win32 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
x11 Fix properties that have X11 types to be 'long' 2009-01-16 23:44:32 +00:00
clutter-actor.c Use the allocation to get the pick area 2009-01-22 15:55:43 +00:00
clutter-actor.h Bug 1380 - Return booleans from CLUTTER_ACTOR_IS_* macros 2009-01-14 18:18:20 +00:00
clutter-alpha.c Merge branch 'cogl-float' 2009-01-20 18:47:50 +00:00
clutter-alpha.h Merge branch 'cogl-float' 2009-01-20 18:47:50 +00:00
clutter-animatable.c Add license notice to ClutterAnimation files 2009-01-08 13:18:00 +00:00
clutter-animatable.h Add license notice to ClutterAnimation files 2009-01-08 13:18:00 +00:00
clutter-animation.c [doc] Clarify the animation mode meaning 2009-01-16 14:37:42 +00:00
clutter-animation.h Remove AnimationMode from the Animation API 2009-01-16 14:37:42 +00:00
clutter-backend.c Store the units-per-em inside the Backend 2009-01-22 11:42:11 +00:00
clutter-backend.h Store the default font name inside ClutterBackend 2008-12-23 15:03:11 +00:00
clutter-behaviour-depth.c [Automatic fixed-to-float.sh change] Applies all scripted changes 2009-01-20 16:20:54 +00:00
clutter-behaviour-depth.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-behaviour-ellipse.c Fix the format for a floating point value 2009-01-22 11:46:23 +00:00
clutter-behaviour-ellipse.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-behaviour-opacity.c
clutter-behaviour-opacity.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-behaviour-path.c Convert clutter_path_get_position to take a gdouble instead of an alpha value 2008-12-16 15:39:53 +00:00
clutter-behaviour-path.h Bug 1252 - Merge ClutterBehaviourPath and ClutterBehaviourBspline 2008-12-05 13:13:37 +00:00
clutter-behaviour-rotate.c [Automatic fixed-to-float.sh change] Applies all scripted changes 2009-01-20 16:20:54 +00:00
clutter-behaviour-rotate.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-behaviour-scale.c [Automatic fixed-to-float.sh change] Applies all scripted changes 2009-01-20 16:20:54 +00:00
clutter-behaviour-scale.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-behaviour.c Fix some *_set functions so they work if the object is the same value 2009-01-05 13:19:40 +00:00
clutter-behaviour.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-bezier.c [Automatic fixed-to-float.sh change] Applies a number fixed to float patches 2009-01-20 16:20:54 +00:00
clutter-bezier.h Bug 1252 - Merge ClutterBehaviourPath and ClutterBehaviourBspline 2008-12-05 13:13:37 +00:00
clutter-binding-pool.c Add ClutterBindingPool:name 2009-01-13 12:51:03 +00:00
clutter-binding-pool.h Add declaration of clutter_binding_pool_get_type() 2009-01-14 15:03:30 +00:00
clutter-cairo-texture.c [docs] Documentation fixes for CairoTexture 2008-12-19 17:48:30 +00:00
clutter-cairo-texture.h [docs] Documentation warnings 2009-01-09 14:26:35 +00:00
clutter-child-meta.c 2008-08-06 Emmanuele Bassi <ebassi@openedhand.com> 2008-08-06 10:20:57 +00:00
clutter-child-meta.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-clone-texture.c Fully integrates CoglMaterial throughout the rest of Cogl 2009-01-27 14:26:39 +00:00
clutter-clone-texture.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-color.c [Automatic fixed-to-float.sh change] Applies all scripted changes 2009-01-20 16:20:54 +00:00
clutter-color.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-container.c 2008-10-16 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-16 10:28:17 +00:00
clutter-container.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-debug.h 2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 09:50:03 +00:00
clutter-deprecated.h 2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 09:50:03 +00:00
clutter-enum-types.c.in
clutter-enum-types.h.in
clutter-event.c 2008-12-08 Emmanuele Bassi <ebassi@linux.intel.com> 2008-12-08 13:57:10 +00:00
clutter-event.h [docs] Specify the coordinate space of ButtonEvent 2009-01-21 22:03:31 +00:00
clutter-feature.c 2008-06-06 Matthew Allum <mallum@openedhand.com> 2008-06-06 13:44:22 +00:00
clutter-feature.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-fixed.c [Automatic fixed-to-float.sh change] Applies a number fixed to float patches 2009-01-20 16:20:54 +00:00
clutter-fixed.h [Automatic fixed-to-float.sh change] Hand coded changes for clutter-{fixed,units} 2009-01-20 16:20:55 +00:00
clutter-frame-source.c * clutter/clutter-frame-source.c (clutter_frame_source_add) 2008-05-09 16:27:06 +00:00
clutter-frame-source.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-group.c 2008-11-26 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-26 16:46:48 +00:00
clutter-group.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-id-pool.c 2008-03-09 Matthew Allum <mallum@openedhand.com> 2008-03-09 19:07:17 +00:00
clutter-id-pool.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-interval.c [Automatic fixed-to-float.sh change] Applies all scripted changes 2009-01-20 16:20:54 +00:00
clutter-interval.h [animation] Allow registering custom progress function 2009-01-08 11:15:09 +00:00
clutter-json.h.in 2008-04-23 Emmanuele Bassi <ebassi@openedhand.com> 2008-04-23 13:58:58 +00:00
clutter-keysyms-table.h 7 small miscellaneous fixes 2008-06-10 06:37:46 +00:00
clutter-keysyms.h 2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> 2008-08-05 10:54:40 +00:00
clutter-list-model.c 2008-03-19 Emmanuele Bassi <ebassi@openedhand.com> 2008-03-19 18:33:33 +00:00
clutter-list-model.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-main.c Fully integrates CoglMaterial throughout the rest of Cogl 2009-01-27 14:26:39 +00:00
clutter-main.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:11:29 +00:00
clutter-marshal.list 2008-12-08 Emmanuele Bassi <ebassi@linux.intel.com> 2008-12-08 13:57:10 +00:00
clutter-media.c Bug 1404 - ClutterMedia issues 2009-01-20 23:40:25 +00:00
clutter-media.h Bug 1404 - ClutterMedia issues 2009-01-20 23:40:25 +00:00
clutter-model-private.h
clutter-model.c * clutter/clutter-model.c (clutter_model_set_sorting_column): This 2008-07-30 10:32:25 +00:00
clutter-model.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-path.c [Automatic fixed-to-float.sh change] Applies a number fixed to float patches 2009-01-20 16:20:54 +00:00
clutter-path.h [build] Replaces use of #include <cairo/cairo.h> with #include <cairo.h> 2008-12-21 21:52:50 +00:00
clutter-private.h Store the units-per-em inside the Backend 2009-01-22 11:42:11 +00:00
clutter-rectangle.c 2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-17 14:21:49 +00:00
clutter-rectangle.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-score.c Bug 1299 - clutter_score_remove will segmentation fault if 2008-11-25 13:19:48 +00:00
clutter-score.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-script-parser.c 2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> 2008-08-04 16:21:27 +00:00
clutter-script-private.h 2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> 2008-08-04 16:21:27 +00:00
clutter-script.c Fixed some trivial compiler warnings 2008-11-18 18:53:10 +00:00
clutter-script.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-scriptable.c
clutter-scriptable.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-shader-types.c 2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 15:08:40 +00:00
clutter-shader-types.h 2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 15:08:40 +00:00
clutter-shader.c 2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 15:08:40 +00:00
clutter-shader.h 2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 15:08:40 +00:00
clutter-stage-manager.c Applied patch from bug #947 2008-06-03 20:15:11 +00:00
clutter-stage-manager.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-stage-window.c 2008-04-04 Emmanuele Bassi <ebassi@openedhand.com> 2008-04-04 15:02:11 +00:00
clutter-stage-window.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-stage.c Bug 1409 - Use G_SIGNAL_RUN_LAST with ::queue-redraw signal 2009-01-22 13:38:32 +00:00
clutter-stage.h Bug 1087 - virtualize stage_queue_redraw 2009-01-12 14:28:39 +00:00
clutter-text.c [clutter-text] Fix x-position of cursor when moving up or down 2009-01-14 11:12:02 +00:00
clutter-text.h Re-align ClutterText header file 2009-01-07 11:46:22 +00:00
clutter-texture.c Fully integrates CoglMaterial throughout the rest of Cogl 2009-01-27 14:26:39 +00:00
clutter-texture.h Merge commit 'origin/master' into cogl-material 2009-01-23 15:23:49 +00:00
clutter-timeline.c [Automatic fixed-to-float.sh change] Applies all scripted changes 2009-01-20 16:20:54 +00:00
clutter-timeline.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-timeout-pool.c 2008-09-23 Emmanuele Bassi <ebassi@linux.intel.com> 2008-09-23 13:25:31 +00:00
clutter-timeout-pool.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-types.h [alpha] Allow registering alpha functions 2009-01-16 14:37:35 +00:00
clutter-units.c [units] Fix Units in GValue and ClutterParamSpecUnit 2009-01-22 12:11:25 +00:00
clutter-units.h Add units-from-em conversion 2009-01-21 17:35:47 +00:00
clutter-util.c
clutter-util.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-version.h.in 2008-03-31 Matthew Allum <mallum@openedhand.com> 2008-03-31 17:15:02 +00:00
clutter.h Remove the Effects API 2009-01-14 16:56:21 +00:00
Makefile.am Remove the Effects API 2009-01-14 16:56:21 +00:00