ruby2d 0.9.4 → 0.11.1

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
@@ -10,18 +10,16 @@ static GLuint vboSize;  // size of the VBO in bytes
 static GLfloat *vboData;  // pointer to the VBO data
 static GLfloat *vboDataCurrent;  // pointer to the data for the current vertices
 static GLuint vboDataIndex = 0;  // index of the current object being rendered
-static GLuint vboObjCapacity = 2500;  // number of objects the VBO can store
+static GLuint vboObjCapacity = 7500;  // number of objects the VBO can store
+static GLuint verticesTextureIds[7500]; // store the texture_id of each vertices
 static GLuint shaderProgram;  // triangle shader program
 static GLuint texShaderProgram;  // texture shader program
-static GLuint indices[] =  // indices for rendering textured quads
-  { 0, 1, 2,
-    2, 3, 0 };
 
 
 /*
  * 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 +44,7 @@ void S2D_GL3_ApplyProjection(GLfloat orthoMatrix[16]) {
 /*
  * Initalize OpenGL
  */
-int S2D_GL3_Init() {
+int R2D_GL3_Init() {
 
   // Enable transparency
   glEnable(GL_BLEND);
@@ -106,7 +104,7 @@ int S2D_GL3_Init() {
   // Create a vertex buffer object and allocate data
   glGenBuffers(1, &vbo);
   glBindBuffer(GL_ARRAY_BUFFER, vbo);
-  vboSize = vboObjCapacity * sizeof(GLfloat) * 24;
+  vboSize = vboObjCapacity * sizeof(GLfloat) * 8;
   vboData = (GLfloat *) malloc(vboSize);
   vboDataCurrent = vboData;
 
@@ -116,9 +114,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 +125,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 +140,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 +159,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 +174,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,18 +204,40 @@ int S2D_GL3_Init() {
 /*
  * Render the vertex buffer and reset it
  */
-void S2D_GL3_FlushBuffers() {
-
-  // Use the triangle shader program
-  glUseProgram(shaderProgram);
-
+void R2D_GL3_FlushBuffers() {
   // Bind to the vertex buffer object and update its data
   glBindBuffer(GL_ARRAY_BUFFER, vbo);
+
   glBufferData(GL_ARRAY_BUFFER, vboSize, NULL, GL_DYNAMIC_DRAW);
-  glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(GLfloat) * vboDataIndex * 24, vboData);
+  glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(GLfloat) * vboDataIndex * 8, vboData);
+
+  GLuint verticesOffset = 0;
+  GLuint lastTextureId = verticesTextureIds[0];
+
+  for (GLuint i = 0; i <= vboDataIndex; i++) {
+    if(lastTextureId != verticesTextureIds[i] || i == vboDataIndex) {
+      // A texture ID of 0 represents no texture (render a triangle)
+      if(lastTextureId == 0) {
+
+        // Use the triangle shader program
+        glUseProgram(shaderProgram);
+
+      // A number other than 0 represents a texture_id
+      } else {
+
+        // Use the texture shader program
+        glUseProgram(texShaderProgram);
+
+        // Bind the texture using the provided ID
+        glBindTexture(GL_TEXTURE_2D, lastTextureId);
+      }
 
-  // Render all the triangles in the buffer
-  glDrawArrays(GL_TRIANGLES, 0, (GLsizei)(vboDataIndex * 3));
+      glDrawArrays(GL_TRIANGLES, verticesOffset, i - verticesOffset);
+
+      lastTextureId = verticesTextureIds[i];
+      verticesOffset = i;
+    }
+  }
 
   // Reset the buffer object index and data pointer
   vboDataIndex = 0;
@@ -228,7 +248,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,10 +256,10 @@ 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 + 3 >= vboObjCapacity) R2D_GL3_FlushBuffers();
 
   // Set the triangle data into a formatted array
-  GLfloat vertices[] =
+  GLfloat vertices[24] =
     { x1, y1, r1, g1, b1, a1, 0, 0,
       x2, y2, r2, g2, b2, a2, 0, 0,
       x3, y3, r3, g3, b3, a3, 0, 0 };
@@ -248,101 +268,38 @@ void S2D_GL3_DrawTriangle(GLfloat x1, GLfloat y1,
   memcpy(vboDataCurrent, vertices, sizeof(vertices));
 
   // Increment the buffer object index and the vertex data pointer for next use
-  vboDataIndex++;
+  verticesTextureIds[vboDataIndex] = verticesTextureIds[vboDataIndex + 1] = verticesTextureIds[vboDataIndex + 2] = 0;
+  vboDataIndex += 3;
   vboDataCurrent = (GLfloat *)((char *)vboDataCurrent + (sizeof(GLfloat) * 24));
 }
 
 
 /*
- * Draw a texture
+ * Draw a texture (New method with vertices pre-calculated)
  */
-static void S2D_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,
-                                GLfloat tx3, GLfloat ty3, GLfloat tx4, GLfloat ty4,
-                                GLuint texture_id) {
-
-  // Currently, textures are not buffered, so we have to flush all buffers so
-  // textures get rendered in the correct Z order
-  S2D_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 };
-
-  // 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);
-  }
-
-  // Set the textured quad data into a formatted array
-  GLfloat vertices[] =
-  //  vertex coords | colors      | x, y texture coords
-    { v1.x, v1.y,     r, g, b, a,   tx1, ty1,    // Top-left
-      v2.x, v2.y,     r, g, b, a,   tx2, ty2,    // Top-right
-      v3.x, v3.y,     r, g, b, a,   tx3, ty3,    // Bottom-right
-      v4.x, v4.y,     r, g, b, a,   tx4, ty4 };  // Bottom-left
-
-  // Use the texture shader program
-  glUseProgram(texShaderProgram);
-
-  // Bind the texture using the provided ID
-  glBindTexture(GL_TEXTURE_2D, texture_id);
-
-  // Create and Initialize the vertex data and array indices
-  glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
-  glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW);
-
-  // Render the textured quad
-  glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
-}
-
-
-/*
- * Draw image
- */
-void S2D_GL3_DrawImage(S2D_Image *img) {
-  S2D_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,
-    0.f, 0.f, 1.f, 0.f, 1.f, 1.f, 0.f, 1.f,
-    img->texture_id
-  );
-}
+void R2D_GL3_DrawTexture(GLfloat coordinates[], GLfloat texture_coordinates[], GLfloat color[], int texture_id) {
+  // If buffer is full, flush it
+  if (vboDataIndex + 6 >= vboObjCapacity) R2D_GL3_FlushBuffers();
+
+  // There are 6 vertices for a square as we are rendering two Triangles to make up our square:
+  // Triangle one: Top left, Top right, Bottom right
+  // Triangle two: Bottom right, Bottom left, Top left
+  GLfloat vertices[48] = {
+    coordinates[0], coordinates[1], color[0], color[1], color[2], color[3], texture_coordinates[0], texture_coordinates[1],
+    coordinates[2], coordinates[3], color[0], color[1], color[2], color[3], texture_coordinates[2], texture_coordinates[3],
+    coordinates[4], coordinates[5], color[0], color[1], color[2], color[3], texture_coordinates[4], texture_coordinates[5],
+    coordinates[4], coordinates[5], color[0], color[1], color[2], color[3], texture_coordinates[4], texture_coordinates[5],
+    coordinates[6], coordinates[7], color[0], color[1], color[2], color[3], texture_coordinates[6], texture_coordinates[7],
+    coordinates[0], coordinates[1], color[0], color[1], color[2], color[3], texture_coordinates[0], texture_coordinates[1],
+  };
 
+  // Copy the vertex data into the current position of the buffer
+  memcpy(vboDataCurrent, vertices, sizeof(vertices));
 
-/*
- * Draw sprite
- */
-void S2D_GL3_DrawSprite(S2D_Sprite *spr) {
-  S2D_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,
-    spr->tx1, spr->ty1, spr->tx2, spr->ty2, spr->tx3, spr->ty3, spr->tx4, spr->ty4,
-    spr->img->texture_id
-  );
+  verticesTextureIds[vboDataIndex] = verticesTextureIds[vboDataIndex + 1] = verticesTextureIds[vboDataIndex + 2] = verticesTextureIds[vboDataIndex + 3] = verticesTextureIds[vboDataIndex + 4] = verticesTextureIds[vboDataIndex + 5] = texture_id;
+  vboDataIndex += 6;
+  vboDataCurrent = (GLfloat *)((char *)vboDataCurrent + (sizeof(GLfloat) * 48));
 }
 
 
