ruby2d 0.10.0 → 0.11.2

data/ext/ruby2d/ruby2d.c

@@ -1,5 +1,9 @@
 // Native C extension for Ruby and MRuby
 
+#ifndef RUBY2D_IOS_TVOS
+#define RUBY2D_IOS_TVOS 0
+#endif
+
 // Ruby 2D includes
 #if RUBY2D_IOS_TVOS
 #else
@@ -59,6 +63,8 @@
   #define r_str_new(str)  mrb_str_new(mrb, str, strlen(str))
   #define r_test(val)  (mrb_test(val) == true)
   #define r_ary_entry(ary, pos)  mrb_ary_entry(ary, pos)
+  #define r_ary_new()  mrb_ary_new(mrb)
+  #define r_ary_push(self, val)  mrb_ary_push(mrb, self, val)
   #define r_data_wrap_struct(name, data)  mrb_obj_value(Data_Wrap_Struct(mrb, mrb->object_class, &name##_data_type, data))
   #define r_data_get_struct(self, var, mrb_type, rb_type, data)  Data_Get_Struct(mrb, r_iv_get(self, var), mrb_type, data)
   #define r_define_module(name)  mrb_define_module(mrb, name)
@@ -82,6 +88,8 @@
   #define r_str_new(str)  rb_str_new2(str)
   #define r_test(val)  (val != Qfalse && val != Qnil)
   #define r_ary_entry(ary, pos)  rb_ary_entry(ary, pos)
+  #define r_ary_new()  rb_ary_new()
+  #define r_ary_push(self, val)  rb_ary_push(self, val)
   #define r_data_wrap_struct(name, data)  Data_Wrap_Struct(rb_cObject, NULL, (free_##name), data)
   #define r_data_get_struct(self, var, mrb_type, rb_type, data)  Data_Get_Struct(r_iv_get(self, var), rb_type, data)
   #define r_define_module(name)  rb_define_module(name)
@@ -103,23 +111,11 @@
 static R_VAL ruby2d_window;
 
 // Ruby 2D native window
-static R2D_Window *window;
+static R2D_Window *ruby2d_c_window;
 
 
 // Method signatures and structures for Ruby 2D classes
 #if MRUBY
