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

paint-volumes: remove alignment constraint for completion

Browse Source 
This removes the constraint that a paint-volume must be axis aligned
before _clutter_paint_volume_complete can be called. NB: A paint volume
is represented by one origin vertex and then three axis vertices to
define the width, height and depth of the volume. It's straightforward
to use the vectors from the origin to the axis vertices to deduce the
other 4 vertices so we can remove the is_axis_aligned assertion.
This commit is contained in:
Robert Bragg 2011-06-16 12:19:49 +01:00
parent 34600949ed
commit a9789616b9
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
clutter/clutter-paint-volume.c
View File

@ -549,33 +549,45 @@ done:
void void
_clutter_paint_volume_complete (ClutterPaintVolume *pv) _clutter_paint_volume_complete (ClutterPaintVolume *pv)
{ {
if (pv->is_complete || pv->is_empty) float dx_l2r, dy_l2r, dz_l2r;
float dx_t2b, dy_t2b, dz_t2b;
if (pv->is_empty)
return; return;
/* TODO: it is possible to complete non axis aligned volumes too. */ /* Find the vector that takes us from any vertex on the left face to
g_return_if_fail (pv->is_axis_aligned); * the corresponding vertex on the right face. */
dx_l2r = pv->vertices[1].x - pv->vertices[0].x;
dy_l2r = pv->vertices[1].y - pv->vertices[0].y;
dz_l2r = pv->vertices[1].z - pv->vertices[0].z;
/* Find the vector that takes us from any vertex on the top face to
* the corresponding vertex on the bottom face. */
dx_t2b = pv->vertices[3].x - pv->vertices[0].x;
dy_t2b = pv->vertices[3].y - pv->vertices[0].y;
dz_t2b = pv->vertices[3].z - pv->vertices[0].z;
/* front-bottom-right */ /* front-bottom-right */
pv->vertices[2].x = pv->vertices[1].x; pv->vertices[2].x = pv->vertices[3].x + dx_l2r;
pv->vertices[2].y = pv->vertices[3].y; pv->vertices[2].y = pv->vertices[3].y + dy_l2r;
pv->vertices[2].z = pv->vertices[0].z; pv->vertices[2].z = pv->vertices[3].z + dz_l2r;
if (G_UNLIKELY (!pv->is_2d)) if (G_UNLIKELY (!pv->is_2d))
{ {
/* back-top-right */ /* back-top-right */
pv->vertices[5].x = pv->vertices[1].x; pv->vertices[5].x = pv->vertices[4].x + dx_l2r;
pv->vertices[5].y = pv->vertices[0].y; pv->vertices[5].y = pv->vertices[4].y + dy_l2r;
pv->vertices[5].z = pv->vertices[4].z; pv->vertices[5].z = pv->vertices[4].z + dz_l2r;
/* back-bottom-right */ /* back-bottom-right */
pv->vertices[6].x = pv->vertices[1].x; pv->vertices[6].x = pv->vertices[5].x + dx_t2b;
pv->vertices[6].y = pv->vertices[3].y; pv->vertices[6].y = pv->vertices[5].y + dy_t2b;
pv->vertices[6].z = pv->vertices[4].z; pv->vertices[6].z = pv->vertices[5].z + dz_t2b;
/* back-bottom-left */ /* back-bottom-left */
pv->vertices[7].x = pv->vertices[0].x; pv->vertices[7].x = pv->vertices[4].x + dx_t2b;
pv->vertices[7].y = pv->vertices[3].y; pv->vertices[7].y = pv->vertices[4].y + dy_t2b;
pv->vertices[7].z = pv->vertices[4].z; pv->vertices[7].z = pv->vertices[4].z + dz_t2b;
} }
pv->is_complete = TRUE; pv->is_complete = TRUE;