[cogl-material] Adds a cogl_material_set_color4f convenience function

This is simply a wrapper around cogl_color_set_from_4f and
cogl_material_set_color. We already had a prototype for this, it was
an oversight that it wasn't already implemented.

diff --git a/clutter/cogl/cogl-material.h b/clutter/cogl/cogl-material.h
index c77b091..95a4748 100644 (file)
--- a/clutter/cogl/cogl-material.h
+++ b/clutter/cogl/cogl-material.h
@@ -109,7 +109,7 @@ void cogl_material_set_color (CoglHandle material, const CoglColor *color);
  *
  * This is the basic color of the material, used when no lighting is enabled.
  *
- * The default value is (1.0, 1.0, 1.0, 1.0)
+ * The default value is (0xff, 0xff, 0xff, 0xff)
  *
  * Since 1.0
  */
@@ -134,7 +134,7 @@ void cogl_material_set_color4ub (CoglHandle material,
  * Since 1.0
  */
 void cogl_material_set_color4f (CoglHandle material,
-                               float      red,
+                                float      red,
                                 float      green,
                                 float      blue,
                                 float      alpha);

diff --git a/clutter/cogl/common/cogl-material.c b/clutter/cogl/common/cogl-material.c
index 2c7df33..c456cac 100644 (file)
--- a/clutter/cogl/common/cogl-material.c
+++ b/clutter/cogl/common/cogl-material.c
@@ -194,6 +194,18 @@ cogl_material_set_color4ub (CoglHandle handle,
 }
 
 void
+cogl_material_set_color4f (CoglHandle handle,
+                          float red,
+                           float green,
+                           float blue,
+                           float alpha)
+{
+  CoglColor color;
+  cogl_color_set_from_4f (&color, red, green, blue, alpha);
+  cogl_material_set_color (handle, &color);
+}
+
+void
 cogl_material_get_ambient (CoglHandle  handle,
                            CoglColor  *ambient)
 {