ruby2d 0.11.1 → 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,7 +111,7 @@
 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
@@ -116,11 +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_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);
+  static void free_surface(SDL_Surface *surface);
 #endif
 
 
@@ -128,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);
 }
 
 
@@ -358,17 +374,23 @@ static R_VAL ruby2d_circle_ext_draw(R_VAL self, R_VAL a) {
  * 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_load_image(mrb_state* mrb, R_VAL self) {
+  mrb_value path;
+  mrb_get_args(mrb, "o", &path);
+#else
 static R_VAL ruby2d_image_ext_load_image(R_VAL self, R_VAL path) {
+#endif
   R2D_Init();
 
-  VALUE result = rb_ary_new2(3);
+  R_VAL result = r_ary_new();
 
   SDL_Surface *surface = R2D_CreateImageSurface(RSTRING_PTR(path));
   R2D_ImageConvertToRGB(surface);
 
-  rb_ary_push(result, r_data_wrap_struct(surface, surface));
-  rb_ary_push(result, INT2NUM(surface->w));
-  rb_ary_push(result, INT2NUM(surface->h));
+  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 result;
 }
@@ -377,33 +399,56 @@ static R_VAL ruby2d_image_ext_load_image(R_VAL self, R_VAL path) {
 /*
  * Ruby2D::Text#ext_load_text
  */
+#if MRUBY
+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 R_VAL ruby2d_text_ext_load_text(R_VAL self, R_VAL font, R_VAL message) {
+#endif
   R2D_Init();
 
-  VALUE result = rb_ary_new2(3);
+  R_VAL result = r_ary_new();
 
   TTF_Font *ttf_font;
+
+#if MRUBY
+  Data_Get_Struct(mrb, font, &font_data_type, ttf_font);
+#else
   Data_Get_Struct(font, TTF_Font, ttf_font);
+#endif
 
   SDL_Surface *surface = R2D_TextCreateSurface(ttf_font, RSTRING_PTR(message));
   if (!surface) {
     return result;
   }
 
-  rb_ary_push(result, r_data_wrap_struct(surface, surface));
-  rb_ary_push(result, INT2NUM(surface->w));
-  rb_ary_push(result, INT2NUM(surface->h));
+  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 result;
 }
 
+
 /*
  * Ruby2D::Texture#ext_create
  */
+#if MRUBY
+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_texture_ext_create(R_VAL self, R_VAL rubySurface, R_VAL width, R_VAL height) {
+#endif
   GLuint texture_id = 0;
   SDL_Surface *surface;
-  Data_Get_Struct(rubySurface, SDL_Surface, surface);
+
+  #if MRUBY
+    Data_Get_Struct(mrb, rubySurface, &surface_data_type, surface);
+  #else
+    Data_Get_Struct(rubySurface, SDL_Surface, surface);
+  #endif
 
   // Detect image mode
   GLint format = GL_RGB;
@@ -418,10 +463,17 @@ static R_VAL ruby2d_texture_ext_create(R_VAL self, R_VAL rubySurface, R_VAL widt
   return INT2NUM(texture_id);
 }
 
+
 /*
  * Ruby2D::Texture#ext_delete
  */
+#if MRUBY
+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 R_VAL ruby2d_texture_ext_delete(R_VAL self, R_VAL rubyTexture_id) {
+#endif
   GLuint texture_id = NUM2INT(rubyTexture_id);
 
   R2D_GL_FreeTexture(&texture_id);
@@ -466,7 +518,11 @@ static R_VAL ruby2d_sound_ext_play(R_VAL self) {
 /*
  * Ruby2D::Sound#ext_length
  */
+#if MRUBY
+static R_VAL ruby2d_sound_ext_length(mrb_state* mrb, R_VAL self) {
+#else
 static R_VAL ruby2d_sound_ext_length(R_VAL self) {
+#endif
   R2D_Sound *snd;
   r_data_get_struct(self, "@data", &sound_data_type, R2D_Sound, snd);
   return INT2NUM(R2D_GetSoundLength(snd));
@@ -485,6 +541,7 @@ static void free_sound(R2D_Sound *snd) {
   R2D_FreeSound(snd);
 }
 
+
 /*
  * Ruby2D::Sound#ext_get_volume
  */
@@ -498,6 +555,7 @@ static R_VAL ruby2d_sound_ext_get_volume(R_VAL self) {
   return INT2NUM(ceil(Mix_VolumeChunk(snd->data, -1) * (100.0 / MIX_MAX_VOLUME)));
 }
 
+
 /*
  * Ruby2D::Music#ext_set_volume
  */
@@ -514,6 +572,7 @@ static R_VAL ruby2d_sound_ext_set_volume(R_VAL self, R_VAL volume) {
   return R_NIL;
 }
 
+
 /*
  * Ruby2D::Sound#ext_get_mix_volume
  */
@@ -525,6 +584,7 @@ static R_VAL ruby2d_sound_ext_get_mix_volume(R_VAL self) {
   return INT2NUM(ceil(Mix_Volume(-1, -1) * (100.0 / MIX_MAX_VOLUME)));
 }
 
+
 /*
  * Ruby2D::Music#ext_set_mix_volume
  */
@@ -539,6 +599,7 @@ static R_VAL ruby2d_sound_ext_set_mix_volume(R_VAL self, R_VAL volume) {
   return R_NIL;
 }
 
+
 /*
  * Ruby2D::Music#ext_init
  * Initialize music structure data
@@ -656,16 +717,27 @@ 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));
@@ -680,7 +752,13 @@ static R_VAL ruby2d_font_ext_load(R_VAL self, R_VAL path, R_VAL size, R_VAL styl
 /*
  * 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];
@@ -694,17 +772,29 @@ static R_VAL ruby2d_texture_ext_draw(R_VAL self, R_VAL ruby_coordinates, R_VAL r
   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);
 }
 
@@ -902,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);
@@ -923,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");
@@ -1040,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;
@@ -1069,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;
@@ -1081,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;
 }
 

data/ext/ruby2d/ruby2d.h

@@ -1,5 +1,8 @@
 // ruby2d.h
 
+#ifndef RUBY2D_H
+#define RUBY2D_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -8,6 +11,10 @@ extern "C" {
 
 // Set Platform Constants //////////////////////////////////////////////////////
 
+#ifndef MRUBY
+#define MRUBY false
+#endif
+
 // Apple
 #ifdef __APPLE__
   #ifndef __TARGETCONDITIONALS__
@@ -15,30 +22,54 @@ extern "C" {
   #endif
   #if TARGET_OS_OSX
     #define MACOS true
-  #elif TARGET_OS_IOS
-    #define IOS   true
-  #elif TARGET_OS_TV
-    #define TVOS  true
+  #else
+    #define MACOS false
+  #endif
+  #if TARGET_OS_IOS
+    #define IOS true
+  #else
+    #define IOS false
+  #endif
+  #if TARGET_OS_TV
+    #define TVOS true
+  #else
+    #define TVOS false
   #endif
 #endif
 
 // Windows
 #ifdef _WIN32
   #define WINDOWS true
+#else
+  #define WINDOWS false
 #endif
 
 // Windows and MinGW
 #ifdef __MINGW32__
   #define MINGW true
+#else
+  #define MINGW false
 #endif
 
-// GLES
-#if defined(__arm__) || IOS || TVOS
+// WebAssembly
+#ifdef __EMSCRIPTEN__
+  #define WASM true
+#else
+  #define WASM false
+#endif
+
+
+// #define GLES true
+
+// ARM and GLES
+#if IOS || TVOS || WASM
   #define GLES true
 #else
   #define GLES false
 #endif
 
+
+
 // Includes ////////////////////////////////////////////////////////////////////
 
 // Define to get GNU extension functions and types, like `vasprintf()` and M_PI
@@ -56,6 +87,7 @@ extern "C" {
 #if WINDOWS
   #include <stdio.h>
   #include <math.h>
+  #include <winsock2.h>
   #include <windows.h>
   // For terminal colors
   #ifndef  ENABLE_VIRTUAL_TERMINAL_PROCESSING
@@ -75,6 +107,17 @@ extern "C" {
   #undef main
 #endif
 
+#if WASM
+  #include <stdlib.h>
+  #include <stdio.h>
+  #include <string.h>
+  #include <math.h>
+  #include <emscripten.h>
+  #include <SDL.h>
+  #define GL_GLEXT_PROTOTYPES 1
+  #include <SDL_opengles2.h>
+#endif
+
 // OpenGL
 #if GLES
   #if IOS || TVOS
@@ -85,6 +128,7 @@ extern "C" {
 #else
   #define GL_GLEXT_PROTOTYPES 1
   #if WINDOWS
+    #define GLEW_STATIC
     #include <glew.h>
   #endif
   #include <SDL2/SDL_opengl.h>
@@ -623,6 +667,7 @@ void R2D_GL_FlushBuffers();
     GLfloat x3, GLfloat y3,
     GLfloat r3, GLfloat g3, GLfloat b3, GLfloat a3);
   void R2D_GLES_DrawTexture(GLfloat coordinates[], GLfloat texture_coordinates[], GLfloat color[], int texture_id);
+  void R2D_GLES_FlushBuffers();
 #else
   int R2D_GL2_Init();
   int R2D_GL3_Init();
@@ -650,3 +695,5 @@ void R2D_GL_FlushBuffers();
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* RUBY2D_H */

data/ext/ruby2d/text.c

@@ -18,5 +18,18 @@ SDL_Surface *R2D_TextCreateSurface(TTF_Font *font, const char *message) {
     return NULL;
   }
 
+  // Re-pack surface for OpenGL
+  // See: https://discourse.libsdl.org/t/sdl-ttf-2-0-18-surface-to-opengl-texture-not-consistent-with-ttf-2-0-15
+  Sint32 i;
+  Uint32 len = surface->w * surface->format->BytesPerPixel;
+  Uint8 *src = surface->pixels;
+  Uint8 *dst = surface->pixels;
+  for (i = 0; i < surface->h; i++) {
+    SDL_memmove(dst, src, len);
+    dst += len;
+    src += surface->pitch;
+  }
+  surface->pitch = len;
+
   return surface;
-}
+}