Changeset 120

Timestamp:

08/19/2007 17:59:05 (13 months ago)

Author:

why

Message:

* shoes/ruby.c: okay, using the Color class for everywhere colors are put to use.
* samples/: switched most of the examples to using the rgb and gray methods, though the old techniques are still good.

Location:

trunk

Files:

• lib/shoes.rb (modified) (1 diff)
• samples/anim-move.rb (modified) (1 diff)
• samples/bounce.rb (modified) (1 diff)
• samples/calc.rb (modified) (1 diff)
• samples/draw.rb (modified) (1 diff)
• samples/edit.rb (modified) (1 diff)
• samples/follow.rb (modified) (2 diffs)
• samples/rect.rb (modified) (1 diff)
• samples/timer.rb (modified) (1 diff)
• shoes/canvas.c (modified) (3 diffs)
• shoes/canvas.h (modified) (3 diffs)
• shoes/ruby.c (modified) (16 diffs)
• shoes/ruby.h (modified) (1 diff)

trunk/lib/shoes.rb

@@ -9 +9 @@
 class Range 
   def rand 
-    (Kernel.rand * (self.end - self.begin)) + self.begin 
+    conv = (self.end === Integer && self.begin === Integer ? :to_i : :to_f)
+    ((Kernel.rand * (self.end - self.begin)) + self.begin).send(conv) 
   end 
 end

trunk/samples/anim-move.rb

@@ -1 +1 @@
 Shoes.app do
-  background "rgb(0, 0, 0)"
-  fill 1.0, 1.0, 1.0
+  background rgb(0, 0, 0)
+  fill rgb(255, 255, 255)
   rects = [
     rect(0, 0, 50, 50),

trunk/samples/bounce.rb

@@ -8 +8 @@
   animate(30) do
     clear do
-      background "rgb(102, 102, 102)"
+      background rgb(102, 102, 102)
       x += xspeed * xdir
       y += yspeed * ydir

trunk/samples/calc.rb

@@ -42 +42 @@
 
   stack :margin => 4 do
-    background "rgb(240, 240, 210)", :radius => 5
+    background rgb(240, 240, 210), :radius => 5
 
     stack do

trunk/samples/draw.rb

@@ -1 +1 @@
 Shoes.app do
-  background "rgb(102, 102, 102)"
-  stroke 0, 0, 0
+  background "#999"
+  stroke "#000"
   x, y = nil, nil
   motion do |_x, _y|

trunk/samples/edit.rb

@@ -1 +1 @@
 str, t = "", nil
 Shoes.app :height => 500, :width => 450 do
-  background "rgb(77, 77, 77)"
+  background rgb(77, 77, 77)
   stack :margin => 10 do
     text "<span color='white'><span color='red' background='white'>TEXT EDITOR</span> * USE ALT-Q TO QUIT</span>"

trunk/samples/follow.rb

@@ -2 +2 @@
 Shoes.app do
   nostroke
-  fill 1.0, 1.0, 1.0, 0.6
+  fill rgb(0x30, 0xFF, 0xFF, 0.6)
   animate(24) do
     trails.shift
@@ -8 +8 @@
 
     clear do
-      background "rgb(51, 51, 51)"
+      background rgb(51, 51, 51)
       trails.each_with_index do |(x, y), i|
         i += 1

trunk/samples/rect.rb

@@ -2 +2 @@
   20.times do
     nostroke
-    fill (0.6..1.0).rand, (0.1..1.0).rand, (0.2..1.0).rand, (0.4..1.0).rand
+    fill rgb((0.6..1.0).rand, (0.1..1.0).rand, (0.2..1.0).rand, (0.4..1.0).rand)
     r = rand(300) + 60
     rect (10..100).rand, (10..200).rand, r, r

trunk/samples/timer.rb

@@ -1 +1 @@
 label, time = nil, Time.now
 Shoes.app :height => 150, :width => 250 do
-  background "rgb(240, 250, 208)"
+  background rgb(240, 250, 208)
   stack :margin => 10 do
     button "Start" do

trunk/shoes/canvas.c

@@ -240 +240 @@
   canvas->cr = cairo_create(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1));;
   canvas->sw = 1.;
