cogl-path: Renames cogl_path_get/set cogl_get/set_path

These aren't path methods so aren't consistent with the
cogl_object_method naming style we are aiming for.
This commit is contained in:
Robert Bragg 2010-06-01 17:34:59 +01:00
parent 781a413362
commit eca2634050
5 changed files with 39 additions and 38 deletions

View File

@ -235,7 +235,7 @@ cogl_clip_push_from_path_preserve (void)
cogl_get_modelview_matrix (&modelview_matrix); cogl_get_modelview_matrix (&modelview_matrix);
_cogl_clip_stack_push_from_path (stack, cogl_path_get (), _cogl_clip_stack_push_from_path (stack, cogl_get_path (),
&modelview_matrix); &modelview_matrix);
clip_state->stack_dirty = TRUE; clip_state->stack_dirty = TRUE;

View File

@ -1060,29 +1060,6 @@ cogl_path_rel_curve_to (float x_1,
data->path_pen.y + y_3); data->path_pen.y + y_3);
} }
CoglPath *
cogl_path_get (void)
{
_COGL_GET_CONTEXT (ctx, NULL);
return ctx->current_path;
}
void
cogl_path_set (CoglPath *path)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
if (!cogl_is_path (path))
return;
/* Reference the new object first in case it is the same as the old
object */
cogl_object_ref (path);
cogl_object_unref (ctx->current_path);
ctx->current_path = path;
}
CoglPath * CoglPath *
_cogl_path_new (void) _cogl_path_new (void)
{ {
@ -1241,3 +1218,27 @@ cogl_rel_curve2_to (float x_1,
} }
#endif #endif
CoglPath *
cogl_get_path (void)
{
_COGL_GET_CONTEXT (ctx, NULL);
return ctx->current_path;
}
void
cogl_set_path (CoglPath *path)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
if (!cogl_is_path (path))
return;
/* Reference the new object first in case it is the same as the old
object */
cogl_object_ref (path);
cogl_object_unref (ctx->current_path);
ctx->current_path = path;
}

View File

@ -368,7 +368,7 @@ cogl_path_round_rectangle (float x_1,
float arc_step); float arc_step);
/** /**
* cogl_path_get: * cogl_get_path:
* *
* Gets a pointer to the current path. The path can later be used * Gets a pointer to the current path. The path can later be used
* again by calling cogl_path_set(). Note that the path isn't copied * again by calling cogl_path_set(). Note that the path isn't copied
@ -382,10 +382,10 @@ cogl_path_round_rectangle (float x_1,
* Since: 1.4 * Since: 1.4
*/ */
CoglPath * CoglPath *
cogl_path_get (void); cogl_get_path (void);
/** /**
* cogl_path_set: * cogl_set_path:
* @path: A #CoglPath object * @path: A #CoglPath object
* *
* Replaces the current path with @path. A reference is taken on the * Replaces the current path with @path. A reference is taken on the
@ -395,7 +395,7 @@ cogl_path_get (void);
* Since: 1.4 * Since: 1.4
*/ */
void void
cogl_path_set (CoglPath *path); cogl_set_path (CoglPath *path);
/** /**
* cogl_path_copy: * cogl_path_copy:

View File

@ -155,8 +155,8 @@ cogl_polygon
<SUBSECTION> <SUBSECTION>
cogl_path_new cogl_path_new
cogl_path_get cogl_get_path
cogl_path_set cogl_set_path
cogl_path_copy cogl_path_copy
cogl_path_move_to cogl_path_move_to
cogl_path_close cogl_path_close

View File

@ -82,27 +82,27 @@ on_paint (ClutterActor *actor, TestState *state)
BLOCK_SIZE, BLOCK_SIZE); BLOCK_SIZE, BLOCK_SIZE);
cogl_path_rectangle (BLOCK_SIZE / 2, BLOCK_SIZE / 2, cogl_path_rectangle (BLOCK_SIZE / 2, BLOCK_SIZE / 2,
BLOCK_SIZE * 3 / 4, BLOCK_SIZE); BLOCK_SIZE * 3 / 4, BLOCK_SIZE);
path_a = cogl_handle_ref (cogl_path_get ()); path_a = cogl_handle_ref (cogl_get_path ());
draw_path_at (0, 0); draw_path_at (0, 0);
/* Create another path filling the whole block */ /* Create another path filling the whole block */
cogl_path_rectangle (0, 0, BLOCK_SIZE, BLOCK_SIZE); cogl_path_rectangle (0, 0, BLOCK_SIZE, BLOCK_SIZE);
path_b = cogl_handle_ref (cogl_path_get ()); path_b = cogl_handle_ref (cogl_get_path ());
draw_path_at (1, 0); draw_path_at (1, 0);
/* Draw the first path again */ /* Draw the first path again */
cogl_path_set (path_a); cogl_set_path (path_a);
draw_path_at (2, 0); draw_path_at (2, 0);
/* Draw a copy of path a */ /* Draw a copy of path a */
path_c = cogl_path_copy (path_a); path_c = cogl_path_copy (path_a);
cogl_path_set (path_c); cogl_set_path (path_c);
draw_path_at (3, 0); draw_path_at (3, 0);
/* Add another rectangle to path a. We'll use line_to's instead of /* Add another rectangle to path a. We'll use line_to's instead of
cogl_rectangle so that we don't create another sub-path because cogl_rectangle so that we don't create another sub-path because
that is more likely to break the copy */ that is more likely to break the copy */
cogl_path_set (path_a); cogl_set_path (path_a);
cogl_path_line_to (0, BLOCK_SIZE / 2); cogl_path_line_to (0, BLOCK_SIZE / 2);
cogl_path_line_to (0, 0); cogl_path_line_to (0, 0);
cogl_path_line_to (BLOCK_SIZE / 2, 0); cogl_path_line_to (BLOCK_SIZE / 2, 0);
@ -110,13 +110,13 @@ on_paint (ClutterActor *actor, TestState *state)
draw_path_at (4, 0); draw_path_at (4, 0);
/* Draw the copy again. It should not have changed */ /* Draw the copy again. It should not have changed */
cogl_path_set (path_c); cogl_set_path (path_c);
draw_path_at (5, 0); draw_path_at (5, 0);
/* Add another rectangle to path c. It will be added in two halves, /* Add another rectangle to path c. It will be added in two halves,
one as an extension of the previous path and the other as a new one as an extension of the previous path and the other as a new
sub path */ sub path */
cogl_path_set (path_c); cogl_set_path (path_c);
cogl_path_line_to (BLOCK_SIZE / 2, 0); cogl_path_line_to (BLOCK_SIZE / 2, 0);
cogl_path_line_to (BLOCK_SIZE * 3 / 4, 0); cogl_path_line_to (BLOCK_SIZE * 3 / 4, 0);
cogl_path_line_to (BLOCK_SIZE * 3 / 4, BLOCK_SIZE / 2); cogl_path_line_to (BLOCK_SIZE * 3 / 4, BLOCK_SIZE / 2);
@ -125,7 +125,7 @@ on_paint (ClutterActor *actor, TestState *state)
draw_path_at (6, 0); draw_path_at (6, 0);
/* Draw the original path again. It should not have changed */ /* Draw the original path again. It should not have changed */
cogl_path_set (path_a); cogl_set_path (path_a);
draw_path_at (7, 0); draw_path_at (7, 0);
cogl_handle_unref (path_a); cogl_handle_unref (path_a);