mirror of
https://github.com/brl/mutter.git
synced 2024-12-22 19:12:04 +00:00
2007-01-17 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-feature.h: * clutter/clutter-feature.c: Move the GL headers from the header file to the body. * clutter/clutter-fixed.h: * clutter/clutter-fixed.c: Fix apidoc. * clutter/clutter-color.h: * clutter/clutter-color.c: Ditto.
This commit is contained in:
parent
cbe5c47090
commit
9bd77e25b2
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
|||||||
|
2007-01-17 Emmanuele Bassi <ebassi@openedhand.com>
|
||||||
|
|
||||||
|
* clutter/clutter-feature.h:
|
||||||
|
* clutter/clutter-feature.c: Move the GL headers from the
|
||||||
|
header file to the body.
|
||||||
|
|
||||||
|
* clutter/clutter-fixed.h:
|
||||||
|
* clutter/clutter-fixed.c: Fix apidoc.
|
||||||
|
|
||||||
|
* clutter/clutter-color.h:
|
||||||
|
* clutter/clutter-color.c: Ditto.
|
||||||
|
|
||||||
2007-01-17 Tomas Frydrych <tf@openedhand.com>
|
2007-01-17 Tomas Frydrych <tf@openedhand.com>
|
||||||
|
|
||||||
* clutter/clutter-fixed.h:
|
* clutter/clutter-fixed.h:
|
||||||
|
@ -317,13 +317,17 @@ clutter_color_shade (const ClutterColor *src,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* clutter_color_shade:
|
* clutter_color_shadex:
|
||||||
* @src: a #ClutterColor
|
* @src: a #ClutterColor
|
||||||
* @dest: return location for the shaded color
|
* @dest: return location for the shaded color
|
||||||
* @shade: #ClutterFixed the shade factor to apply
|
* @shade: #ClutterFixed the shade factor to apply
|
||||||
*
|
*
|
||||||
|
* Fixed point version of clutter_color_shade().
|
||||||
|
*
|
||||||
* Shades @src by the factor of @shade and saves the modified
|
* Shades @src by the factor of @shade and saves the modified
|
||||||
* color into @dest.
|
* color into @dest.
|
||||||
|
*
|
||||||
|
* Since: 0.2
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
clutter_color_shadex (const ClutterColor *src,
|
clutter_color_shadex (const ClutterColor *src,
|
||||||
@ -471,7 +475,7 @@ clutter_color_to_string (const ClutterColor *color)
|
|||||||
*
|
*
|
||||||
* Compares two #ClutterColor<!-- -->s and checks if they are the same.
|
* Compares two #ClutterColor<!-- -->s and checks if they are the same.
|
||||||
*
|
*
|
||||||
* Return: %TRUE if the two colors are the same.
|
* Return value: %TRUE if the two colors are the same.
|
||||||
*
|
*
|
||||||
* Since: 0.2
|
* Since: 0.2
|
||||||
*/
|
*/
|
||||||
|
@ -40,6 +40,9 @@
|
|||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
|
#include <GL/glx.h>
|
||||||
|
#include <GL/gl.h>
|
||||||
|
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
|
|
||||||
#include "clutter-feature.h"
|
#include "clutter-feature.h"
|
||||||
|
@ -34,8 +34,6 @@
|
|||||||
#define _HAVE_CLUTTER_FEATURE_H
|
#define _HAVE_CLUTTER_FEATURE_H
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include <GL/glx.h>
|
|
||||||
#include <GL/gl.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
|
@ -455,8 +455,8 @@ clutter_sqrtx (ClutterFixed x)
|
|||||||
*
|
*
|
||||||
* Since: 0.2
|
* Since: 0.2
|
||||||
*/
|
*/
|
||||||
int
|
gint
|
||||||
clutter_sqrti (int x)
|
clutter_sqrti (gint x)
|
||||||
{
|
{
|
||||||
int t = 0;
|
int t = 0;
|
||||||
int sh = 0;
|
int sh = 0;
|
||||||
|
@ -85,7 +85,7 @@ typedef gint32 ClutterAngle; /* angle such that 1024 == 2*PI */
|
|||||||
#define CFX_DIV CLUTTER_FIXED_DIV
|
#define CFX_DIV CLUTTER_FIXED_DIV
|
||||||
|
|
||||||
/* Fixed point math routines */
|
/* Fixed point math routines */
|
||||||
ClutterFixed clutter_sinx (ClutterFixed anx);
|
ClutterFixed clutter_sinx (ClutterFixed angle);
|
||||||
ClutterFixed clutter_sini (ClutterAngle angle);
|
ClutterFixed clutter_sini (ClutterAngle angle);
|
||||||
|
|
||||||
/* convenience macros for the cos functions */
|
/* convenience macros for the cos functions */
|
||||||
@ -93,7 +93,7 @@ ClutterFixed clutter_sini (ClutterAngle angle);
|
|||||||
#define clutter_cosi(x) clutter_sini((x) - 256)
|
#define clutter_cosi(x) clutter_sini((x) - 256)
|
||||||
|
|
||||||
ClutterFixed clutter_sqrtx (ClutterFixed x);
|
ClutterFixed clutter_sqrtx (ClutterFixed x);
|
||||||
int clutter_sqrti (int x);
|
gint clutter_sqrti (gint x);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
|
@ -467,10 +467,10 @@ CFX_180
|
|||||||
CFX_240
|
CFX_240
|
||||||
CFX_360
|
CFX_360
|
||||||
CFX_60
|
CFX_60
|
||||||
|
CFX_255
|
||||||
CFX_DIV
|
CFX_DIV
|
||||||
CFX_INT
|
CFX_INT
|
||||||
CFX_MUL
|
CFX_MUL
|
||||||
clutter_color_shadex
|
|
||||||
CLUTTER_FIXED_TO_FLOAT
|
CLUTTER_FIXED_TO_FLOAT
|
||||||
CLUTTER_FIXED_TO_DOUBLE
|
CLUTTER_FIXED_TO_DOUBLE
|
||||||
CLUTTER_FLOAT_TO_FIXED
|
CLUTTER_FLOAT_TO_FIXED
|
||||||
@ -481,10 +481,12 @@ CLUTTER_FIXED_FLOOR
|
|||||||
CLUTTER_FIXED_CEIL
|
CLUTTER_FIXED_CEIL
|
||||||
CLUTTER_FIXED_MUL
|
CLUTTER_FIXED_MUL
|
||||||
CLUTTER_FIXED_DIV
|
CLUTTER_FIXED_DIV
|
||||||
clutter_fixed_cos
|
clutter_cosi
|
||||||
clutter_fixed_sin
|
clutter_cosx
|
||||||
clutter_angle_cos
|
clutter_sini
|
||||||
clutter_angle_sin
|
clutter_sinx
|
||||||
|
clutter_sqrti
|
||||||
|
clutter_sqrtx
|
||||||
</SECTION>
|
</SECTION>
|
||||||
|
|
||||||
<SECTION>
|
<SECTION>
|
||||||
|
@ -131,6 +131,13 @@ floating-to-fixed conversion.
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<!-- ##### MACRO CFX_255 ##### -->
|
||||||
|
<para>
|
||||||
|
|
||||||
|
</para>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### MACRO CFX_DIV ##### -->
|
<!-- ##### MACRO CFX_DIV ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
@ -152,16 +159,6 @@ floating-to-fixed conversion.
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION clutter_color_shadex ##### -->
|
|
||||||
<para>
|
|
||||||
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@src:
|
|
||||||
@dest:
|
|
||||||
@shade:
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### MACRO CLUTTER_FIXED_TO_FLOAT ##### -->
|
<!-- ##### MACRO CLUTTER_FIXED_TO_FLOAT ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
@ -244,7 +241,7 @@ floating-to-fixed conversion.
|
|||||||
@y:
|
@y:
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### MACRO clutter_fixed_cos ##### -->
|
<!-- ##### MACRO clutter_cosi ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
</para>
|
</para>
|
||||||
@ -252,7 +249,15 @@ floating-to-fixed conversion.
|
|||||||
@x:
|
@x:
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION clutter_fixed_sin ##### -->
|
<!-- ##### MACRO clutter_cosx ##### -->
|
||||||
|
<para>
|
||||||
|
|
||||||
|
</para>
|
||||||
|
|
||||||
|
@x:
|
||||||
|
|
||||||
|
|
||||||
|
<!-- ##### FUNCTION clutter_sini ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
</para>
|
</para>
|
||||||
@ -261,15 +266,7 @@ floating-to-fixed conversion.
|
|||||||
@Returns:
|
@Returns:
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### MACRO clutter_angle_cos ##### -->
|
<!-- ##### FUNCTION clutter_sinx ##### -->
|
||||||
<para>
|
|
||||||
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@x:
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION clutter_angle_sin ##### -->
|
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
</para>
|
</para>
|
||||||
@ -278,3 +275,21 @@ floating-to-fixed conversion.
|
|||||||
@Returns:
|
@Returns:
|
||||||
|
|
||||||
|
|
||||||
|
<!-- ##### FUNCTION clutter_sqrti ##### -->
|
||||||
|
<para>
|
||||||
|
|
||||||
|
</para>
|
||||||
|
|
||||||
|
@x:
|
||||||
|
@Returns:
|
||||||
|
|
||||||
|
|
||||||
|
<!-- ##### FUNCTION clutter_sqrtx ##### -->
|
||||||
|
<para>
|
||||||
|
|
||||||
|
</para>
|
||||||
|
|
||||||
|
@x:
|
||||||
|
@Returns:
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user