-  canvas->fg.r = 0.;
-  canvas->fg.g = 0.;
-  canvas->fg.b = 0.;
-  canvas->fg.a = 1.;
+  canvas->fg.r = 0x00;
+  canvas->fg.g = 0x00;
+  canvas->fg.b = 0x00;
+  canvas->fg.a = 0xFF;
   canvas->fg.on = TRUE;
-  canvas->bg.r = 0.;
-  canvas->bg.g = 0.;
-  canvas->bg.b = 0.;
-  canvas->bg.a = 1.;
+  canvas->bg.r = 0x00;
+  canvas->bg.g = 0x00;
+  canvas->bg.b = 0x00;
+  canvas->bg.a = 0xFF;
   canvas->bg.on = TRUE;
   canvas->mode = s_center;
@@ -299 +299 @@
 shoes_canvas_stroke(int argc, VALUE *argv, VALUE self)
 {
-  VALUE _r, _g, _b, _a;
-  SETUP();
-
-  rb_scan_args(argc, argv, "31", &_r, &_g, &_b, &_a);
-  canvas->fg.on = TRUE;
-  canvas->fg.r = NUM2DBL(_r);
-  canvas->fg.g = NUM2DBL(_g);
-  canvas->fg.b = NUM2DBL(_b);
-  canvas->fg.a = 1.0;
-  if (!NIL_P(_a)) canvas->fg.a = NUM2DBL(_a);
+  shoes_color *color;
+  VALUE _r, _g, _b, _a, _color;
+  SETUP();
+
+  argc = rb_scan_args(argc, argv, "13", &_r, &_g, &_b, &_a);
+  if (argc == 1 && rb_obj_is_kind_of(_r, cColor))
+    _color = _r;
+  else if (argc == 1 && rb_obj_is_kind_of(_r, rb_cString))
+    _color = shoes_color_parse(cColor, _r);
+  else if (argc == 1 || argc == 2)
+    _color = shoes_color_gray(argc, argv, cColor);
+  else
+    _color = shoes_color_rgb(argc, argv, cColor);
+
+  Data_Get_Struct(_color, shoes_color, color);
+  canvas->fg = *color;
 
   return self;
@@ -333 +339 @@
 shoes_canvas_fill(int argc, VALUE *argv, VALUE self)
 {
-  VALUE _r, _g, _b, _a;
-  SETUP();
-
-  rb_scan_args(argc, argv, "31", &_r, &_g, &_b, &_a);
-  canvas->bg.on = TRUE;
-  canvas->bg.r = NUM2DBL(_r);
-  canvas->bg.g = NUM2DBL(_g);
-  canvas->bg.b = NUM2DBL(_b);
-  canvas->bg.a = 1.0;
-  if (!NIL_P(_a)) canvas->bg.a = NUM2DBL(_a);
+  shoes_color *color;
+  VALUE _r, _g, _b, _a, _color;
+  SETUP();
+
+  argc = rb_scan_args(argc, argv, "13", &_r, &_g, &_b, &_a);
+  if (argc == 1 && rb_obj_is_kind_of(_r, cColor))
+    _color = _r;
+  else if (argc == 1 && rb_obj_is_kind_of(_r, rb_cString))
+    _color = shoes_color_parse(cColor, _r);
+  else if (argc == 1 || argc == 2)
+    _color = shoes_color_gray(argc, argv, cColor);
+  else
+    _color = shoes_color_rgb(argc, argv, cColor);
+
+  Data_Get_Struct(_color, shoes_color, color);
+  canvas->bg = *color;
 
   return self;

trunk/shoes/canvas.h

@@ -27 +27 @@
 //
 typedef struct {
-  double r, g, b, a;
-  unsigned char on;
+  unsigned char r, g, b, a, on;
 } shoes_color;
 
@@ -181 +180 @@
 VALUE shoes_canvas_nofill(VALUE);
 VALUE shoes_canvas_fill(int, VALUE *, VALUE);
+VALUE shoes_canvas_rgb(int, VALUE *, VALUE);
+VALUE shoes_canvas_gray(int, VALUE *, VALUE);
 VALUE shoes_canvas_rect(int, VALUE *, VALUE);
 VALUE shoes_canvas_oval(VALUE, VALUE, VALUE, VALUE, VALUE);
@@ -278 +279 @@
 void shoes_anim_call(VALUE);
 
-VALUE shoes_color_new(double, double, double, double);
+VALUE shoes_color_new(int, int, int, int);
 VALUE shoes_color_alloc(VALUE);
 VALUE shoes_color_rgb(int, VALUE *, VALUE);
 VALUE shoes_color_gray(int, VALUE *, VALUE);
+cairo_pattern_t *shoes_color_pattern(VALUE);
 VALUE shoes_color_parse(VALUE, VALUE);
 VALUE shoes_color_to_s(VALUE);

trunk/shoes/ruby.c

@@ -497 +497 @@
   if (self_t->bg.on)
   {
-    cairo_set_source_rgba(canvas->cr, self_t->bg.r, self_t->bg.g, self_t->bg.b, self_t->bg.a);
+    cairo_set_source_rgba(canvas->cr, self_t->bg.r / 255., self_t->bg.g / 255., self_t->bg.b / 255., self_t->bg.a / 255.);
     cairo_fill_preserve(canvas->cr);
   }
   if (self_t->fg.on)
   {
-    cairo_set_source_rgba(canvas->cr, self_t->fg.r, self_t->fg.g, self_t->fg.b, self_t->fg.a);
+    cairo_set_source_rgba(canvas->cr, self_t->fg.r / 255., self_t->fg.g / 255., self_t->fg.b / 255., self_t->fg.a / 255.);
     cairo_stroke_preserve(canvas->cr);
   }
@@ -608 +608 @@
   shoes_pattern *pattern;
   VALUE obj = shoes_pattern_alloc(klass);
-  VALUE rgb = rb_funcall(source, s_match, 1, reRGB_SOURCE);
+  VALUE rgb;
   Data_Get_Struct(obj, shoes_pattern, pattern);
   pattern->source = source;
-  if (!NIL_P(rgb))
-  {
-    int r = NUM2INT(rb_Integer(rb_reg_nth_match(1, rgb)));
-    int g = NUM2INT(rb_Integer(rb_reg_nth_match(2, rgb)));
-    int b = NUM2INT(rb_Integer(rb_reg_nth_match(3, rgb)));
-    pattern->pattern = cairo_pattern_create_rgb(r / 255., g / 255., b / 255.);
+
+  if (!rb_obj_is_kind_of(source, cColor))
+  {
+    rgb = shoes_color_parse(cColor, source);
+    if (!NIL_P(rgb)) source = rgb;
+  }
+
+  if (rb_obj_is_kind_of(source, cColor))
+  {
+    pattern->pattern = shoes_color_pattern(source);
     pattern->width = pattern->height = 1.;
   }
@@ -627 +631 @@
   }
   cairo_pattern_set_extend(pattern->pattern, CAIRO_EXTEND_REPEAT);
+
   pattern->attr = attr;
   pattern->parent = parent;
@@ -698 +703 @@
 
 VALUE
-shoes_color_new(double r, double g, double b, double a)
+shoes_color_new(int r, int g, int b, int a)
 {
   shoes_color *color;
@@ -715 +720 @@
   shoes_color *color;
   VALUE obj = Data_Make_Struct(klass, shoes_color, shoes_color_mark, shoes_color_free, color);
-  color->r = 0.0;
-  color->g = 0.0;
-  color->b = 0.0;
-  color->a = 1.0;
+  color->r = 0x00;
+  color->g = 0x00;
+  color->b = 0x00;
+  color->a = 0xFF;
   color->on = TRUE;
   return obj;
@@ -726 +731 @@
 shoes_color_rgb(int argc, VALUE *argv, VALUE self)
 {
-  double a;
+  int a;
   VALUE _r, _g, _b, _a;
   rb_scan_args(argc, argv, "31", &_r, &_g, &_b, &_a);
 
-  a = 1.0;
-  if (!NIL_P(a)) a = NUM2DBL(_a);
-  return shoes_color_new(NUM2DBL(_r), NUM2DBL(_g), NUM2DBL(_b), a);
+  a = 0xFF;
+  if (!NIL_P(_a)) a = NUM2RGBINT(_a);
+  return shoes_color_new(NUM2RGBINT(_r), NUM2RGBINT(_g), NUM2RGBINT(_b), a);
 }
 
@@ -740 +745 @@
   shoes_color *color;
   VALUE _g, _a;
-  double g, a;
+  int g, a;
   rb_scan_args(argc, argv, "11", &_g, &_a);
 
-  a = 1.0;
-  g = NUM2DBL(_g);
-  if (!NIL_P(a)) a = NUM2DBL(_a);
+  a = 0xFF;
+  g = NUM2RGBINT(_g);
+  if (!NIL_P(_a)) a = NUM2RGBINT(_a);
   return shoes_color_new(g, g, g, a);
+}
+
+cairo_pattern_t *
+shoes_color_pattern(VALUE obj)
+{
+  shoes_color *color;
+  Data_Get_Struct(obj, shoes_color, color);
+  if (color->a == 255)
+    return cairo_pattern_create_rgb(color->r / 255., color->g / 255., color->b / 255.);
+  else
+    return cairo_pattern_create_rgba(color->r / 255., color->g / 255., color->b / 255., color->a / 255.);
 }
 
@@ -760 +776 @@
   if (!NIL_P(reg))
   {
-    color->r = NUM2DBL(rb_str2inum(rb_reg_nth_match(1, reg), 16) * 17) / 255.;
-    color->g = NUM2DBL(rb_str2inum(rb_reg_nth_match(2, reg), 16) * 17) / 255.;
-    color->b = NUM2DBL(rb_str2inum(rb_reg_nth_match(3, reg), 16) * 17) / 255.;
+    color->r = NUM2INT(rb_str2inum(rb_reg_nth_match(1, reg), 16)) * 17;
+    color->g = NUM2INT(rb_str2inum(rb_reg_nth_match(2, reg), 16)) * 17;
+    color->b = NUM2INT(rb_str2inum(rb_reg_nth_match(3, reg), 16)) * 17;
     return obj;
   }
@@ -769 +785 @@
   if (!NIL_P(reg))
   {
-    color->r = NUM2DBL(rb_str2inum(rb_reg_nth_match(1, reg), 16)) / 255.;
-    color->g = NUM2DBL(rb_str2inum(rb_reg_nth_match(2, reg), 16)) / 255.;
-    color->b = NUM2DBL(rb_str2inum(rb_reg_nth_match(3, reg), 16)) / 255.;
+    color->r = NUM2INT(rb_str2inum(rb_reg_nth_match(1, reg), 16));
+    color->g = NUM2INT(rb_str2inum(rb_reg_nth_match(2, reg), 16));
+    color->b = NUM2INT(rb_str2inum(rb_reg_nth_match(3, reg), 16));
     return obj;
   }
@@ -778 +794 @@
   if (!NIL_P(reg))
   {
-    color->r = NUM2DBL(rb_Integer(rb_reg_nth_match(1, reg))) / 255.;
-    color->g = NUM2DBL(rb_Integer(rb_reg_nth_match(2, reg))) / 255.;
-    color->b = NUM2DBL(rb_Integer(rb_reg_nth_match(3, reg))) / 255.;
+    color->r = NUM2INT(rb_Integer(rb_reg_nth_match(1, reg)));
+    color->g = NUM2INT(rb_Integer(rb_reg_nth_match(2, reg)));
+    color->b = NUM2INT(rb_Integer(rb_reg_nth_match(3, reg)));
     return obj;
   }
@@ -787 +803 @@
   if (!NIL_P(reg))
   {
-    color->r = NUM2DBL(rb_Integer(rb_reg_nth_match(1, reg))) / 255.;
-    color->g = NUM2DBL(rb_Integer(rb_reg_nth_match(2, reg))) / 255.;
-    color->b = NUM2DBL(rb_Integer(rb_reg_nth_match(3, reg))) / 255.;
-    color->a = NUM2DBL(rb_Integer(rb_reg_nth_match(4, reg))) / 255.;
+    color->r = NUM2INT(rb_Integer(rb_reg_nth_match(1, reg)));
+    color->g = NUM2INT(rb_Integer(rb_reg_nth_match(2, reg)));
+    color->b = NUM2INT(rb_Integer(rb_reg_nth_match(3, reg)));
+    color->a = NUM2INT(rb_Integer(rb_reg_nth_match(4, reg)));
     return obj;
   }
@@ -797 +813 @@
   if (!NIL_P(reg))
   {
-    color->r = color->g = color->b = NUM2DBL(rb_Integer(rb_reg_nth_match(1, reg))) / 255.;
+    color->r = color->g = color->b = NUM2INT(rb_Integer(rb_reg_nth_match(1, reg)));
     return obj;
   }
@@ -804 +820 @@
   if (!NIL_P(reg))
   {
-    color->r = color->g = color->b = NUM2DBL(rb_Integer(rb_reg_nth_match(1, reg))) / 255.;
-    color->a = NUM2DBL(rb_Integer(rb_reg_nth_match(2, reg))) / 255.;
+    color->r = color->g = color->b = NUM2INT(rb_Integer(rb_reg_nth_match(1, reg)));
+    color->a = NUM2INT(rb_Integer(rb_reg_nth_match(2, reg)));
     return obj;
   }
@@ -817 +833 @@
   shoes_color *color;
   Data_Get_Struct(self, shoes_color, color);
-  VALUE ary = rb_ary_new3(4, INT2NUM(color->r * 255), INT2NUM(color->g * 255), INT2NUM(color->b * 255), INT2NUM(color->a * 255));
+  VALUE ary = rb_ary_new3(4, INT2NUM(color->r), INT2NUM(color->g), INT2NUM(color->b), INT2NUM(color->a));
   if (color->a == 1.0)
     return rb_funcall(rb_str_new2("rgb(%d, %d, %d)"), s_perc, 1, ary);
@@ -1232 +1248 @@
   if (canvas->fg.on)
   {
-    cairo_set_source_rgba(canvas->cr, canvas->fg.r, canvas->fg.g, canvas->fg.b, canvas->fg.a);
+    cairo_set_source_rgba(canvas->cr, canvas->fg.r / 255., canvas->fg.g / 255., canvas->fg.b / 255., canvas->fg.a / 255.);
   // cairo_stroke(canvas->cr);
   }
@@ -1985 +2001 @@
   rb_define_method(cCanvas, "nofill", CASTHOOK(shoes_canvas_nofill), 0);
   rb_define_method(cCanvas, "fill", CASTHOOK(shoes_canvas_fill), -1);
+  rb_define_method(cCanvas, "rgb", CASTHOOK(shoes_color_rgb), -1);
+  rb_define_method(cCanvas, "gray", CASTHOOK(shoes_color_gray), -1);
   rb_define_method(cCanvas, "rect", CASTHOOK(shoes_canvas_rect), -1);
   rb_define_method(cCanvas, "oval", CASTHOOK(shoes_canvas_oval), 4);

trunk/shoes/ruby.h

@@ -49 +49 @@
   "end;"
 
+#define NUM2RGBINT(x) (rb_obj_is_kind_of(x, rb_cFloat) ? NUM2DBL(x) * 255 : NUM2INT(x))
+
 //
 // Common funcs for dealing with attribute hashes