ruby2d 0.9.3 → 0.9.4

data/assets/include/SDL2/SDL_types.h

@@ -1,6 +1,6 @@
 /*
   Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

data/assets/include/SDL2/SDL_version.h

@@ -1,6 +1,6 @@
 /*
   Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -59,7 +59,7 @@ typedef struct SDL_version
 */
 #define SDL_MAJOR_VERSION   2
 #define SDL_MINOR_VERSION   0
-#define SDL_PATCHLEVEL      9
+#define SDL_PATCHLEVEL      10
 
 /**
  *  \brief Macro to determine SDL version program was compiled against.

data/assets/include/SDL2/SDL_video.h

@@ -1,6 +1,6 @@
 /*
   Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

data/assets/include/SDL2/SDL_vulkan.h

@@ -98,8 +98,8 @@ typedef VkSurfaceKHR SDL_vulkanSurface; /* for compatibility with Tizen */
  *        applications to link with libvulkan (and historically MoltenVK was
  *        provided as a static library). If it is not found then, on macOS, SDL
  *        will attempt to load \c vulkan.framework/vulkan, \c libvulkan.1.dylib,
- *        \c MoltenVK.framework/MoltenVK and \c libMoltenVK.dylib in that order.
- *        On iOS SDL will attempt to load \c libMoltenVK.dylib. Applications
+ *        followed by \c libvulkan.dylib, in that order.
+ *        On iOS SDL will attempt to load \c libvulkan.dylib only. Applications
  *        using a dynamic framework or .dylib must ensure it is included in its
  *        application bundle.
  *
@@ -153,7 +153,7 @@ extern DECLSPEC void SDLCALL SDL_Vulkan_UnloadLibrary(void);
  *  is smaller than the number of required extensions, \c SDL_FALSE will be
  *  returned instead of \c SDL_TRUE, to indicate that not all the required
  *  extensions were returned.
- * 
+ *
  *  \note If \c window is not NULL, it will be checked against its creation
  *        flags to ensure that the Vulkan flag is present. This parameter
  *        will be removed in a future major release.

data/assets/include/SDL2/begin_code.h

@@ -1,6 +1,6 @@
 /*
   Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -105,6 +105,9 @@
 #ifdef _MSC_VER
 #pragma warning(disable: 4103)
 #endif
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wpragma-pack"
+#endif
 #ifdef __BORLANDC__
 #pragma nopackwarning
 #endif

data/assets/include/SDL2/close_code.h

@@ -1,6 +1,6 @@
 /*
   Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -26,6 +26,9 @@
  *  after you finish any function and structure declarations in your headers
  */
 
+#ifndef _begin_code_h
+#error close_code.h included without matching begin_code.h
+#endif
 #undef _begin_code_h
 
 /* Reset structure packing at previous byte alignment */

data/assets/include/simple2d.h

@@ -536,6 +536,26 @@ S2D_Sound *S2D_CreateSound(const char *path);
  */
 void S2D_PlaySound(S2D_Sound *snd);
 
+/*
+ * Get the sound's volume
+ */
+int S2D_GetSoundVolume(S2D_Sound *snd);
+
+/*
+ * Set the sound's volume a given percentage
+ */
+void S2D_SetSoundVolume(S2D_Sound *snd, int volume);
+
+/*
+ * Get the sound mixer volume
+ */
+int S2D_GetSoundMixVolume();
+
+/*
+ * Set the sound mixer volume a given percentage
+ */
+void S2D_SetSoundMixVolume(int volume);
+
 /*
  * Free the sound
  */
@@ -687,6 +707,7 @@ void S2D_GL_DrawSprite(S2D_Sprite *spr);
 void S2D_GL_DrawText(S2D_Text *txt);
 void S2D_GL_FreeTexture(GLuint *id);
 void S2D_GL_Clear(S2D_Color clr);
+void S2D_GL_FlushBuffers();
 
 // OpenGL & GLES Internal Functions ////////////////////////////////////////////
 
@@ -728,6 +749,7 @@ void S2D_GL_Clear(S2D_Color clr);
   void S2D_GL3_DrawSprite(S2D_Sprite *spr);
   void S2D_GL2_DrawText(S2D_Text *txt);
   void S2D_GL3_DrawText(S2D_Text *txt);
