Break out discrete skiaRandomColor() routine

12 files changed, 27 insertions, 30 deletions

diff --git a/src/skia-shapes.cpp b/src/skia-shapes.cpp
index e53ee43..7cf9b7a 100644
--- a/src/skia-shapes.cpp
+++ b/src/skia-shapes.cpp
@@ -10,15 +10,21 @@
 
 #include "skia-shapes.h"
 
-void
-skiaRandomizeColor(caskbench_context_t *ctx)
+SkColor
+skiaRandomColor()
 {
     unsigned int red, blue, green, alpha;
     red = int( 255 * (double)rand()/RAND_MAX );
     green = int( 255 * (double)rand()/RAND_MAX );
     blue = int( 255 * (double)rand()/RAND_MAX );
     alpha = int( 255 * (double)rand()/RAND_MAX );
-    ctx->skia_paint->setARGB(alpha,red, green, blue );
+    return SkColorSetARGB(alpha, red, green, blue);
+}
+
+void
+skiaRandomizePaintColor(caskbench_context_t *ctx)
+{
+    ctx->skia_paint->setColor(skiaRandomColor());
 }
 
 void skiaDrawCircle(caskbench_context_t *ctx, shapes_t *args)
diff --git a/src/skia-shapes.h b/src/skia-shapes.h
index 2ee7fec..72e5524 100644
--- a/src/skia-shapes.h
+++ b/src/skia-shapes.h
@@ -13,7 +13,9 @@
 #include "shapes.h"
 #include "caskbench.h"
 
-void skiaRandomizeColor(caskbench_context_t *ctx);
+SkColor skiaRandomColor();
+
+void skiaRandomizePaintColor(caskbench_context_t *ctx);
 
 void skiaDrawCircle(caskbench_context_t *ctx, shapes_t *args);
 
