ruby2d 0.10.0 → 0.11.0

data/ext/ruby2d/ruby2d.h

@@ -272,64 +272,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 +394,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);
+// Font ////////////////////////////////////////////////////////////////////////
 
 /*
- * Free a sprite
+ * Create a TTF_Font object given a path to a font and a size
  */
-void R2D_FreeSprite(R2D_Sprite *spr);
-
-// Tile ////////////////////////////////////////////////////////////////////////
-
-/*
- * Draw a tile
- */
-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
- */
-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
+ * Create a SDL_Surface that contains the pixel data to render text, given a font and message
  */
-void R2D_FreeText(R2D_Text *txt);
+SDL_Surface *R2D_TextCreateSurface(TTF_Font *font, const char *message);
 
 // Sound ///////////////////////////////////////////////////////////////////////
 
@@ -702,11 +587,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 +605,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 +622,7 @@ 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);
 #else
   int R2D_GL2_Init();
   int R2D_GL3_Init();
@@ -767,20 +642,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_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
 

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,19 @@
 
 
 /*
- * 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);
-  }
-
-  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;
+}

data/ext/ruby2d/window.c

@@ -335,11 +335,11 @@ int R2D_Show(R2D_Window *window) {
  * Set the icon for the window
  */
 void R2D_SetIcon(R2D_Window *window, const char *icon) {
-  R2D_Image *img = R2D_CreateImage(icon);
-  if (img) {
+  SDL_Surface *iconSurface = R2D_CreateImageSurface(icon);
+  if (iconSurface) {
     window->icon = icon;
-    SDL_SetWindowIcon(window->sdl, img->surface);
-    R2D_FreeImage(img);
+    SDL_SetWindowIcon(window->sdl, iconSurface);
+    SDL_FreeSurface(iconSurface);
   } else {
     R2D_Log(R2D_WARN, "Could not set window icon");
   }

data/lib/ruby2d/circle.rb

@@ -13,7 +13,7 @@ module Ruby2D
       @radius = opts[:radius] || 50
       @sectors = opts[:sectors] || 30
       self.color = opts[:color] || 'white'
-      self.opacity = opts[:opacity] if opts[:opacity]
+      self.color.opacity = opts[:opacity] if opts[:opacity]
       add
     end
 
@@ -22,6 +22,8 @@ module Ruby2D
     end
 
     def self.draw(opts = {})
+      Window.render_ready_check
+
       ext_draw([
         opts[:x], opts[:y], opts[:radius], opts[:sectors],
         opts[:color][0], opts[:color][1], opts[:color][2], opts[:color][3]

data/lib/ruby2d/cli/build.rb

@@ -25,6 +25,8 @@ require 'fileutils'
   'text',
   'sound',
   'music',
+  'texture',
+  'vertices',
   '../ruby2d'
 ]
 

data/lib/ruby2d/font.rb

@@ -2,8 +2,22 @@
 
 module Ruby2D
   class Font
+    @@loaded_fonts = {}
+
+    attr_reader :ttf_font
+
+    def initialize(path, size, style=nil)
+      @ttf_font = Font.ext_load(path, size, style.to_s)
+    end
 
     class << self
+      def load(path, size, style=nil)
+        unless File.exist? path
+          raise Error, "Cannot find font file `#{path}`"
+        end
+
+        @@loaded_fonts[[path, size, style]] ||= Font.new(path, size, style)
+      end
 
       # List all fonts, names only
       def all
@@ -50,6 +64,7 @@ module Ruby2D
         macos_font_path   = '/Library/Fonts'
         linux_font_path   = '/usr/share/fonts'
         windows_font_path = 'C:/Windows/Fonts'
+        openbsd_font_path = '/usr/X11R6/lib/X11/fonts'
 
         # If MRI and/or non-Bash shell (like cmd.exe)
         if Object.const_defined? :RUBY_PLATFORM
@@ -60,16 +75,20 @@ module Ruby2D
             linux_font_path
           when /mingw/
             windows_font_path
+          when /openbsd/
+            openbsd_font_path
           end
         # If MRuby
         else
           uname = `uname`
-          if uname.include? 'Darwin' # macOS
+          if uname.include? 'Darwin'  # macOS
             macos_font_path
           elsif uname.include? 'Linux'
             linux_font_path
           elsif uname.include? 'MINGW'
             windows_font_path
+          elsif uname.include? 'OpenBSD'
+            openbsd_font_path
           end
         end
       end