+  void S2D_GL3_FlushBuffers();
 #endif
 
 #ifdef __cplusplus

data/assets/linux/simple2d/Makefile

@@ -46,7 +46,7 @@ OBJECTS=$(addprefix build/,$(notdir $(SOURCES:.c=.o)))
 VERSION=$(shell bash bin/simple2d.sh -v)
 
 # Release directories and archive filenames
-APPLE_RELEASE=simple2d-apple-frameworks-$(VERSION)
+APPLE_RELEASE=simple2d-apple-$(VERSION)
 MINGW_RELEASE=simple2d-windows-mingw-$(VERSION)
 
 # Helper functions
@@ -124,8 +124,8 @@ endif
 	mkdir -p build/tvos/Simple2D.framework/Headers
 	cp include/simple2d.h build/ios/Simple2D.framework/Headers
 	cp include/simple2d.h build/tvos/Simple2D.framework/Headers
-	cp -R deps/ios/include/SDL2  build/ios/Simple2D.framework/Headers
-	cp -R deps/tvos/include/SDL2 build/tvos/Simple2D.framework/Headers
+	cp -R deps/headers/SDL2 build/ios/Simple2D.framework/Headers
+	cp -R deps/headers/SDL2 build/tvos/Simple2D.framework/Headers
 	cp deps/xcode/Info.plist build/ios/Simple2D.framework/Info.plist
 	cp deps/xcode/Info.plist build/tvos/Simple2D.framework/Info.plist
 	mv build/ios/Simple2D  build/ios/Simple2D.framework
@@ -148,13 +148,16 @@ endif
 
 ifeq ($(PLATFORM),apple)
 release: clean frameworks
+	$(call task_msg,Building macOS release)
+	mkdir -p build/$(APPLE_RELEASE)/macOS
+	cp build/libsimple2d.a build/$(APPLE_RELEASE)/macOS
 	$(call task_msg,Building iOS and tvOS release)
-	mkdir -p build/$(APPLE_RELEASE)/Simple2D/iOS
-	mkdir -p build/$(APPLE_RELEASE)/Simple2D/tvOS
-	cp -R build/ios/*  build/$(APPLE_RELEASE)/Simple2D/iOS/
-	cp -R build/tvos/* build/$(APPLE_RELEASE)/Simple2D/tvOS/
+	mkdir -p build/$(APPLE_RELEASE)/iOS
+	mkdir -p build/$(APPLE_RELEASE)/tvOS
+	cp -R build/ios/*  build/$(APPLE_RELEASE)/iOS/
+	cp -R build/tvos/* build/$(APPLE_RELEASE)/tvOS/
 	cd build; zip -rq $(APPLE_RELEASE).zip $(APPLE_RELEASE)
-	$(call info_msg,Frameworks zipped at \`build/$(APPLE_RELEASE).zip\`)
+	$(call info_msg,Apple release zipped at \`build/$(APPLE_RELEASE).zip\`)
 endif
 
 ifeq ($(PLATFORM),mingw)

data/assets/linux/simple2d/bin/simple2d.sh

@@ -12,7 +12,7 @@
 # Set Constants ################################################################
 
 # The installed version
-VERSION='1.1.0'
+VERSION='1.2.0'
 
 # URL to this script in the repo
 SCRIPT_URL="https://raw.githubusercontent.com/simple2d/simple2d/master/bin/simple2d.sh"
@@ -27,16 +27,16 @@ SDL_MIN_VERSION='2.0.4'
 # SDL download paths
 libsdl_url="https://www.libsdl.org"
 
-sdl_fname="SDL2-2.0.9"
+sdl_fname="SDL2-2.0.10"
 sdl_url="${libsdl_url}/release/${sdl_fname}.tar.gz"
 
-image_fname="SDL2_image-2.0.4"
+image_fname="SDL2_image-2.0.5"
 image_url="${libsdl_url}/projects/SDL_image/release/${image_fname}.tar.gz"
 
 mixer_fname="SDL2_mixer-2.0.4"
 mixer_url="${libsdl_url}/projects/SDL_mixer/release/${mixer_fname}.tar.gz"
 
-ttf_fname="SDL2_ttf-2.0.14"
+ttf_fname="SDL2_ttf-2.0.15"
 ttf_url="${libsdl_url}/projects/SDL_ttf/release/${ttf_fname}.tar.gz"
 
 # SDL config
@@ -202,14 +202,20 @@ build() {
   # If no input, print build usage
   if [[ $1 == '' ]]; then print_usage_build; exit; fi
 
-  # If C or C++ source file given, e.g.:
-  #   build app.c; build app.cpp
-  if [[ ${1: -2} == '.c' || ${1: -4} == '.cpp' ]]; then
+  # If C source file given, e.g.: build app.c
+  if [[ ${1: -2} == '.c' ]]; then
     # Compile
     gcc -std=c11 $1 `simple2d --libs` -o ${1%.*}
     exit
   fi
 
+  # If C++ source file given, e.g.: build app.cpp
+  if [[ ${1: -4} == '.cpp' ]]; then
+    # Compile
+    g++ -std=c++11 $1 `simple2d --libs` -o ${1%.*}
+    exit
+  fi
+
   # Check if current directory has an Xcode project
   has_xcodeproj?() {
     if [[ $(ls *.xcodeproj 2>/dev/null) ]]; then

data/assets/linux/simple2d/include/simple2d.h

@@ -536,6 +536,26 @@ S2D_Sound *S2D_CreateSound(const char *path);
  */
 void S2D_PlaySound(S2D_Sound *snd);
 
