Merge pull request #123 from gasti-jm/cambios_gasty

Cambios gasty

Author: gasti-jm

resources/shaders/default.frag

@@ -12,8 +12,7 @@ void main() {
 
     vec4 finalColor = tex * vColor;
 
-    if (finalColor.a <= 0.01)
-    discard;
+    if (tex.a < 0.5) discard;
 
     FragColor = finalColor;
 }

src/main/java/org/aoclient/engine/renderer/BatchRenderer.java

@@ -30,7 +30,7 @@
 public class BatchRenderer {
     private Texture currentTexture = null;
     private boolean drawing = false;
-    private boolean currentBlend = false;
+    private boolean currentBlend;
 
     private static final int MAX_QUADS = 10000;
     private static final int VERTICES_PER_QUAD = 6;
@@ -89,8 +89,8 @@ public void begin() {
         buffer.clear();
         vertexCount = 0;
         currentTexture = null;
-        currentBlend = false;
         drawing = true;
+        currentBlend = false;
     }
 
     // =========================
@@ -114,23 +114,27 @@ public void submitQuad(
             return;
         }
 
-        if (currentBlend != blend) {
+
+        if (currentTexture != texture || currentBlend != blend) {
             flush();
+
             currentBlend = blend;
 
             if (blend) {
                 glBlendFunc(GL_SRC_ALPHA, GL_ONE);
             } else {
                 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
             }
-        }
 
-        if (currentTexture != texture) {
-            flush();
             currentTexture = texture;
             currentTexture.bind();
         }
 
+        if (vertexCount + 6 >= MAX_QUADS * VERTICES_PER_QUAD) {
+            flush();
+        }
+
+
         push(x, y,         u0, v1, r, g, b, a);
         push(x + w, y,     u1, v1, r, g, b, a);
         push(x + w, y + h, u1, v0, r, g, b, a);
@@ -144,7 +148,15 @@ private void flush() {
         if (vertexCount == 0) return;
 
         buffer.flip();
+
         glBindBuffer(GL_ARRAY_BUFFER, vbo);
+
+        glBufferData(
+                GL_ARRAY_BUFFER,
+                buffer.capacity() * Float.BYTES,
+                GL_DYNAMIC_DRAW
+        );
+
         glBufferSubData(GL_ARRAY_BUFFER, 0, buffer);
 
         glBindVertexArray(vao);
@@ -176,7 +188,6 @@ public void end() {
         flush();
         drawing = false;
         currentTexture = null;
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     }
 
     public void render() {

src/main/java/org/aoclient/engine/renderer/Renderer.java

@@ -15,8 +15,11 @@ public class Renderer {
     private final Shader shader;
     private final Matrix4f projection;
 
+    private final FloatBuffer projBuf = MemoryUtil.memAllocFloat(16);
+    private final FloatBuffer viewBuf = MemoryUtil.memAllocFloat(16);
     private final BatchRenderer batch = new BatchRenderer();
 
+
     public Renderer() {
         camera = new Camera2D(0, 0);
 
@@ -45,6 +48,7 @@ public void draw(
         float v1 = srcY / tex.getTex_height();
         float v0 = (srcY + srcH) / tex.getTex_height();
 
+
         batch.submitQuad(
                 tex,
                 x, y,
@@ -54,8 +58,8 @@ public void draw(
                 color.getRed(),
                 color.getGreen(),
                 color.getBlue(),
-                alpha
-        );
+                alpha);
+
     }
 
     public void render(Scene scene) {
@@ -64,23 +68,22 @@ public void render(Scene scene) {
         int texLoc = glGetUniformLocation(shader.getId(), "uTexture");
         glUniform1i(texLoc, 0);
 
+        setMatrices();
+
+        batch.begin();
+        scene.render();
+        batch.end();
+
+        shader.unbind();
+    }
+
+    private void setMatrices() {
         int projLoc = glGetUniformLocation(shader.getId(), "uProjection");
-        FloatBuffer projBuf = MemoryUtil.memAllocFloat(16);
         projection.get(projBuf);
         glUniformMatrix4fv(projLoc, false, projBuf);
 
         int viewLoc = glGetUniformLocation(shader.getId(), "uView");
-        FloatBuffer viewBuf = MemoryUtil.memAllocFloat(16);
         camera.getViewMatrix().get(viewBuf);
         glUniformMatrix4fv(viewLoc, false, viewBuf);
-
-        batch.begin();
-        scene.render();
-        batch.end();
-
-        MemoryUtil.memFree(projBuf);
-        MemoryUtil.memFree(viewBuf);
-
-        shader.unbind();
     }
 }