ruby2d 0.10.0 → 0.11.2

data/ext/ruby2d/gl.c

@@ -20,7 +20,7 @@ static GLfloat orthoMatrix[16] =
 /*
  * Prints current GL error
  */
-void R2D_GL_PrintError(char *error) {
+void R2D_GL_PrintError(const char *error) {
   R2D_Log(R2D_ERROR, "%s (%d)", error, glGetError());
 }
 
@@ -69,7 +69,7 @@ void R2D_GL_StoreContextInfo(R2D_Window *window) {
  * Creates a shader object, loads shader string, and compiles.
  * Returns 0 if shader could not be compiled.
  */
-GLuint R2D_GL_LoadShader(GLenum type, const GLchar *shaderSrc, char *shaderName) {
+GLuint R2D_GL_LoadShader(GLenum type, const GLchar *shaderSrc, const char *shaderName) {
 
   // Create the shader object
   GLuint shader = glCreateShader(type);
@@ -111,7 +111,7 @@ GLuint R2D_GL_LoadShader(GLenum type, const GLchar *shaderSrc, char *shaderName)
 /*
  * Check if shader program was linked
  */
-int R2D_GL_CheckLinked(GLuint program, char *name) {
+int R2D_GL_CheckLinked(GLuint program, const char *name) {
 
   GLint linked;
   glGetProgramiv(program, GL_LINK_STATUS, &linked);
@@ -361,65 +361,16 @@ void R2D_GL_DrawTriangle(GLfloat x1, GLfloat y1,
 
 
 /*
- * Draw an image
+ * Draw a texture
  */
-void R2D_GL_DrawImage(R2D_Image *img) {
+void R2D_GL_DrawTexture(GLfloat coordinates[], GLfloat texture_coordinates[], GLfloat color[], int texture_id) {
   #if GLES
-    R2D_GLES_DrawImage(img);
+    R2D_GLES_DrawTexture(coordinates, texture_coordinates, color, texture_id);
   #else
     if (R2D_GL2) {
-      R2D_GL2_DrawImage(img);
+      R2D_GL2_DrawTexture(coordinates, texture_coordinates, color, texture_id);
     } else {
-      R2D_GL3_DrawImage(img);
-    }
-  #endif
-}
-
-
-/*
- * Draw sprite
- */
-void R2D_GL_DrawSprite(R2D_Sprite *spr) {
-  #if GLES
-    R2D_GLES_DrawSprite(spr);
-  #else
-    if (R2D_GL2) {
-      R2D_GL2_DrawSprite(spr);
-    } else {
-      R2D_GL3_DrawSprite(spr);
-    }
-  #endif
-}
-
-
-/*
- * Draw a tile
- */
-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) {
-  #if GLES
-    R2D_GLES_DrawTile(img, x, y, tw, th, tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4);
-  #else
-    if (R2D_GL2) {
-      R2D_GL2_DrawTile(img, x, y, tw, th, tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4);
-    } else {
-      R2D_GL3_DrawTile(img, x, y, tw, th, tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4);
-    }
-  #endif
-}
-
-
-/*
- * Draw text
- */
-void R2D_GL_DrawText(R2D_Text *txt) {
-  #if GLES
-    R2D_GLES_DrawText(txt);
-  #else
-    if (R2D_GL2) {
-      R2D_GL2_DrawText(txt);
-    } else {
-      R2D_GL3_DrawText(txt);
+      R2D_GL3_DrawTexture(coordinates, texture_coordinates, color, texture_id);
     }
   #endif
 }
@@ -431,7 +382,7 @@ void R2D_GL_DrawText(R2D_Text *txt) {
 void R2D_GL_FlushBuffers() {
   // Only implemented in our OpenGL 3.3+ and ES 2.0 renderers
   #if GLES
-    // TODO: R2D_GLES_FlushBuffers();
+    R2D_GLES_FlushBuffers();
   #else
     if (!R2D_GL2) R2D_GL3_FlushBuffers();
   #endif

data/ext/ruby2d/gl2.c

@@ -64,98 +64,23 @@ void R2D_GL2_DrawTriangle(GLfloat x1, GLfloat y1,
 
 
 /*
- * Draw texture
+ * Draw a texture (New method with vertices pre-calculated)
  */
-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) {
-
-  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 = 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);
-  }
-
+void R2D_GL2_DrawTexture(GLfloat coordinates[], GLfloat texture_coordinates[], GLfloat color[], int texture_id) {
   glEnable(GL_TEXTURE_2D);
 
   glBindTexture(GL_TEXTURE_2D, texture_id);
 
   glBegin(GL_QUADS);
-    glColor4f(r, g, b, a);
-    glTexCoord2f(tx1, ty1); glVertex2f(v1.x, v1.y);
-    glTexCoord2f(tx2, ty2); glVertex2f(v2.x, v2.y);
-    glTexCoord2f(tx3, ty3); glVertex2f(v3.x, v3.y);
-    glTexCoord2f(tx4, ty4); glVertex2f(v4.x, v4.y);
+    glColor4f(color[0], color[1], color[2], color[3]);
+    glTexCoord2f(texture_coordinates[0], texture_coordinates[1]); glVertex2f(coordinates[0], coordinates[1]);
+    glTexCoord2f(texture_coordinates[2], texture_coordinates[3]); glVertex2f(coordinates[2], coordinates[3]);
+    glTexCoord2f(texture_coordinates[4], texture_coordinates[5]); glVertex2f(coordinates[4], coordinates[5]);
+    glTexCoord2f(texture_coordinates[6], texture_coordinates[7]); glVertex2f(coordinates[6], coordinates[7]);
   glEnd();
 
   glDisable(GL_TEXTURE_2D);
-}
-
-
-/*
- * Draw image
- */
-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,
-    0.f, 0.f, 1.f, 0.f, 1.f, 1.f, 0.f, 1.f,
-    img->texture_id
-  );
-}
-
-
-/*
- * Draw sprite
- */
-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,
-    spr->tx1, spr->ty1, spr->tx2, spr->ty2, spr->tx3, spr->ty3, spr->tx4, spr->ty4,
-    spr->img->texture_id
-  );
-}
-
+};
 
-/*
- * Draw a tile
- */
-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) {
-  R2D_GL2_DrawTexture(
-    x, y, tw, th,
-    img->rotate, img->rx, img->ry,
-    img->color.r, img->color.g, img->color.b, img->color.a,
-    tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4,
-    img->texture_id
-  );
-}
-
-
-/*
- * Draw text
- */
-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,
-    0.f, 0.f, 1.f, 0.f, 1.f, 1.f, 0.f, 1.f,
-    txt->texture_id
-  );
-}
 
 #endif

