ruby2d 0.9.4 → 0.9.5

data/{assets/linux/simple2d/src → ext/ruby2d}/gl2.c

@@ -1,6 +1,6 @@
 // OpenGL 2.1
 
-#include "../include/simple2d.h"
+#include "ruby2d.h"
 
 #if !GLES
 
@@ -8,7 +8,7 @@
 /*
  * Applies the projection matrix
  */
-void S2D_GL2_ApplyProjection(int w, int h) {
+void R2D_GL2_ApplyProjection(int w, int h) {
 
   // Initialize the projection matrix
   glMatrixMode(GL_PROJECTION);
@@ -26,7 +26,7 @@ void S2D_GL2_ApplyProjection(int w, int h) {
 /*
  * Initalize OpenGL
  */
-int S2D_GL2_Init() {
+int R2D_GL2_Init() {
 
   GLenum error = GL_NO_ERROR;
 
@@ -37,7 +37,7 @@ int S2D_GL2_Init() {
   // Check for errors
   error = glGetError();
   if (error != GL_NO_ERROR) {
-    S2D_GL_PrintError("OpenGL initialization failed");
+    R2D_GL_PrintError("OpenGL initialization failed");
     return 1;
   } else {
     return 0;
@@ -48,7 +48,7 @@ int S2D_GL2_Init() {
 /*
  * Draw triangle
  */
-void S2D_GL2_DrawTriangle(GLfloat x1, GLfloat y1,
+void R2D_GL2_DrawTriangle(GLfloat x1, GLfloat y1,
                           GLfloat r1, GLfloat g1, GLfloat b1, GLfloat a1,
                           GLfloat x2, GLfloat y2,
                           GLfloat r2, GLfloat g2, GLfloat b2, GLfloat a2,
@@ -66,24 +66,24 @@ void S2D_GL2_DrawTriangle(GLfloat x1, GLfloat y1,
 /*
  * Draw texture
  */
-static void S2D_GL2_DrawTexture(int x, int y, int w, int h,
+static void R2D_GL2_DrawTexture(int x, int y, int w, int h,
                                 GLfloat angle, GLfloat rx, GLfloat ry,
                                 GLfloat r, GLfloat g, GLfloat b, GLfloat a,
                                 GLfloat tx1, GLfloat ty1, GLfloat tx2, GLfloat ty2,
                                 GLfloat tx3, GLfloat ty3, GLfloat tx4, GLfloat ty4,
                                 GLuint texture_id) {
 
-  S2D_GL_Point v1 = { .x = x,     .y = y     };
-  S2D_GL_Point v2 = { .x = x + w, .y = y     };
-  S2D_GL_Point v3 = { .x = x + w, .y = y + h };
-  S2D_GL_Point v4 = { .x = x,     .y = y + h };
+  R2D_GL_Point v1 = { .x = x,     .y = y     };
+  R2D_GL_Point v2 = { .x = x + w, .y = y     };
+  R2D_GL_Point v3 = { .x = x + w, .y = y + h };
+  R2D_GL_Point v4 = { .x = x,     .y = y + h };
 
   // Rotate vertices
   if (angle != 0) {
-    v1 = S2D_RotatePoint(v1, angle, rx, ry);
-    v2 = S2D_RotatePoint(v2, angle, rx, ry);
-    v3 = S2D_RotatePoint(v3, angle, rx, ry);
-    v4 = S2D_RotatePoint(v4, angle, rx, ry);
+    v1 = R2D_RotatePoint(v1, angle, rx, ry);
+    v2 = R2D_RotatePoint(v2, angle, rx, ry);
+    v3 = R2D_RotatePoint(v3, angle, rx, ry);
+    v4 = R2D_RotatePoint(v4, angle, rx, ry);
   }
 
   glEnable(GL_TEXTURE_2D);
@@ -105,8 +105,8 @@ static void S2D_GL2_DrawTexture(int x, int y, int w, int h,
 /*
  * Draw image
  */
-void S2D_GL2_DrawImage(S2D_Image *img) {
-  S2D_GL2_DrawTexture(
+void R2D_GL2_DrawImage(R2D_Image *img) {
+  R2D_GL2_DrawTexture(
     img->x, img->y, img->width, img->height,
     img->rotate, img->rx, img->ry,
     img->color.r, img->color.g, img->color.b, img->color.a,
@@ -119,8 +119,8 @@ void S2D_GL2_DrawImage(S2D_Image *img) {
 /*
  * Draw sprite
  */
-void S2D_GL2_DrawSprite(S2D_Sprite *spr) {
-  S2D_GL2_DrawTexture(
+void R2D_GL2_DrawSprite(R2D_Sprite *spr) {
+  R2D_GL2_DrawTexture(
     spr->x, spr->y, spr->width, spr->height,
     spr->rotate, spr->rx, spr->ry,
     spr->color.r, spr->color.g, spr->color.b, spr->color.a,
@@ -133,8 +133,8 @@ void S2D_GL2_DrawSprite(S2D_Sprite *spr) {
 /*
  * Draw text
  */
-void S2D_GL2_DrawText(S2D_Text *txt) {
-  S2D_GL2_DrawTexture(
+void R2D_GL2_DrawText(R2D_Text *txt) {
+  R2D_GL2_DrawTexture(
     txt->x, txt->y, txt->width, txt->height,
     txt->rotate, txt->rx, txt->ry,
     txt->color.r, txt->color.g, txt->color.b, txt->color.a,

data/{assets/linux/simple2d/src → ext/ruby2d}/gl3.c

@@ -1,6 +1,6 @@
 // OpenGL 3.3+
 
-#include "../include/simple2d.h"
+#include "ruby2d.h"
 
 // Skip this file if OpenGL ES
 #if !GLES
@@ -21,7 +21,7 @@ static GLuint indices[] =  // indices for rendering textured quads
 /*
  * Applies the projection matrix
  */
-void S2D_GL3_ApplyProjection(GLfloat orthoMatrix[16]) {
+void R2D_GL3_ApplyProjection(GLfloat orthoMatrix[16]) {
 
   // Use the program object
   glUseProgram(shaderProgram);
@@ -46,7 +46,7 @@ void S2D_GL3_ApplyProjection(GLfloat orthoMatrix[16]) {
 /*
  * Initalize OpenGL
  */
-int S2D_GL3_Init() {
+int R2D_GL3_Init() {
 
   // Enable transparency
   glEnable(GL_BLEND);
@@ -116,9 +116,9 @@ int S2D_GL3_Init() {
   glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo);
 
   // Load the vertex and fragment shaders
-  GLuint vertexShader      = S2D_GL_LoadShader(  GL_VERTEX_SHADER,      vertexSource, "GL3 Vertex");
-  GLuint fragmentShader    = S2D_GL_LoadShader(GL_FRAGMENT_SHADER,    fragmentSource, "GL3 Fragment");
-  GLuint texFragmentShader = S2D_GL_LoadShader(GL_FRAGMENT_SHADER, texFragmentSource, "GL3 Texture Fragment");
+  GLuint vertexShader      = R2D_GL_LoadShader(  GL_VERTEX_SHADER,      vertexSource, "GL3 Vertex");
+  GLuint fragmentShader    = R2D_GL_LoadShader(GL_FRAGMENT_SHADER,    fragmentSource, "GL3 Fragment");
+  GLuint texFragmentShader = R2D_GL_LoadShader(GL_FRAGMENT_SHADER, texFragmentSource, "GL3 Texture Fragment");
 
   // Triangle Shader //
 
@@ -127,7 +127,7 @@ int S2D_GL3_Init() {
 
   // Check if program was created successfully
   if (shaderProgram == 0) {
-    S2D_GL_PrintError("Failed to create shader program");
+    R2D_GL_PrintError("Failed to create shader program");
     return GL_FALSE;
   }
 
@@ -142,7 +142,7 @@ int S2D_GL3_Init() {
   glLinkProgram(shaderProgram);
 
   // Check if linked
-  S2D_GL_CheckLinked(shaderProgram, "GL3 shader");
+  R2D_GL_CheckLinked(shaderProgram, "GL3 shader");
 
   // Specify the layout of the position vertex data...
   GLint posAttrib = glGetAttribLocation(shaderProgram, "position");
@@ -161,7 +161,7 @@ int S2D_GL3_Init() {
 
   // Check if program was created successfully
   if (texShaderProgram == 0) {
-    S2D_GL_PrintError("Failed to create shader program");
+    R2D_GL_PrintError("Failed to create shader program");
     return GL_FALSE;
   }
 
@@ -176,7 +176,7 @@ int S2D_GL3_Init() {
   glLinkProgram(texShaderProgram);
 
   // Check if linked
-  S2D_GL_CheckLinked(texShaderProgram, "GL3 texture shader");
+  R2D_GL_CheckLinked(texShaderProgram, "GL3 texture shader");
 
   // Specify the layout of the position vertex data...
   posAttrib = glGetAttribLocation(texShaderProgram, "position");
@@ -206,7 +206,7 @@ int S2D_GL3_Init() {
 /*
  * Render the vertex buffer and reset it
  */
-void S2D_GL3_FlushBuffers() {
+void R2D_GL3_FlushBuffers() {
 
   // Use the triangle shader program
   glUseProgram(shaderProgram);
@@ -228,7 +228,7 @@ void S2D_GL3_FlushBuffers() {
 /*
  * Draw triangle
  */
-void S2D_GL3_DrawTriangle(GLfloat x1, GLfloat y1,
+void R2D_GL3_DrawTriangle(GLfloat x1, GLfloat y1,
                           GLfloat r1, GLfloat g1, GLfloat b1, GLfloat a1,
                           GLfloat x2, GLfloat y2,
                           GLfloat r2, GLfloat g2, GLfloat b2, GLfloat a2,
@@ -236,7 +236,7 @@ void S2D_GL3_DrawTriangle(GLfloat x1, GLfloat y1,
                           GLfloat r3, GLfloat g3, GLfloat b3, GLfloat a3) {
 
   // If buffer is full, flush it
-  if (vboDataIndex >= vboObjCapacity) S2D_GL3_FlushBuffers();
+  if (vboDataIndex >= vboObjCapacity) R2D_GL3_FlushBuffers();
 
   // Set the triangle data into a formatted array
   GLfloat vertices[] =
@@ -256,7 +256,7 @@ void S2D_GL3_DrawTriangle(GLfloat x1, GLfloat y1,
 /*
  * Draw a texture
  */
-static void S2D_GL3_DrawTexture(int x, int y, int w, int h,
+static void R2D_GL3_DrawTexture(int x, int y, int w, int h,
                                 GLfloat angle, GLfloat rx, GLfloat ry,
                                 GLfloat r, GLfloat g, GLfloat b, GLfloat a,
                                 GLfloat tx1, GLfloat ty1, GLfloat tx2, GLfloat ty2,
@@ -265,20 +265,20 @@ static void S2D_GL3_DrawTexture(int x, int y, int w, int h,
 
   // Currently, textures are not buffered, so we have to flush all buffers so
   // textures get rendered in the correct Z order
-  S2D_GL3_FlushBuffers();
+  R2D_GL3_FlushBuffers();
 
   // Set up the vertex points
-  S2D_GL_Point v1 = { .x = x,     .y = y     };
-  S2D_GL_Point v2 = { .x = x + w, .y = y     };
-  S2D_GL_Point v3 = { .x = x + w, .y = y + h };
-  S2D_GL_Point v4 = { .x = x,     .y = y + h };
+  R2D_GL_Point v1 = { .x = x,     .y = y     };
+  R2D_GL_Point v2 = { .x = x + w, .y = y     };
+  R2D_GL_Point v3 = { .x = x + w, .y = y + h };
+  R2D_GL_Point v4 = { .x = x,     .y = y + h };
 
   // Rotate vertices
   if (angle != 0) {
-    v1 = S2D_RotatePoint(v1, angle, rx, ry);
-    v2 = S2D_RotatePoint(v2, angle, rx, ry);
-    v3 = S2D_RotatePoint(v3, angle, rx, ry);
-    v4 = S2D_RotatePoint(v4, angle, rx, ry);
+    v1 = R2D_RotatePoint(v1, angle, rx, ry);
+    v2 = R2D_RotatePoint(v2, angle, rx, ry);
+    v3 = R2D_RotatePoint(v3, angle, rx, ry);
+    v4 = R2D_RotatePoint(v4, angle, rx, ry);
   }
 
   // Set the textured quad data into a formatted array
@@ -307,8 +307,8 @@ static void S2D_GL3_DrawTexture(int x, int y, int w, int h,
 /*
  * Draw image
  */
-void S2D_GL3_DrawImage(S2D_Image *img) {
-  S2D_GL3_DrawTexture(
+void R2D_GL3_DrawImage(R2D_Image *img) {
+  R2D_GL3_DrawTexture(
     img->x, img->y, img->width, img->height,
     img->rotate, img->rx, img->ry,
     img->color.r, img->color.g, img->color.b, img->color.a,
@@ -321,8 +321,8 @@ void S2D_GL3_DrawImage(S2D_Image *img) {
 /*
  * Draw sprite
  */
-void S2D_GL3_DrawSprite(S2D_Sprite *spr) {
-  S2D_GL3_DrawTexture(
+void R2D_GL3_DrawSprite(R2D_Sprite *spr) {
+  R2D_GL3_DrawTexture(
     spr->x, spr->y, spr->width, spr->height,
     spr->rotate, spr->rx, spr->ry,
     spr->color.r, spr->color.g, spr->color.b, spr->color.a,
@@ -335,8 +335,8 @@ void S2D_GL3_DrawSprite(S2D_Sprite *spr) {
 /*
  * Draw text
  */
-void S2D_GL3_DrawText(S2D_Text *txt) {
-  S2D_GL3_DrawTexture(
+void R2D_GL3_DrawText(R2D_Text *txt) {
+  R2D_GL3_DrawTexture(
     txt->x, txt->y, txt->width, txt->height,
     txt->rotate, txt->rx, txt->ry,
     txt->color.r, txt->color.g, txt->color.b, txt->color.a,

data/{assets/linux/simple2d/src → ext/ruby2d}/gles.c

@@ -1,6 +1,6 @@
 // OpenGL ES 2.0
 
-#include "../include/simple2d.h"
+#include "ruby2d.h"
 
 #if GLES
 
@@ -24,7 +24,7 @@ static GLushort indices[] =
 /*
  * Applies the projection matrix
  */
-void S2D_GLES_ApplyProjection(GLfloat orthoMatrix[16]) {
+void R2D_GLES_ApplyProjection(GLfloat orthoMatrix[16]) {
 
   // Use the program object
   glUseProgram(shaderProgram);
@@ -47,7 +47,7 @@ void S2D_GLES_ApplyProjection(GLfloat orthoMatrix[16]) {
 /*
  * Initalize OpenGL ES
  */
-int S2D_GLES_Init() {
+int R2D_GLES_Init() {
 
   // Enable transparency
   glEnable(GL_BLEND);
@@ -99,9 +99,9 @@ int S2D_GLES_Init() {
     "}";
 
   // Load the vertex and fragment shaders
-  GLuint vertexShader      = S2D_GL_LoadShader(  GL_VERTEX_SHADER,      vertexSource, "GLES Vertex");
-  GLuint fragmentShader    = S2D_GL_LoadShader(GL_FRAGMENT_SHADER,    fragmentSource, "GLES Fragment");
-  GLuint texFragmentShader = S2D_GL_LoadShader(GL_FRAGMENT_SHADER, texFragmentSource, "GLES Texture Fragment");
+  GLuint vertexShader      = R2D_GL_LoadShader(  GL_VERTEX_SHADER,      vertexSource, "GLES Vertex");
+  GLuint fragmentShader    = R2D_GL_LoadShader(GL_FRAGMENT_SHADER,    fragmentSource, "GLES Fragment");
+  GLuint texFragmentShader = R2D_GL_LoadShader(GL_FRAGMENT_SHADER, texFragmentSource, "GLES Texture Fragment");
 
   // Triangle Shader //
 
@@ -110,7 +110,7 @@ int S2D_GLES_Init() {
 
   // Check if program was created successfully
   if (shaderProgram == 0) {
-    S2D_GL_PrintError("Failed to create shader program");
+    R2D_GL_PrintError("Failed to create shader program");
     return GL_FALSE;
   }
 
@@ -122,7 +122,7 @@ int S2D_GLES_Init() {
   glLinkProgram(shaderProgram);
 
   // Check if linked
-  S2D_GL_CheckLinked(shaderProgram, "GLES shader");
+  R2D_GL_CheckLinked(shaderProgram, "GLES shader");
 
   // Get the attribute locations
   positionLocation = glGetAttribLocation(shaderProgram, "a_position");
@@ -135,7 +135,7 @@ int S2D_GLES_Init() {
 
   // Check if program was created successfully
   if (texShaderProgram == 0) {
-    S2D_GL_PrintError("Failed to create shader program");
+    R2D_GL_PrintError("Failed to create shader program");
     return GL_FALSE;
   }
 
@@ -147,7 +147,7 @@ int S2D_GLES_Init() {
   glLinkProgram(texShaderProgram);
 
   // Check if linked
-  S2D_GL_CheckLinked(texShaderProgram, "GLES texture shader");
+  R2D_GL_CheckLinked(texShaderProgram, "GLES texture shader");
 
   // Get the attribute locations
   texPositionLocation = glGetAttribLocation(texShaderProgram, "a_position");
@@ -169,7 +169,7 @@ int S2D_GLES_Init() {
 /*
  * Draw triangle
  */
-void S2D_GLES_DrawTriangle(GLfloat x1, GLfloat y1,
+void R2D_GLES_DrawTriangle(GLfloat x1, GLfloat y1,
                            GLfloat r1, GLfloat g1, GLfloat b1, GLfloat a1,
                            GLfloat x2, GLfloat y2,
                            GLfloat r2, GLfloat g2, GLfloat b2, GLfloat a2,
@@ -204,24 +204,24 @@ void S2D_GLES_DrawTriangle(GLfloat x1, GLfloat y1,
 /*
  * Draw a texture
  */
-static void S2D_GLES_DrawTexture(int x, int y, int w, int h,
+static void R2D_GLES_DrawTexture(int x, int y, int w, int h,
                                  GLfloat angle, GLfloat rx, GLfloat ry,
                                  GLfloat r, GLfloat g, GLfloat b, GLfloat a,
                                  GLfloat tx1, GLfloat ty1, GLfloat tx2, GLfloat ty2,
                                  GLfloat tx3, GLfloat ty3, GLfloat tx4, GLfloat ty4,
                                  GLuint texture_id) {
 
-  S2D_GL_Point v1 = { .x = x,     .y = y     };
-  S2D_GL_Point v2 = { .x = x + w, .y = y     };
-  S2D_GL_Point v3 = { .x = x + w, .y = y + h };
-  S2D_GL_Point v4 = { .x = x,     .y = y + h };
+  R2D_GL_Point v1 = { .x = x,     .y = y     };
+  R2D_GL_Point v2 = { .x = x + w, .y = y     };
+  R2D_GL_Point v3 = { .x = x + w, .y = y + h };
+  R2D_GL_Point v4 = { .x = x,     .y = y + h };
 
   // Rotate vertices
   if (angle != 0) {
-    v1 = S2D_RotatePoint(v1, angle, rx, ry);
-    v2 = S2D_RotatePoint(v2, angle, rx, ry);
-    v3 = S2D_RotatePoint(v3, angle, rx, ry);
-    v4 = S2D_RotatePoint(v4, angle, rx, ry);
+    v1 = R2D_RotatePoint(v1, angle, rx, ry);
+    v2 = R2D_RotatePoint(v2, angle, rx, ry);
+    v3 = R2D_RotatePoint(v3, angle, rx, ry);
+    v4 = R2D_RotatePoint(v4, angle, rx, ry);
   }
 
   GLfloat vertices[] =
@@ -267,8 +267,8 @@ static void S2D_GLES_DrawTexture(int x, int y, int w, int h,
 /*
  * Draw image
  */
-void S2D_GLES_DrawImage(S2D_Image *img) {
-  S2D_GLES_DrawTexture(
+void R2D_GLES_DrawImage(R2D_Image *img) {
+  R2D_GLES_DrawTexture(
     img->x, img->y, img->width, img->height,
     img->rotate, img->rx, img->ry,
     img->color.r, img->color.g, img->color.b, img->color.a,
@@ -281,8 +281,8 @@ void S2D_GLES_DrawImage(S2D_Image *img) {
 /*
  * Draw sprite
  */
-void S2D_GLES_DrawSprite(S2D_Sprite *spr) {
-  S2D_GLES_DrawTexture(
+void R2D_GLES_DrawSprite(R2D_Sprite *spr) {
+  R2D_GLES_DrawTexture(
     spr->x, spr->y, spr->width, spr->height,
     spr->rotate, spr->rx, spr->ry,
     spr->color.r, spr->color.g, spr->color.b, spr->color.a,
@@ -295,8 +295,8 @@ void S2D_GLES_DrawSprite(S2D_Sprite *spr) {
 /*
  * Draw text
  */
-void S2D_GLES_DrawText(S2D_Text *txt) {
-  S2D_GLES_DrawTexture(
+void R2D_GLES_DrawText(R2D_Text *txt) {
+  R2D_GLES_DrawTexture(
     txt->x, txt->y, txt->width, txt->height,
     txt->rotate, txt->rx, txt->ry,
     txt->color.r, txt->color.g, txt->color.b, txt->color.a,

data/{assets/linux/simple2d/src → ext/ruby2d}/image.c

@@ -1,31 +1,31 @@
 // image.c
 
-#include "../include/simple2d.h"
+#include "ruby2d.h"
 
 
 /*
  * Create an image, given a file path
  */
-S2D_Image *S2D_CreateImage(const char *path) {
-  S2D_Init();
+R2D_Image *R2D_CreateImage(const char *path) {
+  R2D_Init();
 
   // Check if image file exists
-  if (!S2D_FileExists(path)) {
-    S2D_Error("S2D_CreateImage", "Image file `%s` not found", path);
+  if (!R2D_FileExists(path)) {
+    R2D_Error("R2D_CreateImage", "Image file `%s` not found", path);
     return NULL;
   }
 
   // Allocate the image structure
-  S2D_Image *img = (S2D_Image *) malloc(sizeof(S2D_Image));
+  R2D_Image *img = (R2D_Image *) malloc(sizeof(R2D_Image));
   if (!img) {
-    S2D_Error("S2D_CreateImage", "Out of memory!");
+    R2D_Error("R2D_CreateImage", "Out of memory!");
     return NULL;
   }
 
   // Load image from file as SDL_Surface
   img->surface = IMG_Load(path);
   if (!img->surface) {
-    S2D_Error("IMG_Load", IMG_GetError());
+    R2D_Error("IMG_Load", IMG_GetError());
     free(img);
     return NULL;
   }
@@ -35,7 +35,7 @@ S2D_Image *S2D_CreateImage(const char *path) {
     img->surface->format->BitsPerPixel / 4;
 
   if (bits_per_color < 8) {
-    S2D_Log(S2D_WARN, "`%s` has less than 8 bits per color and will likely not render correctly", path, bits_per_color);
+    R2D_Log(R2D_WARN, "`%s` has less than 8 bits per color and will likely not render correctly", path, bits_per_color);
   }
 
   // Initialize values
@@ -99,9 +99,9 @@ S2D_Image *S2D_CreateImage(const char *path) {
 /*
  * Rotate an image
  */
-void S2D_RotateImage(S2D_Image *img, GLfloat angle, int position) {
+void R2D_RotateImage(R2D_Image *img, GLfloat angle, int position) {
 
-  S2D_GL_Point p = S2D_GetRectRotationPoint(
+  R2D_GL_Point p = R2D_GetRectRotationPoint(
     img->x, img->y, img->width, img->height, position
   );
 
@@ -114,25 +114,25 @@ void S2D_RotateImage(S2D_Image *img, GLfloat angle, int position) {
 /*
  * Draw an image
  */
-void S2D_DrawImage(S2D_Image *img) {
+void R2D_DrawImage(R2D_Image *img) {
   if (!img) return;
 
   if (img->texture_id == 0) {
-    S2D_GL_CreateTexture(&img->texture_id, img->format,
+    R2D_GL_CreateTexture(&img->texture_id, img->format,
                          img->orig_width, img->orig_height,
                          img->surface->pixels, GL_NEAREST);
     SDL_FreeSurface(img->surface);
   }
 
-  S2D_GL_DrawImage(img);
+  R2D_GL_DrawImage(img);
 }
 
 
 /*
  * Free an image
  */
-void S2D_FreeImage(S2D_Image *img) {
+void R2D_FreeImage(R2D_Image *img) {
   if (!img) return;
-  S2D_GL_FreeTexture(&img->texture_id);
+  R2D_GL_FreeTexture(&img->texture_id);
   free(img);
 }