diff --git a/src/skia-tests/bubbles.cpp b/src/skia-tests/bubbles.cpp
index 2e776a5..8ec6dc1 100644
--- a/src/skia-tests/bubbles.cpp
+++ b/src/skia-tests/bubbles.cpp
@@ -32,7 +32,7 @@ sk_test_bubbles(caskbench_context_t *ctx)
 {
     int i, x, y, r;
     for (i=0; i<ctx->size; i++) {
-        skiaRandomizeColor(ctx);
+        skiaRandomizePaintColor(ctx);
 
         r = ((double)max_dim*rand())/RAND_MAX + 1;
         x = (0.5*(double)ctx->canvas_width*rand())/RAND_MAX;
diff --git a/src/skia-tests/clip.cpp b/src/skia-tests/clip.cpp
index 83fa47c..0eb2935 100644
--- a/src/skia-tests/clip.cpp
+++ b/src/skia-tests/clip.cpp
@@ -157,7 +157,7 @@ draw_clip_tests (caskbench_context_t *ctx,SkCanvas* canvas,kinetics_t* particles
         y = particles?particles->y : j * element_spacing;
         for (i=0; i<num_x_elements; i++) {
             x = particles?particles->x : i * element_spacing;
-            skiaRandomizeColor(ctx);
+            skiaRandomizePaintColor(ctx);
             if (!draw_square(ctx,canvas, x,y))
                 return false;
         }
diff --git a/src/skia-tests/fill.cpp b/src/skia-tests/fill.cpp
index 4865121..0b0f3f8 100644
--- a/src/skia-tests/fill.cpp
+++ b/src/skia-tests/fill.cpp
@@ -49,7 +49,6 @@ sk_teardown_fill(void)
 void drawSkiaShapes(caskbench_context_t *ctx, kinetics_t *particle)
 {
     int i, j, r, p, shape;
-    unsigned int red, green, blue, alpha;
     r = 0.9 * element_spacing /2;
     int old_x, old_y, old_width, old_height;
 
@@ -205,12 +204,12 @@ void drawSkiaShapes(caskbench_context_t *ctx, kinetics_t *particle)
             if (ctx->shape_args.fill_type == NULL)
             {
                 if (randomize_color)
-                    skiaRandomizeColor(ctx);
+                    skiaRandomizePaintColor(ctx);
             }
             else if ((strcmp(ctx->shape_args.fill_type,"solid")) == 0)
             {
                 if (randomize_color)
-                    skiaRandomizeColor(ctx);
+                    skiaRandomizePaintColor(ctx);
             }
             else if ((strcmp(ctx->shape_args.fill_type,"image-pattern")) == 0 &&(ctx->shape_args.image_path))
             {
@@ -226,13 +225,8 @@ void drawSkiaShapes(caskbench_context_t *ctx, kinetics_t *particle)
                 SkColor linearColors[2];
                 SkScalar radialPoints[4];
 
-                red = 255*(double)rand()/RAND_MAX;
-                green = 255*(double)rand()/RAND_MAX;
-                blue = 255*(double)rand()/RAND_MAX;
-                alpha = 255*(double)rand()/RAND_MAX;
-
                 linearColors[0] = SkColorSetARGB (200,200,200,200);
-                linearColors[1] = SkColorSetARGB (alpha, red, green, blue);
+                linearColors[1] = skiaRandomColor();
                 center.set(cx, cy);
 
                 shader = SkGradientShader::CreateRadial(
@@ -245,12 +239,7 @@ void drawSkiaShapes(caskbench_context_t *ctx, kinetics_t *particle)
                 SkColor linearColors[2];
                 SkPoint linearPoints[2];
 
-                red = 255*(double)rand()/RAND_MAX;
-                green = 255*(double)rand()/RAND_MAX;
-                blue = 255*(double)rand()/RAND_MAX;
-                alpha = 255*(double)rand()/RAND_MAX;
-
-                linearColors[0] = SkColorSetARGB (alpha, red, green, blue);
+                linearColors[0] = skiaRandomColor();
                 linearColors[1] = SkColorSetARGB (200,200,200,200);
                 linearPoints[0].fX = SkIntToScalar(0);
                 linearPoints[0].fY = SkIntToScalar(y1);
diff --git a/src/skia-tests/mask.cpp b/src/skia-tests/mask.cpp
index 991170b..0951e63 100644
--- a/src/skia-tests/mask.cpp
+++ b/src/skia-tests/mask.cpp
@@ -36,7 +36,7 @@ sk_test_mask(caskbench_context_t *ctx)
     int i;
 
     for (i=0; i<ctx->size; i++) {
-        skiaRandomizeColor(ctx);
+        skiaRandomizePaintColor(ctx);
 
         // Apply mask on a circle
         ctx->skia_canvas->drawCircle(40*i, 40, 30, *ctx->skia_paint);
diff --git a/src/skia-tests/multishape.cpp b/src/skia-tests/multishape.cpp
index 6d90233..6898529 100644
--- a/src/skia-tests/multishape.cpp
+++ b/src/skia-tests/multishape.cpp
@@ -49,7 +49,7 @@ sk_test_multishape(caskbench_context_t *ctx)
             x = i * element_spacing;
 
             // TODO: Select a pre-defined paint object at random
-            skiaRandomizeColor(ctx);
+            skiaRandomizePaintColor(ctx);
 
             shape = (4.0 * rand())/RAND_MAX;
             switch (shape) {
diff --git a/src/skia-tests/paint.cpp b/src/skia-tests/paint.cpp
index eb3e587..1a7e0eb 100644
--- a/src/skia-tests/paint.cpp
+++ b/src/skia-tests/paint.cpp
@@ -30,7 +30,7 @@ sk_test_paint(caskbench_context_t *ctx)
 {
     int i;
     for (i=0; i<ctx->size; i++) {
-        skiaRandomizeColor(ctx);
+        skiaRandomizePaintColor(ctx);
         ctx->skia_canvas->drawPaint(*ctx->skia_paint);
     }
 
diff --git a/src/skia-tests/rectangles.cpp b/src/skia-tests/rectangles.cpp
index faee19a..b6cfa7d 100644
--- a/src/skia-tests/rectangles.cpp
+++ b/src/skia-tests/rectangles.cpp
@@ -36,7 +36,7 @@ sk_test_rectangles(caskbench_context_t *ctx)
     SkRect rect;
 
     for (i=0; i<ctx->size; i++) {
-        skiaRandomizeColor(ctx);
+        skiaRandomizePaintColor(ctx);
         w = trunc( (0.5*(double)ctx->canvas_width*rand())/RAND_MAX ) + 1;
         h = trunc( (0.5*(double)ctx->canvas_height*rand())/RAND_MAX ) + 1;
         x = trunc( (0.5*(double)ctx->canvas_width*rand())/RAND_MAX );
diff --git a/src/skia-tests/roundrect.cpp b/src/skia-tests/roundrect.cpp
index e878478..e3aba75 100644
--- a/src/skia-tests/roundrect.cpp
+++ b/src/skia-tests/roundrect.cpp
@@ -36,7 +36,7 @@ sk_test_roundrect(caskbench_context_t *ctx)
     SkRect rect;
 
     for (i=0; i<ctx->size; i++) {
-        skiaRandomizeColor(ctx);
+        skiaRandomizePaintColor(ctx);
 
         x = trunc( (((double)ctx->canvas_width-20)*rand())/RAND_MAX ) + 10;
         y = trunc( (((double)ctx->canvas_height-20)*rand())/RAND_MAX ) + 10;
diff --git a/src/skia-tests/stroke.cpp b/src/skia-tests/stroke.cpp
index 1c3a1b9..391041f 100644
--- a/src/skia-tests/stroke.cpp
+++ b/src/skia-tests/stroke.cpp
@@ -102,7 +102,7 @@ static void draw_stroke(caskbench_context_t *ctx,SkCanvas* canvas,kinetics_t* pa
         for (i=0; i<num_x_elements; i++) {
             x = particles?particles->x : i * element_spacing;
             ctx->skia_paint->setStrokeCap((SkPaint::Cap)(i % 5));
-            skiaRandomizeColor(ctx);
+            skiaRandomizePaintColor(ctx);
             drawShape(ctx, x,y);
         }
     }
@@ -152,7 +152,7 @@ sk_test_stroke(caskbench_context_t *ctx)
             ctx->skia_canvas->drawColor(SK_ColorWHITE);
             for (i = 0; i < num_particles; i++) {
                 kinetics_update(&particles[i], 0.3);
-                skiaRandomizeColor(ctx);
+                skiaRandomizePaintColor(ctx);
                 //draw_stroke(ctx,ctx->skia_canvas,&particles[i]);
                 drawShape(ctx,particles[i].x,particles[i].y,&particles[i]);
             }
diff --git a/src/skia-tests/text.cpp b/src/skia-tests/text.cpp
index 54ee30f..5280fd9 100644
--- a/src/skia-tests/text.cpp
+++ b/src/skia-tests/text.cpp
@@ -78,7 +78,7 @@ sk_test_text(caskbench_context_t *ctx)
         for(font_size = 18; font_size <= 36; font_size++)
         {
             ctx->skia_paint->setTextSize (SkIntToScalar (font_size));
-            skiaRandomizeColor(ctx);
+            skiaRandomizePaintColor(ctx);
 
             SkPaint newpaint (*ctx->skia_paint);;
             newpaint.setTextEncoding (SkPaint::kGlyphID_TextEncoding);
@@ -97,7 +97,7 @@ sk_test_text(caskbench_context_t *ctx)
         for(font_size = 36; font_size >= 18; font_size--)
         {
             ctx->skia_paint->setTextSize (SkIntToScalar (font_size));
-            skiaRandomizeColor(ctx);
+            skiaRandomizePaintColor(ctx);
 
             SkPaint localPaint (*ctx->skia_paint);;
             localPaint.setTextEncoding (SkPaint::kGlyphID_TextEncoding);