diff --git a/clutter/cogl/common/cogl-matrix.c b/clutter/cogl/common/cogl-matrix.c index 8786da570..4d7ae6f16 100644 --- a/clutter/cogl/common/cogl-matrix.c +++ b/clutter/cogl/common/cogl-matrix.c @@ -53,14 +53,16 @@ cogl_matrix_multiply (CoglMatrix *result, /** * cogl_3dmatrix_rotate: - * matrix: A 3D Affine transformation matrix - * angle: The angle in degrees you want to rotate by - * x: The X component of your rotation vector - * y: The Y component of your rotation vector - * z: The Z component of your rotation vector + * @matrix: A 3D Affine transformation matrix + * @angle: The angle in degrees you want to rotate by + * @x: The X component of your rotation vector + * @y: The Y component of your rotation vector + * @z: The Z component of your rotation vector * * The matrix is multiplied with a rotation matrix representing a rotation * of angle degress around the vector (x,y,z) + * + * Since: 1.0 */ void cogl_matrix_rotate (CoglMatrix *matrix, diff --git a/doc/reference/cogl/cogl-sections.txt b/doc/reference/cogl/cogl-sections.txt index a00db7c77..72665e93d 100644 --- a/doc/reference/cogl/cogl-sections.txt +++ b/doc/reference/cogl/cogl-sections.txt @@ -37,7 +37,6 @@ cogl_clip_ensure cogl_enable_depth_test cogl_enable_backface_culling -cogl_alpha_func cogl_fog_set @@ -89,10 +88,15 @@ cogl_path_stroke_preserve cogl_set_source_color cogl_set_source_color4ub cogl_set_source_color4f +cogl_set_source_texture cogl_color cogl_rectangle +cogl_polygon +cogl_rectangle_with_multitexture_coords +cogl_rectangle_with_texture_coords +cogl_rectangles_with_texture_coords
@@ -123,11 +127,6 @@ cogl_texture_get_data cogl_texture_set_filters cogl_texture_set_region - -cogl_texture_rectangle -cogl_texture_multiple_rectangles -cogl_texture_polygon - CoglBitmap cogl_bitmap_new_from_file @@ -324,20 +323,31 @@ cogl_matrix_scale
cogl-material Materials +CoglMaterial +CoglMaterialFlags cogl_material_new cogl_material_ref cogl_material_unref -cogl_material_set_diffuse cogl_material_set_ambient +cogl_material_get_ambient cogl_material_set_ambient_and_diffuse -cogl_material_set_specular -cogl_material_set_shininess +cogl_material_set_color +cogl_material_set_color4ub +cogl_material_get_color +cogl_material_set_diffuse +cogl_material_get_diffuse cogl_material_set_emission +cogl_material_get_emission +cogl_material_set_specular +cogl_material_get_specular +cogl_material_set_shininess +cogl_material_get_shininess cogl_set_source CoglMaterialAlphaFunc cogl_material_set_alpha_test_function CoglMaterialBlendFactor cogl_material_set_blend_factors +CoglMaterialLayer cogl_material_set_layer cogl_material_remove_layer CoglMaterialLayerCombineFunc @@ -348,14 +358,23 @@ cogl_material_set_layer_combine_arg_src CoglMaterialLayerCombineOp cogl_material_set_layer_combine_arg_op cogl_material_set_layer_matrix +cogl_material_set_layer_alpha_combine +cogl_material_set_layer_rgb_combine cogl_material_get_cogl_enable_flags +CoglMaterialFlushOption cogl_material_flush_gl_material_state cogl_material_flush_gl_alpha_func cogl_material_flush_gl_blend_func +cogl_material_flush_gl_state cogl_material_get_layers CoglMaterialLayerType cogl_material_layer_get_type +CoglMaterialLayerFlags +cogl_material_layer_get_flags cogl_material_layer_get_texture cogl_material_layer_flush_gl_sampler_state + + +CoglMaterialLayerPrivFlags