Revision: 48929
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48929
Author: campbellbarton
Date: 2012-07-14 23:23:24 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
unfilled-cyclic curves now works as expected, also fix for own crash on 32bit
systems.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
Modified: trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
2012-07-14 20:56:40 UTC (rev 48928)
+++ trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
2012-07-14 23:23:24 UTC (rev 48929)
@@ -96,6 +96,12 @@
} MaskRasterLayer;
+typedef struct MaskRasterSplineInfo {
+ unsigned int vertex_offset;
+ unsigned int vertex_total;
+ unsigned int is_cyclic;
+} MaskRasterSplineInfo;
+
/**
* opaque local struct for mask pixel lookup, each MaskLayer needs one of these
*/
@@ -107,7 +113,6 @@
rctf bounds;
};
-
/* --------------------------------------------------------------------- */
/* alloc / free functions */
/* --------------------------------------------------------------------- */
@@ -446,7 +451,7 @@
const unsigned int tot_splines =
BLI_countlist(&masklay->splines);
/* we need to store vertex ranges for open splines for filling
*/
- unsigned int (*open_spline_ranges)[2] =
MEM_callocN(sizeof(open_spline_ranges) * tot_splines, __func__);
+ MaskRasterSplineInfo *open_spline_ranges =
MEM_callocN(sizeof(*open_spline_ranges) * tot_splines, __func__);
unsigned int open_spline_index = 0;
MaskSpline *spline;
@@ -467,6 +472,7 @@
BLI_scanfill_begin(&sf_ctx);
for (spline = masklay->splines.first; spline; spline =
spline->next) {
+ const unsigned int is_cyclic = (spline->flag &
MASK_SPLINE_CYCLIC) != 0;
const unsigned int is_fill = (spline->flag &
MASK_SPLINE_NOFILL) == 0;
float (*diff_points)[2];
@@ -605,8 +611,9 @@
float co_feather[3];
co_feather[2] = 1.0f;
-
open_spline_ranges[open_spline_index ][0] = sf_vert_tot;
-
open_spline_ranges[open_spline_index ][1] = tot_diff_point;
+
open_spline_ranges[open_spline_index].vertex_offset = sf_vert_tot;
+
open_spline_ranges[open_spline_index].vertex_total = tot_diff_point;
+
open_spline_ranges[open_spline_index].is_cyclic = is_cyclic;
open_spline_index++;
@@ -639,8 +646,11 @@
tot_feather_quads += 2;
}
- tot_feather_quads -= 2;
+ if (!is_cyclic) {
+ tot_feather_quads -= 2;
+ }
+
MEM_freeN(diff_feather_points);
/* ack these are infact tris,
but they are extra faces so no matter,
@@ -723,8 +733,8 @@
/* feather only splines */
while (open_spline_index > 0) {
- unsigned int start_vidx =
open_spline_ranges[--open_spline_index][0];
- unsigned int tot_diff_point_sub1 =
open_spline_ranges[ open_spline_index][1] - 1;
+ unsigned int start_vidx =
open_spline_ranges[--open_spline_index].vertex_offset;
+ unsigned int tot_diff_point_sub1 =
open_spline_ranges[ open_spline_index].vertex_total - 1;
unsigned int k, j;
j = start_vidx;
@@ -734,20 +744,36 @@
BLI_assert(j == start_vidx + (k * 3));
- *(face++) = j + 0;
- *(face++) = j + 1;
- *(face++) = j + 4; /* next span */
- *(face++) = j + 3; /* next span */
+ *(face++) = j + 3; /* next span */ /* z
1 */
+ *(face++) = j + 0; /* z
1 */
+ *(face++) = j + 1; /* z
0 */
+ *(face++) = j + 4; /* next span */ /* z
0 */
face_index++;
- *(face++) = j + 0;
- *(face++) = j + 3; /* next span */
- *(face++) = j + 5; /* next span */
- *(face++) = j + 2;
+ *(face++) = j + 0; /* z
1 */
+ *(face++) = j + 3; /* next span */ /* z
1 */
+ *(face++) = j + 5; /* next span */ /* z
0 */
+ *(face++) = j + 2; /* z
0 */
face_index++;
}
+
+ if
(open_spline_ranges[open_spline_index].is_cyclic) {
+ *(face++) = start_vidx + 3; /* next
span */ /* z 1 */
+ *(face++) = j + 0;
/* z 1 */
+ *(face++) = j + 1;
/* z 0 */
+ *(face++) = start_vidx + 4; /* next
span */ /* z 0 */
+
+ face_index++;
+
+ *(face++) = j + 0;
/* z 1 */
+ *(face++) = start_vidx + 3; /* next
span */ /* z 1 */
+ *(face++) = start_vidx + 5; /* next
span */ /* z 0 */
+ *(face++) = j + 2;
/* z 0 */
+
+ face_index++;
+ }
}
MEM_freeN(open_spline_ranges);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