data/ext/ruby2d/gl3.c

@@ -2,7 +2,6 @@
 
 #include "ruby2d.h"
 
-// Skip this file if OpenGL ES
 #if !GLES
 
 static GLuint vbo;  // our primary vertex buffer object (VBO)
@@ -10,12 +9,10 @@ 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 };
 
 
 /*
@@ -106,7 +103,7 @@ int R2D_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;
 
@@ -207,17 +204,39 @@ int R2D_GL3_Init() {
  * Render the vertex buffer and reset it
  */
 void R2D_GL3_FlushBuffers() {
-
-  // Use the triangle shader program
-  glUseProgram(shaderProgram);
-
   // 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);
+      }
+
+      glDrawArrays(GL_TRIANGLES, verticesOffset, i - verticesOffset);
 
-  // Render all the triangles in the buffer
-  glDrawArrays(GL_TRIANGLES, 0, (GLsizei)(vboDataIndex * 3));
+      lastTextureId = verticesTextureIds[i];
+      verticesOffset = i;
+    }
+  }
 
   // Reset the buffer object index and data pointer
   vboDataIndex = 0;
@@ -236,10 +255,10 @@ void R2D_GL3_DrawTriangle(GLfloat x1, GLfloat y1,
                           GLfloat r3, GLfloat g3, GLfloat b3, GLfloat a3) {
 
   // If buffer is full, flush it
-  if (vboDataIndex >= vboObjCapacity) R2D_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,116 +267,38 @@ void R2D_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 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,
-                                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
-  R2D_GL3_FlushBuffers();
-
-  // Set up the vertex points
-  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 = 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
-  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 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,
-    0.f, 0.f, 1.f, 0.f, 1.f, 1.f, 0.f, 1.f,
-    img->texture_id
-  );
-}
-
-
-/*
- * Draw sprite
- */
-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,
-    spr->tx1, spr->ty1, spr->tx2, spr->ty2, spr->tx3, spr->ty3, spr->tx4, spr->ty4,
-    spr->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 a tile
- */
-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) {
-  R2D_GL3_DrawTexture(
-    x, y, tw, th,
-    img->rotate, img->rx, img->ry,
-    img->color.r, img->color.g, img->color.b, img->color.a,
-    tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4,
-    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 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,
-    0.f, 0.f, 1.f, 0.f, 1.f, 1.f, 0.f, 1.f,
-    txt->texture_id
-  );
-}
-
 #endif