ruby2d 0.10.0 → 0.11.2

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>
@@ -272,64 +316,6 @@ typedef struct {
   bool close;
 } R2D_Window;
 
-// R2D_Image
-typedef struct {
-  const char *path;
-  SDL_Surface *surface;
-  int format;
-  GLuint texture_id;
-  R2D_Color color;
-  int x;
-  int y;
-  int width;
-  int height;
-  int orig_width;
-  int orig_height;
-  GLfloat rotate;  // Rotation angle in degrees
-  GLfloat rx;      // X coordinate to be rotated around
-  GLfloat ry;      // Y coordinate to be rotated around
-} R2D_Image;
-
-// R2D_Sprite
-typedef struct {
-  const char *path;
-  R2D_Image *img;
-  R2D_Color color;
-  int x;
-  int y;
-  int width;
-  int height;
-  int clip_width;
-  int clip_height;
-  GLfloat rotate;  // Rotation angle in degrees
-  GLfloat rx;      // X coordinate to be rotated around
-  GLfloat ry;      // Y coordinate to be rotated around
-  GLfloat tx1;
-  GLfloat ty1;
-  GLfloat tx2;
-  GLfloat ty2;
-  GLfloat tx3;
-  GLfloat ty3;
-  GLfloat tx4;
-  GLfloat ty4;
-} R2D_Sprite;
-
-// R2D_Text
-typedef struct {
-  const char *font;
-  SDL_Surface *surface;
-  GLuint texture_id;
-  TTF_Font *font_data;
-  R2D_Color color;
-  char *msg;
-  int x;
-  int y;
-  int width;
-  int height;
-  GLfloat rotate;  // Rotation angle in degrees
-  GLfloat rx;      // X coordinate to be rotated around
-  GLfloat ry;      // Y coordinate to be rotated around
-} R2D_Text;
 
 // R2D_Sound
 typedef struct {
@@ -452,85 +438,28 @@ void R2D_DrawCircle(
 // Image ///////////////////////////////////////////////////////////////////////
 
 /*
- * Create an image, given a file path
- */
-R2D_Image *R2D_CreateImage(const char *path);
-
-/*
- * Rotate an image
- */
-void R2D_RotateImage(R2D_Image *img, GLfloat angle, int position);
-
-/*
- * Draw an image
- */
-void R2D_DrawImage(R2D_Image *img);
-
-/*
- * Free an image
- */
-void R2D_FreeImage(R2D_Image *img);
-
-// Sprite //////////////////////////////////////////////////////////////////////
-
-/*
- * Create a sprite, given an image file path
- */
-R2D_Sprite *R2D_CreateSprite(const char *path);
-
-/*
- * Clip a sprite
+ * Create a surface with image pixel data, given a file path
  */
-void R2D_ClipSprite(R2D_Sprite *spr, int x, int y, int w, int h);
+SDL_Surface *R2D_CreateImageSurface(const char *path);
 
 /*
- * Rotate a sprite
+ * Convert images to RGB format if they are in a different (BGR for example) format.
  */
-void R2D_RotateSprite(R2D_Sprite *spr, GLfloat angle, int position);
+void R2D_ImageConvertToRGB(SDL_Surface *surface);
 
-/*
- * Draw a sprite
- */
-void R2D_DrawSprite(R2D_Sprite *spr);
-
-/*
- * Free a sprite
- */
-void R2D_FreeSprite(R2D_Sprite *spr);
-
-// Tile ////////////////////////////////////////////////////////////////////////
+// Font ////////////////////////////////////////////////////////////////////////
 
 /*
- * Draw a tile
+ * Create a TTF_Font object given a path to a font and a size
  */
-void R2D_DrawTile(R2D_Image *img, int tw, int th, int padding, int spacing, int tx, int ty, int x, int y);
+TTF_Font *R2D_FontCreateTTFFont(const char *path, int size, const char *style);
 
 // Text ////////////////////////////////////////////////////////////////////////
 
 /*
- * Create text, given a font file path, the message, and size
+ * Create a SDL_Surface that contains the pixel data to render text, given a font and message
  */
-R2D_Text *R2D_CreateText(const char *font, const char *msg, int size);
-
-/*
-* Set the text message
-*/
-void R2D_SetText(R2D_Text *txt, const char *msg, ...);
-
-/*
- * Rotate text
- */
-void R2D_RotateText(R2D_Text *txt, GLfloat angle, int position);
-
-/*
- * Draw text
- */
-void R2D_DrawText(R2D_Text *txt);
-
-/*
- * Free the text
- */
-void R2D_FreeText(R2D_Text *txt);
+SDL_Surface *R2D_TextCreateSurface(TTF_Font *font, const char *message);
 
 // Sound ///////////////////////////////////////////////////////////////////////
 
@@ -702,11 +631,11 @@ int R2D_FreeWindow(R2D_Window *window);
 // Ruby 2D OpenGL Functions ////////////////////////////////////////////////////
 
 int R2D_GL_Init(R2D_Window *window);
-void R2D_GL_PrintError(char *error);
+void R2D_GL_PrintError(const char *error);
 void R2D_GL_PrintContextInfo(R2D_Window *window);
 void R2D_GL_StoreContextInfo(R2D_Window *window);
-GLuint R2D_GL_LoadShader(GLenum type, const GLchar *shaderSrc, char *shaderName);
-int R2D_GL_CheckLinked(GLuint program, char *name);
+GLuint R2D_GL_LoadShader(GLenum type, const GLchar *shaderSrc, const char *shaderName);
+int R2D_GL_CheckLinked(GLuint program, const char *name);
 void R2D_GL_GetViewportScale(R2D_Window *window, int *w, int *h, double *scale);
 void R2D_GL_SetViewport(R2D_Window *window);
 void R2D_GL_CreateTexture(
@@ -720,11 +649,7 @@ void R2D_GL_DrawTriangle(
   GLfloat r2, GLfloat g2, GLfloat b2, GLfloat a2,
   GLfloat x3, GLfloat y3,
   GLfloat r3, GLfloat g3, GLfloat b3, GLfloat a3);
-void R2D_GL_DrawImage(R2D_Image *img);
-void R2D_GL_DrawSprite(R2D_Sprite *spr);
-void R2D_GL_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);
-void R2D_GL_DrawText(R2D_Text *txt);
+void R2D_GL_DrawTexture(GLfloat coordinates[], GLfloat texture_coordinates[], GLfloat color[], int texture_id);
 void R2D_GL_FreeTexture(GLuint *id);
 void R2D_GL_Clear(R2D_Color clr);
 void R2D_GL_FlushBuffers();
@@ -741,13 +666,8 @@ void R2D_GL_FlushBuffers();
     GLfloat r2, GLfloat g2, GLfloat b2, GLfloat a2,
     GLfloat x3, GLfloat y3,
     GLfloat r3, GLfloat g3, GLfloat b3, GLfloat a3);
-  void R2D_GLES_DrawImage(R2D_Image *img);
-  void R2D_GLES_DrawSprite(R2D_Sprite *spr);
-    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);
-  void R2D_GLES_DrawText(R2D_Text *txt);
+  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();
@@ -767,23 +687,13 @@ void R2D_GL_FlushBuffers();
     GLfloat r2, GLfloat g2, GLfloat b2, GLfloat a2,
     GLfloat x3, GLfloat y3,
     GLfloat r3, GLfloat g3, GLfloat b3, GLfloat a3);
