ruby2d 0.9.5 → 0.10.0

data/assets/include/SDL2/close_code.h

@@ -1,6 +1,6 @@
 /*
   Simple DirectMedia Layer
-  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

data/ext/ruby2d/extconf.rb

@@ -113,7 +113,7 @@ else
     add_flags(:ld, "#{ldir}/libjpeg.a #{ldir}/libpng16.a #{ldir}/libtiff.a #{ldir}/libwebp.a")
     add_flags(:ld, "#{ldir}/libmpg123.a #{ldir}/libogg.a #{ldir}/libFLAC.a #{ldir}/libvorbis.a #{ldir}/libvorbisfile.a")
     add_flags(:ld, "#{ldir}/libfreetype.a")
-    add_flags(:ld, "-Wl,-framework,Cocoa -Wl,-framework,ForceFeedback")
+    add_flags(:ld, "-Wl,-framework,Cocoa -Wl,-framework,GameController -Wl,-framework,ForceFeedback")
 
   when :linux, :linux_rpi
     check_sdl_linux

data/ext/ruby2d/gl.c

@@ -392,6 +392,23 @@ void R2D_GL_DrawSprite(R2D_Sprite *spr) {
 }
 
 
+/*
+ * Draw a tile
+ */
+void R2D_GL_DrawTile(R2D_Image *img, int x, int y, int tw, int th, GLfloat tx1, GLfloat ty1, GLfloat tx2,
+  GLfloat ty2, GLfloat tx3, GLfloat ty3, GLfloat tx4, GLfloat ty4) {
+  #if GLES
+    R2D_GLES_DrawTile(img, x, y, tw, th, tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4);
+  #else
+    if (R2D_GL2) {
+      R2D_GL2_DrawTile(img, x, y, tw, th, tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4);
+    } else {
+      R2D_GL3_DrawTile(img, x, y, tw, th, tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4);
+    }
+  #endif
+}
+
+
 /*
  * Draw text
  */

data/ext/ruby2d/gl2.c

@@ -130,6 +130,21 @@ void R2D_GL2_DrawSprite(R2D_Sprite *spr) {
 }
 
 
+/*
+ * Draw a tile
+ */
+void R2D_GL2_DrawTile(R2D_Image *img, int x, int y, int tw, int th, GLfloat tx1, GLfloat ty1, GLfloat tx2,
+GLfloat ty2, GLfloat tx3, GLfloat ty3, GLfloat tx4, GLfloat ty4) {
+  R2D_GL2_DrawTexture(
+    x, y, tw, th,
+    img->rotate, img->rx, img->ry,
+    img->color.r, img->color.g, img->color.b, img->color.a,
+    tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4,
+    img->texture_id
+  );
+}
+
+
 /*
  * Draw text
  */

data/ext/ruby2d/gl3.c

@@ -332,6 +332,21 @@ void R2D_GL3_DrawSprite(R2D_Sprite *spr) {
 }
 
 
+/*
+ * Draw a tile
+ */
+void R2D_GL3_DrawTile(R2D_Image *img, int x, int y, int tw, int th, GLfloat tx1, GLfloat ty1, GLfloat tx2,
+GLfloat ty2, GLfloat tx3, GLfloat ty3, GLfloat tx4, GLfloat ty4) {
+  R2D_GL3_DrawTexture(
+    x, y, tw, th,
+    img->rotate, img->rx, img->ry,
+    img->color.r, img->color.g, img->color.b, img->color.a,
+    tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4,
+    img->texture_id
+  );
+}
+
+
 /*
  * Draw text
  */

data/ext/ruby2d/gles.c

@@ -292,6 +292,21 @@ void R2D_GLES_DrawSprite(R2D_Sprite *spr) {
 }
 
 
+/*
+ * Draw a tile
+ */
+void R2D_GLES_DrawTile(R2D_Image *img, int x, int y, int tw, int th, GLfloat tx1, GLfloat ty1, GLfloat tx2,
+GLfloat ty2, GLfloat tx3, GLfloat ty3, GLfloat tx4, GLfloat ty4) {
+  R2D_GLES_DrawTexture(
+    x, y, tw, th,
+    img->rotate, img->rx, img->ry,
+    img->color.r, img->color.g, img->color.b, img->color.a,
+    tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4,
+    img->texture_id
+  );
+}
+
+
 /*
  * Draw text
  */

data/ext/ruby2d/music.c

@@ -33,6 +33,11 @@ R2D_Music *R2D_CreateMusic(const char *path) {
   // Initialize values
   mus->path = path;
 
+  // Calculate the length of music by creating a temporary R2D_Sound object
+  R2D_Sound *snd = R2D_CreateSound(path);
+  mus->length = R2D_GetSoundLength(snd);
+  R2D_FreeSound(snd);
+
   return mus;
 }
 
@@ -104,6 +109,14 @@ void R2D_FadeOutMusic(int ms) {
 }
 
 
+/*
+ * Get the length of the music in seconds
+ */
+int R2D_GetMusicLength(R2D_Music *mus) {
+  return mus->length;
+}
+
+
 /*
  * Free the music
  */

