Changeset 474

Timestamp:

03/07/2008 01:59:12 (6 months ago)

Author:

why

Message:

• shoes/ruby.c: playing around with keeping a transformation matrix in images. will be useful when the image block syntax comes to be.
  

Location:

trunk/shoes

Files:

• canvas.c (modified) (3 diffs)
• canvas.h (modified) (3 diffs)
• ruby.c (modified) (7 diffs)

trunk/shoes/canvas.c

@@ -310 +310 @@
 
 void
+shoes_apply_transformation(shoes_canvas *canvas, cairo_matrix_t *tf, 
+  double x, double y, double w, double h, VALUE mode)
+{
+  if (tf)
+  {
+    w /= 2.; h /= 2.;
+
+    if (mode == s_center)
+    {
+      cairo_translate(canvas->cr, w, h);
+      cairo_transform(canvas->cr, tf);
+    }
+    else
+    {
+      cairo_translate(canvas->cr, -x, -y);
+      cairo_transform(canvas->cr, tf);
+      cairo_translate(canvas->cr, x + w, y + h);
+    }
+  }
+}
+
+void
 shoes_canvas_shape_do(shoes_canvas *canvas, double x, double y, double w, double h, unsigned char center)
 {
+  if (center)
+  {
+    w = 0.; h = 0.;
+  }
+
   cairo_save(canvas->cr);
-  if (center)
-  {
-    w = 0.; h = 0.;
-  }
-  else
-  {
-    w /= 2.; h /= 2.;
-  }
-
-  if (canvas->mode == s_center)
-  {
-    cairo_translate(canvas->cr, w, h);
-    cairo_transform(canvas->cr, canvas->tf);
-  }
-  else
-  {
-    cairo_transform(canvas->cr, canvas->tf);
-    cairo_translate(canvas->cr, x + w, y + h);
-  }
+  shoes_apply_transformation(canvas, canvas->tf, x, y, w, h, canvas->mode);
 }
 
@@ -806 +815 @@
     rb_hash_aset(attr, ID2SYM(s_click), rb_block_proc());
   }
-  image = shoes_image_new(cImage, path, attr, self);
+  image = shoes_image_new(cImage, path, attr, self, canvas->tf, canvas->mode);
   if (!NIL_P(image))
     rb_ary_push(canvas->contents, image);
@@ -913 +922 @@
 
   cairo_curve_to(cr, x1, y1, x2, y2, x3, y3);
-  return self;
-}
-
-VALUE
-shoes_canvas_transform(VALUE self, VALUE _m)
-{
-  ID m = SYM2ID(_m);
-  SETUP();
-
-  if (m == s_center || m == s_corner)
-  {
-    canvas->mode = m;
-  }
-  else
-  {
-    rb_raise(rb_eArgError, "transform must be called with either :center or :corner.");
-  }
-  return self;
-}
-
-VALUE
-shoes_canvas_translate(VALUE self, VALUE _x, VALUE _y)
-{
-  double x, y;
-  SETUP();
-
-  x = NUM2DBL(_x);
-  y = NUM2DBL(_y);
-
-  cairo_matrix_translate(canvas->tf, x, y);
-  return self;
-}
-
-VALUE
-shoes_canvas_rotate(VALUE self, VALUE _deg)
-{
-  double rad;
-  SETUP();
-
-  rad = NUM2DBL(_deg) * RAD2PI;
-
-  cairo_matrix_rotate(canvas->tf, -rad);
-  return self;
-}
-
-VALUE
-shoes_canvas_scale(int argc, VALUE *argv, VALUE self)
-{
-  VALUE _sx, _sy;
-  double sx, sy;
-  SETUP();
-
-  rb_scan_args(argc, argv, "11", &_sx, &_sy);
-
-  sx = NUM2DBL(_sx);
-  if (NIL_P(_sy)) sy = sx;
-  else            sy = NUM2DBL(_sy);
-
-  cairo_matrix_scale(canvas->tf, sx, sy);
-  return self;
-}
-
-VALUE
-shoes_canvas_skew(int argc, VALUE *argv, VALUE self)
-{
-  cairo_matrix_t matrix;
-  VALUE _sx, _sy;
-  double sx, sy;
-  SETUP();
-
-  rb_scan_args(argc, argv, "11", &_sx, &_sy);
-
-  sx = NUM2DBL(_sx) * RAD2PI;
-  sy = 0.0;
-  if (!NIL_P(_sy)) sy = NUM2DBL(_sy) * RAD2PI;
-
-  cairo_matrix_init(&matrix, 1.0, sy, sx, 1.0, 0.0, 0.0);
-  cairo_matrix_multiply(canvas->tf, canvas->tf, &matrix);
   return self;
 }

trunk/shoes/canvas.h

@@ -123 +123 @@
 typedef struct {
   cairo_surface_t *surface;
+  cairo_matrix_t *tf;
+  VALUE mode;
   shoes_place place;
   VALUE path;
@@ -261 +263 @@
 shoes_canvas *shoes_canvas_init(VALUE, SHOES_SLOT_OS, VALUE, int, int);
 void shoes_canvas_paint(VALUE);
+void shoes_apply_transformation(shoes_canvas *, cairo_matrix_t *, 
+  double, double, double, double, VALUE);
 void shoes_canvas_shape_do(shoes_canvas *, double, double, double, double, unsigned char);
 VALUE shoes_canvas_style(int, VALUE *, VALUE);
@@ -406 +410 @@
 void shoes_shape_send_release(VALUE, int, int, int);
 
-VALUE shoes_image_new(VALUE, VALUE, VALUE, VALUE);
+VALUE shoes_image_new(VALUE, VALUE, VALUE, VALUE, cairo_matrix_t *, VALUE);
 VALUE shoes_image_alloc(VALUE);
 VALUE shoes_image_draw(VALUE, VALUE, VALUE);

trunk/shoes/ruby.c

@@ -815 +815 @@
   rb_gc_mark_maybe(image->parent);
   rb_gc_mark_maybe(image->attr);
+  rb_gc_mark_maybe(image->mode);
 }
 
