brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move BehaviourScale to CoglFixed

Browse Source 
ClutterFixed as a type is going away, superceded by CoglFixed. The
fixed point entry points in the API should be ported to the
CoglFixed type so that they are useful again.
This commit is contained in:
Emmanuele Bassi 2009-03-05 20:17:11 +00:00
parent 7bf385a067
commit 045ad21921
2 changed files with 202 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

328
clutter/clutter-behaviour-scale.c
View File

@ -39,7 +39,6 @@
#include "clutter-behaviour.h" #include "clutter-behaviour.h"
#include "clutter-enum-types.h" #include "clutter-enum-types.h"
#include "clutter-main.h" #include "clutter-main.h"
#include "clutter-fixed.h"
#include "clutter-behaviour-scale.h" #include "clutter-behaviour-scale.h"
#include "clutter-private.h" #include "clutter-private.h"
#include "clutter-debug.h" #include "clutter-debug.h"
@ -52,16 +51,14 @@ G_DEFINE_TYPE (ClutterBehaviourScale,
struct _ClutterBehaviourScalePrivate struct _ClutterBehaviourScalePrivate
{ {
ClutterFixed x_scale_start; gdouble x_scale_start;
ClutterFixed y_scale_start; gdouble y_scale_start;
ClutterFixed x_scale_end;
ClutterFixed y_scale_end; gdouble x_scale_end;
gdouble y_scale_end;
}; };
#define CLUTTER_BEHAVIOUR_SCALE_GET_PRIVATE(obj) \ #define CLUTTER_BEHAVIOUR_SCALE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScalePrivate))
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
CLUTTER_TYPE_BEHAVIOUR_SCALE, \
ClutterBehaviourScalePrivate))
enum enum
{ {
@ -74,8 +71,8 @@ enum
}; };
typedef struct { typedef struct {
ClutterFixed scale_x; gdouble scale_x;
ClutterFixed scale_y; gdouble scale_y;
} ScaleFrameClosure; } ScaleFrameClosure;
static void static void
@ -85,9 +82,7 @@ scale_frame_foreach (ClutterBehaviour *behaviour,
{ {
ScaleFrameClosure *closure = data; ScaleFrameClosure *closure = data;
clutter_actor_set_scale (actor, clutter_actor_set_scale (actor, closure->scale_x, closure->scale_y);
CLUTTER_FIXED_TO_DOUBLE (closure->scale_x),
CLUTTER_FIXED_TO_DOUBLE (closure->scale_y));
} }
static void static void
@ -95,7 +90,6 @@ clutter_behaviour_scale_alpha_notify (ClutterBehaviour *behave,
gdouble alpha_value) gdouble alpha_value)
{ {
ClutterBehaviourScalePrivate *priv; ClutterBehaviourScalePrivate *priv;
ClutterFixed scale_x, scale_y;
ScaleFrameClosure closure = { 0, }; ScaleFrameClosure closure = { 0, };
priv = CLUTTER_BEHAVIOUR_SCALE (behave)->priv; priv = CLUTTER_BEHAVIOUR_SCALE (behave)->priv;
@ -105,32 +99,25 @@ clutter_behaviour_scale_alpha_notify (ClutterBehaviour *behave,
*/ */
if (alpha_value == 1.0) if (alpha_value == 1.0)
{ {
scale_x = priv->x_scale_end; closure.scale_x = priv->x_scale_end;
scale_y = priv->y_scale_end; closure.scale_y = priv->y_scale_end;
} }
else if (alpha_value == 0) else if (alpha_value == 0)
{ {
scale_x = priv->x_scale_start; closure.scale_x = priv->x_scale_start;
scale_y = priv->y_scale_start; closure.scale_y = priv->y_scale_start;
} }
else else
{ {
ClutterFixed factor; closure.scale_x = (priv->x_scale_end - priv->x_scale_start)
* alpha_value
factor = CLUTTER_FLOAT_TO_FIXED (alpha_value); + priv->x_scale_start;
scale_x =
CLUTTER_FIXED_MUL (factor, (priv->x_scale_end - priv->x_scale_start));
scale_x += priv->x_scale_start;
scale_y = closure.scale_y = (priv->y_scale_end - priv->y_scale_start)
CLUTTER_FIXED_MUL (factor, (priv->y_scale_end - priv->y_scale_start)); * alpha_value
scale_y += priv->y_scale_start; + priv->y_scale_start;
} }
closure.scale_x = scale_x;
closure.scale_y = scale_y;
clutter_behaviour_actors_foreach (behave, clutter_behaviour_actors_foreach (behave,
scale_frame_foreach, scale_frame_foreach,
&closure); &closure);
@ -149,17 +136,21 @@ clutter_behaviour_scale_set_property (GObject *gobject,
switch (prop_id) switch (prop_id)
{ {
case PROP_X_SCALE_START: case PROP_X_SCALE_START:
priv->x_scale_start = CLUTTER_FLOAT_TO_FIXED (g_value_get_double (value)); priv->x_scale_start = g_value_get_double (value);
break; break;
case PROP_X_SCALE_END: case PROP_X_SCALE_END:
priv->x_scale_end = CLUTTER_FLOAT_TO_FIXED (g_value_get_double (value)); priv->x_scale_end = g_value_get_double (value);
break; break;
case PROP_Y_SCALE_START: case PROP_Y_SCALE_START:
priv->y_scale_start = CLUTTER_FLOAT_TO_FIXED (g_value_get_double (value)); priv->y_scale_start = g_value_get_double (value);
break; break;
case PROP_Y_SCALE_END: case PROP_Y_SCALE_END:
priv->y_scale_end = CLUTTER_FLOAT_TO_FIXED (g_value_get_double (value)); priv->y_scale_end = g_value_get_double (value);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
break; break;
@ -179,17 +170,21 @@ clutter_behaviour_scale_get_property (GObject *gobject,
switch (prop_id) switch (prop_id)
{ {
case PROP_X_SCALE_START: case PROP_X_SCALE_START:
g_value_set_double (value, CLUTTER_FIXED_TO_FLOAT (priv->x_scale_start)); g_value_set_double (value, priv->x_scale_start);
break; break;
case PROP_X_SCALE_END: case PROP_X_SCALE_END:
g_value_set_double (value, CLUTTER_FIXED_TO_FLOAT (priv->x_scale_end)); g_value_set_double (value, priv->x_scale_end);
break; break;
case PROP_Y_SCALE_START: case PROP_Y_SCALE_START:
g_value_set_double (value, CLUTTER_FIXED_TO_FLOAT (priv->y_scale_start)); g_value_set_double (value, priv->y_scale_start);
break; break;
case PROP_Y_SCALE_END: case PROP_Y_SCALE_END:
g_value_set_double (value, CLUTTER_FIXED_TO_FLOAT (priv->y_scale_end)); g_value_set_double (value, priv->y_scale_end);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
break; break;
@ -201,6 +196,9 @@ clutter_behaviour_scale_class_init (ClutterBehaviourScaleClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
ClutterBehaviourClass *behave_class = CLUTTER_BEHAVIOUR_CLASS (klass); ClutterBehaviourClass *behave_class = CLUTTER_BEHAVIOUR_CLASS (klass);
GParamSpec *pspec = NULL;
g_type_class_add_private (klass, sizeof (ClutterBehaviourScalePrivate));
gobject_class->set_property = clutter_behaviour_scale_set_property; gobject_class->set_property = clutter_behaviour_scale_set_property;
gobject_class->get_property = clutter_behaviour_scale_get_property; gobject_class->get_property = clutter_behaviour_scale_get_property;
@ -212,14 +210,15 @@ clutter_behaviour_scale_class_init (ClutterBehaviourScaleClass *klass)
* *
* Since: 0.6 * Since: 0.6
*/ */
pspec = g_param_spec_double ("x-scale-start",
"X Start Scale",
"Initial scale on the X axis",
0.0, G_MAXDOUBLE,
1.0,
CLUTTER_PARAM_READWRITE);
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_X_SCALE_START, PROP_X_SCALE_START,
g_param_spec_double ("x-scale-start", pspec);
"X Start Scale",
"Initial scale on the X axis",
0.0, G_MAXDOUBLE,
1.0,
CLUTTER_PARAM_READWRITE));
/** /**
* ClutterBehaviourScale:x-scale-end: * ClutterBehaviourScale:x-scale-end:
* *
@ -227,14 +226,15 @@ clutter_behaviour_scale_class_init (ClutterBehaviourScaleClass *klass)
* *
* Since: 0.6 * Since: 0.6
*/ */
pspec = g_param_spec_double ("x-scale-end",
"X End Scale",
"Final scale on the X axis",
0.0, G_MAXDOUBLE,
1.0,
CLUTTER_PARAM_READWRITE);
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_X_SCALE_END, PROP_X_SCALE_END,
g_param_spec_double ("x-scale-end", pspec);
"X End Scale",
"Final scale on the X axis",
0.0, G_MAXDOUBLE,
1.0,
CLUTTER_PARAM_READWRITE));
/** /**
* ClutterBehaviourScale:y-scale-start: * ClutterBehaviourScale:y-scale-start:
* *
@ -242,14 +242,15 @@ clutter_behaviour_scale_class_init (ClutterBehaviourScaleClass *klass)
* *
* Since: 0.6 * Since: 0.6
*/ */
pspec = g_param_spec_double ("y-scale-start",
"Y Start Scale",
"Initial scale on the Y axis",
0.0, G_MAXDOUBLE,
1.0,
CLUTTER_PARAM_READWRITE);
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_Y_SCALE_START, PROP_Y_SCALE_START,
g_param_spec_double ("y-scale-start", pspec);
"Y Start Scale",
"Initial scale on the Y axis",
0.0, G_MAXDOUBLE,
1.0,
CLUTTER_PARAM_READWRITE));
/** /**
* ClutterBehaviourScale:y-scale-end: * ClutterBehaviourScale:y-scale-end:
* *
@ -257,18 +258,17 @@ clutter_behaviour_scale_class_init (ClutterBehaviourScaleClass *klass)
* *
* Since: 0.6 * Since: 0.6
*/ */
pspec = g_param_spec_double ("y-scale-end",
"Y End Scale",
"Final scale on the Y axis",
0.0, G_MAXDOUBLE,
1.0,
CLUTTER_PARAM_READWRITE);
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_Y_SCALE_END, PROP_Y_SCALE_END,
g_param_spec_double ("y-scale-end", pspec);
"Y End Scale",
"Final scale on the Y axis",
0.0, G_MAXDOUBLE,
1.0,
CLUTTER_PARAM_READWRITE));
behave_class->alpha_notify = clutter_behaviour_scale_alpha_notify; behave_class->alpha_notify = clutter_behaviour_scale_alpha_notify;
g_type_class_add_private (klass, sizeof (ClutterBehaviourScalePrivate));
} }
static void static void
@ -305,11 +305,13 @@ clutter_behaviour_scale_new (ClutterAlpha *alpha,
{ {
g_return_val_if_fail (alpha == NULL || CLUTTER_IS_ALPHA (alpha), NULL); g_return_val_if_fail (alpha == NULL || CLUTTER_IS_ALPHA (alpha), NULL);
return clutter_behaviour_scale_newx (alpha, return g_object_new (CLUTTER_TYPE_BEHAVIOUR_SCALE,
CLUTTER_FLOAT_TO_FIXED (x_scale_start), "alpha", alpha,
CLUTTER_FLOAT_TO_FIXED (y_scale_start), "x-scale-start", x_scale_start,
CLUTTER_FLOAT_TO_FIXED (x_scale_end), "y-scale-start", y_scale_start,
CLUTTER_FLOAT_TO_FIXED (y_scale_end)); "x-scale-end", x_scale_end,
"y-scale-end", y_scale_end,
NULL);
} }
/** /**
@ -327,24 +329,21 @@ clutter_behaviour_scale_new (ClutterAlpha *alpha,
* Since: 0.2 * Since: 0.2
*/ */
ClutterBehaviour * ClutterBehaviour *
clutter_behaviour_scale_newx (ClutterAlpha *alpha, clutter_behaviour_scale_newx (ClutterAlpha *alpha,
ClutterFixed x_scale_start, CoglFixed x_scale_start,
ClutterFixed y_scale_start, CoglFixed y_scale_start,
ClutterFixed x_scale_end, CoglFixed x_scale_end,
ClutterFixed y_scale_end) CoglFixed y_scale_end)
{ {
ClutterBehaviourScale *behave;
g_return_val_if_fail (alpha == NULL || CLUTTER_IS_ALPHA (alpha), NULL); g_return_val_if_fail (alpha == NULL || CLUTTER_IS_ALPHA (alpha), NULL);
behave = g_object_new (CLUTTER_TYPE_BEHAVIOUR_SCALE, "alpha", alpha, NULL); return g_object_new (CLUTTER_TYPE_BEHAVIOUR_SCALE,
"alpha", alpha,
behave->priv->x_scale_start = x_scale_start; "x-scale-start", COGL_FIXED_TO_DOUBLE (x_scale_start),
behave->priv->y_scale_start = y_scale_start; "y-scale-start", COGL_FIXED_TO_DOUBLE (y_scale_start),
behave->priv->x_scale_end = x_scale_end; "x-scale-end", COGL_FIXED_TO_DOUBLE (x_scale_end),
behave->priv->y_scale_end = y_scale_end; "y-scale-end", COGL_FIXED_TO_DOUBLE (y_scale_end),
NULL);
return CLUTTER_BEHAVIOUR (behave);
} }
/** /**
@ -365,78 +364,6 @@ clutter_behaviour_scale_set_bounds (ClutterBehaviourScale *scale,
gdouble y_scale_start, gdouble y_scale_start,
gdouble x_scale_end, gdouble x_scale_end,
gdouble y_scale_end) gdouble y_scale_end)
{
g_return_if_fail (CLUTTER_IS_BEHAVIOUR_SCALE (scale));
clutter_behaviour_scale_set_boundsx (scale,
CLUTTER_FLOAT_TO_FIXED (x_scale_start),
CLUTTER_FLOAT_TO_FIXED (y_scale_start),
CLUTTER_FLOAT_TO_FIXED (x_scale_end),
CLUTTER_FLOAT_TO_FIXED (y_scale_end));
}
/**
* clutter_behaviour_scale_get_bounds:
* @scale: a #ClutterBehaviourScale
* @x_scale_start: return location for the initial scale factor on the X
* axis, or %NULL
* @y_scale_start: return location for the initial scale factor on the Y
* axis, or %NULL
* @x_scale_end: return location for the final scale factor on the X axis,
* or %NULL
* @y_scale_end: return location for the final scale factor on the Y axis,
* or %NULL
*
* Retrieves the bounds used by scale behaviour.
*
* Since: 0.4
*/
void
clutter_behaviour_scale_get_bounds (ClutterBehaviourScale *scale,
gdouble *x_scale_start,
gdouble *y_scale_start,
gdouble *x_scale_end,
gdouble *y_scale_end)
{
ClutterBehaviourScalePrivate *priv;
g_return_if_fail (CLUTTER_IS_BEHAVIOUR_SCALE (scale));
priv = scale->priv;
if (x_scale_start)
*x_scale_start = CLUTTER_FIXED_TO_DOUBLE (priv->x_scale_start);
if (x_scale_end)
*x_scale_end = CLUTTER_FIXED_TO_DOUBLE (priv->x_scale_end);
if (y_scale_start)
*y_scale_start = CLUTTER_FIXED_TO_DOUBLE (priv->y_scale_start);
if (y_scale_end)
*y_scale_end = CLUTTER_FIXED_TO_DOUBLE (priv->y_scale_end);
}
/**
* clutter_behaviour_scale_set_boundsx:
* @scale: a #ClutterBehaviourScale
* @x_scale_start: initial scale factor on the X axis
* @y_scale_start: initial scale factor on the Y axis
* @x_scale_end: final scale factor on the X axis
* @y_scale_end: final scale factor on the Y axis
*
* Fixed point version of clutter_behaviour_scale_set_bounds().
*
* Sets the bounds used by scale behaviour.
*
* Since: 0.6
*/
void
clutter_behaviour_scale_set_boundsx (ClutterBehaviourScale *scale,
ClutterFixed x_scale_start,
ClutterFixed y_scale_start,
ClutterFixed x_scale_end,
ClutterFixed y_scale_end)
{ {
ClutterBehaviourScalePrivate *priv; ClutterBehaviourScalePrivate *priv;
@ -474,7 +401,7 @@ clutter_behaviour_scale_set_boundsx (ClutterBehaviourScale *scale,
} }
/** /**
* clutter_behaviour_scale_get_boundsx: * clutter_behaviour_scale_get_bounds:
* @scale: a #ClutterBehaviourScale * @scale: a #ClutterBehaviourScale
* @x_scale_start: return location for the initial scale factor on the X * @x_scale_start: return location for the initial scale factor on the X
* axis, or %NULL * axis, or %NULL
@ -485,18 +412,16 @@ clutter_behaviour_scale_set_boundsx (ClutterBehaviourScale *scale,
* @y_scale_end: return location for the final scale factor on the Y axis, * @y_scale_end: return location for the final scale factor on the Y axis,
* or %NULL * or %NULL
* *
* Fixed point version of clutter_behaviour_scale_get_bounds().
*
* Retrieves the bounds used by scale behaviour. * Retrieves the bounds used by scale behaviour.
* *
* Since: 0.4 * Since: 0.4
*/ */
void void
clutter_behaviour_scale_get_boundsx (ClutterBehaviourScale *scale, clutter_behaviour_scale_get_bounds (ClutterBehaviourScale *scale,
ClutterFixed *x_scale_start, gdouble *x_scale_start,
ClutterFixed *y_scale_start, gdouble *y_scale_start,
ClutterFixed *x_scale_end, gdouble *x_scale_end,
ClutterFixed *y_scale_end) gdouble *y_scale_end)
{ {
ClutterBehaviourScalePrivate *priv; ClutterBehaviourScalePrivate *priv;
@ -517,3 +442,74 @@ clutter_behaviour_scale_get_boundsx (ClutterBehaviourScale *scale,
*y_scale_end = priv->y_scale_end; *y_scale_end = priv->y_scale_end;
} }
/**
* clutter_behaviour_scale_set_boundsx:
* @scale: a #ClutterBehaviourScale
* @x_scale_start: initial scale factor on the X axis
* @y_scale_start: initial scale factor on the Y axis
* @x_scale_end: final scale factor on the X axis
* @y_scale_end: final scale factor on the Y axis
*
* Fixed point version of clutter_behaviour_scale_set_bounds().
*
* Sets the bounds used by scale behaviour.
*
* Since: 0.6
*/
void
clutter_behaviour_scale_set_boundsx (ClutterBehaviourScale *scale,
CoglFixed x_scale_start,
CoglFixed y_scale_start,
CoglFixed x_scale_end,
CoglFixed y_scale_end)
{
clutter_behaviour_scale_set_bounds (scale,
COGL_FIXED_TO_DOUBLE (x_scale_start),
COGL_FIXED_TO_DOUBLE (y_scale_start),
COGL_FIXED_TO_DOUBLE (x_scale_end),
COGL_FIXED_TO_DOUBLE (y_scale_end));
}
/**
* clutter_behaviour_scale_get_boundsx:
* @scale: a #ClutterBehaviourScale
* @x_scale_start: return location for the initial scale factor on the X
* axis, or %NULL
* @y_scale_start: return location for the initial scale factor on the Y
* axis, or %NULL
* @x_scale_end: return location for the final scale factor on the X axis,
* or %NULL
* @y_scale_end: return location for the final scale factor on the Y axis,
* or %NULL
*
* Fixed point version of clutter_behaviour_scale_get_bounds().
*
* Retrieves the bounds used by scale behaviour.
*
* Since: 0.4
*/
void
clutter_behaviour_scale_get_boundsx (ClutterBehaviourScale *scale,
CoglFixed *x_scale_start,
CoglFixed *y_scale_start,
CoglFixed *x_scale_end,
CoglFixed *y_scale_end)
{
ClutterBehaviourScalePrivate *priv;
g_return_if_fail (CLUTTER_IS_BEHAVIOUR_SCALE (scale));
priv = scale->priv;
if (x_scale_start)
*x_scale_start = COGL_FIXED_FROM_DOUBLE (priv->x_scale_start);
if (x_scale_end)
*x_scale_end = COGL_FIXED_FROM_DOUBLE (priv->x_scale_end);
if (y_scale_start)
*y_scale_start = COGL_FIXED_FROM_DOUBLE (priv->y_scale_start);
if (y_scale_end)
*y_scale_end = COGL_FIXED_FROM_DOUBLE (priv->y_scale_end);
}

81
clutter/clutter-behaviour-scale.h
View File

@ -30,49 +30,47 @@
#ifndef __CLUTTER_BEHAVIOUR_SCALE_H__ #ifndef __CLUTTER_BEHAVIOUR_SCALE_H__
#define __CLUTTER_BEHAVIOUR_SCALE_H__ #define __CLUTTER_BEHAVIOUR_SCALE_H__
#include <clutter/clutter-actor.h>
#include <clutter/clutter-alpha.h>
#include <clutter/clutter-behaviour.h> #include <clutter/clutter-behaviour.h>
#include <clutter/clutter-types.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define CLUTTER_TYPE_BEHAVIOUR_SCALE (clutter_behaviour_scale_get_type ()) #define CLUTTER_TYPE_BEHAVIOUR_SCALE (clutter_behaviour_scale_get_type ())
#define CLUTTER_BEHAVIOUR_SCALE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScale))
#define CLUTTER_BEHAVIOUR_SCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScaleClass))
#define CLUTTER_IS_BEHAVIOUR_SCALE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BEHAVIOUR_SCALE))
#define CLUTTER_IS_BEHAVIOUR_SCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BEHAVIOUR_SCALE))
#define CLUTTER_BEHAVIOUR_SCALE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScaleClass))
#define CLUTTER_BEHAVIOUR_SCALE(obj) \ typedef struct _ClutterBehaviourScale ClutterBehaviourScale;
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \ typedef struct _ClutterBehaviourScalePrivate ClutterBehaviourScalePrivate;
CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScale)) typedef struct _ClutterBehaviourScaleClass ClutterBehaviourScaleClass;
#define CLUTTER_BEHAVIOUR_SCALE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), \
CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScaleClass))
#define CLUTTER_IS_BEHAVIOUR_SCALE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
CLUTTER_TYPE_BEHAVIOUR_SCALE))
#define CLUTTER_IS_BEHAVIOUR_SCALE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
CLUTTER_TYPE_BEHAVIOUR_SCALE))
#define CLUTTER_BEHAVIOUR_SCALE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScaleClass))
typedef struct _ClutterBehaviourScale ClutterBehaviourScale;
typedef struct _ClutterBehaviourScalePrivate ClutterBehaviourScalePrivate;
typedef struct _ClutterBehaviourScaleClass ClutterBehaviourScaleClass;
/**
* ClutterBehaviourScale:
*
* The #ClutterBehaviourScale struct contains only private data and
* should be accessed using the provided API
*
* Since: 0.2
*/
struct _ClutterBehaviourScale struct _ClutterBehaviourScale
{ {
/*< private >*/
ClutterBehaviour parent_instance; ClutterBehaviour parent_instance;
/*< private >*/
ClutterBehaviourScalePrivate *priv; ClutterBehaviourScalePrivate *priv;
}; };
/**
* ClutterBehaviourScaleClass:
*
* The #ClutterBehaviourScaleClass struct contains only private data
*
* Since: 0.2
*/
struct _ClutterBehaviourScaleClass struct _ClutterBehaviourScaleClass
{ {
/*< private >*/
ClutterBehaviourClass parent_class; ClutterBehaviourClass parent_class;
}; };
@ -84,31 +82,32 @@ ClutterBehaviour *clutter_behaviour_scale_new (ClutterAlpha *alpha,
gdouble x_scale_end, gdouble x_scale_end,
gdouble y_scale_end); gdouble y_scale_end);
ClutterBehaviour *clutter_behaviour_scale_newx (ClutterAlpha *alpha, ClutterBehaviour *clutter_behaviour_scale_newx (ClutterAlpha *alpha,
ClutterFixed x_scale_start, CoglFixed x_scale_start,
ClutterFixed y_scale_start, CoglFixed y_scale_start,
ClutterFixed x_scale_end, CoglFixed x_scale_end,
ClutterFixed y_scale_end); CoglFixed y_scale_end);
void clutter_behaviour_scale_set_bounds (ClutterBehaviourScale *scale, void clutter_behaviour_scale_set_bounds (ClutterBehaviourScale *scale,
gdouble x_scale_start, gdouble x_scale_start,
gdouble y_scale_start, gdouble y_scale_start,
gdouble x_scale_end, gdouble x_scale_end,
gdouble y_scale_end); gdouble y_scale_end);
void clutter_behaviour_scale_set_boundsx (ClutterBehaviourScale *scale,
ClutterFixed x_scale_start,
ClutterFixed y_scale_start,
ClutterFixed x_scale_end,
ClutterFixed y_scale_end);
void clutter_behaviour_scale_get_bounds (ClutterBehaviourScale *scale, void clutter_behaviour_scale_get_bounds (ClutterBehaviourScale *scale,
gdouble *x_scale_start, gdouble *x_scale_start,
gdouble *y_scale_start, gdouble *y_scale_start,
gdouble *x_scale_end, gdouble *x_scale_end,
gdouble *y_scale_end); gdouble *y_scale_end);
void clutter_behaviour_scale_set_boundsx (ClutterBehaviourScale *scale,
CoglFixed x_scale_start,
CoglFixed y_scale_start,
CoglFixed x_scale_end,
CoglFixed y_scale_end);
void clutter_behaviour_scale_get_boundsx (ClutterBehaviourScale *scale, void clutter_behaviour_scale_get_boundsx (ClutterBehaviourScale *scale,
ClutterFixed *x_scale_start, CoglFixed *x_scale_start,
ClutterFixed *y_scale_start, CoglFixed *y_scale_start,
ClutterFixed *x_scale_end, CoglFixed *x_scale_end,
ClutterFixed *y_scale_end); CoglFixed *y_scale_end);
G_END_DECLS G_END_DECLS