diff options
| author | Bryce Harrington <b.harrington@samsung.com> | 2014-04-18 13:42:17 -0700 |
|---|---|---|
| committer | Bryce Harrington <b.harrington@samsung.com> | 2014-04-18 13:42:17 -0700 |
| commit | 2e9ea4a08a75dcc352621250dd1938e062362a7f (patch) | |
| tree | ea703a4edf7b2f53f3d27cc5e4102cf278d6f6c8 /src/skia-tests/stroke.cpp | |
| parent | 078954202f4a79a2853e740ae37fe68e88727a45 (diff) | |
Cleanup whitespace in tests
Diffstat (limited to 'src/skia-tests/stroke.cpp')
| -rw-r--r-- | src/skia-tests/stroke.cpp | 111 |
1 files changed, 56 insertions, 55 deletions
diff --git a/src/skia-tests/stroke.cpp b/src/skia-tests/stroke.cpp index 9cfe82f..8ced035 100644 --- a/src/skia-tests/stroke.cpp +++ b/src/skia-tests/stroke.cpp @@ -5,10 +5,12 @@ #include <SkRect.h> #include <cairo.h> #include <SkDashPathEffect.h> + #include "kinetics.h" #include "caskbench.h" #include "skia-shapes.h" #include "SkParsePath.h" + static kinetics_t *particles; static int element_spacing; static int num_x_elements; @@ -29,6 +31,7 @@ static int star_points[11][2] = { SkAutoTUnref<SkPathEffect> fPE; static SkRect r; static int line_length; + static void drawShape(caskbench_context_t *ctx,double x,double y,kinetics_t *particles=NULL) { cairo_t *cr = ctx->cairo_cr; @@ -38,68 +41,66 @@ static void drawShape(caskbench_context_t *ctx,double x,double y,kinetics_t *par int i,shape,p; double r; - r = particles?50:0.9 * element_spacing /2; - if(!ctx->shape_args.shape_id) - shape = ((4.0 * rand())/RAND_MAX) +1; - else - shape = ctx->shape_args.shape_id ; - - switch (shape) { - case 1: - // Circle - ctx->shape_args.centre_x = x+r; - ctx->shape_args.centre_y = y+r; - ctx->shape_args.radius = r; - skiaShapes[Circle](ctx,&ctx->shape_args); - break; - - case 2: - - // Rectangle - ctx->shape_args.centre_x = x; - ctx->shape_args.centre_y = y; - ctx->shape_args.width = (ctx->shape_args.centre_x) +((ctx->shape_args.width)?ctx->shape_args.width:2*r); - ctx->shape_args.height = (ctx->shape_args.centre_y) + ((ctx->shape_args.height)?ctx->shape_args.height:2*r); - skiaShapes[Rectangle](ctx,&ctx->shape_args); - ctx->shape_args.width = old_width; - ctx->shape_args.height = old_height; + r = particles?50:0.9 * element_spacing /2; + if(!ctx->shape_args.shape_id) + shape = ((4.0 * rand())/RAND_MAX) +1; + else + shape = ctx->shape_args.shape_id ; - break; + switch (shape) { + case 1: + // Circle + ctx->shape_args.centre_x = x+r; + ctx->shape_args.centre_y = y+r; + ctx->shape_args.radius = r; + skiaShapes[Circle](ctx,&ctx->shape_args); + break; - case 3: - // Triangle - ctx->shape_args.numpoints = 3; - ctx->shape_args.points = (double (*)[2]) malloc(ctx->shape_args.numpoints*2*(sizeof(double))); - ctx->shape_args.points[0][0] = x; - ctx->shape_args.points[0][1] = y+2*r; - ctx->shape_args.points[1][0] = 2*r; - ctx->shape_args.points[1][1] = 0; - ctx->shape_args.points[2][0] = -r; - ctx->shape_args.points[2][1] = -2*r; - skiaShapes[Triangle] (ctx,&ctx->shape_args); - free (ctx->shape_args.points); + case 2: + // Rectangle + ctx->shape_args.centre_x = x; + ctx->shape_args.centre_y = y; + ctx->shape_args.width = (ctx->shape_args.centre_x) +((ctx->shape_args.width)?ctx->shape_args.width:2*r); + ctx->shape_args.height = (ctx->shape_args.centre_y) + ((ctx->shape_args.height)?ctx->shape_args.height:2*r); + skiaShapes[Rectangle](ctx,&ctx->shape_args); + ctx->shape_args.width = old_width; + ctx->shape_args.height = old_height; + break; - break; - case 4: - // Star - ctx->shape_args.numpoints = 10; - ctx->shape_args.points = (double (*)[2]) malloc(ctx->shape_args.numpoints*2*(sizeof(double))); + case 3: + // Triangle + ctx->shape_args.numpoints = 3; + ctx->shape_args.points = (double (*)[2]) malloc(ctx->shape_args.numpoints*2*(sizeof(double))); + ctx->shape_args.points[0][0] = x; + ctx->shape_args.points[0][1] = y+2*r; + ctx->shape_args.points[1][0] = 2*r; + ctx->shape_args.points[1][1] = 0; + ctx->shape_args.points[2][0] = -r; + ctx->shape_args.points[2][1] = -2*r; + skiaShapes[Triangle] (ctx,&ctx->shape_args); + free (ctx->shape_args.points); + break; + case 4: + // Star + ctx->shape_args.numpoints = 10; + ctx->shape_args.points = (double (*)[2]) malloc(ctx->shape_args.numpoints*2*(sizeof(double))); - for (p = 0; p < 10; p++ ) { - int px = x + 2*r * star_points[p][0]/200.0; - int py = y + 2*r * star_points[p][1]/200.0; - ctx->shape_args.points[p][0] = px; - ctx->shape_args.points[p][1] = py; - } - skiaShapes[Star] (ctx,&ctx->shape_args); - free (ctx->shape_args.points); - break; + for (p = 0; p < 10; p++ ) { + int px = x + 2*r * star_points[p][0]/200.0; + int py = y + 2*r * star_points[p][1]/200.0; + ctx->shape_args.points[p][0] = px; + ctx->shape_args.points[p][1] = py; + } + skiaShapes[Star] (ctx,&ctx->shape_args); + free (ctx->shape_args.points); + break; - default: - break; + default: + break; } ctx->skia_canvas->flush(); } + static void draw_stroke(caskbench_context_t *ctx,SkCanvas* canvas,kinetics_t* particles) { int i,j,x,y; double red,green,blue,alpha; @@ -172,6 +173,6 @@ sk_test_stroke(caskbench_context_t *ctx) } /* Static clip */ else - ctx->shape_args.multi_shapes?draw_stroke(ctx,ctx->skia_canvas,NULL):drawShape(ctx,ctx->shape_args.centre_x?ctx->shape_args.centre_x:100,ctx->shape_args.centre_y?ctx->shape_args.centre_y:100); + ctx->shape_args.multi_shapes?draw_stroke(ctx,ctx->skia_canvas,NULL):drawShape(ctx,ctx->shape_args.centre_x?ctx->shape_args.centre_x:100,ctx->shape_args.centre_y?ctx->shape_args.centre_y:100); return 1; } |