-/*
- * Draw text
- */
-void S2D_GL3_DrawText(S2D_Text *txt) {
-  S2D_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,
-    0.f, 0.f, 1.f, 0.f, 1.f, 1.f, 0.f, 1.f,
-    txt->texture_id
-  );
-}
-
 #endif

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,
@@ -202,40 +202,22 @@ void S2D_GLES_DrawTriangle(GLfloat x1, GLfloat y1,
 
 
 /*
- * Draw a texture
+ * Draw a texture (New method with vertices pre-calculated)
  */
-static void S2D_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 };
-
-  // 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);
-  }
-
+void R2D_GLES_DrawTexture(GLfloat coordinates[], GLfloat texture_coordinates[], GLfloat color[], int texture_id);
   GLfloat vertices[] =
   //  x, y coords | x, y texture coords
-    { v1.x, v1.y,   0.f, tx1, ty1,
-      v2.x, v2.y,   0.f, tx2, ty2,
-      v3.x, v3.y,   0.f, tx3, ty3,
-      v4.x, v4.y,   0.f, tx4, ty4 };
+  {
+    coordinates[0], coordinates[1], 0.f, texture_coordinates[0], texture_coordinates[1],
+    coordinates[2], coordinates[3], 0.f, texture_coordinates[2], texture_coordinates[3],
+    coordinates[4], coordinates[5], 0.f, texture_coordinates[4], texture_coordinates[5],
+    coordinates[6], coordinates[7], 0.f, texture_coordinates[6], texture_coordinates[7] };
 
   GLfloat colors[] =