@@ -822 +823 @@
   if (image->surface != NULL)
     cairo_surface_destroy(image->surface);
+  SHOE_FREE(image->tf);
   RUBY_CRITICAL(SHOE_FREE(image));
 }
 
 VALUE
-shoes_image_new(VALUE klass, VALUE path, VALUE attr, VALUE parent)
+shoes_image_new(VALUE klass, VALUE path, VALUE attr, VALUE parent, cairo_matrix_t *tf, VALUE mode)
 {
   GError *error = NULL;
@@ -839 +841 @@
     image->path = path;
     image->surface = surf;
+    cairo_matrix_init_identity(image->tf);
+    cairo_matrix_multiply(image->tf, image->tf, tf);
+    image->mode = mode;
     image->attr = attr;
     image->parent = parent;
@@ -854 +859 @@
   image->path = Qnil;
   image->surface = NULL;
+  image->tf = SHOE_ALLOC(cairo_matrix_t);
+  cairo_matrix_init_identity(image->tf);
+  image->mode = Qnil;
   image->attr = Qnil;
   image->parent = Qnil;
@@ -903 +911 @@
   if (RTEST(actual))
   {
-    shoes_canvas_shape_do(canvas, place.ix, place.iy, place.iw, place.ih, FALSE);
+    cairo_save(canvas->cr);
     cairo_translate(canvas->cr, place.ix, place.iy);
+    shoes_apply_transformation(canvas, self_t->tf, place.ix, place.iy, place.iw, place.ih, self_t->mode);
     if (place.iw != imw || place.ih != imh)
     {
@@ -3391 +3400 @@
   return self;
 }
+
+//
+// Transformations
+//
+#define TRANS_COMMON(ele) \
+  VALUE \
+  shoes_##ele##_transform(VALUE self, VALUE _m) \
+  { \
+    GET_STRUCT(ele, self_t); \
+    ID m = SYM2ID(_m); \
+    if (m == s_center || m == s_corner) \
+    { \
+      self_t->mode = m; \
+    } \
+    else \
+    { \
+      rb_raise(rb_eArgError, "transform must be called with either :center or :corner."); \
+    } \
+    return self; \
+  } \
+  VALUE \
+  shoes_##ele##_translate(VALUE self, VALUE _x, VALUE _y) \
+  { \
+    GET_STRUCT(ele, self_t); \
+    double x, y; \
+    x = NUM2DBL(_x); \
+    y = NUM2DBL(_y); \
+    cairo_matrix_translate(self_t->tf, x, y); \
+    return self; \
+  } \
+  VALUE \
+  shoes_##ele##_rotate(VALUE self, VALUE _deg) \
+  { \
+    GET_STRUCT(ele, self_t); \
+    double rad; \
+    rad = NUM2DBL(_deg) * RAD2PI; \
+    cairo_matrix_rotate(self_t->tf, -rad); \
+    return self; \
+  } \
+  VALUE \
+  shoes_##ele##_scale(int argc, VALUE *argv, VALUE self) \
+  { \
+    VALUE _sx, _sy; \
+    double sx, sy; \
+    GET_STRUCT(ele, self_t); \
+    rb_scan_args(argc, argv, "11", &_sx, &_sy); \
+    sx = NUM2DBL(_sx); \
+    if (NIL_P(_sy)) sy = sx; \
+    else            sy = NUM2DBL(_sy); \
+    cairo_matrix_scale(self_t->tf, sx, sy); \
+    return self; \
+  } \
+  VALUE \
+  shoes_##ele##_skew(int argc, VALUE *argv, VALUE self) \
+  { \
+    cairo_matrix_t matrix; \
+    VALUE _sx, _sy; \
+    double sx, sy; \
+    GET_STRUCT(ele, self_t); \
+    rb_scan_args(argc, argv, "11", &_sx, &_sy); \
+    sx = NUM2DBL(_sx) * RAD2PI; \
+    sy = 0.0; \
+    if (!NIL_P(_sy)) sy = NUM2DBL(_sy) * RAD2PI; \
+    cairo_matrix_init(&matrix, 1.0, sy, sx, 1.0, 0.0, 0.0); \
+    cairo_matrix_multiply(self_t->tf, self_t->tf, &matrix); \
+    return self; \
+  }
+
+TRANS_COMMON(canvas);
+TRANS_COMMON(image);
 
 //
@@ -3945 +4024 @@
   rb_define_method(cImage, "size", CASTHOOK(shoes_image_size), 0);
   rb_define_method(cImage, "move", CASTHOOK(shoes_image_move), 2);
+  rb_define_method(cImage, "rotate", CASTHOOK(shoes_image_rotate), 1);
+  rb_define_method(cImage, "scale", CASTHOOK(shoes_image_scale), -1);
+  rb_define_method(cImage, "skew", CASTHOOK(shoes_image_skew), -1);
+  rb_define_method(cImage, "transform", CASTHOOK(shoes_image_transform), 1);
+  rb_define_method(cImage, "translate", CASTHOOK(shoes_image_translate), 2);
   rb_define_method(cImage, "top", CASTHOOK(shoes_image_get_top), 0);
   rb_define_method(cImage, "left", CASTHOOK(shoes_image_get_left), 0);