ext/ruby2d/ruby2d.c in ruby2d-0.2.0 vs ext/ruby2d/ruby2d.c in ruby2d-0.2.1
- old
+ new
@@ -9,26 +9,26 @@
// Ruby 2D window
VALUE self;
// Simple 2D window
-Window *window;
+S2D_Window *window;
// Ruby data types
static VALUE ruby2d_module;
static VALUE ruby2d_window_klass;
static VALUE c_data_klass;
// Structures for Ruby 2D classes
struct image_data {
- Image img;
+ S2D_Image *img;
};
struct text_data {
- Text txt;
+ S2D_Text *txt;
};
struct sound_data {
- Sound snd;
+ S2D_Sound *snd;
};
/*
* Function pointer to close the Simple 2D window
@@ -213,12 +213,12 @@
}
struct image_data *data;
Data_Get_Struct(rb_iv_get(el, "@data"), struct image_data, data);
- data->img.x = NUM2DBL(rb_iv_get(el, "@x"));
- data->img.y = NUM2DBL(rb_iv_get(el, "@y"));
+ data->img->x = NUM2DBL(rb_iv_get(el, "@x"));
+ data->img->y = NUM2DBL(rb_iv_get(el, "@y"));
S2D_DrawImage(data->img);
}
break;
case TEXT: {
@@ -232,12 +232,12 @@
}
struct text_data *data;
Data_Get_Struct(rb_iv_get(el, "@data"), struct text_data, data);
- data->txt.x = NUM2DBL(rb_iv_get(el, "@x"));
- data->txt.y = NUM2DBL(rb_iv_get(el, "@y"));
+ data->txt->x = NUM2DBL(rb_iv_get(el, "@x"));
+ data->txt->y = NUM2DBL(rb_iv_get(el, "@y"));
S2D_DrawText(data->txt);
}
break;
}
}
@@ -251,12 +251,13 @@
self = s;
char *title = RSTRING_PTR(rb_iv_get(self, "@title"));
int width = NUM2INT(rb_iv_get(self, "@width"));
int height = NUM2INT(rb_iv_get(self, "@height"));
+ int flags = 0;
window = S2D_CreateWindow(
- title, width, height, update, render, 0
+ title, width, height, update, render, flags
);
window->on_key = on_key;
window->on_key_down = on_key_down;
window->on_controller = on_controller;