From 3770fee3778f74112d3687ad0c382f0aefa5d7a4 Mon Sep 17 00:00:00 2001
From: uis <uis9936@gmail.com>
Date: Wed, 19 Dec 2018 14:45:39 +0300
Subject: Fixes #29

---
 src/RendererWorld.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/RendererWorld.cpp')

diff --git a/src/RendererWorld.cpp b/src/RendererWorld.cpp
index bb8c8f4..e1dd52c 100644
--- a/src/RendererWorld.cpp
+++ b/src/RendererWorld.cpp
@@ -291,13 +291,13 @@ void RendererWorld::Render(RenderState & renderState) {
     glCheckError();
     modelLoc = glGetUniformLocation(entityShader->Program, "model");
     colorLoc = glGetUniformLocation(entityShader->Program, "color");
+
+    renderState.SetActiveVao(RendererEntity::GetVao());
     for (auto& it : entities) {
         it.modelLoc = modelLoc;
         it.colorLoc = colorLoc;
         it.Render(renderState);
     }
-    glLineWidth(1.0);
-    glCheckError();
 
     //Render selected block
     Vector selectedBlock = gs->selectedBlock;
@@ -311,16 +311,14 @@ void RendererWorld::Render(RenderState & renderState) {
             glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glm::value_ptr(model));
             glUniform3f(colorLoc, 0.0, 0.0, 0.0);
             glCheckError();
-            glDrawArrays(GL_LINE_STRIP, 0, 36);
+            glDrawArrays(GL_LINES, 0, 24);
         }
-        glLineWidth(1.0f);
-        glCheckError();
     }
 
     //Render raycast hit
-    bool renderHit = false;
+    const bool renderHit = false;
     if (renderHit) {
-        VectorF hit = gs->raycastHit;
+    VectorF hit = gs->raycastHit;
         glLineWidth(2.0f);
         {
             glm::mat4 model;
@@ -334,10 +332,11 @@ void RendererWorld::Render(RenderState & renderState) {
             glCheckError();
             glDrawArrays(GL_LINE_STRIP, 0, 36);
         }
-        glLineWidth(1.0f);
-        glCheckError();
     }
 
+	glLineWidth(1.0);
+	glCheckError();
+
 	//Render sky
 	renderState.TimeOfDay = gs->TimeOfDay;
 	renderState.SetActiveShader(skyShader->Program);
@@ -464,4 +463,4 @@ void RendererWorld::Update(double timeToUpdate) {
 
 GameState* RendererWorld::GameStatePtr() {
     return gs;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3