data/ext/ruby2d/ruby2d.c

@@ -166,38 +166,84 @@ static R_VAL ruby2d_ext_base_path(R_VAL self) {
 
 
 /*
- * Ruby2D::Triangle#ext_render
+ * Ruby2D::Pixel#self.ext_draw
  */
 #if MRUBY
-static R_VAL ruby2d_triangle_ext_render(mrb_state* mrb, R_VAL self) {
+static R_VAL ruby2d_pixel_ext_draw(mrb_state* mrb, R_VAL self) {
+  mrb_value a;
+  mrb_get_args(mrb, "o", &a);
 #else
-static R_VAL ruby2d_triangle_ext_render(R_VAL self) {
+static R_VAL ruby2d_pixel_ext_draw(R_VAL self, R_VAL a) {
 #endif
-  R_VAL c1 = r_iv_get(self, "@c1");
-  R_VAL c2 = r_iv_get(self, "@c2");
-  R_VAL c3 = r_iv_get(self, "@c3");
+  // `a` is the array representing the pixel
+
+  R2D_DrawQuad(
+    NUM2DBL(r_ary_entry(a,  0)),  // x1
+    NUM2DBL(r_ary_entry(a,  1)),  // y1
+    NUM2DBL(r_ary_entry(a,  8)),  // color
+    NUM2DBL(r_ary_entry(a,  9)),  // color
+    NUM2DBL(r_ary_entry(a, 10)),  // color
+    NUM2DBL(r_ary_entry(a, 11)),  // color
+
+    NUM2DBL(r_ary_entry(a,  2)),  // x2
+    NUM2DBL(r_ary_entry(a,  3)),  // y2
+    NUM2DBL(r_ary_entry(a,  8)),  // color
+    NUM2DBL(r_ary_entry(a,  9)),  // color
+    NUM2DBL(r_ary_entry(a, 10)),  // color
+    NUM2DBL(r_ary_entry(a, 11)),  // color
+
+    NUM2DBL(r_ary_entry(a,  4)),  // x3
+    NUM2DBL(r_ary_entry(a,  5)),  // y3
+    NUM2DBL(r_ary_entry(a,  8)),  // color
+    NUM2DBL(r_ary_entry(a,  9)),  // color
+    NUM2DBL(r_ary_entry(a, 10)),  // color
+    NUM2DBL(r_ary_entry(a, 11)),  // color
+
+    NUM2DBL(r_ary_entry(a,  6)),  // x4
+    NUM2DBL(r_ary_entry(a,  7)),  // y4
+    NUM2DBL(r_ary_entry(a,  8)),  // color
+    NUM2DBL(r_ary_entry(a,  9)),  // color
+    NUM2DBL(r_ary_entry(a, 10)),  // color
+    NUM2DBL(r_ary_entry(a, 11))   // color
+  );
+
+  return R_NIL;
+}
+
+
+/*
+ * Ruby2D::Triangle#self.ext_draw
+ */
+#if MRUBY
+static R_VAL ruby2d_triangle_ext_draw(mrb_state* mrb, R_VAL self) {
+  mrb_value a;
+  mrb_get_args(mrb, "o", &a);
+#else
+static R_VAL ruby2d_triangle_ext_draw(R_VAL self, R_VAL a) {
+#endif
+  // `a` is the array representing the triangle
 
   R2D_DrawTriangle(
-    NUM2DBL(r_iv_get(self, "@x1")),
-    NUM2DBL(r_iv_get(self, "@y1")),
-    NUM2DBL(r_iv_get(c1, "@r")),
-    NUM2DBL(r_iv_get(c1, "@g")),
-    NUM2DBL(r_iv_get(c1, "@b")),
-    NUM2DBL(r_iv_get(c1, "@a")),
-
-    NUM2DBL(r_iv_get(self, "@x2")),
-    NUM2DBL(r_iv_get(self, "@y2")),
-    NUM2DBL(r_iv_get(c2, "@r")),
-    NUM2DBL(r_iv_get(c2, "@g")),
-    NUM2DBL(r_iv_get(c2, "@b")),
-    NUM2DBL(r_iv_get(c2, "@a")),
-
-    NUM2DBL(r_iv_get(self, "@x3")),
-    NUM2DBL(r_iv_get(self, "@y3")),
-    NUM2DBL(r_iv_get(c3, "@r")),
-    NUM2DBL(r_iv_get(c3, "@g")),
-    NUM2DBL(r_iv_get(c3, "@b")),
-    NUM2DBL(r_iv_get(c3, "@a"))
+    NUM2DBL(r_ary_entry(a,  0)),  // x1
+    NUM2DBL(r_ary_entry(a,  1)),  // y1
+    NUM2DBL(r_ary_entry(a,  2)),  // c1 red
+    NUM2DBL(r_ary_entry(a,  3)),  // c1 green
+    NUM2DBL(r_ary_entry(a,  4)),  // c1 blue
+    NUM2DBL(r_ary_entry(a,  5)),  // c1 alpha
+
+    NUM2DBL(r_ary_entry(a,  6)),  // x2
+    NUM2DBL(r_ary_entry(a,  7)),  // y2
+    NUM2DBL(r_ary_entry(a,  8)),  // c2 red
+    NUM2DBL(r_ary_entry(a,  9)),  // c2 green
+    NUM2DBL(r_ary_entry(a, 10)),  // c2 blue
+    NUM2DBL(r_ary_entry(a, 11)),  // c2 alpha
+
+    NUM2DBL(r_ary_entry(a, 12)),  // x3
+    NUM2DBL(r_ary_entry(a, 13)),  // y3
+    NUM2DBL(r_ary_entry(a, 14)),  // c3 red
+    NUM2DBL(r_ary_entry(a, 15)),  // c3 green
+    NUM2DBL(r_ary_entry(a, 16)),  // c3 blue
+    NUM2DBL(r_ary_entry(a, 17))  // c3 alpha
   );
 
   return R_NIL;
@@ -205,46 +251,45 @@ static R_VAL ruby2d_triangle_ext_render(R_VAL self) {
 
 
 /*
- * Ruby2D::Quad#ext_render
+ * Ruby2D::Quad#self.ext_draw
  */
 #if MRUBY
-static R_VAL ruby2d_quad_ext_render(mrb_state* mrb, R_VAL self) {
+static R_VAL ruby2d_quad_ext_draw(mrb_state* mrb, R_VAL self) {
+  mrb_value a;
+  mrb_get_args(mrb, "o", &a);
 #else
-static R_VAL ruby2d_quad_ext_render(R_VAL self) {
+static R_VAL ruby2d_quad_ext_draw(R_VAL self, R_VAL a) {
 #endif
-  R_VAL c1 = r_iv_get(self, "@c1");
-  R_VAL c2 = r_iv_get(self, "@c2");
-  R_VAL c3 = r_iv_get(self, "@c3");
-  R_VAL c4 = r_iv_get(self, "@c4");
+  // `a` is the array representing the quad
 
   R2D_DrawQuad(
-    NUM2DBL(r_iv_get(self, "@x1")),
-    NUM2DBL(r_iv_get(self, "@y1")),
-    NUM2DBL(r_iv_get(c1, "@r")),
-    NUM2DBL(r_iv_get(c1, "@g")),
-    NUM2DBL(r_iv_get(c1, "@b")),
-    NUM2DBL(r_iv_get(c1, "@a")),
-
-    NUM2DBL(r_iv_get(self, "@x2")),
-    NUM2DBL(r_iv_get(self, "@y2")),
-    NUM2DBL(r_iv_get(c2, "@r")),
-    NUM2DBL(r_iv_get(c2, "@g")),
-    NUM2DBL(r_iv_get(c2, "@b")),
-    NUM2DBL(r_iv_get(c2, "@a")),
-
-    NUM2DBL(r_iv_get(self, "@x3")),
-    NUM2DBL(r_iv_get(self, "@y3")),
-    NUM2DBL(r_iv_get(c3, "@r")),
-    NUM2DBL(r_iv_get(c3, "@g")),
-    NUM2DBL(r_iv_get(c3, "@b")),
-    NUM2DBL(r_iv_get(c3, "@a")),
-
-    NUM2DBL(r_iv_get(self, "@x4")),
-    NUM2DBL(r_iv_get(self, "@y4")),
-    NUM2DBL(r_iv_get(c4, "@r")),
-    NUM2DBL(r_iv_get(c4, "@g")),
-    NUM2DBL(r_iv_get(c4, "@b")),
-    NUM2DBL(r_iv_get(c4, "@a"))
+    NUM2DBL(r_ary_entry(a,  0)),  // x1
+    NUM2DBL(r_ary_entry(a,  1)),  // y1
+    NUM2DBL(r_ary_entry(a,  2)),  // c1 red
+    NUM2DBL(r_ary_entry(a,  3)),  // c1 green
+    NUM2DBL(r_ary_entry(a,  4)),  // c1 blue
+    NUM2DBL(r_ary_entry(a,  5)),  // c1 alpha
+
+    NUM2DBL(r_ary_entry(a,  6)),  // x2
+    NUM2DBL(r_ary_entry(a,  7)),  // y2
+    NUM2DBL(r_ary_entry(a,  8)),  // c2 red
+    NUM2DBL(r_ary_entry(a,  9)),  // c2 green
+    NUM2DBL(r_ary_entry(a, 10)),  // c2 blue
+    NUM2DBL(r_ary_entry(a, 11)),  // c2 alpha
+
+    NUM2DBL(r_ary_entry(a, 12)),  // x3
+    NUM2DBL(r_ary_entry(a, 13)),  // y3
+    NUM2DBL(r_ary_entry(a, 14)),  // c3 red
+    NUM2DBL(r_ary_entry(a, 15)),  // c3 green
+    NUM2DBL(r_ary_entry(a, 16)),  // c3 blue
+    NUM2DBL(r_ary_entry(a, 17)),  // c3 alpha
+
+    NUM2DBL(r_ary_entry(a, 18)),  // x4
+    NUM2DBL(r_ary_entry(a, 19)),  // y4
+    NUM2DBL(r_ary_entry(a, 20)),  // c4 red
+    NUM2DBL(r_ary_entry(a, 21)),  // c4 green
+    NUM2DBL(r_ary_entry(a, 22)),  // c4 blue
+    NUM2DBL(r_ary_entry(a, 23))   // c4 alpha
   );
 
   return R_NIL;
@@ -252,44 +297,43 @@ static R_VAL ruby2d_quad_ext_render(R_VAL self) {
 
 
 /*
- * Ruby2D::Line#ext_render
+ * Ruby2D::Line#self.ext_draw
  */
 #if MRUBY
-static R_VAL ruby2d_line_ext_render(mrb_state* mrb, R_VAL self) {
+static R_VAL ruby2d_line_ext_draw(mrb_state* mrb, R_VAL self) {
+  mrb_value a;
+  mrb_get_args(mrb, "o", &a);
 #else
-static R_VAL ruby2d_line_ext_render(R_VAL self) {
+static R_VAL ruby2d_line_ext_draw(R_VAL self, R_VAL a) {
 #endif
-  R_VAL c1 = r_iv_get(self, "@c1");
-  R_VAL c2 = r_iv_get(self, "@c2");
-  R_VAL c3 = r_iv_get(self, "@c3");
-  R_VAL c4 = r_iv_get(self, "@c4");
+  // `a` is the array representing the line
 
   R2D_DrawLine(
-    NUM2DBL(r_iv_get(self, "@x1")),
-    NUM2DBL(r_iv_get(self, "@y1")),
-    NUM2DBL(r_iv_get(self, "@x2")),
-    NUM2DBL(r_iv_get(self, "@y2")),
-    NUM2DBL(r_iv_get(self, "@width")),
-
-    NUM2DBL(r_iv_get(c1, "@r")),
-    NUM2DBL(r_iv_get(c1, "@g")),
-    NUM2DBL(r_iv_get(c1, "@b")),
-    NUM2DBL(r_iv_get(c1, "@a")),
-
-    NUM2DBL(r_iv_get(c2, "@r")),
-    NUM2DBL(r_iv_get(c2, "@g")),
-    NUM2DBL(r_iv_get(c2, "@b")),
-    NUM2DBL(r_iv_get(c2, "@a")),
-
-    NUM2DBL(r_iv_get(c3, "@r")),
-    NUM2DBL(r_iv_get(c3, "@g")),
-    NUM2DBL(r_iv_get(c3, "@b")),
-    NUM2DBL(r_iv_get(c3, "@a")),
-
-    NUM2DBL(r_iv_get(c4, "@r")),
-    NUM2DBL(r_iv_get(c4, "@g")),
-    NUM2DBL(r_iv_get(c4, "@b")),
-    NUM2DBL(r_iv_get(c4, "@a"))
+    NUM2DBL(r_ary_entry(a,  0)),  // x1
+    NUM2DBL(r_ary_entry(a,  1)),  // y1
+    NUM2DBL(r_ary_entry(a,  2)),  // x2
+    NUM2DBL(r_ary_entry(a,  3)),  // y2
+    NUM2DBL(r_ary_entry(a,  4)),  // width
+
+    NUM2DBL(r_ary_entry(a,  5)),  // c1 red
+    NUM2DBL(r_ary_entry(a,  6)),  // c1 green
+    NUM2DBL(r_ary_entry(a,  7)),  // c1 blue
+    NUM2DBL(r_ary_entry(a,  8)),  // c1 alpha
+
+    NUM2DBL(r_ary_entry(a,  9)),  // c2 red
+    NUM2DBL(r_ary_entry(a, 10)),  // c2 green
+    NUM2DBL(r_ary_entry(a, 11)),  // c2 blue
+    NUM2DBL(r_ary_entry(a, 12)),  // c2 alpha
+
+    NUM2DBL(r_ary_entry(a, 13)),  // c3 red
+    NUM2DBL(r_ary_entry(a, 14)),  // c3 green
+    NUM2DBL(r_ary_entry(a, 15)),  // c3 blue
+    NUM2DBL(r_ary_entry(a, 16)),  // c3 alpha
+
+    NUM2DBL(r_ary_entry(a, 17)),  // c4 red
+    NUM2DBL(r_ary_entry(a, 18)),  // c4 green
+    NUM2DBL(r_ary_entry(a, 19)),  // c4 blue
+    NUM2DBL(r_ary_entry(a, 20))   // c4 alpha
   );
 
   return R_NIL;
@@ -297,24 +341,26 @@ static R_VAL ruby2d_line_ext_render(R_VAL self) {
 
 
 /*
- * Ruby2D::Circle#ext_render
+ * Ruby2D::Circle#self.ext_draw
  */
 #if MRUBY
-static R_VAL ruby2d_circle_ext_render(mrb_state* mrb, R_VAL self) {
+static R_VAL ruby2d_circle_ext_draw(mrb_state* mrb, R_VAL self) {
+  mrb_value a;
+  mrb_get_args(mrb, "o", &a);
 #else
-static R_VAL ruby2d_circle_ext_render(R_VAL self) {
+static R_VAL ruby2d_circle_ext_draw(R_VAL self, R_VAL a) {
 #endif
-  R_VAL c = r_iv_get(self, "@color");
+  // `a` is the array representing the circle
 
   R2D_DrawCircle(
-    NUM2DBL(r_iv_get(self, "@x")),
-    NUM2DBL(r_iv_get(self, "@y")),
-    NUM2DBL(r_iv_get(self, "@radius")),
-    NUM2DBL(r_iv_get(self, "@sectors")),
-    NUM2DBL(r_iv_get(c, "@r")),
-    NUM2DBL(r_iv_get(c, "@g")),
-    NUM2DBL(r_iv_get(c, "@b")),
-    NUM2DBL(r_iv_get(c, "@a"))
+    NUM2DBL(r_ary_entry(a, 0)),  // x
+    NUM2DBL(r_ary_entry(a, 1)),  // y
+    NUM2DBL(r_ary_entry(a, 2)),  // radius
+    NUM2DBL(r_ary_entry(a, 3)),  // sectors
+    NUM2DBL(r_ary_entry(a, 4)),  // red
+    NUM2DBL(r_ary_entry(a, 5)),  // green
+    NUM2DBL(r_ary_entry(a, 6)),  // blue
+    NUM2DBL(r_ary_entry(a, 7))   // alpha
   );
 
   return R_NIL;
@@ -348,34 +394,36 @@ static R_VAL ruby2d_image_ext_init(R_VAL self, R_VAL path) {
 
 
 /*
- * Ruby2D::Image#ext_render
+ * Ruby2D::Image#self.ext_draw
  */
 #if MRUBY
-static R_VAL ruby2d_image_ext_render(mrb_state* mrb, R_VAL self) {
+static R_VAL ruby2d_image_ext_draw(mrb_state* mrb, R_VAL self) {
+  mrb_value a;
+  mrb_get_args(mrb, "o", &a);
 #else
-static R_VAL ruby2d_image_ext_render(R_VAL self) {
+static R_VAL ruby2d_image_ext_draw(R_VAL self, R_VAL a) {
 #endif
+  // `a` is the array representing the image
+
   R2D_Image *img;
-  r_data_get_struct(self, "@data", &image_data_type, R2D_Image, img);
+  r_data_get_struct(r_ary_entry(a, 0), "@data", &image_data_type, R2D_Image, img);
 
-  img->x = NUM2DBL(r_iv_get(self, "@x"));
-  img->y = NUM2DBL(r_iv_get(self, "@y"));
+  img->x = NUM2DBL(r_ary_entry(a, 1));
+  img->y = NUM2DBL(r_ary_entry(a, 2));
 
-  R_VAL w = r_iv_get(self, "@width");
-  R_VAL h = r_iv_get(self, "@height");
+  R_VAL w = r_ary_entry(a, 3);
+  R_VAL h = r_ary_entry(a, 4);
   if (r_test(w)) img->width  = NUM2INT(w);
   if (r_test(h)) img->height = NUM2INT(h);
 
-  R2D_RotateImage(img, NUM2DBL(r_iv_get(self, "@rotate")), R2D_CENTER);
+  R2D_RotateImage(img, NUM2DBL(r_ary_entry(a, 5)), R2D_CENTER);
 
-  R_VAL c = r_iv_get(self, "@color");
-  img->color.r = NUM2DBL(r_iv_get(c, "@r"));
-  img->color.g = NUM2DBL(r_iv_get(c, "@g"));
-  img->color.b = NUM2DBL(r_iv_get(c, "@b"));
-  img->color.a = NUM2DBL(r_iv_get(c, "@a"));
+  img->color.r = NUM2DBL(r_ary_entry(a, 6));
+  img->color.g = NUM2DBL(r_ary_entry(a, 7));
+  img->color.b = NUM2DBL(r_ary_entry(a, 8));
+  img->color.a = NUM2DBL(r_ary_entry(a, 9));
 
   R2D_DrawImage(img);
-
   return R_NIL;
 }
 
@@ -416,45 +464,45 @@ static R_VAL ruby2d_sprite_ext_init(R_VAL self, R_VAL path) {
 
 
 /*
- * Ruby2D::Sprite#ext_render
+ * Ruby2D::Sprite#ext_draw
  */
 #if MRUBY
-static R_VAL ruby2d_sprite_ext_render(mrb_state* mrb, R_VAL self) {
+static R_VAL ruby2d_sprite_ext_draw(mrb_state* mrb, R_VAL self) {
+  mrb_value a;
+  mrb_get_args(mrb, "o", &a);
 #else
-static R_VAL ruby2d_sprite_ext_render(R_VAL self) {
+static R_VAL ruby2d_sprite_ext_draw(R_VAL self, R_VAL a) {
 #endif
-  r_funcall(self, "update", 0);
+  // `a` is the array representing the sprite
 
   R2D_Sprite *spr;
-  r_data_get_struct(self, "@data", &sprite_data_type, R2D_Sprite, spr);
+  r_data_get_struct(r_ary_entry(a, 0), "@data", &sprite_data_type, R2D_Sprite, spr);
 
-  spr->x = NUM2DBL(r_iv_get(self, "@flip_x"));
-  spr->y = NUM2DBL(r_iv_get(self, "@flip_y"));
+  spr->x = NUM2DBL(r_ary_entry(a, 1));
+  spr->y = NUM2DBL(r_ary_entry(a, 2));
 
-  R_VAL w = r_iv_get(self, "@flip_width");
+  R_VAL w = r_ary_entry(a, 3);
   if (r_test(w)) spr->width = NUM2DBL(w);
 
-  R_VAL h = r_iv_get(self, "@flip_height");
+  R_VAL h = r_ary_entry(a, 4);
   if (r_test(h)) spr->height = NUM2DBL(h);
 
-  R2D_RotateSprite(spr, NUM2DBL(r_iv_get(self, "@rotate")), R2D_CENTER);
-
-  R_VAL c = r_iv_get(self, "@color");
-  spr->color.r = NUM2DBL(r_iv_get(c, "@r"));
-  spr->color.g = NUM2DBL(r_iv_get(c, "@g"));
-  spr->color.b = NUM2DBL(r_iv_get(c, "@b"));
-  spr->color.a = NUM2DBL(r_iv_get(c, "@a"));
+  R2D_RotateSprite(spr, NUM2DBL(r_ary_entry(a, 5)), R2D_CENTER);
 
   R2D_ClipSprite(
     spr,
-    NUM2INT(r_iv_get(self, "@clip_x")),
-    NUM2INT(r_iv_get(self, "@clip_y")),
-    NUM2INT(r_iv_get(self, "@clip_width")),
-    NUM2INT(r_iv_get(self, "@clip_height"))
+    NUM2INT(r_ary_entry(a, 6)),
+    NUM2INT(r_ary_entry(a, 7)),
+    NUM2INT(r_ary_entry(a, 8)),
+    NUM2INT(r_ary_entry(a, 9))
   );
 
-  R2D_DrawSprite(spr);
+  spr->color.r = NUM2DBL(r_ary_entry(a, 10));
+  spr->color.g = NUM2DBL(r_ary_entry(a, 11));
+  spr->color.b = NUM2DBL(r_ary_entry(a, 12));
+  spr->color.a = NUM2DBL(r_ary_entry(a, 13));
 
+  R2D_DrawSprite(spr);
   return R_NIL;
 }
 
@@ -472,6 +520,50 @@ static void free_sprite(R2D_Sprite *spr) {
 }
 
 
+/*
+ * Ruby2D::Tileset#ext_init
+ * Initialize tileset data
+ */
+static R_VAL ruby2d_tileset_ext_init(R_VAL self, R_VAL path) {
+  R2D_Image *img = R2D_CreateImage(RSTRING_PTR(path));
+  if (!img) return R_FALSE;
+
+  // Get width and height from Ruby class. If set, use it, else choose the
+  // native dimensions of the image.
+  R_VAL w = r_iv_get(self, "@width");
+  R_VAL h = r_iv_get(self, "@height");
+  r_iv_set(self, "@width" , r_test(w) ? w : INT2NUM(img->width));
+  r_iv_set(self, "@height", r_test(h) ? h : INT2NUM(img->height));
+  r_iv_set(self, "@data", r_data_wrap_struct(image, img));
+
+  return R_TRUE;
+}
+
+
+/*
+ * Ruby2D::Tileset#ext_draw
+ * Draws a single tile, will be called once per individual tile to draw
+ */
+static R_VAL ruby2d_tileset_ext_draw(R_VAL self, R_VAL a) {
+  // `a` is the array representing the tileset
+
+  R2D_Image *img;
+  r_data_get_struct(r_ary_entry(a, 0), "@data", &image_data_type, R2D_Image, img);
+
+  int tw = NUM2INT(r_ary_entry(a, 1));
+  int th = NUM2INT(r_ary_entry(a, 2));
+  int padding = NUM2INT(r_ary_entry(a, 3));
+  int spacing = NUM2INT(r_ary_entry(a, 4));
+  int tx = NUM2INT(r_ary_entry(a, 5));
+  int ty = NUM2INT(r_ary_entry(a, 6));
+  int x = NUM2INT(r_ary_entry(a, 7));
+  int y = NUM2INT(r_ary_entry(a, 8));
+
+  R2D_DrawTile(img, tw, th, padding, spacing, tx, ty, x, y);
+  return R_NIL;
+}
+
+
 /*
  * Ruby2D::Text#ext_init
  * Initialize text structure data
@@ -525,29 +617,31 @@ static R_VAL ruby2d_text_ext_set(R_VAL self, R_VAL text) {
 
 
 /*
- * Ruby2D::Text#ext_render
+ * Ruby2D::Text#self.ext_draw
  */
 #if MRUBY
-static R_VAL ruby2d_text_ext_render(mrb_state* mrb, R_VAL self) {
+static R_VAL ruby2d_text_ext_draw(mrb_state* mrb, R_VAL self) {
+  mrb_value a;
+  mrb_get_args(mrb, "o", &a);
 #else
-static R_VAL ruby2d_text_ext_render(R_VAL self) {
+static R_VAL ruby2d_text_ext_draw(R_VAL self, R_VAL a) {
 #endif
+  // `a` is the array representing the text
+
   R2D_Text *txt;
-  r_data_get_struct(self, "@data", &text_data_type, R2D_Text, txt);
+  r_data_get_struct(r_ary_entry(a, 0), "@data", &text_data_type, R2D_Text, txt);
 
-  txt->x = NUM2DBL(r_iv_get(self, "@x"));
-  txt->y = NUM2DBL(r_iv_get(self, "@y"));
+  txt->x = NUM2DBL(r_ary_entry(a, 1));
+  txt->y = NUM2DBL(r_ary_entry(a, 2));
 
-  R2D_RotateText(txt, NUM2DBL(r_iv_get(self, "@rotate")), R2D_CENTER);
+  R2D_RotateText(txt, NUM2DBL(r_ary_entry(a, 3)), R2D_CENTER);
 
-  R_VAL c = r_iv_get(self, "@color");
-  txt->color.r = NUM2DBL(r_iv_get(c, "@r"));
-  txt->color.g = NUM2DBL(r_iv_get(c, "@g"));
-  txt->color.b = NUM2DBL(r_iv_get(c, "@b"));
-  txt->color.a = NUM2DBL(r_iv_get(c, "@a"));
+  txt->color.r = NUM2DBL(r_ary_entry(a, 4));
+  txt->color.g = NUM2DBL(r_ary_entry(a, 5));
+  txt->color.b = NUM2DBL(r_ary_entry(a, 6));
+  txt->color.a = NUM2DBL(r_ary_entry(a, 7));
 
   R2D_DrawText(txt);
-
   return R_NIL;
 }
 
@@ -598,6 +692,16 @@ static R_VAL ruby2d_sound_ext_play(R_VAL self) {
 }
 
 
+/*
+ * Ruby2D::Sound#ext_length
+ */
+static R_VAL ruby2d_sound_ext_length(R_VAL self) {
+  R2D_Sound *snd;
+  r_data_get_struct(self, "@data", &sound_data_type, R2D_Sound, snd);
+  return INT2NUM(R2D_GetSoundLength(snd));
+}
+
+
 /*
  * Free sound structure attached to Ruby 2D `Sound` class
  */
@@ -725,6 +829,16 @@ static R_VAL ruby2d_music_ext_fadeout(R_VAL self, R_VAL ms) {
 }
 
 
+/*
+ * Ruby2D::Music#ext_length
+ */
+static R_VAL ruby2d_music_ext_length(R_VAL self) {
+  R2D_Music *ms;
+  r_data_get_struct(self, "@data", &music_data_type, R2D_Music, ms);
+  return INT2NUM(R2D_GetMusicLength(ms));
+}
+
+
 /*
  * Free music structure attached to Ruby 2D `Music` class
  */
@@ -951,8 +1065,11 @@ static void render() {
   // Switch on each object type
   for (int i = 0; i < num_objects; ++i) {
     R_VAL el = r_ary_entry(objects, i);
-    r_funcall(el, "ext_render", 0);
+    r_funcall(el, "render", 0);  // call the object's `render` function
   }
+
+  // Call render proc, `window.render`
+  r_funcall(ruby2d_window, "render_callback", 0);
 }
 
 
@@ -1125,29 +1242,35 @@ void Init_ruby2d() {
   // Ruby2D#self.ext_base_path
   r_define_class_method(ruby2d_module, "ext_base_path", ruby2d_ext_base_path, r_args_none);
 
+  // Ruby2D::Pixel
+  R_CLASS ruby2d_pixel_class = r_define_class(ruby2d_module, "Pixel");
+
+  // Ruby2D::Pixel#self.ext_draw
+  r_define_class_method(ruby2d_pixel_class, "ext_draw", ruby2d_pixel_ext_draw, r_args_req(1));
+
   // Ruby2D::Triangle
   R_CLASS ruby2d_triangle_class = r_define_class(ruby2d_module, "Triangle");
 
-  // Ruby2D::Triangle#ext_render
-  r_define_method(ruby2d_triangle_class, "ext_render", ruby2d_triangle_ext_render, r_args_none);
+  // Ruby2D::Triangle#self.ext_draw
+  r_define_class_method(ruby2d_triangle_class, "ext_draw", ruby2d_triangle_ext_draw, r_args_req(1));
 
   // Ruby2D::Quad
   R_CLASS ruby2d_quad_class = r_define_class(ruby2d_module, "Quad");
 
-  // Ruby2D::Quad#ext_render
-  r_define_method(ruby2d_quad_class, "ext_render", ruby2d_quad_ext_render, r_args_none);
+  // Ruby2D::Quad#self.ext_draw
+  r_define_class_method(ruby2d_quad_class, "ext_draw", ruby2d_quad_ext_draw, r_args_req(1));
 
   // Ruby2D::Line
   R_CLASS ruby2d_line_class = r_define_class(ruby2d_module, "Line");
 
-  // Ruby2D::Line#ext_render
-  r_define_method(ruby2d_line_class, "ext_render", ruby2d_line_ext_render, r_args_none);
+  // Ruby2D::Line#self.ext_draw
+  r_define_class_method(ruby2d_line_class, "ext_draw", ruby2d_line_ext_draw, r_args_req(1));
 
   // Ruby2D::Circle
   R_CLASS ruby2d_circle_class = r_define_class(ruby2d_module, "Circle");
 
-  // Ruby2D::Circle#ext_render
-  r_define_method(ruby2d_circle_class, "ext_render", ruby2d_circle_ext_render, r_args_none);
+  // Ruby2D::Circle#self.ext_draw
+  r_define_class_method(ruby2d_circle_class, "ext_draw", ruby2d_circle_ext_draw, r_args_req(1));
 
   // Ruby2D::Image
   R_CLASS ruby2d_image_class = r_define_class(ruby2d_module, "Image");
@@ -1155,8 +1278,8 @@ void Init_ruby2d() {
   // Ruby2D::Image#ext_init
   r_define_method(ruby2d_image_class, "ext_init", ruby2d_image_ext_init, r_args_req(1));
 
-  // Ruby2D::Image#ext_render
-  r_define_method(ruby2d_image_class, "ext_render", ruby2d_image_ext_render, r_args_none);
+  // Ruby2D::Image#self.ext_draw
+  r_define_class_method(ruby2d_image_class, "ext_draw", ruby2d_image_ext_draw, r_args_req(1));
 
   // Ruby2D::Sprite
   R_CLASS ruby2d_sprite_class = r_define_class(ruby2d_module, "Sprite");
@@ -1164,8 +1287,17 @@ void Init_ruby2d() {
   // Ruby2D::Sprite#ext_init
   r_define_method(ruby2d_sprite_class, "ext_init", ruby2d_sprite_ext_init, r_args_req(1));
 
-  // Ruby2D::Sprite#ext_render
-  r_define_method(ruby2d_sprite_class, "ext_render", ruby2d_sprite_ext_render, r_args_none);
+  // Ruby2D::Sprite#self.ext_draw
+  r_define_class_method(ruby2d_sprite_class, "ext_draw", ruby2d_sprite_ext_draw, r_args_req(1));
+
+  // Ruby2D::Tileset
+  R_CLASS ruby2d_tileset_class = r_define_class(ruby2d_module, "Tileset");
+
+  // Ruby2D::Tileset#ext_init
+  r_define_method(ruby2d_tileset_class, "ext_init", ruby2d_tileset_ext_init, r_args_req(1));
+
+  // Ruby2D::Tileset#self.ext_draw
+  r_define_class_method(ruby2d_tileset_class, "ext_draw", ruby2d_tileset_ext_draw, r_args_req(1));
 
   // Ruby2D::Text
   R_CLASS ruby2d_text_class = r_define_class(ruby2d_module, "Text");
@@ -1176,8 +1308,8 @@ void Init_ruby2d() {
   // Ruby2D::Text#ext_set
   r_define_method(ruby2d_text_class, "ext_set", ruby2d_text_ext_set, r_args_req(1));
 
-  // Ruby2D::Text#ext_render
-  r_define_method(ruby2d_text_class, "ext_render", ruby2d_text_ext_render, r_args_none);
+  // Ruby2D::Text#self.ext_draw
+  r_define_class_method(ruby2d_text_class, "ext_draw", ruby2d_text_ext_draw, r_args_req(1));
 
   // Ruby2D::Sound
   R_CLASS ruby2d_sound_class = r_define_class(ruby2d_module, "Sound");
@@ -1188,6 +1320,9 @@ void Init_ruby2d() {
   // Ruby2D::Sound#ext_play
   r_define_method(ruby2d_sound_class, "ext_play", ruby2d_sound_ext_play, r_args_none);
 
+  // Ruby2D::Sound#ext_length
+  r_define_method(ruby2d_sound_class, "ext_length", ruby2d_sound_ext_length, r_args_none);
+
   // Ruby2D::Music
   R_CLASS ruby2d_music_class = r_define_class(ruby2d_module, "Music");
 
@@ -1215,6 +1350,9 @@ void Init_ruby2d() {
   // Ruby2D::Music#ext_fadeout
   r_define_method(ruby2d_music_class, "ext_fadeout", ruby2d_music_ext_fadeout, r_args_req(1));
 
+  // Ruby2D::Music#ext_length
+  r_define_method(ruby2d_music_class, "ext_length", ruby2d_music_ext_length, r_args_none);
+
   // Ruby2D::Window
   R_CLASS ruby2d_window_class = r_define_class(ruby2d_module, "Window");