From 722e9f53cde2c41a672d9fbe71a1cd9292b5e8fe Mon Sep 17 00:00:00 2001 From: Andreas Ortmann Date: Wed, 28 Sep 2016 13:38:31 +0200 Subject: [PATCH] model rendering is working :) --- .../renderer_polygon_3d.cpp | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/game/renderer_polygon_3d/renderer_polygon_3d.cpp b/game/renderer_polygon_3d/renderer_polygon_3d.cpp index d9e8760..9b17513 100644 --- a/game/renderer_polygon_3d/renderer_polygon_3d.cpp +++ b/game/renderer_polygon_3d/renderer_polygon_3d.cpp @@ -9,8 +9,8 @@ namespace endofthejedi { { std::cout<<"setup 3d" << std::endl; - //m_atomicBomb = new PolygonModel("../data/mesh/small_atomic_bomb.stl"); - m_atomicBomb = new PolygonModel("../data/mesh/quad_screen_coords.stl"); + m_atomicBomb = new PolygonModel("../data/mesh/small_atomic_bomb.stl"); + //m_atomicBomb = new PolygonModel("../data/mesh/quad_screen_coords.stl"); m_atomicBomb->import(); m_atomicBomb->uploadToOpenGl(); @@ -45,16 +45,16 @@ namespace endofthejedi { (void) state; - //m_atomicBomb->bind(); - //m_atomicBomb->render(); + m_atomicBomb->bind(); + m_atomicBomb->render(); - glColor3f(1.0, 0.0, 0.0); - glBegin(GL_QUADS); - glVertex2f(-1.0f, -1.0f); - glVertex2f(1.0f, -1.0f); - glVertex2f(1.0f, 1.0f); - glVertex2f(-1.0f, 1.0f); - glEnd(); + //glColor3f(1.0, 0.0, 0.0); + //glBegin(GL_QUADS); + //glVertex2f(-1.0f, -1.0f); + //glVertex2f(1.0f, -1.0f); + //glVertex2f(1.0f, 1.0f); + //glVertex2f(-1.0f, 1.0f); + //glEnd(); //std::cout<<"render 3d" << std::endl; }