From 030f8b298a892f4679da05a24fdb970a98d4a22f Mon Sep 17 00:00:00 2001
From: Faerbit <faerbit@gmail.com>
Date: Sun, 31 May 2015 15:23:54 +0200
Subject: [PATCH] Increased the geometry resolution of the flames.

---
 data/shader/flame.gsh | 18 +++++-------------
 game/flame.cc         | 17 +++++++----------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/data/shader/flame.gsh b/data/shader/flame.gsh
index 181a31f..1ede56b 100644
--- a/data/shader/flame.gsh
+++ b/data/shader/flame.gsh
@@ -3,7 +3,7 @@
 uniform mat4 modelViewProjectionMatrix;
 uniform float time;
 uniform bool bottom;
-uniform bool left;
+uniform int circle_index;
 uniform vec2 skew;
 
 layout(points) in;
@@ -75,19 +75,11 @@ void main() {
     for (i; i<render_end; i+=step) {
         float downRadius    = radiusFunction(i);
         float upRadius = radiusFunction(i+step);
-        float circle_end = 0.0;
-        int j = 0;
-        if (left) {
-            j = 0;
-            circle_end = resolution/2.0;
-        }
-        else {
-            j = int(resolution/2.0);
-            circle_end = resolution;
-        }
+        int j = int(resolution/2.0) * circle_index;
+        int circle_end = int(resolution/2.0) * (circle_index + 1);
         for (j; j<circle_end; j++) {
-            float leftAngle     = PI * 2.0 / resolution   * j;
-            float rightAngle    = PI * 2.0 / resolution * (j+1);
+            float leftAngle     = PI * 2.0 / resolution / 4.0  * j;
+            float rightAngle    = PI * 2.0 / resolution / 4.0 * (j+1);
 
             vec4 offset = vec4(cos(rightAngle) * downRadius, i, -sin(rightAngle) * downRadius, 0.0);
             gl_Position = gl_in[0].gl_Position + modelViewProjectionMatrix * offset;
diff --git a/game/flame.cc b/game/flame.cc
index 4c8b6ac..31598f4 100644
--- a/game/flame.cc
+++ b/game/flame.cc
@@ -42,14 +42,11 @@ void Flame::render(SharedShaderProgram shader, glm::mat4 viewProjectionMatrix, f
     shader->setUniform("withColor", withColor);
     shader->setUniform("time", time);
     shader->setUniform("skew", skewing);
-    shader->setUniform("bottom", true);
-    shader->setUniform("left", true);
-    vao->render();
-    shader->setUniform("left", false);
-    vao->render();
-    shader->setUniform("bottom", false);
-    shader->setUniform("left", true);
-    vao->render();
-    shader->setUniform("left", false);
-    vao->render();
+    for (int i = 0; i<8; i++) {
+        shader->setUniform("bottom", true);
+        shader->setUniform("circle_index", i);
+        vao->render();
+        shader->setUniform("bottom", false);
+        vao->render();
+    }
 }