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

Move PathNode definitions into clutter-types.h

Browse Source 
Near ClutterKnot, so that we can easily remove both when we branch off
for 2.0.
This commit is contained in:
Emmanuele Bassi 2012-06-22 12:12:33 +01:00
parent 49dd99f9c1
commit 8fe8b9c89e
2 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
clutter/clutter-path.h
View File

@ -43,7 +43,6 @@ G_BEGIN_DECLS
typedef struct _ClutterPathClass ClutterPathClass; typedef struct _ClutterPathClass ClutterPathClass;
typedef struct _ClutterPathPrivate ClutterPathPrivate; typedef struct _ClutterPathPrivate ClutterPathPrivate;
typedef struct _ClutterPathNode ClutterPathNode;
/** /**
* ClutterPathCallback: * ClutterPathCallback:
@ -87,29 +86,7 @@ struct _ClutterPathClass
GInitiallyUnownedClass parent_class; GInitiallyUnownedClass parent_class;
}; };
/**
* ClutterPathNode:
* @type: the node's type
* @points: the coordinates of the node
*
* Represents a single node of a #ClutterPath.
*
* Some of the coordinates in @points may be unused for some node
* types. %CLUTTER_PATH_MOVE_TO and %CLUTTER_PATH_LINE_TO use only one
* pair of coordinates, %CLUTTER_PATH_CURVE_TO uses all three and
* %CLUTTER_PATH_CLOSE uses none.
*
* Since: 1.0
*/
struct _ClutterPathNode
{
ClutterPathNodeType type;
ClutterKnot points[3];
};
GType clutter_path_get_type (void) G_GNUC_CONST; GType clutter_path_get_type (void) G_GNUC_CONST;
GType clutter_path_node_get_type (void) G_GNUC_CONST;
ClutterPath *clutter_path_new (void); ClutterPath *clutter_path_new (void);
ClutterPath *clutter_path_new_with_description (const gchar *desc); ClutterPath *clutter_path_new_with_description (const gchar *desc);
@ -173,11 +150,6 @@ guint clutter_path_get_position (ClutterPath *path,
ClutterKnot *position); ClutterKnot *position);
guint clutter_path_get_length (ClutterPath *path); guint clutter_path_get_length (ClutterPath *path);
ClutterPathNode *clutter_path_node_copy (const ClutterPathNode *node);
void clutter_path_node_free (ClutterPathNode *node);
gboolean clutter_path_node_equal (const ClutterPathNode *node_a,
const ClutterPathNode *node_b);
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_PATH_H__ */ #endif /* __CLUTTER_PATH_H__ */

33
clutter/clutter-types.h
View File

@ -73,6 +73,7 @@ typedef struct _ClutterConstraint ClutterConstraint;
typedef struct _ClutterEffect ClutterEffect; typedef struct _ClutterEffect ClutterEffect;
typedef struct _ClutterPath ClutterPath; typedef struct _ClutterPath ClutterPath;
typedef struct _ClutterPathNode ClutterPathNode;
typedef struct _ClutterActorBox ClutterActorBox; typedef struct _ClutterActorBox ClutterActorBox;
typedef struct _ClutterColor ClutterColor; typedef struct _ClutterColor ClutterColor;
@ -548,6 +549,38 @@ void clutter_knot_free (ClutterKnot *knot);
gboolean clutter_knot_equal (const ClutterKnot *knot_a, gboolean clutter_knot_equal (const ClutterKnot *knot_a,
const ClutterKnot *knot_b); const ClutterKnot *knot_b);
/**
* ClutterPathNode:
* @type: the node's type
* @points: the coordinates of the node
*
* Represents a single node of a #ClutterPath.
*
* Some of the coordinates in @points may be unused for some node
* types. %CLUTTER_PATH_MOVE_TO and %CLUTTER_PATH_LINE_TO use only one
* pair of coordinates, %CLUTTER_PATH_CURVE_TO uses all three and
* %CLUTTER_PATH_CLOSE uses none.
*
* Since: 1.0
*/
struct _ClutterPathNode
{
ClutterPathNodeType type;
ClutterKnot points[3];
};
GType clutter_path_node_get_type (void) G_GNUC_CONST;
ClutterPathNode *clutter_path_node_copy (const ClutterPathNode *node);
void clutter_path_node_free (ClutterPathNode *node);
gboolean clutter_path_node_equal (const ClutterPathNode *node_a,
const ClutterPathNode *node_b);
/*
* ClutterPaintVolume
*/
GType clutter_paint_volume_get_type (void) G_GNUC_CONST; GType clutter_paint_volume_get_type (void) G_GNUC_CONST;
ClutterPaintVolume *clutter_paint_volume_copy (const ClutterPaintVolume *pv); ClutterPaintVolume *clutter_paint_volume_copy (const ClutterPaintVolume *pv);