mirror of
https://github.com/brl/mutter.git
synced 2024-09-20 14:35:48 -04:00
7365c3aa77
This splits out the cogl_path_ api into a separate cogl-path sub-library
like cogl-pango and cogl-gst. This enables developers to build Cogl with
this sub-library disabled if they don't need it which can be useful when
its important to keep the size of an application and its dependencies
down to a minimum. The functions cogl_framebuffer_{fill,stroke}_path
have been renamed to cogl_path_{fill,stroke}.
There were a few places in core cogl and cogl-gst that referenced the
CoglPath api and these have been decoupled by using the CoglPrimitive
api instead. In the case of cogl_framebuffer_push_path_clip() the core
clip stack no longer accepts path clips directly but it's now possible
to get a CoglPrimitive for the fill of a path and so the implementation
of cogl_framebuffer_push_path_clip() now lives in cogl-path and works as
a shim that first gets a CoglPrimitive and uses
cogl_framebuffer_push_primitive_clip instead.
We may want to consider renaming cogl_framebuffer_push_path_clip to
put it in the cogl_path_ namespace.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 8aadfd829239534fb4ec8255cdea813d698c5a3f)
So as to avoid breaking the 1.x API or even the ABI since we are quite
late in the 1.16 development cycle the patch was modified to build
cogl-path as a noinst_LTLIBRARY before building cogl and link the code
directly into libcogl.so as it was previously. This way we can wait
until the start of the 1.18 cycle before splitting the code into a
separate libcogl-path.so.
This also adds shims for cogl_framebuffer_fill/stroke_path() to avoid
breaking the 1.x API/ABI.
348 lines
7.4 KiB
C
348 lines
7.4 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2010,2013 Intel Corporation.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Authors:
|
|
* Robert Bragg <robert@linux.intel.com>
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include "cogl-util.h"
|
|
#include "cogl-object.h"
|
|
#include "cogl-context-private.h"
|
|
|
|
#include "cogl-path-types.h"
|
|
|
|
#include "cogl2-path-functions.h"
|
|
|
|
#undef cogl_path_set_fill_rule
|
|
#undef cogl_path_get_fill_rule
|
|
#undef cogl_path_fill
|
|
#undef cogl_path_fill_preserve
|
|
#undef cogl_path_stroke
|
|
#undef cogl_path_stroke_preserve
|
|
#undef cogl_path_move_to
|
|
#undef cogl_path_rel_move_to
|
|
#undef cogl_path_line_to
|
|
#undef cogl_path_rel_line_to
|
|
#undef cogl_path_close
|
|
#undef cogl_path_new
|
|
#undef cogl_path_line
|
|
#undef cogl_path_polyline
|
|
#undef cogl_path_polygon
|
|
#undef cogl_path_rectangle
|
|
#undef cogl_path_arc
|
|
#undef cogl_path_ellipse
|
|
#undef cogl_path_round_rectangle
|
|
#undef cogl_path_curve_to
|
|
#undef cogl_path_rel_curve_to
|
|
#undef cogl_clip_push_from_path
|
|
|
|
#include "cogl1-path-functions.h"
|
|
|
|
#include <string.h>
|
|
#include <math.h>
|
|
|
|
static void
|
|
ensure_current_path (CoglContext *ctx)
|
|
{
|
|
if (ctx->current_path == NULL)
|
|
ctx->current_path = cogl2_path_new ();
|
|
}
|
|
|
|
static CoglPath *
|
|
get_current_path (CoglContext *ctx)
|
|
{
|
|
ensure_current_path (ctx);
|
|
return ctx->current_path;
|
|
}
|
|
|
|
void
|
|
cogl_path_set_fill_rule (CoglPathFillRule fill_rule)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_set_fill_rule (get_current_path (ctx), fill_rule);
|
|
}
|
|
|
|
CoglPathFillRule
|
|
cogl_path_get_fill_rule (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, COGL_PATH_FILL_RULE_EVEN_ODD);
|
|
|
|
return cogl2_path_get_fill_rule (get_current_path (ctx));
|
|
}
|
|
|
|
void
|
|
cogl_path_fill (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_fill (get_current_path (ctx));
|
|
|
|
if (ctx->current_path)
|
|
cogl_object_unref (ctx->current_path);
|
|
ctx->current_path = cogl2_path_new ();
|
|
}
|
|
|
|
void
|
|
cogl_path_fill_preserve (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_fill (get_current_path (ctx));
|
|
}
|
|
|
|
void
|
|
cogl_path_stroke (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_stroke (get_current_path (ctx));
|
|
|
|
if (ctx->current_path)
|
|
cogl_object_unref (ctx->current_path);
|
|
ctx->current_path = cogl2_path_new ();
|
|
}
|
|
|
|
void
|
|
cogl_path_stroke_preserve (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_stroke (get_current_path (ctx));
|
|
}
|
|
|
|
void
|
|
cogl_path_move_to (float x,
|
|
float y)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_move_to (get_current_path (ctx), x, y);
|
|
}
|
|
|
|
void
|
|
cogl_path_rel_move_to (float x,
|
|
float y)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_rel_move_to (get_current_path (ctx), x, y);
|
|
}
|
|
|
|
void
|
|
cogl_path_line_to (float x,
|
|
float y)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_line_to (get_current_path (ctx), x, y);
|
|
}
|
|
|
|
void
|
|
cogl_path_rel_line_to (float x,
|
|
float y)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_rel_line_to (get_current_path (ctx), x, y);
|
|
}
|
|
|
|
void
|
|
cogl_path_close (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_close (get_current_path (ctx));
|
|
}
|
|
|
|
void
|
|
cogl_path_new (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
if (ctx->current_path)
|
|
cogl_object_unref (ctx->current_path);
|
|
ctx->current_path = cogl2_path_new ();
|
|
}
|
|
|
|
void
|
|
cogl_path_line (float x_1,
|
|
float y_1,
|
|
float x_2,
|
|
float y_2)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_line (get_current_path (ctx), x_1, y_1, x_2, y_2);
|
|
}
|
|
|
|
void
|
|
cogl_path_polyline (const float *coords,
|
|
int num_points)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_polyline (get_current_path (ctx), coords, num_points);
|
|
}
|
|
|
|
void
|
|
cogl_path_polygon (const float *coords,
|
|
int num_points)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_polygon (get_current_path (ctx), coords, num_points);
|
|
}
|
|
|
|
void
|
|
cogl_path_rectangle (float x_1,
|
|
float y_1,
|
|
float x_2,
|
|
float y_2)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_rectangle (get_current_path (ctx), x_1, y_1, x_2, y_2);
|
|
}
|
|
|
|
void
|
|
cogl_path_arc (float center_x,
|
|
float center_y,
|
|
float radius_x,
|
|
float radius_y,
|
|
float angle_1,
|
|
float angle_2)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_arc (get_current_path (ctx),
|
|
center_x,
|
|
center_y,
|
|
radius_x,
|
|
radius_y,
|
|
angle_1,
|
|
angle_2);
|
|
}
|
|
|
|
void
|
|
cogl_path_ellipse (float center_x,
|
|
float center_y,
|
|
float radius_x,
|
|
float radius_y)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_ellipse (get_current_path (ctx),
|
|
center_x,
|
|
center_y,
|
|
radius_x,
|
|
radius_y);
|
|
}
|
|
|
|
void
|
|
cogl_path_round_rectangle (float x_1,
|
|
float y_1,
|
|
float x_2,
|
|
float y_2,
|
|
float radius,
|
|
float arc_step)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_round_rectangle (get_current_path (ctx),
|
|
x_1, y_1, x_2, y_2, radius, arc_step);
|
|
}
|
|
|
|
void
|
|
cogl_path_curve_to (float x_1,
|
|
float y_1,
|
|
float x_2,
|
|
float y_2,
|
|
float x_3,
|
|
float y_3)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_curve_to (get_current_path (ctx),
|
|
x_1, y_1, x_2, y_2, x_3, y_3);
|
|
}
|
|
|
|
void
|
|
cogl_path_rel_curve_to (float x_1,
|
|
float y_1,
|
|
float x_2,
|
|
float y_2,
|
|
float x_3,
|
|
float y_3)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_rel_curve_to (get_current_path (ctx),
|
|
x_1, y_1, x_2, y_2, x_3, y_3);
|
|
}
|
|
|
|
CoglPath *
|
|
cogl_get_path (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NULL);
|
|
|
|
return get_current_path (ctx);
|
|
}
|
|
|
|
void
|
|
cogl_set_path (CoglPath *path)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
_COGL_RETURN_IF_FAIL (cogl_is_path (path));
|
|
|
|
/* Reference the new object first in case it is the same as the old
|
|
object */
|
|
cogl_object_ref (path);
|
|
if (ctx->current_path)
|
|
cogl_object_unref (ctx->current_path);
|
|
ctx->current_path = path;
|
|
}
|
|
|
|
void
|
|
cogl_clip_push_from_path_preserve (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
cogl_framebuffer_push_path_clip (cogl_get_draw_framebuffer (),
|
|
get_current_path (ctx));
|
|
}
|
|
|
|
void
|
|
cogl_clip_push_from_path (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl_clip_push_from_path_preserve ();
|
|
|
|
if (ctx->current_path)
|
|
cogl_object_unref (ctx->current_path);
|
|
ctx->current_path = cogl2_path_new ();
|
|
}
|