From 6bab0ab86a72881c3e0b88284c211e01fb22435a Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Wed, 20 Sep 2017 20:54:09 +0500
Subject: 2017-09-20

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

(limited to 'src/RendererWorld.cpp')

diff --git a/src/RendererWorld.cpp b/src/RendererWorld.cpp
index 282d97e..f13011e 100644
--- a/src/RendererWorld.cpp
+++ b/src/RendererWorld.cpp
@@ -226,8 +226,13 @@ void RendererWorld::Render(RenderState & renderState) {
     glUniform2f(windowSizeLoc, renderState.WindowWidth, renderState.WindowHeight);
     glCheckError();
 
+    glBindVertexArray(RendererSection::GetVao());
+
+    size_t faces = 0;
+
     sectionsMutex.lock();
-    for (auto& section : sections) {        
+    for (auto& section : sections) {
+        faces += section.second.numOfFaces;
         sectionsMutex.unlock();        
         std::vector<Vector> sectionCorners = {
             Vector(0, 0, 0),
@@ -258,12 +263,13 @@ void RendererWorld::Render(RenderState & renderState) {
             sectionsMutex.lock();
             continue;
         }
-        glm::mat4 transform = glm::translate(glm::mat4(), (section.second.GetPosition() * 16).glm());
-        glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glm::value_ptr(transform));
-        section.second.Render(renderState);
+
+        //glDrawArraysInstanced(GL_TRIANGLES, section.second.offset, 6, section.second.numOfFaces);               
         sectionsMutex.lock();
     }
     sectionsMutex.unlock();
+    glBindVertexArray(RendererSection::GetVao());
+    glDrawArraysInstanced(GL_TRIANGLES, 0, 6, faces);
     glCheckError();
 
     glLineWidth(3.0);
-- 
cgit v1.2.3