sfml3-rb 0.2.2 → 0.3.1

data/ext/graphics/color.c

@@ -13,15 +13,14 @@ typedef struct {
 
 static VALUE rb_cColor;
 
-static void Color_free(void *ptr) {
+static void Color_free(void* ptr) {
     free(ptr);
 }
 
 static const rb_data_type_t Color_data_type = {
     .wrap_struct_name = "SFML::Color",
     .function = {.dmark = NULL, .dfree = Color_free, .dsize = NULL},
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY
-};
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY};
 
 static unsigned char clamp_channel(int value) {
     if (value < 0) {
@@ -32,11 +31,11 @@ static unsigned char clamp_channel(int value) {
         return 255;
     }
 
-    return (unsigned char) value;
+    return (unsigned char)value;
 }
 
 static VALUE Color_wrap(sfColor color) {
-    Color *ptr = malloc(sizeof(Color));
+    Color* ptr = malloc(sizeof(Color));
 
     ptr->color = color;
 
@@ -44,32 +43,50 @@ static VALUE Color_wrap(sfColor color) {
 }
 
 static sfColor Color_from_integer(VALUE rb_integer) {
-    unsigned int value = (unsigned int) NUM2UINT(rb_integer);
+    unsigned int value = (unsigned int)NUM2UINT(rb_integer);
 
     if (value <= 0xFFFFFF) {
-        return (sfColor) {
-            (unsigned char) ((value >> 16) & 0xFF),
-            (unsigned char) ((value >> 8) & 0xFF),
-            (unsigned char) (value & 0xFF),
-            255
-        };
+        return (sfColor){(unsigned char)((value >> 16) & 0xFF),
+                         (unsigned char)((value >> 8) & 0xFF), (unsigned char)(value & 0xFF), 255};
     }
 
-    return (sfColor) {
-        (unsigned char) ((value >> 24) & 0xFF),
-        (unsigned char) ((value >> 16) & 0xFF),
-        (unsigned char) ((value >> 8) & 0xFF),
-        (unsigned char) (value & 0xFF)
-    };
+    return (sfColor){(unsigned char)((value >> 24) & 0xFF), (unsigned char)((value >> 16) & 0xFF),
+                     (unsigned char)((value >> 8) & 0xFF), (unsigned char)(value & 0xFF)};
 }
 
-static VALUE Color_new(int argc, VALUE *argv, VALUE klass) {
-    VALUE self;
-    Color *ptr;
+static VALUE Color_alloc(VALUE klass) {
+    Color* ptr = malloc(sizeof(Color));
+
+    if (ptr == NULL) {
+        rb_raise(rb_eNoMemError, "failed to allocate color");
+    }
+
+    ptr->color = (sfColor){0, 0, 0, 255};
+
+    return TypedData_Wrap_Struct(klass, &Color_data_type, ptr);
+}
+
+/* call-seq:
+ *   Color.new                    -> Color(0, 0, 0, 255)
+ *   Color.new(r, g, b, a=255)    -> Color(r, g, b, a)
+ *   Color.new([r, g, b])         -> Color(r, g, b, 255)
+ *   Color.new([r, g, b, a])      -> Color(r, g, b, a)
+ *   Color.new(packed_integer)    -> Color
+ *   Color.new(other_color)       -> copy of +other_color+
+ *
+ * Each channel argument is clamped to 0..255. A single Integer argument is
+ * interpreted as #from_rgb (0xRRGGBB) if it fits in 24 bits, or #from_rgba
+ * (0xRRGGBBAA) otherwise.
+ *
+ * @return [Color]
+ * @raise [ArgumentError] if given an Array shorter than 3 elements, or an
+ *   argument count other than 0, 1, 3 or 4
+ */
+static VALUE Color_initialize(int argc, VALUE* argv, VALUE self) {
     sfColor color = {0, 0, 0, 255};
 
     if (argc == 1 && rb_obj_is_kind_of(argv[0], rb_cColor)) {
-        color = ((Color *) Get_Color_Struct(argv[0]))->color;
+        color = ((Color*)Get_Color_Struct(argv[0]))->color;
     } else if (argc == 1 && RB_TYPE_P(argv[0], T_ARRAY)) {
         color = color_from_rb(argv[0]);
     } else if (argc == 1 && RB_INTEGER_TYPE_P(argv[0])) {
@@ -83,121 +100,231 @@ static VALUE Color_new(int argc, VALUE *argv, VALUE klass) {
         raise_invalid_arguments_excepted(4, argc);
     }
 
-    ptr = malloc(sizeof(Color));
-    ptr->color = color;
-
-    self = TypedData_Wrap_Struct(klass, &Color_data_type, ptr);
+    ((Color*)Get_Color_Struct(self))->color = color;
 
     return self;
 }
 
+/* call-seq:
+ *   Color.from_rgb(value) -> Color
+ *
+ * Creates a color from 8-bit red, green and blue components.
+ *
+ * @return [Color] the fully-opaque color packed as 0xRRGGBB
+ */
 static VALUE Color_from_rgb(VALUE klass, VALUE rb_integer) {
-    return Color_wrap((sfColor) {
-        (unsigned char) ((NUM2UINT(rb_integer) >> 16) & 0xFF),
-        (unsigned char) ((NUM2UINT(rb_integer) >> 8) & 0xFF),
-        (unsigned char) (NUM2UINT(rb_integer) & 0xFF),
-        255
-    });
-}
-
+    return Color_wrap((sfColor){(unsigned char)((NUM2UINT(rb_integer) >> 16) & 0xFF),
+                                (unsigned char)((NUM2UINT(rb_integer) >> 8) & 0xFF),
+                                (unsigned char)(NUM2UINT(rb_integer) & 0xFF), 255});
+}
+
+/* call-seq:
+ *   Color.from_rgba(value) -> Color
+ *
+ * Also available as .from_integer.
+ *
+ * @return [Color] the color packed as 0xRRGGBBAA (or 0xRRGGBB, treated as
+ *   fully opaque, if it fits in 24 bits)
+ */
 static VALUE Color_from_rgba(VALUE klass, VALUE rb_integer) {
     return Color_wrap(Color_from_integer(rb_integer));
 }
 
+/* call-seq: r -> Integer
+ *
+ * Returns the red component.
+ *
+ * @return [Integer] the red channel, 0..255
+ */
 static VALUE Color_get_r(VALUE self) {
-    return INT2NUM(((Color *) Get_Color_Struct(self))->color.r);
+    return INT2NUM(((Color*)Get_Color_Struct(self))->color.r);
 }
 
+/* call-seq: g -> Integer
+ *
+ * Returns the green component.
+ *
+ * @return [Integer] the green channel, 0..255
+ */
 static VALUE Color_get_g(VALUE self) {
-    return INT2NUM(((Color *) Get_Color_Struct(self))->color.g);
+    return INT2NUM(((Color*)Get_Color_Struct(self))->color.g);
 }
 
+/* call-seq: b -> Integer
+ *
+ * Returns the blue component.
+ *
+ * @return [Integer] the blue channel, 0..255
+ */
 static VALUE Color_get_b(VALUE self) {
-    return INT2NUM(((Color *) Get_Color_Struct(self))->color.b);
+    return INT2NUM(((Color*)Get_Color_Struct(self))->color.b);
 }
 
+/* call-seq: a -> Integer
+ *
+ * Returns the alpha component.
+ *
+ * @return [Integer] the alpha channel, 0..255
+ */
 static VALUE Color_get_a(VALUE self) {
-    return INT2NUM(((Color *) Get_Color_Struct(self))->color.a);
+    return INT2NUM(((Color*)Get_Color_Struct(self))->color.a);
 }
 
+/* call-seq:
+ *   r=(value) -> Integer
+ *
+ * Sets the red channel. +value+ is clamped to 0..255.
+ *
+ * @return [Integer] +value+
+ */
 static VALUE Color_set_r(VALUE self, VALUE rb_value) {
-    ((Color *) Get_Color_Struct(self))->color.r = clamp_channel(NUM2INT(rb_value));
+    rb_check_frozen(self);
+    ((Color*)Get_Color_Struct(self))->color.r = clamp_channel(NUM2INT(rb_value));
     return rb_value;
 }
 
+/* call-seq:
+ *   g=(value) -> Integer
+ *
+ * Sets the green channel. +value+ is clamped to 0..255.
+ *
+ * @return [Integer] +value+
+ */
 static VALUE Color_set_g(VALUE self, VALUE rb_value) {
-    ((Color *) Get_Color_Struct(self))->color.g = clamp_channel(NUM2INT(rb_value));
+    rb_check_frozen(self);
+    ((Color*)Get_Color_Struct(self))->color.g = clamp_channel(NUM2INT(rb_value));
     return rb_value;
 }
 
+/* call-seq:
+ *   b=(value) -> Integer
+ *
+ * Sets the blue channel. +value+ is clamped to 0..255.
+ *
+ * @return [Integer] +value+
+ */
 static VALUE Color_set_b(VALUE self, VALUE rb_value) {
-    ((Color *) Get_Color_Struct(self))->color.b = clamp_channel(NUM2INT(rb_value));
+    rb_check_frozen(self);
+    ((Color*)Get_Color_Struct(self))->color.b = clamp_channel(NUM2INT(rb_value));
     return rb_value;
 }
 
+/* call-seq:
+ *   a=(value) -> Integer
+ *
+ * Sets the alpha channel. +value+ is clamped to 0..255.
+ *
+ * @return [Integer] +value+
+ */
 static VALUE Color_set_a(VALUE self, VALUE rb_value) {
-    ((Color *) Get_Color_Struct(self))->color.a = clamp_channel(NUM2INT(rb_value));
+    rb_check_frozen(self);
+    ((Color*)Get_Color_Struct(self))->color.a = clamp_channel(NUM2INT(rb_value));
     return rb_value;
 }
 
+/* call-seq: to_i -> Integer
+ *
+ * Returns the color encoded as a 32-bit integer.
+ *
+ * @return [Integer] the color packed as 0xRRGGBBAA
+ */
 static VALUE Color_to_i(VALUE self) {
-    sfColor color = ((Color *) Get_Color_Struct(self))->color;
+    sfColor color = ((Color*)Get_Color_Struct(self))->color;
 
-    return UINT2NUM(((unsigned int) color.r << 24) | ((unsigned int) color.g << 16) |
-                    ((unsigned int) color.b << 8) | (unsigned int) color.a);
+    return UINT2NUM(((unsigned int)color.r << 24) | ((unsigned int)color.g << 16) |
+                    ((unsigned int)color.b << 8) | (unsigned int)color.a);
 }
 
+/* call-seq: to_a -> [Integer, Integer, Integer, Integer]
+ *
+ * Returns the object as an Array.
+ *
+ * @return [Array<Integer>] +[r, g, b, a]+
+ */
 static VALUE Color_to_a(VALUE self) {
-    sfColor color = ((Color *) Get_Color_Struct(self))->color;
+    sfColor color = ((Color*)Get_Color_Struct(self))->color;
 
-    return rb_ary_new_from_args(4, INT2NUM(color.r), INT2NUM(color.g), INT2NUM(color.b), INT2NUM(color.a));
+    return rb_ary_new_from_args(4, INT2NUM(color.r), INT2NUM(color.g), INT2NUM(color.b),
+                                INT2NUM(color.a));
 }
 
+/* call-seq:
+ *   self == other -> true or false
+ *
+ * Returns +true+ if the two objects are equal.
+ *
+ * @return [Boolean]
+ */
 static VALUE Color_eql(VALUE self, VALUE rb_other) {
-    sfColor a = ((Color *) Get_Color_Struct(self))->color;
+    sfColor a = ((Color*)Get_Color_Struct(self))->color;
     sfColor b;
 
     if (!rb_obj_is_kind_of(rb_other, rb_cColor)) {
         return Qfalse;
     }
 
-    b = ((Color *) Get_Color_Struct(rb_other))->color;
+    b = ((Color*)Get_Color_Struct(rb_other))->color;
 
     return BOOL2RB(a.r == b.r && a.g == b.g && a.b == b.b && a.a == b.a);
 }
 
+/* call-seq:
+ *   self + other -> Color
+ *
+ * +other+ may be a Color, a 3/4-element Array, or a packed Integer.
+ * Channels are summed and clamped to 0..255.
+ *
+ * @return [Color]
+ */
 static VALUE Color_add(VALUE self, VALUE rb_other) {
-    sfColor a = ((Color *) Get_Color_Struct(self))->color;
+    sfColor a = ((Color*)Get_Color_Struct(self))->color;
     sfColor b = color_from_rb(rb_other);
 
-    return Color_wrap((sfColor) {
-        clamp_channel(a.r + b.r), clamp_channel(a.g + b.g),
-        clamp_channel(a.b + b.b), clamp_channel(a.a + b.a)
-    });
+    return Color_wrap((sfColor){clamp_channel(a.r + b.r), clamp_channel(a.g + b.g),
+                                clamp_channel(a.b + b.b), clamp_channel(a.a + b.a)});
 }
 
+/* call-seq:
+ *   self - other -> Color
+ *
+ * +other+ may be a Color, a 3/4-element Array, or a packed Integer.
+ * Channels are subtracted and clamped to 0..255.
+ *
+ * @return [Color]
+ */
 static VALUE Color_sub(VALUE self, VALUE rb_other) {
-    sfColor a = ((Color *) Get_Color_Struct(self))->color;
+    sfColor a = ((Color*)Get_Color_Struct(self))->color;
     sfColor b = color_from_rb(rb_other);
 
-    return Color_wrap((sfColor) {
-        clamp_channel(a.r - b.r), clamp_channel(a.g - b.g),
-        clamp_channel(a.b - b.b), clamp_channel(a.a - b.a)
-    });
+    return Color_wrap((sfColor){clamp_channel(a.r - b.r), clamp_channel(a.g - b.g),
+                                clamp_channel(a.b - b.b), clamp_channel(a.a - b.a)});
 }
 
+/* call-seq:
+ *   self * other -> Color
+ *
+ * Componentwise modulation: each channel is +(self_channel * other_channel)
+ * / 255+. +other+ may be a Color, a 3/4-element Array, or a packed Integer.
+ *
+ * @return [Color]
+ */
 static VALUE Color_mul(VALUE self, VALUE rb_other) {
-    sfColor a = ((Color *) Get_Color_Struct(self))->color;
+    sfColor a = ((Color*)Get_Color_Struct(self))->color;
     sfColor b = color_from_rb(rb_other);
 
-    return Color_wrap((sfColor) {
-        (unsigned char) ((a.r * b.r) / 255), (unsigned char) ((a.g * b.g) / 255),
-        (unsigned char) ((a.b * b.b) / 255), (unsigned char) ((a.a * b.a) / 255)
-    });
+    return Color_wrap(
+        (sfColor){(unsigned char)((a.r * b.r) / 255), (unsigned char)((a.g * b.g) / 255),
+                  (unsigned char)((a.b * b.b) / 255), (unsigned char)((a.a * b.a) / 255)});
 }
 
+/* call-seq: to_s -> String
+ *
+ * Returns a human-readable representation of the object.
+ *
+ * @return [String] +"(r, g, b, a)"+
+ */
 static VALUE Color_to_s(VALUE self) {
-    sfColor c = ((Color *) Get_Color_Struct(self))->color;
+    sfColor c = ((Color*)Get_Color_Struct(self))->color;
     char buffer[64];
 
     snprintf(buffer, sizeof(buffer), "(%u, %u, %u, %u)", c.r, c.g, c.b, c.a);
@@ -205,16 +332,31 @@ static VALUE Color_to_s(VALUE self) {
     return rb_str_new2(buffer);
 }
 
-static void Color_define_predefined(VALUE klass, const char *name, sfColor color) {
-    rb_define_const(klass, name, Color_wrap(color));
-}
-
-void Init_Color(VALUE rb_module) {
-    rb_cColor = rb_define_class_under(rb_module, "Color", rb_cObject);
+/* Document-class: SFML::Color
+ * An RGBA color, each channel an Integer 0..255.
+ *
+ * @!attribute r
+ *   The red component.
+ *   @return [Integer] the red channel, 0..255
+ * @!attribute g
+ *   The green component.
+ *   @return [Integer] the green channel, 0..255
+ * @!attribute b
+ *   The blue component.
+ *   @return [Integer] the blue channel, 0..255
+ * @!attribute a
+ *   The alpha component.
+ *   @return [Integer] the alpha channel, 0..255
+ */
+void Init_Color(VALUE rb_mSFML) {
+    rb_cColor = rb_define_class_under(rb_mSFML, "Color", rb_cObject);
+
+    rb_define_alloc_func(rb_cColor, Color_alloc);
+    rb_define_method(rb_cColor, "initialize", Color_initialize, -1);
 
-    rb_define_singleton_method(rb_cColor, "new", Color_new, -1);
     rb_define_singleton_method(rb_cColor, "from_rgb", Color_from_rgb, 1);
     rb_define_singleton_method(rb_cColor, "from_rgba", Color_from_rgba, 1);
+
     rb_define_singleton_method(rb_cColor, "from_integer", Color_from_rgba, 1);
 
     rb_define_method(rb_cColor, "r", Color_get_r, 0);
@@ -235,30 +377,47 @@ void Init_Color(VALUE rb_module) {
     rb_define_method(rb_cColor, "*", Color_mul, 1);
     rb_define_method(rb_cColor, "to_s", Color_to_s, 0);
 
-    Color_define_predefined(rb_cColor, "BLACK", sfBlack);
-    Color_define_predefined(rb_cColor, "WHITE", sfWhite);
-    Color_define_predefined(rb_cColor, "RED", sfRed);
-    Color_define_predefined(rb_cColor, "GREEN", sfGreen);
-    Color_define_predefined(rb_cColor, "BLUE", sfBlue);
-    Color_define_predefined(rb_cColor, "YELLOW", sfYellow);
-    Color_define_predefined(rb_cColor, "MAGENTA", sfMagenta);
-    Color_define_predefined(rb_cColor, "CYAN", sfCyan);
-    Color_define_predefined(rb_cColor, "TRANSPARENT", sfTransparent);
+    /* Opaque black, RGBA(0, 0, 0, 255). */
+    rb_define_const(rb_cColor, "BLACK", rb_obj_freeze(Color_wrap(sfBlack)));
+
+    /* Opaque white, RGBA(255, 255, 255, 255). */
+    rb_define_const(rb_cColor, "WHITE", rb_obj_freeze(Color_wrap(sfWhite)));
+
+    /* Opaque red, RGBA(255, 0, 0, 255). */
+    rb_define_const(rb_cColor, "RED", rb_obj_freeze(Color_wrap(sfRed)));
+
+    /* Opaque green, RGBA(0, 255, 0, 255). */
+    rb_define_const(rb_cColor, "GREEN", rb_obj_freeze(Color_wrap(sfGreen)));
+
+    /* Opaque blue, RGBA(0, 0, 255, 255). */
+    rb_define_const(rb_cColor, "BLUE", rb_obj_freeze(Color_wrap(sfBlue)));
+
+    /* Opaque yellow, RGBA(255, 255, 0, 255). */
+    rb_define_const(rb_cColor, "YELLOW", rb_obj_freeze(Color_wrap(sfYellow)));
+
+    /* Opaque magenta, RGBA(255, 0, 255, 255). */
+    rb_define_const(rb_cColor, "MAGENTA", rb_obj_freeze(Color_wrap(sfMagenta)));
+
+    /* Opaque cyan, RGBA(0, 255, 255, 255). */
+    rb_define_const(rb_cColor, "CYAN", rb_obj_freeze(Color_wrap(sfCyan)));
+
+    /* Fully transparent black, RGBA(0, 0, 0, 0). */
+    rb_define_const(rb_cColor, "TRANSPARENT", rb_obj_freeze(Color_wrap(sfTransparent)));
 }
 
 VALUE Get_Klass_Color(void) {
     return rb_cColor;
 }
 
-void *Get_Color_Struct(VALUE self) {
-    Color *ptr;
+void* Get_Color_Struct(VALUE self) {
+    Color* ptr;
     TypedData_Get_Struct(self, Color, &Color_data_type, ptr);
     return ptr;
 }
 
 sfColor color_from_rb(VALUE rb_color) {
     if (rb_obj_is_kind_of(rb_color, rb_cColor)) {
-        return ((Color *) Get_Color_Struct(rb_color))->color;
+        return ((Color*)Get_Color_Struct(rb_color))->color;
     }
 
     if (RB_TYPE_P(rb_color, T_ARRAY)) {
@@ -268,12 +427,10 @@ sfColor color_from_rb(VALUE rb_color) {
             raise_invalid_array_length(VALID_LENGTH_COLOR);
         }
 
-        return (sfColor) {
-            clamp_channel(NUM2INT(rb_ary_entry(rb_color, 0))),
-            clamp_channel(NUM2INT(rb_ary_entry(rb_color, 1))),
-            clamp_channel(NUM2INT(rb_ary_entry(rb_color, 2))),
-            (length == 4) ? clamp_channel(NUM2INT(rb_ary_entry(rb_color, 3))) : 255
-        };
+        return (sfColor){clamp_channel(NUM2INT(rb_ary_entry(rb_color, 0))),
+                         clamp_channel(NUM2INT(rb_ary_entry(rb_color, 1))),
+                         clamp_channel(NUM2INT(rb_ary_entry(rb_color, 2))),
+                         (length == 4) ? clamp_channel(NUM2INT(rb_ary_entry(rb_color, 3))) : 255};
     }
 
     if (RB_INTEGER_TYPE_P(rb_color)) {
@@ -282,7 +439,7 @@ sfColor color_from_rb(VALUE rb_color) {
 
     raise_invalid_argument_class(rb_cColor);
 
-    return (sfColor) {0, 0, 0, 255};
+    return (sfColor){0, 0, 0, 255};
 }
 
 VALUE color_to_rb(sfColor color) {
@@ -290,18 +447,20 @@ VALUE color_to_rb(sfColor color) {
 }
 
 VALUE color_new(int r, int g, int b, int a) {
-    return Color_wrap((sfColor) {clamp_channel(r), clamp_channel(g), clamp_channel(b), clamp_channel(a)});
+    return Color_wrap(
+        (sfColor){clamp_channel(r), clamp_channel(g), clamp_channel(b), clamp_channel(a)});
 }
 
 void color_check(VALUE rb_color) {
-    if (rb_obj_is_kind_of(rb_color, rb_cColor) || RB_TYPE_P(rb_color, T_ARRAY) || RB_INTEGER_TYPE_P(rb_color)) {
+    if (rb_obj_is_kind_of(rb_color, rb_cColor) || RB_TYPE_P(rb_color, T_ARRAY) ||
+        RB_INTEGER_TYPE_P(rb_color)) {
         return;
     }
 
     raise_invalid_argument_class(rb_cColor);
 }
 
-void color_swap(sfColor *color_a, sfColor *color_b) {
+void color_swap(sfColor* color_a, sfColor* color_b) {
     sfColor c;
 
     c = *color_b;

data/ext/graphics/drawable.c

@@ -16,20 +16,32 @@
 
 static VALUE rb_mDrawable;
 
+/* call-seq:
+ *   draw(target, state) -> nil
+ *
+ * Default no-op implementation; classes that include Drawable (Circle,
+ * RectangleShape, ConvexShape, Shape, Sprite, Text, VertexArray,
+ * VertexBuffer, ...) override this with the actual drawing call.
+ *
+ * @return [nil]
+ */
 static VALUE Drawable_draw(VALUE self, VALUE rb_target, VALUE rb_state) {
     if (!rb_obj_is_kind_of(rb_target, Get_Klass_Target())) {
-
     }
 
     if (!rb_obj_is_kind_of(rb_state, Get_Klass_RenderState())) {
-
     }
 
     return Qnil;
 }
 
-void Init_Drawable(VALUE rb_module) {
-    rb_mDrawable = rb_define_module_under(rb_module, "Drawable");
+/* Document-module: SFML::Drawable
+ * A mixin for anything that can be drawn to a render target (RenderWindow,
+ * RenderTexture -- both include RenderTarget -- or a legacy Target) via
+ * #draw(target, state).
+ */
+void Init_Drawable(VALUE rb_mSFML) {
+    rb_mDrawable = rb_define_module_under(rb_mSFML, "Drawable");
 
     rb_define_method(rb_mDrawable, "draw", Drawable_draw, 2);
 }