-  static void free_image(mrb_state *mrb, void *p_);
-  static const struct mrb_data_type image_data_type = {
-    "image", free_image
-  };
-  static void free_sprite(mrb_state *mrb, void *p_);
-  static const struct mrb_data_type sprite_data_type = {
-    "sprite", free_sprite
-  };
-  static void free_text(mrb_state *mrb, void *p_);
-  static const struct mrb_data_type text_data_type = {
-    "text", free_text
-  };
   static void free_sound(mrb_state *mrb, void *p_);
   static const struct mrb_data_type sound_data_type = {
     "sound", free_sound
@@ -128,12 +124,19 @@ static R2D_Window *window;
   static const struct mrb_data_type music_data_type = {
     "music", free_music
   };
+static void free_font(mrb_state *mrb, void *p_);
+  static const struct mrb_data_type font_data_type = {
+    "font", free_font
+  };
+static void free_surface(mrb_state *mrb, void *p_);
+  static const struct mrb_data_type surface_data_type = {
+    "surface", free_surface
+  };
 #else
-  static void free_image(R2D_Image *img);
-  static void free_sprite(R2D_Sprite *spr);
-  static void free_text(R2D_Text *txt);
   static void free_sound(R2D_Sound *snd);
   static void free_music(R2D_Music *mus);
+  static void free_font(TTF_Font *font);
+  static void free_surface(SDL_Surface *surface);
 #endif
 
 
@@ -141,7 +144,7 @@ static R2D_Window *window;
  * Function pointer to free the Ruby 2D native window
  */
 static void free_window() {
-  R2D_FreeWindow(window);
+  R2D_FreeWindow(ruby2d_c_window);
 }
 
 
@@ -368,350 +371,232 @@ static R_VAL ruby2d_circle_ext_draw(R_VAL self, R_VAL a) {
 
 
 /*
- * Ruby2D::Image#ext_init
- * Initialize image structure data
+ * Ruby2D::Image#ext_load_image
+ * Create an SDL surface from an image path, return the surface, width, and height
  */
 #if MRUBY
-static R_VAL ruby2d_image_ext_init(mrb_state* mrb, R_VAL self) {
+static R_VAL ruby2d_image_ext_load_image(mrb_state* mrb, R_VAL self) {
   mrb_value path;
   mrb_get_args(mrb, "o", &path);
 #else
-static R_VAL ruby2d_image_ext_init(R_VAL self, R_VAL path) {
-#endif
-  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::Image#self.ext_draw
- */
-#if MRUBY
-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_draw(R_VAL self, R_VAL a) {
+static R_VAL ruby2d_image_ext_load_image(R_VAL self, R_VAL path) {
 #endif
-  // `a` is the array representing the image
-
-  R2D_Image *img;
-  r_data_get_struct(r_ary_entry(a, 0), "@data", &image_data_type, R2D_Image, img);
+  R2D_Init();
 
-  img->x = NUM2DBL(r_ary_entry(a, 1));
-  img->y = NUM2DBL(r_ary_entry(a, 2));
+  R_VAL result = r_ary_new();
 
-  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);
+  SDL_Surface *surface = R2D_CreateImageSurface(RSTRING_PTR(path));
+  R2D_ImageConvertToRGB(surface);
 
-  R2D_RotateImage(img, NUM2DBL(r_ary_entry(a, 5)), R2D_CENTER);
+  r_ary_push(result, r_data_wrap_struct(surface, surface));
+  r_ary_push(result, INT2NUM(surface->w));
+  r_ary_push(result, INT2NUM(surface->h));
 
-  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;
+  return result;
 }
 
 
 /*
- * Free image structure attached to Ruby 2D `Image` class
+ * Ruby2D::Text#ext_load_text
  */
 #if MRUBY
-static void free_image(mrb_state *mrb, void *p_) {
-  R2D_Image *img = (R2D_Image *)p_;
+static R_VAL ruby2d_text_ext_load_text(mrb_state* mrb, R_VAL self) {
+  mrb_value font, message;
+  mrb_get_args(mrb, "oo", &font, &message);
 #else
-static void free_image(R2D_Image *img) {
+static R_VAL ruby2d_text_ext_load_text(R_VAL self, R_VAL font, R_VAL message) {
 #endif
-  R2D_FreeImage(img);
-}
+  R2D_Init();
 
+  R_VAL result = r_ary_new();
+
+  TTF_Font *ttf_font;
 
-/*
- * Ruby2D::Sprite#ext_init
- * Initialize sprite structure data
- */
 #if MRUBY
-static R_VAL ruby2d_sprite_ext_init(mrb_state* mrb, R_VAL self) {
-  mrb_value path;
-  mrb_get_args(mrb, "o", &path);
+  Data_Get_Struct(mrb, font, &font_data_type, ttf_font);
 #else
-static R_VAL ruby2d_sprite_ext_init(R_VAL self, R_VAL path) {
+  Data_Get_Struct(font, TTF_Font, ttf_font);
 #endif
-  R2D_Sprite *spr = R2D_CreateSprite(RSTRING_PTR(path));
-  if (!spr) return R_FALSE;
 
-  r_iv_set(self, "@img_width" , INT2NUM(spr->width));
-  r_iv_set(self, "@img_height", INT2NUM(spr->height));
-  r_iv_set(self, "@data", r_data_wrap_struct(sprite, spr));
+  SDL_Surface *surface = R2D_TextCreateSurface(ttf_font, RSTRING_PTR(message));
+  if (!surface) {
+    return result;
+  }
+
+  r_ary_push(result, r_data_wrap_struct(surface, surface));
+  r_ary_push(result, INT2NUM(surface->w));
+  r_ary_push(result, INT2NUM(surface->h));
 
-  return R_TRUE;
+  return result;
 }
 
 
 /*
- * Ruby2D::Sprite#ext_draw
+ * Ruby2D::Texture#ext_create
  */
 #if MRUBY
-static R_VAL ruby2d_sprite_ext_draw(mrb_state* mrb, R_VAL self) {
-  mrb_value a;
-  mrb_get_args(mrb, "o", &a);
+static R_VAL ruby2d_texture_ext_create(mrb_state* mrb, R_VAL self) {
+  mrb_value rubySurface, width, height;
+  mrb_get_args(mrb, "ooo", &rubySurface, &width, &height);
 #else
-static R_VAL ruby2d_sprite_ext_draw(R_VAL self, R_VAL a) {
+static R_VAL ruby2d_texture_ext_create(R_VAL self, R_VAL rubySurface, R_VAL width, R_VAL height) {
 #endif
-  // `a` is the array representing the sprite
-
-  R2D_Sprite *spr;
-  r_data_get_struct(r_ary_entry(a, 0), "@data", &sprite_data_type, R2D_Sprite, spr);
-
-  spr->x = NUM2DBL(r_ary_entry(a, 1));
-  spr->y = NUM2DBL(r_ary_entry(a, 2));
+  GLuint texture_id = 0;
+  SDL_Surface *surface;
 
-  R_VAL w = r_ary_entry(a, 3);
-  if (r_test(w)) spr->width = NUM2DBL(w);
-
-  R_VAL h = r_ary_entry(a, 4);
-  if (r_test(h)) spr->height = NUM2DBL(h);
-
-  R2D_RotateSprite(spr, NUM2DBL(r_ary_entry(a, 5)), R2D_CENTER);
+  #if MRUBY
+    Data_Get_Struct(mrb, rubySurface, &surface_data_type, surface);
+  #else
+    Data_Get_Struct(rubySurface, SDL_Surface, surface);
+  #endif
 
-  R2D_ClipSprite(
-    spr,
-    NUM2INT(r_ary_entry(a, 6)),
-    NUM2INT(r_ary_entry(a, 7)),
-    NUM2INT(r_ary_entry(a, 8)),
-    NUM2INT(r_ary_entry(a, 9))
-  );
+  // Detect image mode
+  GLint format = GL_RGB;
+  if (surface->format->BytesPerPixel == 4) {
+    format = GL_RGBA;
+  }
 
-  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_GL_CreateTexture(&texture_id, format,
+                       NUM2INT(width), NUM2INT(height),
+                       surface->pixels, GL_NEAREST);
 
-  R2D_DrawSprite(spr);
-  return R_NIL;
+  return INT2NUM(texture_id);
 }
 
 
 /*
- * Free sprite structure attached to Ruby 2D `Sprite` class
+ * Ruby2D::Texture#ext_delete
  */
 #if MRUBY
-static void free_sprite(mrb_state *mrb, void *p_) {
-  R2D_Sprite *spr = (R2D_Sprite *)p_;
+static R_VAL ruby2d_texture_ext_delete(mrb_state* mrb, R_VAL self) {
+  mrb_value rubyTexture_id;
+  mrb_get_args(mrb, "o", &rubyTexture_id);
 #else
-static void free_sprite(R2D_Sprite *spr) {
+static R_VAL ruby2d_texture_ext_delete(R_VAL self, R_VAL rubyTexture_id) {
 #endif
-  R2D_FreeSprite(spr);
-}
-
+  GLuint texture_id = NUM2INT(rubyTexture_id);
 
-/*
- * 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));
+  R2D_GL_FreeTexture(&texture_id);
 
-  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
+ * Ruby2D::Sound#ext_init
+ * Initialize sound structure data
  */
 #if MRUBY
-static R_VAL ruby2d_text_ext_init(mrb_state* mrb, R_VAL self) {
+static R_VAL ruby2d_sound_ext_init(mrb_state* mrb, R_VAL self) {
+  mrb_value path;
+  mrb_get_args(mrb, "o", &path);
 #else
-static R_VAL ruby2d_text_ext_init(R_VAL self) {
+static R_VAL ruby2d_sound_ext_init(R_VAL self, R_VAL path) {
 #endif
-  // Trim the font file string to its actual length on MRuby
-  #if MRUBY
-    mrb_value s = r_iv_get(self, "@font");
-    mrb_str_resize(mrb, s, RSTRING_LEN(s));
-  #endif
-
-  R2D_Text *txt = R2D_CreateText(
-    RSTRING_PTR(r_iv_get(self, "@font")),
-    RSTRING_PTR(r_iv_get(self, "@text")),
-    NUM2DBL(r_iv_get(self, "@size"))
-  );
-  if (!txt) return R_FALSE;
-
-  r_iv_set(self, "@width", INT2NUM(txt->width));
-  r_iv_set(self, "@height", INT2NUM(txt->height));
-  r_iv_set(self, "@data", r_data_wrap_struct(text, txt));
-
+  R2D_Sound *snd = R2D_CreateSound(RSTRING_PTR(path));
+  if (!snd) return R_FALSE;
+  r_iv_set(self, "@data", r_data_wrap_struct(sound, snd));
   return R_TRUE;
 }
 
 
 /*
- * Ruby2D::Text#ext_set
+ * Ruby2D::Sound#ext_play
  */
 #if MRUBY
-static R_VAL ruby2d_text_ext_set(mrb_state* mrb, R_VAL self) {
-  mrb_value text;
-  mrb_get_args(mrb, "o", &text);
+static R_VAL ruby2d_sound_ext_play(mrb_state* mrb, R_VAL self) {
 #else
-static R_VAL ruby2d_text_ext_set(R_VAL self, R_VAL text) {
+static R_VAL ruby2d_sound_ext_play(R_VAL self) {
 #endif
-  R2D_Text *txt;
-  r_data_get_struct(self, "@data", &text_data_type, R2D_Text, txt);
-
-  R2D_SetText(txt, RSTRING_PTR(text));
-
-  r_iv_set(self, "@width", INT2NUM(txt->width));
-  r_iv_set(self, "@height", INT2NUM(txt->height));
-
+  R2D_Sound *snd;
+  r_data_get_struct(self, "@data", &sound_data_type, R2D_Sound, snd);
+  R2D_PlaySound(snd);
   return R_NIL;
 }
 
 
 /*
- * Ruby2D::Text#self.ext_draw
+ * Ruby2D::Sound#ext_length
  */
 #if MRUBY
-static R_VAL ruby2d_text_ext_draw(mrb_state* mrb, R_VAL self) {
-  mrb_value a;
-  mrb_get_args(mrb, "o", &a);
+static R_VAL ruby2d_sound_ext_length(mrb_state* mrb, R_VAL self) {
 #else
-static R_VAL ruby2d_text_ext_draw(R_VAL self, R_VAL a) {
+static R_VAL ruby2d_sound_ext_length(R_VAL self) {
 #endif
-  // `a` is the array representing the text
-
-  R2D_Text *txt;
-  r_data_get_struct(r_ary_entry(a, 0), "@data", &text_data_type, R2D_Text, txt);
-
-  txt->x = NUM2DBL(r_ary_entry(a, 1));
-  txt->y = NUM2DBL(r_ary_entry(a, 2));
-
-  R2D_RotateText(txt, NUM2DBL(r_ary_entry(a, 3)), R2D_CENTER);
-
-  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;
+  R2D_Sound *snd;
+  r_data_get_struct(self, "@data", &sound_data_type, R2D_Sound, snd);
+  return INT2NUM(R2D_GetSoundLength(snd));
 }
 
 
 /*
- * Free text structure attached to Ruby 2D `Text` class
+ * Free sound structure attached to Ruby 2D `Sound` class
  */
 #if MRUBY
-static void free_text(mrb_state *mrb, void *p_) {
-  R2D_Text *txt = (R2D_Text *)p_;
+static void free_sound(mrb_state *mrb, void *p_) {
+  R2D_Sound *snd = (R2D_Sound *)p_;
 #else
-static void free_text(R2D_Text *txt) {
+static void free_sound(R2D_Sound *snd) {
 #endif
-  R2D_FreeText(txt);
+  R2D_FreeSound(snd);
 }
 
 
 /*
- * Ruby2D::Sound#ext_init
- * Initialize sound structure data
+ * Ruby2D::Sound#ext_get_volume
  */
 #if MRUBY
-static R_VAL ruby2d_sound_ext_init(mrb_state* mrb, R_VAL self) {
-  mrb_value path;
-  mrb_get_args(mrb, "o", &path);
+static R_VAL ruby2d_sound_ext_get_volume(mrb_state* mrb, R_VAL self) {
 #else
-static R_VAL ruby2d_sound_ext_init(R_VAL self, R_VAL path) {
+static R_VAL ruby2d_sound_ext_get_volume(R_VAL self) {
 #endif
-  R2D_Sound *snd = R2D_CreateSound(RSTRING_PTR(path));
-  if (!snd) return R_FALSE;
-  r_iv_set(self, "@data", r_data_wrap_struct(sound, snd));
-  return R_TRUE;
+  R2D_Sound *snd;
+  r_data_get_struct(self, "@data", &sound_data_type, R2D_Sound, snd);
+  return INT2NUM(ceil(Mix_VolumeChunk(snd->data, -1) * (100.0 / MIX_MAX_VOLUME)));
 }
 
 
 /*
- * Ruby2D::Sound#ext_play
+ * Ruby2D::Music#ext_set_volume
  */
 #if MRUBY
-static R_VAL ruby2d_sound_ext_play(mrb_state* mrb, R_VAL self) {
+static R_VAL ruby2d_sound_ext_set_volume(mrb_state* mrb, R_VAL self) {
+  mrb_value volume;
+  mrb_get_args(mrb, "o", &volume);
 #else
-static R_VAL ruby2d_sound_ext_play(R_VAL self) {
+static R_VAL ruby2d_sound_ext_set_volume(R_VAL self, R_VAL volume) {
 #endif
   R2D_Sound *snd;
   r_data_get_struct(self, "@data", &sound_data_type, R2D_Sound, snd);
-  R2D_PlaySound(snd);
+  Mix_VolumeChunk(snd->data, (NUM2INT(volume) / 100.0) * MIX_MAX_VOLUME);
   return R_NIL;
 }
 
 
 /*
- * Ruby2D::Sound#ext_length
+ * Ruby2D::Sound#ext_get_mix_volume
  */
-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));
+#if MRUBY
+static R_VAL ruby2d_sound_ext_get_mix_volume(mrb_state* mrb, R_VAL self) {
+#else
+static R_VAL ruby2d_sound_ext_get_mix_volume(R_VAL self) {
+#endif
+  return INT2NUM(ceil(Mix_Volume(-1, -1) * (100.0 / MIX_MAX_VOLUME)));
 }
 
 
 /*
- * Free sound structure attached to Ruby 2D `Sound` class
+ * Ruby2D::Music#ext_set_mix_volume
  */
 #if MRUBY
-static void free_sound(mrb_state *mrb, void *p_) {
-  R2D_Sound *snd = (R2D_Sound *)p_;
+static R_VAL ruby2d_sound_ext_set_mix_volume(mrb_state* mrb, R_VAL self) {
+  mrb_value volume;
+  mrb_get_args(mrb, "o", &volume);
 #else
-static void free_sound(R2D_Sound *snd) {
+static R_VAL ruby2d_sound_ext_set_mix_volume(R_VAL self, R_VAL volume) {
 #endif
-  R2D_FreeSound(snd);
+  Mix_Volume(-1, (NUM2INT(volume) / 100.0) * MIX_MAX_VOLUME);
+  return R_NIL;
 }
 
 
@@ -832,13 +717,88 @@ static R_VAL ruby2d_music_ext_fadeout(R_VAL self, R_VAL ms) {
 /*
  * Ruby2D::Music#ext_length
  */
+#if MRUBY
+static R_VAL ruby2d_music_ext_length(mrb_state* mrb, R_VAL self) {
+#else
 static R_VAL ruby2d_music_ext_length(R_VAL self) {
+#endif
   R2D_Music *ms;
   r_data_get_struct(self, "@data", &music_data_type, R2D_Music, ms);
   return INT2NUM(R2D_GetMusicLength(ms));
 }
 
 
+/*
+ * Ruby2D::Font#ext_load
+ */
+#if MRUBY
+static R_VAL ruby2d_font_ext_load(mrb_state* mrb, R_VAL self) {
+  mrb_value path, size, style;
+  mrb_get_args(mrb, "ooo", &path, &size, &style);
+#else
+static R_VAL ruby2d_font_ext_load(R_VAL self, R_VAL path, R_VAL size, R_VAL style) {
+#endif
+  R2D_Init();
+
+  TTF_Font *font = R2D_FontCreateTTFFont(RSTRING_PTR(path), NUM2INT(size), RSTRING_PTR(style));
+  if (!font) {
+    return R_NIL;
+  }
+
+  return r_data_wrap_struct(font, font);
+}
+
+
+/*
+ * Ruby2D::Texture#ext_draw
+ */
+#if MRUBY
+static R_VAL ruby2d_texture_ext_draw(mrb_state* mrb, R_VAL self) {
+  mrb_value ruby_coordinates, ruby_texture_coordinates, ruby_color, texture_id;
+  mrb_get_args(mrb, "oooo", &ruby_coordinates, &ruby_texture_coordinates, &ruby_color, &texture_id);
+#else
+static R_VAL ruby2d_texture_ext_draw(R_VAL self, R_VAL ruby_coordinates, R_VAL ruby_texture_coordinates, R_VAL ruby_color, R_VAL texture_id) {
+#endif
+  GLfloat coordinates[8];
+  GLfloat texture_coordinates[8];
+  GLfloat color[4];
+
+  for(int i = 0; i < 8; i++) { coordinates[i] = NUM2DBL(r_ary_entry(ruby_coordinates, i)); }
+  for(int i = 0; i < 8; i++) { texture_coordinates[i] = NUM2DBL(r_ary_entry(ruby_texture_coordinates, i)); }
+  for(int i = 0; i < 4; i++) { color[i] = NUM2DBL(r_ary_entry(ruby_color, i)); }
+  
+  R2D_GL_DrawTexture(coordinates, texture_coordinates, color, NUM2INT(texture_id));
+
+  return R_NIL;
+}
+
+
+/*
+ * Free font structure stored in the Ruby 2D `Font` class
+ */
+#if MRUBY
+static void free_font(mrb_state *mrb, void *p_) {
+  TTF_Font *font = (TTF_Font *)p_;
+#else
+static void free_font(TTF_Font *font) {
+#endif
+  TTF_CloseFont(font);
+}
+
+
+/*
+ * Free surface structure used within the Ruby 2D `Texture` class
+ */
+#if MRUBY
+static void free_surface(mrb_state *mrb, void *p_) {
+  SDL_Surface *surface = (SDL_Surface *)p_;
+#else
+static void free_surface(SDL_Surface *surface) {
+#endif
+  SDL_FreeSurface(surface);
+}
+
+
 /*
  * Free music structure attached to Ruby 2D `Music` class
  */
@@ -1032,14 +992,14 @@ static void on_controller(R2D_Event e) {
 static void update() {
 
   // Set the cursor
-  r_iv_set(ruby2d_window, "@mouse_x", INT2NUM(window->mouse.x));
-  r_iv_set(ruby2d_window, "@mouse_y", INT2NUM(window->mouse.y));
+  r_iv_set(ruby2d_window, "@mouse_x", INT2NUM(ruby2d_c_window->mouse.x));
+  r_iv_set(ruby2d_window, "@mouse_y", INT2NUM(ruby2d_c_window->mouse.y));
 
   // Store frames
-  r_iv_set(ruby2d_window, "@frames", DBL2NUM(window->frames));
+  r_iv_set(ruby2d_window, "@frames", DBL2NUM(ruby2d_c_window->frames));
 
   // Store frame rate
-  r_iv_set(ruby2d_window, "@fps", DBL2NUM(window->fps));
+  r_iv_set(ruby2d_window, "@fps", DBL2NUM(ruby2d_c_window->fps));
 
   // Call update proc, `window.update`
   r_funcall(ruby2d_window, "update_callback", 0);
@@ -1053,10 +1013,10 @@ static void render() {
 
   // Set background color
   R_VAL bc = r_iv_get(ruby2d_window, "@background");
-  window->background.r = NUM2DBL(r_iv_get(bc, "@r"));
-  window->background.g = NUM2DBL(r_iv_get(bc, "@g"));
-  window->background.b = NUM2DBL(r_iv_get(bc, "@b"));
-  window->background.a = NUM2DBL(r_iv_get(bc, "@a"));
+  ruby2d_c_window->background.r = NUM2DBL(r_iv_get(bc, "@r"));
+  ruby2d_c_window->background.g = NUM2DBL(r_iv_get(bc, "@g"));
+  ruby2d_c_window->background.b = NUM2DBL(r_iv_get(bc, "@b"));
+  ruby2d_c_window->background.a = NUM2DBL(r_iv_get(bc, "@a"));
 
   // Read window objects
   R_VAL objects = r_iv_get(ruby2d_window, "@objects");
@@ -1170,19 +1130,19 @@ static R_VAL ruby2d_window_ext_show(R_VAL self) {
 
   // Create and show window
 
-  window = R2D_CreateWindow(
+  ruby2d_c_window = R2D_CreateWindow(
     title, width, height, update, render, flags
   );
 
-  window->viewport.width  = viewport_width;
-  window->viewport.height = viewport_height;
-  window->fps_cap         = fps_cap;
-  window->icon            = icon;
-  window->on_key          = on_key;
-  window->on_mouse        = on_mouse;
-  window->on_controller   = on_controller;
+  ruby2d_c_window->viewport.width  = viewport_width;
+  ruby2d_c_window->viewport.height = viewport_height;
+  ruby2d_c_window->fps_cap         = fps_cap;
+  ruby2d_c_window->icon            = icon;
+  ruby2d_c_window->on_key          = on_key;
+  ruby2d_c_window->on_mouse        = on_mouse;
+  ruby2d_c_window->on_controller   = on_controller;
 
-  R2D_Show(window);
+  R2D_Show(ruby2d_c_window);
 
   atexit(free_window);
   return R_NIL;
@@ -1199,8 +1159,8 @@ static R_VAL ruby2d_ext_screenshot(mrb_state* mrb, R_VAL self) {
 #else
 static R_VAL ruby2d_ext_screenshot(R_VAL self, R_VAL path) {
 #endif
-  if (window) {
-    R2D_Screenshot(window, RSTRING_PTR(path));
+  if (ruby2d_c_window) {
+    R2D_Screenshot(ruby2d_c_window, RSTRING_PTR(path));
     return path;
   } else {
     return R_FALSE;
@@ -1211,8 +1171,12 @@ static R_VAL ruby2d_ext_screenshot(R_VAL self, R_VAL path) {
 /*
  * Ruby2D::Window#ext_close
  */
+#if MRUBY
+static R_VAL ruby2d_window_ext_close(mrb_state* mrb, R_VAL self) {
+#else
 static R_VAL ruby2d_window_ext_close() {
-  R2D_Close(window);
+#endif
+  R2D_Close(ruby2d_c_window);
   return R_NIL;
 }
 
@@ -1275,41 +1239,14 @@ void Init_ruby2d() {
   // Ruby2D::Image
   R_CLASS ruby2d_image_class = r_define_class(ruby2d_module, "Image");
 
-  // Ruby2D::Image#ext_init
-  r_define_method(ruby2d_image_class, "ext_init", ruby2d_image_ext_init, r_args_req(1));
-
-  // 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");
-
-  // Ruby2D::Sprite#ext_init
-  r_define_method(ruby2d_sprite_class, "ext_init", ruby2d_sprite_ext_init, r_args_req(1));
-
-  // 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::Image#ext_load_image
+  r_define_class_method(ruby2d_image_class, "ext_load_image", ruby2d_image_ext_load_image, r_args_req(1));
 
   // Ruby2D::Text
   R_CLASS ruby2d_text_class = r_define_class(ruby2d_module, "Text");
 
-  // Ruby2D::Text#ext_init
-  r_define_method(ruby2d_text_class, "ext_init", ruby2d_text_ext_init, r_args_none);
-
-  // Ruby2D::Text#ext_set
-  r_define_method(ruby2d_text_class, "ext_set", ruby2d_text_ext_set, r_args_req(1));
-
-  // Ruby2D::Text#self.ext_draw
-  r_define_class_method(ruby2d_text_class, "ext_draw", ruby2d_text_ext_draw, r_args_req(1));
+  // Ruby2D::Text#ext_load_text
+  r_define_class_method(ruby2d_text_class, "ext_load_text", ruby2d_text_ext_load_text, r_args_req(2));
 
   // Ruby2D::Sound
   R_CLASS ruby2d_sound_class = r_define_class(ruby2d_module, "Sound");
@@ -1319,6 +1256,18 @@ 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_get_volume
+  r_define_method(ruby2d_sound_class, "ext_get_volume", ruby2d_sound_ext_get_volume, r_args_none);
+  
+  // Ruby2D::Sound#ext_set_volume
+  r_define_method(ruby2d_sound_class, "ext_set_volume", ruby2d_sound_ext_set_volume, r_args_req(1));
+  
+  // Ruby2D::Sound#self.ext_get_mix_volume
+  r_define_class_method(ruby2d_sound_class, "ext_get_mix_volume", ruby2d_sound_ext_get_mix_volume, r_args_none);
+  
+  // Ruby2D::Sound#self.ext_set_mix_volume
+  r_define_class_method(ruby2d_sound_class, "ext_set_mix_volume", ruby2d_sound_ext_set_mix_volume, r_args_req(1));
 
   // Ruby2D::Sound#ext_length
   r_define_method(ruby2d_sound_class, "ext_length", ruby2d_sound_ext_length, r_args_none);
@@ -1353,6 +1302,24 @@ void Init_ruby2d() {
   // Ruby2D::Music#ext_length
   r_define_method(ruby2d_music_class, "ext_length", ruby2d_music_ext_length, r_args_none);
 
+  // Ruby2D::Font
+  R_CLASS ruby2d_font_class = r_define_class(ruby2d_module, "Font");
+
+  // Ruby2D::Font#ext_load
+  r_define_class_method(ruby2d_font_class, "ext_load", ruby2d_font_ext_load, r_args_req(3));
+
+  // Ruby2D::Texture
+  R_CLASS ruby2d_texture_class = r_define_class(ruby2d_module, "Texture");
+
+  // Ruby2D::Texture#ext_draw
+  r_define_method(ruby2d_texture_class, "ext_draw", ruby2d_texture_ext_draw, r_args_req(4));
+
+  // Ruby2D::Texture#ext_create
+  r_define_method(ruby2d_texture_class, "ext_create", ruby2d_texture_ext_create, r_args_req(3));
+
+  // Ruby2D::Texture#ext_delete
+  r_define_method(ruby2d_texture_class, "ext_delete", ruby2d_texture_ext_delete, r_args_req(1));
+
   // Ruby2D::Window
   R_CLASS ruby2d_window_class = r_define_class(ruby2d_module, "Window");