-    { r, g, b, a,
-      r, g, b, a,
-      r, g, b, a,
-      r, g, b, a };
+    { color[0], color[1], color[2], color[3],
+    color[0], color[1], color[2], color[3],
+    color[0], color[1], color[2], color[3],
+    color[0], color[1], color[2], color[3] };
 
   glUseProgram(texShaderProgram);
 
@@ -264,45 +246,4 @@ 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(
-    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,
-    0.f, 0.f, 1.f, 0.f, 1.f, 1.f, 0.f, 1.f,
-    img->texture_id
-  );
-}
-
-
-/*
- * Draw sprite
- */
-void S2D_GLES_DrawSprite(S2D_Sprite *spr) {
-  S2D_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,
-    spr->tx1, spr->ty1, spr->tx2, spr->ty2, spr->tx3, spr->ty3, spr->tx4, spr->ty4,
-    spr->img->texture_id
-  );
-}
-
-
-/*
- * Draw text
- */
-void S2D_GLES_DrawText(S2D_Text *txt) {
-  S2D_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,
-    0.f, 0.f, 1.f, 0.f, 1.f, 1.f, 0.f, 1.f,
-    txt->texture_id
-  );
-}
-
 #endif

data/ext/ruby2d/image.c

@@ -0,0 +1,58 @@
+// image.c
+
+#include "ruby2d.h"
+
+
+SDL_Surface *R2D_CreateImageSurface(const char *path) {
+  R2D_Init();
+
+  // Check if image file exists
+  if (!R2D_FileExists(path)) {
+    R2D_Error("R2D_CreateImageSurface", "Image file `%s` not found", path);
+    return NULL;
+  }
+
+  // Load image from file as SDL_Surface
+  SDL_Surface *surface = IMG_Load(path);
+
+  int bits_per_color = surface->format->Amask == 0 ?
+    surface->format->BitsPerPixel / 3 :
+    surface->format->BitsPerPixel / 4;
+
+  if (bits_per_color < 8) {
+    R2D_Log(R2D_WARN, "`%s` has less than 8 bits per color and will likely not render correctly", path, bits_per_color);
+  }
+
+  return surface;
+}
+
+void R2D_ImageConvertToRGB(SDL_Surface *surface) {
+  Uint32 r = surface->format->Rmask;
+  Uint32 g = surface->format->Gmask;
+  Uint32 a = surface->format->Amask;
+
+  if (r&0xFF000000 || r&0xFF0000) {
+    char *p = (char *)surface->pixels;
+    int bpp = surface->format->BytesPerPixel;
+    int w = surface->w;
+    int h = surface->h;
+    char tmp;
+    for (int i = 0; i < bpp * w * h; i += bpp) {
+      if (a&0xFF) {
+        tmp = p[i];
+        p[i] = p[i+3];
+        p[i+3] = tmp;
+      }
+      if (g&0xFF0000) {
+        tmp = p[i+1];
+        p[i+1] = p[i+2];
+        p[i+2] = tmp;
+      }
+      if (r&0xFF0000) {
+        tmp = p[i];
+        p[i] = p[i+2];
+        p[i+2] = tmp;
+      }
+    }
+  }
+}

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

@@ -1,30 +1,30 @@
 // input.c
 
-#include "../include/simple2d.h"
+#include "ruby2d.h"
 
 
 /*
  * Get the mouse coordinates relative to the viewport
  */
-void S2D_GetMouseOnViewport(S2D_Window *window, int wx, int wy, int *x, int *y) {
+void R2D_GetMouseOnViewport(R2D_Window *window, int wx, int wy, int *x, int *y) {
 
   double scale;  // viewport scale factor
   int w, h;      // width and height of scaled viewport
 
   switch (window->viewport.mode) {
 
-    case S2D_FIXED: case S2D_EXPAND:
+    case R2D_FIXED: case R2D_EXPAND:
       *x = wx / (window->orig_width  / (double)window->viewport.width);
       *y = wy / (window->orig_height / (double)window->viewport.height);
       break;
 
-    case S2D_SCALE:
-      S2D_GL_GetViewportScale(window, &w, &h, &scale);
+    case R2D_SCALE:
+      R2D_GL_GetViewportScale(window, &w, &h, &scale);
       *x = wx * 1 / scale - (window->width  - w) / (2.0 * scale);
       *y = wy * 1 / scale - (window->height - h) / (2.0 * scale);
       break;
 
-    case S2D_STRETCH:
+    case R2D_STRETCH:
       *x = wx * window->viewport.width  / (double)window->width;
       *y = wy * window->viewport.height / (double)window->height;
       break;
@@ -35,7 +35,7 @@ void S2D_GetMouseOnViewport(S2D_Window *window, int wx, int wy, int *x, int *y)
 /*
  * Show the cursor over the window
  */
-void S2D_ShowCursor() {
+void R2D_ShowCursor() {
   SDL_ShowCursor(SDL_ENABLE);
 }
 
@@ -43,6 +43,6 @@ void S2D_ShowCursor() {
 /*
  * Hide the cursor over the window
  */
-void S2D_HideCursor() {
+void R2D_HideCursor() {
   SDL_ShowCursor(SDL_DISABLE);
 }