diff options
| author | Bryce Harrington <b.harrington@samsung.com> | 2014-07-03 12:06:37 -0700 |
|---|---|---|
| committer | Bryce Harrington <b.harrington@samsung.com> | 2014-07-03 12:06:37 -0700 |
| commit | d2fb40482089a5d333438c4f59c5e8788e15c6d8 (patch) | |
| tree | 80f17ea3f613c1341d6f7841c5a8cda200265398 /src/cairo-shapes.cpp | |
| parent | b056641ef302205719974aac5f8f4e2e56fe9f3e (diff) | |
| parent | 1f267c34ccf8b6fa319859235555dbbdbd9fae07 (diff) | |
Merge pull request #123 from Samsung/Issue_5
Issue #5 Clean up and randomize stroke settings.
Diffstat (limited to 'src/cairo-shapes.cpp')
| -rw-r--r-- | src/cairo-shapes.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/cairo-shapes.cpp b/src/cairo-shapes.cpp index 28320ae..1c301b0 100644 --- a/src/cairo-shapes.cpp +++ b/src/cairo-shapes.cpp @@ -277,8 +277,7 @@ void (*cairoShapes[CB_SHAPE_END-1])(caskbench_context_t *ctx , shapes_t *args) = void cairoDrawRandomizedShape(caskbench_context_t *ctx, shapes_t *shape) { - static const double dashed3[] = {1.0}; - static const double dashed2[] = {14.0, 6.0}; + static double dashed[] = {14.0, 6.0}; cairo_path_t *new_path; @@ -325,12 +324,11 @@ cairoDrawRandomizedShape(caskbench_context_t *ctx, shapes_t *shape) cairo_append_path (ctx->cairo_cr, new_path); cairo_set_line_width (ctx->cairo_cr, shape->stroke_width); - cairo_set_line_join (ctx->cairo_cr, (cairo_line_join_t)shape->join_style); - cairo_set_line_cap (ctx->cairo_cr, (cairo_line_cap_t)shape->cap_style); - if (shape->dash_style == 0) - cairo_set_dash (ctx->cairo_cr, dashed3, 1, 0); - else if (shape->dash_style == 1) - cairo_set_dash (ctx->cairo_cr, dashed2, 2, 0); + cairo_set_line_join (ctx->cairo_cr, (cairo_line_join_t) (int)(drand48()*2)); + cairo_set_line_cap (ctx->cairo_cr, (cairo_line_cap_t)(int)(drand48()*2)); + dashed[0] = (drand48()*20); + dashed[1] = (drand48()*20); + cairo_set_dash (ctx->cairo_cr, dashed, 2, 0); if (shape->stroke_color != -1) { cairo_set_source_rgb (ctx->cairo_cr, |