-  void R2D_GL2_DrawImage(R2D_Image *img);
-  void R2D_GL3_DrawImage(R2D_Image *img);
-  void R2D_GL2_DrawSprite(R2D_Sprite *spr);
-  void R2D_GL3_DrawSprite(R2D_Sprite *spr);
-  void R2D_GL2_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);
-  void R2D_GL3_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);
-  void R2D_GL2_DrawText(R2D_Text *txt);
-  void R2D_GL3_DrawText(R2D_Text *txt);
+  void R2D_GL2_DrawTexture(GLfloat coordinates[], GLfloat texture_coordinates[], GLfloat color[], int texture_id);
+  void R2D_GL3_DrawTexture(GLfloat coordinates[], GLfloat texture_coordinates[], GLfloat color[], int texture_id);
   void R2D_GL3_FlushBuffers();
 #endif
 
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* RUBY2D_H */

data/ext/ruby2d/sound.c

@@ -57,7 +57,7 @@ int R2D_GetSoundLength(R2D_Sound *snd) {
   int channels = 0;
 
   // Populate the frequency, format and channel variables
-  if (!Mix_QuerySpec(&frequency, &format, &channels)) return -1; // Querying audio deails failed
+  if (!Mix_QuerySpec(&frequency, &format, &channels)) return -1; // Querying audio details failed
   if (!snd) return -1;
 
   // points = bytes / samplesize

data/ext/ruby2d/text.c

@@ -4,126 +4,32 @@
 
 
 /*
- * Create text, given a font file path, the message, and size
+ * Create a SDL_Surface that contains the pixel data to render text, given a font and message
  */
-R2D_Text *R2D_CreateText(const char *font, const char *msg, int size) {
-  R2D_Init();
-
-  // Check if font file exists
-  if (!R2D_FileExists(font)) {
-    R2D_Error("R2D_CreateText", "Font file `%s` not found", font);
-    return NULL;
-  }
-
+SDL_Surface *R2D_TextCreateSurface(TTF_Font *font, const char *message) {
   // `msg` cannot be an empty string or NULL for TTF_SizeText
-  if (msg == NULL || strlen(msg) == 0) msg = " ";
+  if (message == NULL || strlen(message) == 0) message = " ";
 
-  // Allocate the text structure
-  R2D_Text *txt = (R2D_Text *) malloc(sizeof(R2D_Text));
-  if (!txt) {
-    R2D_Error("R2D_CreateText", "Out of memory!");
+  SDL_Color color = {255, 255, 255};
+  SDL_Surface *surface = TTF_RenderUTF8_Blended(font, message, color);
+  if (!surface)
+  {
+    R2D_Error("TTF_RenderUTF8_Blended", TTF_GetError());
     return NULL;
   }
 
-  // Open the font
-  txt->font_data = TTF_OpenFont(font, size);
-  if (!txt->font_data) {
-    R2D_Error("TTF_OpenFont", TTF_GetError());
-    free(txt);
-    return NULL;
-  }
-
-  // Initialize values
-  txt->font = font;
-  txt->msg = (char *) malloc(strlen(msg) + 1 * sizeof(char));
-  strcpy(txt->msg, msg);
-  txt->x = 0;
-  txt->y = 0;
-  txt->color.r = 1.f;
-  txt->color.g = 1.f;
-  txt->color.b = 1.f;
-  txt->color.a = 1.f;
-  txt->rotate = 0;
-  txt->rx = 0;
-  txt->ry = 0;
-  txt->texture_id = 0;
-
-  // Save the width and height of the text
-  TTF_SizeUTF8(txt->font_data, txt->msg, &txt->width, &txt->height);
-
-  return txt;
-}
-
-
-/*
- * Set the text message
- */
-void R2D_SetText(R2D_Text *txt, const char *msg, ...) {
-  if (!txt) return;
-
-  // `msg` cannot be an empty string or NULL for TTF_SizeUTF8
-  if (msg == NULL || strlen(msg) == 0) msg = " ";
-
-  // Format and store new text string
-  va_list args;
-  va_start(args, msg);
-  free(txt->msg);
-  vasprintf(&txt->msg, msg, args);
-  va_end(args);
-
-  // Save the width and height of the text
-  TTF_SizeUTF8(txt->font_data, txt->msg, &txt->width, &txt->height);
-
-  // Delete the current texture so a new one can be generated
-  R2D_GL_FreeTexture(&txt->texture_id);
-}
-
-
-/*
- * Rotate text
- */
-void R2D_RotateText(R2D_Text *txt, GLfloat angle, int position) {
-
-  R2D_GL_Point p = R2D_GetRectRotationPoint(
-    txt->x, txt->y, txt->width, txt->height, position
-  );
-
-  txt->rotate = angle;
-  txt->rx = p.x;
-  txt->ry = p.y;
-}
-
-
-/*
- * Draw text
- */
-void R2D_DrawText(R2D_Text *txt) {
-  if (!txt) return;
-
-  if (txt->texture_id == 0) {
-    SDL_Color color = { 255, 255, 255 };
-    txt->surface = TTF_RenderUTF8_Blended(txt->font_data, txt->msg, color);
-    if (!txt->surface) {
-      R2D_Error("TTF_RenderUTF8_Blended", TTF_GetError());
-      return;
-    }
-    R2D_GL_CreateTexture(&txt->texture_id, GL_RGBA,
-                         txt->width, txt->height,
-                         txt->surface->pixels, GL_NEAREST);
-    SDL_FreeSurface(txt->surface);
+  // 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;
 
-  R2D_GL_DrawText(txt);
-}
-
-
-/*
- * Free the text
- */
-void R2D_FreeText(R2D_Text *txt) {
-  if (!txt) return;
-  free(txt->msg);
-  R2D_GL_FreeTexture(&txt->texture_id);
-  TTF_CloseFont(txt->font_data);
-  free(txt);
+  return surface;
 }