ruby2d 0.10.0 → 0.11.0

data/ext/ruby2d/gles.c

@@ -202,40 +202,22 @@ void R2D_GLES_DrawTriangle(GLfloat x1, GLfloat y1,
 
 
 /*
- * Draw a texture
+ * Draw a texture (New method with vertices pre-calculated)
  */
-static void R2D_GLES_DrawTexture(int x, int y, int w, int h,
-                                 GLfloat angle, GLfloat rx, GLfloat ry,
-                                 GLfloat r, GLfloat g, GLfloat b, GLfloat a,
-                                 GLfloat tx1, GLfloat ty1, GLfloat tx2, GLfloat ty2,
-                                 GLfloat tx3, GLfloat ty3, GLfloat tx4, GLfloat ty4,
-                                 GLuint texture_id) {
-
-  R2D_GL_Point v1 = { .x = x,     .y = y     };
-  R2D_GL_Point v2 = { .x = x + w, .y = y     };
-  R2D_GL_Point v3 = { .x = x + w, .y = y + h };
-  R2D_GL_Point v4 = { .x = x,     .y = y + h };
-
-  // Rotate vertices
-  if (angle != 0) {
-    v1 = R2D_RotatePoint(v1, angle, rx, ry);
-    v2 = R2D_RotatePoint(v2, angle, rx, ry);
-    v3 = R2D_RotatePoint(v3, angle, rx, ry);
-    v4 = R2D_RotatePoint(v4, angle, rx, ry);
-  }
-
+void R2D_GLES_DrawTexture(GLfloat coordinates[], GLfloat texture_coordinates[], GLfloat color[], int texture_id);
   GLfloat vertices[] =
   //  x, y coords | x, y texture coords
-    { v1.x, v1.y,   0.f, tx1, ty1,
-      v2.x, v2.y,   0.f, tx2, ty2,
-      v3.x, v3.y,   0.f, tx3, ty3,
-      v4.x, v4.y,   0.f, tx4, ty4 };
+  {
+    coordinates[0], coordinates[1], 0.f, texture_coordinates[0], texture_coordinates[1],
+    coordinates[2], coordinates[3], 0.f, texture_coordinates[2], texture_coordinates[3],
+    coordinates[4], coordinates[5], 0.f, texture_coordinates[4], texture_coordinates[5],
+    coordinates[6], coordinates[7], 0.f, texture_coordinates[6], texture_coordinates[7] };
 
   GLfloat colors[] =
-    { r, g, b, a,
-      r, g, b, a,
-      r, g, b, a,
-      r, g, b, a };
+    { color[0], color[1], color[2], color[3],
+    color[0], color[1], color[2], color[3],
+    color[0], color[1], color[2], color[3],
+    color[0], color[1], color[2], color[3] };
 
   glUseProgram(texShaderProgram);
 
@@ -264,60 +246,4 @@ static void R2D_GLES_DrawTexture(int x, int y, int w, int h,
 }
 
 
-/*
- * Draw image
- */
-void R2D_GLES_DrawImage(R2D_Image *img) {
-  R2D_GLES_DrawTexture(
-    img->x, img->y, img->width, img->height,
-    img->rotate, img->rx, img->ry,
-    img->color.r, img->color.g, img->color.b, img->color.a,
-    0.f, 0.f, 1.f, 0.f, 1.f, 1.f, 0.f, 1.f,
-    img->texture_id
-  );
-}
-
-
-/*
- * Draw sprite
- */
-void R2D_GLES_DrawSprite(R2D_Sprite *spr) {
-  R2D_GLES_DrawTexture(
-    spr->x, spr->y, spr->width, spr->height,
-    spr->rotate, spr->rx, spr->ry,
-    spr->color.r, spr->color.g, spr->color.b, spr->color.a,
-    spr->tx1, spr->ty1, spr->tx2, spr->ty2, spr->tx3, spr->ty3, spr->tx4, spr->ty4,
-    spr->img->texture_id
-  );
-}
-
-
-/*
- * 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
- */
-void R2D_GLES_DrawText(R2D_Text *txt) {
-  R2D_GLES_DrawTexture(
-    txt->x, txt->y, txt->width, txt->height,
-    txt->rotate, txt->rx, txt->ry,
-    txt->color.r, txt->color.g, txt->color.b, txt->color.a,
-    0.f, 0.f, 1.f, 0.f, 1.f, 1.f, 0.f, 1.f,
-    txt->texture_id
-  );
-}
-
 #endif

data/ext/ruby2d/image.c

@@ -3,75 +3,39 @@
 #include "ruby2d.h"
 
 
-/*
- * Create an image, given a file path
- */
-R2D_Image *R2D_CreateImage(const char *path) {
+SDL_Surface *R2D_CreateImageSurface(const char *path) {
   R2D_Init();
 
   // Check if image file exists
   if (!R2D_FileExists(path)) {
-    R2D_Error("R2D_CreateImage", "Image file `%s` not found", path);
-    return NULL;
-  }
-
-  // Allocate the image structure
-  R2D_Image *img = (R2D_Image *) malloc(sizeof(R2D_Image));
-  if (!img) {
-    R2D_Error("R2D_CreateImage", "Out of memory!");
+    R2D_Error("R2D_CreateImageSurface", "Image file `%s` not found", path);
     return NULL;
   }
 
   // Load image from file as SDL_Surface
-  img->surface = IMG_Load(path);
-  if (!img->surface) {
-    R2D_Error("IMG_Load", IMG_GetError());
-    free(img);
-    return NULL;
-  }
+  SDL_Surface *surface = IMG_Load(path);
 
-  int bits_per_color = img->surface->format->Amask == 0 ?
-    img->surface->format->BitsPerPixel / 3 :
-    img->surface->format->BitsPerPixel / 4;
+  int bits_per_color = surface->format->Amask == 0 ?
+    surface->format->BitsPerPixel / 3 :
+    surface->format->BitsPerPixel / 4;
 
   if (bits_per_color < 8) {
     R2D_Log(R2D_WARN, "`%s` has less than 8 bits per color and will likely not render correctly", path, bits_per_color);
   }
 
-  // Initialize values
-  img->path = path;
-  img->x = 0;
-  img->y = 0;
-  img->color.r = 1.f;
-  img->color.g = 1.f;
-  img->color.b = 1.f;
-  img->color.a = 1.f;
-  img->orig_width  = img->surface->w;
-  img->orig_height = img->surface->h;
-  img->width  = img->orig_width;
-  img->height = img->orig_height;
-  img->rotate = 0;
-  img->rx = 0;
-  img->ry = 0;
-  img->texture_id = 0;
-
-  // Detect image mode
-  img->format = GL_RGB;
-  if (img->surface->format->BytesPerPixel == 4) {
-    img->format = GL_RGBA;
-  }
-
-  // Flip image bits if BGA
+  return surface;
+}
 
-  Uint32 r = img->surface->format->Rmask;
-  Uint32 g = img->surface->format->Gmask;
-  Uint32 a = img->surface->format->Amask;
+void R2D_ImageConvertToRGB(SDL_Surface *surface) {
+  Uint32 r = surface->format->Rmask;
+  Uint32 g = surface->format->Gmask;
+  Uint32 a = surface->format->Amask;
 
   if (r&0xFF000000 || r&0xFF0000) {
-    char *p = (char *)img->surface->pixels;
-    int bpp = img->surface->format->BytesPerPixel;
-    int w = img->surface->w;
-    int h = img->surface->h;
+    char *p = (char *)surface->pixels;
+    int bpp = surface->format->BytesPerPixel;
+    int w = surface->w;
+    int h = surface->h;
     char tmp;
     for (int i = 0; i < bpp * w * h; i += bpp) {
       if (a&0xFF) {
@@ -91,48 +55,4 @@ R2D_Image *R2D_CreateImage(const char *path) {
       }
     }
   }
-
-  return img;
-}
-
-
-/*
- * Rotate an image
- */
-void R2D_RotateImage(R2D_Image *img, GLfloat angle, int position) {
-
-  R2D_GL_Point p = R2D_GetRectRotationPoint(
-    img->x, img->y, img->width, img->height, position
-  );
-
-  img->rotate = angle;
-  img->rx = p.x;
-  img->ry = p.y;
-}
-
-
-/*
- * Draw an image
- */
-void R2D_DrawImage(R2D_Image *img) {
-  if (!img) return;
-
-  if (img->texture_id == 0) {
-    R2D_GL_CreateTexture(&img->texture_id, img->format,
-                         img->orig_width, img->orig_height,
-                         img->surface->pixels, GL_NEAREST);
-    SDL_FreeSurface(img->surface);
-  }
-
-  R2D_GL_DrawImage(img);
-}
-
-
-/*
- * Free an image
- */
-void R2D_FreeImage(R2D_Image *img) {
-  if (!img) return;
-  R2D_GL_FreeTexture(&img->texture_id);
-  free(img);
 }

data/ext/ruby2d/ruby2d.c

@@ -108,18 +108,6 @@ static R2D_Window *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
@@ -129,11 +117,10 @@ static R2D_Window *window;
     "music", free_music
   };
 #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 *font);
 #endif
 
 
@@ -368,353 +355,190 @@ static R_VAL ruby2d_circle_ext_draw(R_VAL self, R_VAL a) {
 
 
 /*
- * Ruby2D::Image#ext_init
- * Initialize image structure data
- */
-#if MRUBY
-static R_VAL ruby2d_image_ext_init(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
+ * 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_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) {
-#endif
-  // `a` is the array representing the image
+static R_VAL ruby2d_image_ext_load_image(R_VAL self, R_VAL path) {
+  R2D_Init();
 
-  R2D_Image *img;
-  r_data_get_struct(r_ary_entry(a, 0), "@data", &image_data_type, R2D_Image, img);
+  VALUE result = rb_ary_new2(3);
 
-  img->x = NUM2DBL(r_ary_entry(a, 1));
-  img->y = NUM2DBL(r_ary_entry(a, 2));
+  SDL_Surface *surface = R2D_CreateImageSurface(RSTRING_PTR(path));
+  R2D_ImageConvertToRGB(surface);
 
-  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);
+  rb_ary_push(result, r_data_wrap_struct(surface, surface));
+  rb_ary_push(result, INT2NUM(surface->w));
+  rb_ary_push(result, INT2NUM(surface->h));
 
-  R2D_RotateImage(img, NUM2DBL(r_ary_entry(a, 5)), R2D_CENTER);
-
-  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_;
-#else
-static void free_image(R2D_Image *img) {
-#endif
-  R2D_FreeImage(img);
-}
+static R_VAL ruby2d_text_ext_load_text(R_VAL self, R_VAL font, R_VAL message) {
+  R2D_Init();
 
+  VALUE result = rb_ary_new2(3);
 
-/*
- * 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);
-#else
-static R_VAL ruby2d_sprite_ext_init(R_VAL self, R_VAL path) {
-#endif
-  R2D_Sprite *spr = R2D_CreateSprite(RSTRING_PTR(path));
-  if (!spr) return R_FALSE;
+  TTF_Font *ttf_font;
+  Data_Get_Struct(font, TTF_Font, ttf_font);
 
-  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;
+  }
 
-  return R_TRUE;
-}
+  rb_ary_push(result, r_data_wrap_struct(surface, surface));
+  rb_ary_push(result, INT2NUM(surface->w));
+  rb_ary_push(result, INT2NUM(surface->h));
 
+  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);
-#else
-static R_VAL ruby2d_sprite_ext_draw(R_VAL self, R_VAL a) {
-#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));
-
-  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);
-
-  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))
-  );
-
-  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;
-}
+static R_VAL ruby2d_texture_ext_create(R_VAL self, R_VAL rubySurface, R_VAL width, R_VAL height) {
+  GLuint texture_id = 0;
+  SDL_Surface *surface;
+  Data_Get_Struct(rubySurface, SDL_Surface, surface);
+
+  // Detect image mode
+  GLint format = GL_RGB;
+  if (surface->format->BytesPerPixel == 4) {
+    format = GL_RGBA;
+  }
 
+  R2D_GL_CreateTexture(&texture_id, format,
+                       NUM2INT(width), NUM2INT(height),
+                       surface->pixels, GL_NEAREST);
 
-/*
- * Free sprite structure attached to Ruby 2D `Sprite` class
- */
-#if MRUBY
-static void free_sprite(mrb_state *mrb, void *p_) {
-  R2D_Sprite *spr = (R2D_Sprite *)p_;
-#else
-static void free_sprite(R2D_Sprite *spr) {
-#endif
-  R2D_FreeSprite(spr);
+  return INT2NUM(texture_id);
 }
 
-
 /*
- * Ruby2D::Tileset#ext_init
- * Initialize tileset data
+ * Ruby2D::Texture#ext_delete
  */
-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;
-}
+static R_VAL ruby2d_texture_ext_delete(R_VAL self, R_VAL rubyTexture_id) {
+  GLuint texture_id = NUM2INT(rubyTexture_id);
 
+  R2D_GL_FreeTexture(&texture_id);
 
-/*
- * 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);
-#else
-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(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;
+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 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;
 }
 
-
 /*
  * Ruby2D::Music#ext_init
  * Initialize music structure data
@@ -838,6 +662,52 @@ static R_VAL ruby2d_music_ext_length(R_VAL self) {
   return INT2NUM(R2D_GetMusicLength(ms));
 }
 
+/*
+ * Ruby2D::Font#ext_load
+ */
+static R_VAL ruby2d_font_ext_load(R_VAL self, R_VAL path, R_VAL size, R_VAL style) {
+  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
+ */
+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) {
+  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
+ */
+static void free_font(TTF_Font *font) {
+  TTF_CloseFont(font);
+}
+
+/*
+ * Free surface structure used within the Ruby 2D `Texture` class
+ */
+static void free_surface(SDL_Surface *surface) {
+  SDL_FreeSurface(surface);
+}
+
 
 /*
  * Free music structure attached to Ruby 2D `Music` class
@@ -1275,41 +1145,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 +1162,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 +1208,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");