renderer cleanup

3 files changed, 27 insertions, 30 deletions

diff --git a/include/llmr/renderer/painter.hpp b/include/llmr/renderer/painter.hpp
index fe8fdbc711..d6997940c4 100644
--- a/include/llmr/renderer/painter.hpp
+++ b/include/llmr/renderer/painter.hpp
@@ -16,18 +16,17 @@ public:
 
     void setup();
     void teardown();
-    void viewport();
-
 
     void clear();
-    void render(std::shared_ptr<tile> tile);
+    void render(const std::shared_ptr<tile>& tile);
+    void renderDebug(const std::shared_ptr<tile>& tile);
 
     void drawClippingMask();
-    void switchShader(Shader *shader);
+    bool switchShader(Shader *shader);
 
 private:
     void setupShaders();
-    void changeMatrix(std::shared_ptr<tile> tile);
+    void changeMatrix(const std::shared_ptr<tile>& tile);
 
 public:
 
diff --git a/src/map/tile.cpp b/src/map/tile.cpp
index c7d62bd064..15894678fa 100644
--- a/src/map/tile.cpp
+++ b/src/map/tile.cpp
@@ -126,8 +126,6 @@ bool tile::parse() {
         }
     }
 
-    // fprintf(stderr, "[%p] parsing tile [%d/%d/%d]... done\n", this, z, x, y);
-
     if (state == obsolete) {
         return false;
     } else {
diff --git a/src/renderer/painter.cpp b/src/renderer/painter.cpp
index ae7d610789..f055761b06 100644
--- a/src/renderer/painter.cpp
+++ b/src/renderer/painter.cpp
@@ -83,7 +83,7 @@ void painter::teardown() {
 
 }
 
-void painter::changeMatrix(std::shared_ptr<tile> tile) {
+void painter::changeMatrix(const tile::ptr& tile) {
     assert(transform);
 
     // Initialize projection matrix
@@ -137,7 +137,7 @@ void painter::clear() {
     glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 }
 
-void painter::render(tile::ptr tile) {
+void painter::render(const tile::ptr& tile) {
     if (tile->state != tile::ready) {
         return;
     }
@@ -162,31 +162,31 @@ void painter::render(tile::ptr tile) {
 
 
     if (settings->debug) {
-        // draw tile outline
-        switchShader(lineShader);
-        glUniformMatrix4fv(lineShader->u_matrix, 1, GL_FALSE, matrix);
-        glBindBuffer(GL_ARRAY_BUFFER, tile_border_buffer);
-        glVertexAttribPointer(lineShader->a_pos, 2, GL_SHORT, false, 0, BUFFER_OFFSET(0));
-        glUniform4f(lineShader->u_color, 1.0f, 1.0f, 1.0f, 1.0f);
-        glLineWidth(4.0f);
-        glDrawArrays(GL_LINE_STRIP, 0, sizeof(tile_border_vertices));
-
-        // draw debug info
-        switchShader(lineShader);
-        glUniformMatrix4fv(lineShader->u_matrix, 1, GL_FALSE, matrix);
-        tile->debugFontVertex.bind();
-        glVertexAttribPointer(lineShader->a_pos, 2, GL_SHORT, GL_FALSE, 0, BUFFER_OFFSET(0));
-        glUniform4f(lineShader->u_color, 1.0f, 1.0f, 1.0f, 1.0f);
-        glLineWidth(4.0f);
-        glDrawArrays(GL_LINES, 0, tile->debugFontVertex.length());
-        glUniform4f(lineShader->u_color, 0.0f, 0.0f, 0.0f, 1.0f);
-        glLineWidth(2.0f);
-        glDrawArrays(GL_LINES, 0, tile->debugFontVertex.length());
+        renderDebug(tile);
     }
 }
 
-void painter::viewport() {
+void painter::renderDebug(const tile::ptr& tile) {
+    // draw tile outline
+    switchShader(lineShader);
+    glUniformMatrix4fv(lineShader->u_matrix, 1, GL_FALSE, matrix);
+    glBindBuffer(GL_ARRAY_BUFFER, tile_border_buffer);
+    glVertexAttribPointer(lineShader->a_pos, 2, GL_SHORT, false, 0, BUFFER_OFFSET(0));
+    glUniform4f(lineShader->u_color, 1.0f, 1.0f, 1.0f, 1.0f);
+    glLineWidth(4.0f);
+    glDrawArrays(GL_LINE_STRIP, 0, sizeof(tile_border_vertices));
 
+    // draw debug info
+    switchShader(lineShader);
+    glUniformMatrix4fv(lineShader->u_matrix, 1, GL_FALSE, matrix);
+    tile->debugFontVertex.bind();
+    glVertexAttribPointer(lineShader->a_pos, 2, GL_SHORT, GL_FALSE, 0, BUFFER_OFFSET(0));
+    glUniform4f(lineShader->u_color, 1.0f, 1.0f, 1.0f, 1.0f);
+    glLineWidth(4.0f);
+    glDrawArrays(GL_LINES, 0, tile->debugFontVertex.length());
+    glUniform4f(lineShader->u_color, 0.0f, 0.0f, 0.0f, 1.0f);
+    glLineWidth(2.0f);
+    glDrawArrays(GL_LINES, 0, tile->debugFontVertex.length());
 }
 
 // Switches to a different shader program.