Add sprites

Also namespace `type_id` definitions

1 files changed, 56 insertions, 9 deletions

diff --git a/ext/ruby2d/ruby2d.c b/ext/ruby2d/ruby2d.c
index e426f0d..784ca7c 100644
--- a/ext/ruby2d/ruby2d.c
+++ b/ext/ruby2d/ruby2d.c
@@ -2,10 +2,11 @@
 #include <simple2d.h>
 
 // @type_id values for rendering
-#define TRIANGLE 1
-#define QUAD     2
-#define IMAGE    3
-#define TEXT     4
+#define R2D_TRIANGLE 1
+#define R2D_QUAD     2
+#define R2D_IMAGE    3
+#define R2D_SPRITE   4
+#define R2D_TEXT     5
 
 // Ruby 2D window
 static VALUE self;
@@ -22,6 +23,9 @@ static VALUE c_data_klass;
 struct image_data {
   S2D_Image *img;
 };
+struct sprite_data {
+  S2D_Sprite *spr;
+};
 struct text_data {
   S2D_Text *txt;
 };
@@ -58,6 +62,25 @@ static VALUE init_image(char *path) {
 
 
 /*
+ * Free sprite structure attached to Ruby 2D `Sprite` class
+ */
+static void free_sprite(struct sprite_data *data) {
+  S2D_FreeSprite(data->spr);
+  xfree(data);
+}
+
+
+/*
+ * Initialize sprite structure data
+ */
+static VALUE init_sprite(char *path) {
+  struct sprite_data *data = ALLOC(struct sprite_data);
+  data->spr = S2D_CreateSprite(path);
+  return Data_Wrap_Struct(c_data_klass, NULL, free_sprite, data);
+}
+
+
+/*
  * Free text structure attached to Ruby 2D `Text` class
  */
 static void free_text(struct text_data *data) {
@@ -145,7 +168,7 @@ static void render() {
     // Switch on the object's type_id
     switch(type_id) {
       
-      case TRIANGLE: {
+      case R2D_TRIANGLE: {
         VALUE c1 = rb_iv_get(el, "@c1");
         VALUE c2 = rb_iv_get(el, "@c2");
         VALUE c3 = rb_iv_get(el, "@c3");
@@ -175,7 +198,7 @@ static void render() {
       }
       break;
       
-      case QUAD: {
+      case R2D_QUAD: {
         VALUE c1 = rb_iv_get(el, "@c1");
         VALUE c2 = rb_iv_get(el, "@c2");
         VALUE c3 = rb_iv_get(el, "@c3");
@@ -213,10 +236,10 @@ static void render() {
       }
       break;
       
-      case IMAGE: {
+      case R2D_IMAGE: {
         if (rb_iv_get(el, "@data") == Qnil) {
           VALUE data = init_image(RSTRING_PTR(rb_iv_get(el, "@path")));
-          rb_iv_set(el, "@data", data);
+          rb_iv_set(el, "@data",   data);
         }
         
         struct image_data *data;
@@ -228,7 +251,31 @@ static void render() {
       }
       break;
       
-      case TEXT: {
+      case R2D_SPRITE: {
+        if (rb_iv_get(el, "@data") == Qnil) {
+          VALUE data = init_sprite(RSTRING_PTR(rb_iv_get(el, "@path")));
+          rb_iv_set(el, "@data", data);
+        }
+        
+        struct sprite_data *data;
+        Data_Get_Struct(rb_iv_get(el, "@data"), struct sprite_data, data);
+        
+        data->spr->x = NUM2DBL(rb_iv_get(el, "@x"));
+        data->spr->y = NUM2DBL(rb_iv_get(el, "@y"));
+        
+        S2D_ClipSprite(
+          data->spr,
+          NUM2INT(rb_iv_get(el, "@clip_x")),
+          NUM2INT(rb_iv_get(el, "@clip_y")),
+          NUM2INT(rb_iv_get(el, "@clip_w")),
+          NUM2INT(rb_iv_get(el, "@clip_h"))
+        );
+        
+        S2D_DrawSprite(data->spr);
+      }
+      break;
+      
+      case R2D_TEXT: {
         if (rb_iv_get(el, "@data") == Qnil) {
           VALUE data = init_text(
             RSTRING_PTR(rb_iv_get(el, "@font")),