From 0e27eb554f22497d71cc5ef89c54762c165f4a90 Mon Sep 17 00:00:00 2001
From: Sri Harsha Chilakapati <hello@goharsha.com>
Date: Tue, 29 Dec 2015 19:41:49 +0530
Subject: [PATCH] Fix issue causing missing buffer objects due to duplicate IDs

---
 .../shc/webgl4j/client/WebGLObjectMap.java    | 62 ++++++++++++-------
 1 file changed, 38 insertions(+), 24 deletions(-)

diff --git a/webgl4j/src/main/java/com/shc/webgl4j/client/WebGLObjectMap.java b/webgl4j/src/main/java/com/shc/webgl4j/client/WebGLObjectMap.java
index 3e0c6de..1456cd8 100644
--- a/webgl4j/src/main/java/com/shc/webgl4j/client/WebGLObjectMap.java
+++ b/webgl4j/src/main/java/com/shc/webgl4j/client/WebGLObjectMap.java
@@ -60,6 +60,20 @@ final class WebGLObjectMap
     // Field to store the current program
     int currentProgram = 0;
 
+    // Fields for last generated IDs of WebGL objects
+    private int lastShaderID            = 0;
+    private int lastBufferID            = 0;
+    private int lastProgramID           = 0;
+    private int lastTextureID           = 0;
+    private int lastFramebufferID       = 0;
+    private int lastRenderbufferID      = 0;
+    private int lastUniformID           = 0;
+    private int lastQueryID             = 0;
+    private int lastSamplerID           = 0;
+    private int lastSyncID              = 0;
+    private int lastTransformFeedbackID = 0;
+    private int lastVertexArrayObjectID = 0;
+
     private WebGLObjectMap()
     {
     }
@@ -89,8 +103,8 @@ int createShader(JavaScriptObject shader)
                     return key;
         }
 
-        shaders.put(shaders.size() + 1, shader);
-        return shaders.size();
+        shaders.put(++lastShaderID, shader);
+        return lastShaderID;
     }
 
     JavaScriptObject toShader(int shaderID)
@@ -110,8 +124,8 @@ int createBuffer(JavaScriptObject buffer)
                     return key;
         }
 
-        buffers.put(buffers.size() + 1, buffer);
-        return buffers.size();
+        buffers.put(++lastBufferID, buffer);
+        return lastBufferID;
     }
 
     JavaScriptObject toBuffer(int bufferID)
@@ -131,8 +145,8 @@ int createProgram(JavaScriptObject program)
                     return key;
         }
 
-        programs.put(programs.size() + 1, program);
-        return programs.size();
+        programs.put(++lastProgramID, program);
+        return lastProgramID;
     }
 
     JavaScriptObject toProgram(int programID)
@@ -152,8 +166,8 @@ int createTexture(JavaScriptObject texture)
                     return key;
         }
 
-        textures.put(textures.size() + 1, texture);
-        return textures.size();
+        textures.put(++lastTextureID, texture);
+        return lastTextureID;
     }
 
     JavaScriptObject toTexture(int textureID)
@@ -173,8 +187,8 @@ int createFramebuffer(JavaScriptObject frameBuffer)
                     return key;
         }
 
-        frameBuffers.put(frameBuffers.size() + 1, frameBuffer);
-        return frameBuffers.size();
+        frameBuffers.put(++lastFramebufferID, frameBuffer);
+        return lastFramebufferID;
     }
 
     JavaScriptObject toFramebuffer(int frameBuffer)
@@ -194,8 +208,8 @@ int createRenderBuffer(JavaScriptObject renderBuffer)
                     return key;
         }
 
-        renderBuffers.put(renderBuffers.size() + 1, renderBuffer);
-        return renderBuffers.size();
+        renderBuffers.put(++lastRenderbufferID, renderBuffer);
+        return lastRenderbufferID;
     }
 
     JavaScriptObject toRenderBuffer(int renderBuffer)
@@ -223,8 +237,8 @@ int createUniform(JavaScriptObject uniform)
                     return key;
         }
 
-        progUniforms.put(progUniforms.size() + 1, uniform);
-        return progUniforms.size();
+        progUniforms.put(++lastUniformID, uniform);
+        return lastUniformID;
     }
 
     JavaScriptObject toUniform(int programID, int uniform)
@@ -288,8 +302,8 @@ int createQuery(JavaScriptObject query)
                     return key;
         }
 
-        queries.put(queries.size() + 1, query);
-        return queries.size();
+        queries.put(++lastQueryID, query);
+        return lastQueryID;
     }
 
     JavaScriptObject toQuery(int query)
@@ -309,8 +323,8 @@ int createSampler(JavaScriptObject sampler)
                     return key;
         }
 
-        samplers.put(samplers.size() + 1, sampler);
-        return samplers.size();
+        samplers.put(++lastSamplerID, sampler);
+        return lastSamplerID;
     }
 
     JavaScriptObject toSampler(int sampler)
@@ -330,8 +344,8 @@ int createSync(JavaScriptObject sync)
                     return key;
         }
 
-        syncs.put(syncs.size() + 1, sync);
-        return syncs.size();
+        syncs.put(++lastSyncID, sync);
+        return lastSyncID;
     }
 
     JavaScriptObject toSync(int sync)
@@ -351,8 +365,8 @@ int createTransformFeedback(JavaScriptObject transformFeedback)
                     return key;
         }
 
-        transformFeedbacks.put(transformFeedbacks.size() + 1, transformFeedback);
-        return transformFeedbacks.size();
+        transformFeedbacks.put(++lastTransformFeedbackID, transformFeedback);
+        return lastTransformFeedbackID;
     }
 
     JavaScriptObject toTransformFeedback(int transformFeedback)
@@ -372,8 +386,8 @@ int createVertexArrayObject(JavaScriptObject vertexArrayObject)
                     return key;
         }
 
-        vertexArrayObjects.put(vertexArrayObjects.size() + 1, vertexArrayObject);
-        return vertexArrayObjects.size();
+        vertexArrayObjects.put(++lastVertexArrayObjectID, vertexArrayObject);
+        return lastVertexArrayObjectID;
     }
 
     JavaScriptObject toVertexArrayObject(int vertexArrayObject)