gl2.c in ruby2d-0.11.0

- old
+ new
@@ -62,100 +62,25 @@
   glEnd();
 }
 
 
 /*
- * 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