+/*
+ * Get the sound's volume
+ */
+int S2D_GetSoundVolume(S2D_Sound *snd);
+
+/*
+ * Set the sound's volume a given percentage
+ */
+void S2D_SetSoundVolume(S2D_Sound *snd, int volume);
+
+/*
+ * Get the sound mixer volume
+ */
+int S2D_GetSoundMixVolume();
+
+/*
+ * Set the sound mixer volume a given percentage
+ */
+void S2D_SetSoundMixVolume(int volume);
+
 /*
  * Free the sound
  */
@@ -687,6 +707,7 @@ void S2D_GL_DrawSprite(S2D_Sprite *spr);
 void S2D_GL_DrawText(S2D_Text *txt);
 void S2D_GL_FreeTexture(GLuint *id);
 void S2D_GL_Clear(S2D_Color clr);
+void S2D_GL_FlushBuffers();
 
 // OpenGL & GLES Internal Functions ////////////////////////////////////////////
 
@@ -728,6 +749,7 @@ void S2D_GL_Clear(S2D_Color clr);
   void S2D_GL3_DrawSprite(S2D_Sprite *spr);
   void S2D_GL2_DrawText(S2D_Text *txt);
   void S2D_GL3_DrawText(S2D_Text *txt);
+  void S2D_GL3_FlushBuffers();
 #endif
 
 #ifdef __cplusplus

data/assets/linux/simple2d/src/gl.c

@@ -47,6 +47,7 @@ void S2D_GL_PrintContextInfo(S2D_Window *window) {
  * Store info about the current OpenGL context
  */
 void S2D_GL_StoreContextInfo(S2D_Window *window) {
+
   window->S2D_GL_VENDOR   = glGetString(GL_VENDOR);
   window->S2D_GL_RENDERER = glGetString(GL_RENDERER);
   window->S2D_GL_VERSION  = glGetString(GL_VERSION);
@@ -70,11 +71,8 @@ void S2D_GL_StoreContextInfo(S2D_Window *window) {
  */
 GLuint S2D_GL_LoadShader(GLenum type, const GLchar *shaderSrc, char *shaderName) {
 
-  GLuint shader;
-  GLint compiled;
-
   // Create the shader object
-  shader = glCreateShader(type);
+  GLuint shader = glCreateShader(type);
 
   if (shader == 0) {
     S2D_GL_PrintError("Failed to create shader program");
@@ -88,21 +86,17 @@ GLuint S2D_GL_LoadShader(GLenum type, const GLchar *shaderSrc, char *shaderName)
   glCompileShader(shader);
 
   // Check the compile status
+  GLint compiled;
   glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
 
   if (!compiled) {
-
     GLint infoLen = 0;
-
     glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLen);
 
     if (infoLen > 1) {
-
       char *infoLog = malloc(sizeof(char) * infoLen);
-
       glGetShaderInfoLog(shader, infoLen, NULL, infoLog);
       printf("Error compiling shader \"%s\":\n%s\n", shaderName, infoLog);
-
       free(infoLog);
     }
 
@@ -123,17 +117,13 @@ int S2D_GL_CheckLinked(GLuint program, char *name) {
   glGetProgramiv(program, GL_LINK_STATUS, &linked);
 
   if (!linked) {
-
     GLint infoLen = 0;
     glGetProgramiv(program, GL_INFO_LOG_LENGTH, &infoLen);
 
     if (infoLen > 1) {
-
       char *infoLog = malloc(sizeof(char) * infoLen);
-
       glGetProgramInfoLog(program, infoLen, NULL, infoLog);
       printf("Error linking program `%s`: %s\n", name, infoLog);
-
       free(infoLog);
     }
 
@@ -231,6 +221,7 @@ int S2D_GL_Init(S2D_Window *window) {
     if (FORCE_GL2) {
       SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
       SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
+
     // Request an OpenGL 3.3 forward-compatible core profile
     } else {
       SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
@@ -417,6 +408,19 @@ void S2D_GL_DrawText(S2D_Text *txt) {
 }
 
 
+/*
+ * Render and flush OpenGL buffers
+ */
+void S2D_GL_FlushBuffers() {
+  // Only implemented in our OpenGL 3.3+ and ES 2.0 renderers
+  #if GLES
+    // TODO: S2D_GLES_FlushBuffers();
+  #else
+    if (!S2D_GL2) S2D_GL3_FlushBuffers();
+  #endif
+}
+
+
 /*
  * Clear buffers to given color values
  */

data/assets/linux/simple2d/src/gl3.c

@@ -1,12 +1,19 @@
-// OpenGL 3.3
+// OpenGL 3.3+
 
 #include "../include/simple2d.h"
 
+// Skip this file if OpenGL ES
 #if !GLES
 
-static GLuint shaderProgram;
-static GLuint texShaderProgram;
-static GLuint indices[] =
+static GLuint vbo;  // our primary vertex buffer object (VBO)
+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 shaderProgram;  // triangle shader program
+static GLuint texShaderProgram;  // texture shader program
+static GLuint indices[] =  // indices for rendering textured quads
   { 0, 1, 2,
     2, 3, 0 };
 
@@ -19,6 +26,7 @@ void S2D_GL3_ApplyProjection(GLfloat orthoMatrix[16]) {
   // Use the program object
   glUseProgram(shaderProgram);
 
+  // Apply the projection matrix to the triangle shader
   glUniformMatrix4fv(
     glGetUniformLocation(shaderProgram, "u_mvpMatrix"),
     1, GL_FALSE, orthoMatrix
@@ -27,6 +35,7 @@ void S2D_GL3_ApplyProjection(GLfloat orthoMatrix[16]) {
   // Use the texture program object
   glUseProgram(texShaderProgram);
 
+  // Apply the projection matrix to the texture shader
   glUniformMatrix4fv(
     glGetUniformLocation(texShaderProgram, "u_mvpMatrix"),
     1, GL_FALSE, orthoMatrix
@@ -45,50 +54,63 @@ int S2D_GL3_Init() {
 
   // Vertex shader source string
   GLchar vertexSource[] =
-    "#version 150 core\n"
-    "uniform mat4 u_mvpMatrix;"
-    "in vec4 position;"
-    "in vec4 color;"
-    "in vec2 texcoord;"
-    "out vec4 Color;"
-    "out vec2 Texcoord;"
+    "#version 150 core\n"  // shader version
+
+    "uniform mat4 u_mvpMatrix;"  // projection matrix
+
+    // Input attributes to the vertex shader
+    "in vec4 position;"  // position value
+    "in vec4 color;"     // vertex color
+    "in vec2 texcoord;"  // texture coordinates
+
+    // Outputs to the fragment shader
+    "out vec4 Color;"     // vertex color
+    "out vec2 Texcoord;"  // texture coordinates
+
     "void main() {"
+    // Send the color and texture coordinates right through to the fragment shader
     "  Color = color;"
     "  Texcoord = texcoord;"
+    // Transform the vertex position using the projection matrix
     "  gl_Position = u_mvpMatrix * position;"
     "}";
 
   // Fragment shader source string
   GLchar fragmentSource[] =
-    "#version 150 core\n"
-    "in vec4 Color;"
-    "out vec4 outColor;"
+    "#version 150 core\n"  // shader version
+    "in vec4 Color;"       // input color from vertex shader
+    "out vec4 outColor;"   // output fragment color
+
     "void main() {"
-    "  outColor = Color;"
+    "  outColor = Color;"  // pass the color right through
     "}";
 
   // Fragment shader source string for textures
   GLchar texFragmentSource[] =
-    "#version 150 core\n"
-    "in vec4 Color;"
-    "in vec2 Texcoord;"
-    "out vec4 outColor;"
-    "uniform sampler2D tex;"
+    "#version 150 core\n"     // shader version
+    "in vec4 Color;"          // input color from vertex shader
+    "in vec2 Texcoord;"       // input texture coordinates
+    "out vec4 outColor;"      // output fragment color
+    "uniform sampler2D tex;"  // 2D texture unit
+
     "void main() {"
+    // Apply the texture unit, texture coordinates, and color
     "  outColor = texture(tex, Texcoord) * Color;"
     "}";
 
-  // Create Vertex Array Object
+  // Create a vertex array object
   GLuint vao;
   glGenVertexArrays(1, &vao);
   glBindVertexArray(vao);
 
-  // Create Vertex Buffer Object
-  GLuint vbo;
+  // Create a vertex buffer object and allocate data
   glGenBuffers(1, &vbo);
   glBindBuffer(GL_ARRAY_BUFFER, vbo);
+  vboSize = vboObjCapacity * sizeof(GLfloat) * 24;
+  vboData = (GLfloat *) malloc(vboSize);
+  vboDataCurrent = vboData;
 
-  // Create an element array
+  // Create an element buffer object
   GLuint ebo;
   glGenBuffers(1, &ebo);
   glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo);
@@ -98,6 +120,8 @@ int S2D_GL3_Init() {
   GLuint fragmentShader    = S2D_GL_LoadShader(GL_FRAGMENT_SHADER,    fragmentSource, "GL3 Fragment");
   GLuint texFragmentShader = S2D_GL_LoadShader(GL_FRAGMENT_SHADER, texFragmentSource, "GL3 Texture Fragment");
 
+  // Triangle Shader //
+
   // Create the shader program object
   shaderProgram = glCreateProgram();
 
@@ -111,7 +135,7 @@ int S2D_GL3_Init() {
   glAttachShader(shaderProgram, vertexShader);
   glAttachShader(shaderProgram, fragmentShader);
 
-  // Bind the varying out variables to the fragment shader color number
+  // Bind the output color variable to the fragment shader color number
   glBindFragDataLocation(shaderProgram, 0, "outColor");
 
   // Link the shader program
@@ -120,14 +144,17 @@ int S2D_GL3_Init() {
   // Check if linked
   S2D_GL_CheckLinked(shaderProgram, "GL3 shader");
 
-  // Specify the layout of the vertex data
+  // Specify the layout of the position vertex data...
   GLint posAttrib = glGetAttribLocation(shaderProgram, "position");
-  glVertexAttribPointer(posAttrib, 2, GL_FLOAT, GL_FALSE, 8 * sizeof(GLfloat), 0);
   glEnableVertexAttribArray(posAttrib);
+  glVertexAttribPointer(posAttrib, 2, GL_FLOAT, GL_FALSE, 8 * sizeof(GLfloat), 0);
 
+  // ...and the color vertex data
   GLint colAttrib = glGetAttribLocation(shaderProgram, "color");
-  glVertexAttribPointer(colAttrib, 4, GL_FLOAT, GL_FALSE, 8 * sizeof(GLfloat), (void*)(2 * sizeof(GLfloat)));
   glEnableVertexAttribArray(colAttrib);
+  glVertexAttribPointer(colAttrib, 4, GL_FLOAT, GL_FALSE, 8 * sizeof(GLfloat), (void*)(2 * sizeof(GLfloat)));
+
+  // Texture Shader //
 
   // Create the texture shader program object
   texShaderProgram = glCreateProgram();
@@ -138,25 +165,30 @@ int S2D_GL3_Init() {
     return GL_FALSE;
   }
 
+  // Attach the shader objects to the program object
   glAttachShader(texShaderProgram, vertexShader);
   glAttachShader(texShaderProgram, texFragmentShader);
 
+  // Bind the output color variable to the fragment shader color number
   glBindFragDataLocation(texShaderProgram, 0, "outColor");
 
+  // Link the shader program
   glLinkProgram(texShaderProgram);
 
   // Check if linked
   S2D_GL_CheckLinked(texShaderProgram, "GL3 texture shader");
 
-  // Specify the layout of the vertex data
+  // Specify the layout of the position vertex data...
   posAttrib = glGetAttribLocation(texShaderProgram, "position");
   glVertexAttribPointer(posAttrib, 2, GL_FLOAT, GL_FALSE, 8 * sizeof(GLfloat), 0);
   glEnableVertexAttribArray(posAttrib);
 
+  // ...and the color vertex data...
   colAttrib = glGetAttribLocation(texShaderProgram, "color");
   glVertexAttribPointer(colAttrib, 4, GL_FLOAT, GL_FALSE, 8 * sizeof(GLfloat), (void*)(2 * sizeof(GLfloat)));
   glEnableVertexAttribArray(colAttrib);
 
+  // ...and the texture coordinates
   GLint texAttrib = glGetAttribLocation(texShaderProgram, "texcoord");
   glVertexAttribPointer(texAttrib, 2, GL_FLOAT, GL_FALSE, 8 * sizeof(GLfloat), (void*)(6 * sizeof(GLfloat)));
   glEnableVertexAttribArray(texAttrib);
@@ -166,10 +198,33 @@ int S2D_GL3_Init() {
   glDeleteShader(fragmentShader);
   glDeleteShader(texFragmentShader);
 
+  // If successful, return true
   return GL_TRUE;
 }
 
 
+/*
+ * Render the vertex buffer and reset it
+ */
+void S2D_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);
+
+  // Render all the triangles in the buffer
+  glDrawArrays(GL_TRIANGLES, 0, (GLsizei)(vboDataIndex * 3));
+
+  // Reset the buffer object index and data pointer
+  vboDataIndex = 0;
+  vboDataCurrent = vboData;
+}
+
+
 /*
  * Draw triangle
  */
@@ -180,14 +235,21 @@ void S2D_GL3_DrawTriangle(GLfloat x1, GLfloat y1,
                           GLfloat x3, GLfloat y3,
                           GLfloat r3, GLfloat g3, GLfloat b3, GLfloat a3) {
 
+  // If buffer is full, flush it
+  if (vboDataIndex >= vboObjCapacity) S2D_GL3_FlushBuffers();
+
+  // Set the triangle data into a formatted array
   GLfloat vertices[] =
     { x1, y1, r1, g1, b1, a1, 0, 0,
       x2, y2, r2, g2, b2, a2, 0, 0,
       x3, y3, r3, g3, b3, a3, 0, 0 };
 
-  glUseProgram(shaderProgram);
-  glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
-  glDrawArrays(GL_TRIANGLES, 0, 3);
+  // Copy the vertex data into the current position of the buffer
+  memcpy(vboDataCurrent, vertices, sizeof(vertices));
+
+  // Increment the buffer object index and the vertex data pointer for next use
+  vboDataIndex++;
+  vboDataCurrent = (GLfloat *)((char *)vboDataCurrent + (sizeof(GLfloat) * 24));
 }
 
 
@@ -201,6 +263,11 @@ static void S2D_GL3_DrawTexture(int x, int y, int w, int h,
                                 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 };
@@ -214,6 +281,7 @@ static void S2D_GL3_DrawTexture(int x, int y, int w, int h,
     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
@@ -221,12 +289,17 @@ static void S2D_GL3_DrawTexture(int x, int y, int w, int h,
       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);
 }