can render models with scale and translation and color now.

game/renderer_polygon_3d/polygon_model.hpp

@@ -71,6 +71,7 @@ class PolygonModel {
                 std::cerr<<"[polygonmodel] warning: try to upload model data "
                     << "to OpenGL but no data is loaded!" << std::endl;
 
+                exit(-1);
                 return false;
             }
 
@@ -126,6 +127,7 @@ class PolygonModel {
                 std::cout<<"[polygonmodel] warning: try to bind model vbo "
                     << "which was not uploaded to OpenGL!" << std::endl;
 
+                exit(-1);
                 return false;
             }
 
@@ -152,6 +154,7 @@ class PolygonModel {
         {
             if (!m_binding_active || !m_loaded_to_opengl) {
                 std::cout<<"[polygonmodel] warning: try to render model without bind()" << std::endl;
+                exit(-1);
                 return false;
             }
 

game/renderer_polygon_3d/renderer_polygon_3d.cpp

@@ -2,30 +2,33 @@
 
 #include <iostream>
 
+#include "glm/gtc/type_ptr.hpp"
+
 #include "polygon_model.hpp"
 
 namespace endofthejedi {
     void RendererPolygon3d::setup()
     {
-        std::cout<<"setup 3d" << std::endl;
+        std::cout<<"setup polygon 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->import();
-        m_atomicBomb->uploadToOpenGl();
+        //m_missileModel = new PolygonModel("../data/mesh/quad_screen_coords.stl");
 
-        m_models.push_back(m_atomicBomb);
+        addModel("../data/mesh/small_atomic_bomb.stl", &m_missileModel);
+        //addModel("../data/mesh/planet_128.stl",        &m_planetModel);
+        addModel("../data/mesh/planet_12.stl",        &m_planetModel);
 
-        std::string vss =
+        std::string vss_simple =
+            "#version 120\n"
             "varying vec3 vertex;\n"
             "void main()\n"
             "{\n"
             "  gl_Position = gl_Vertex;\n"
-            "  vertex = gl_Vertex.xyz;\n"
+            "  vertex = gl_Position.xyz;\n"
             "}\n"
             ;
 
-        std::string fss =
+        std::string fss_simple =
+            "#version 120\n"
             "varying vec3 vertex;\n"
             "void main()\n"
             "{\n"
@@ -34,19 +37,52 @@ namespace endofthejedi {
             "}\n"
             ;
 
+        std::string vss_game_objects =
+            "#version 120\n"
+            "uniform vec3 position;\n"
+            "uniform float scale;\n"
+            "varying vec3 vertex;\n"
+            "void main()\n"
+            "{\n"
+            "  vec3 p = scale*gl_Vertex.xyz;\n"
+            "  p += position;\n"
+            "  gl_Position = vec4(p, gl_Vertex.w);\n"
+            "  vertex = p;\n"
+            "}\n"
+            ;
+
+        std::string fss_game_objects =
+            "#version 120\n"
+            "varying vec3 vertex;\n"
+            "uniform vec3 color;\n"
+            "void main()\n"
+            "{\n"
+            //"  gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);\n"
+            //"  gl_FragColor = vec4(0.5+0.5*vertex.xyz, 1.0);\n"
+            "  gl_FragColor = vec4(color, 1.0);\n"
+            "}\n"
+            ;
+
         m_shader.init();
-        m_shader.load(vss.c_str(), GL_VERTEX_SHADER);
-        m_shader.load(fss.c_str(), GL_FRAGMENT_SHADER);
+
+#if 0
+        (void) vss_game_objects;
+        (void) fss_game_objects;
+        m_shader.load(vss_simple.c_str(), GL_VERTEX_SHADER);
+        m_shader.load(fss_simple.c_str(), GL_FRAGMENT_SHADER);
+#else
+        (void) vss_simple;
+        (void) fss_simple;
+        m_shader.load(vss_game_objects.c_str(), GL_VERTEX_SHADER);
+        m_shader.load(fss_game_objects.c_str(), GL_FRAGMENT_SHADER);
+#endif
     }
 
     void RendererPolygon3d::render(const game::State *state)
     {
         m_shader.bind();
 
-        (void) state;
-
-        m_atomicBomb->bind();
-        m_atomicBomb->render();
+        renderPlanets(state);
 
         //glColor3f(1.0, 0.0, 0.0);
         //glBegin(GL_QUADS);
@@ -55,7 +91,44 @@ namespace endofthejedi {
         //glVertex2f(1.0f, 1.0f);
         //glVertex2f(-1.0f, 1.0f);
         //glEnd();
+    }
 
-        //std::cout<<"render 3d" << std::endl;
+    void RendererPolygon3d::renderPlanets(const game::State *state)
+    {
+        m_planetModel->bind();
+
+        for (const game::Planet *planet : state->planets) {
+            glm::vec3 c = glm::vec3(0.7, 0.2, 0.1);
+            const auto &p = planet->position;
+
+            glUniform3f(m_shader.location("position"), p.x, p.y, 0.0);
+            glUniform3f(m_shader.location("color"),    c.x, c.y, c.z);
+            glUniform1f(m_shader.location("scale"),    planet->radius);
+
+            m_planetModel->render();
+        }
+    }
+
+    void RendererPolygon3d::renderMissiles(const game::State *state)
+    {
+        (void) state;
+        //m_missileModel->bind();
+        // TODO
+        //m_missileModel->render();
+    }
+
+    void RendererPolygon3d::addModel(const std::string &filename, PolygonModel **dest)
+    {
+        std::cout<<"adding a model: " << filename << std::endl;
+
+        *dest = new PolygonModel(filename);
+        if (!(*dest)->import()) {
+            std::cout<<"error: failed to load needed model!!!" << std::endl << std::endl;
+            exit(-1);
+        }
+
+        (*dest)->uploadToOpenGl();
+
+        m_models.push_back(*dest);
     }
 }

game/renderer_polygon_3d/renderer_polygon_3d.hpp

@@ -21,12 +21,20 @@ namespace endofthejedi {
             void setup();
             void render(const game::State *state) override;
 
+        private:
+            void renderPlanets(const game::State *state);
+            void renderMissiles(const game::State *state);
+            //void renderShips(const game::State *state);
+
+            void addModel(const std::string &filename, PolygonModel **dest);
+
         private:
             // all models are also here (for easy reloading etc.)
             std::vector<PolygonModel*>  m_models;
 
             // and with a specific variable name here
-            PolygonModel               *m_atomicBomb;
+            PolygonModel               *m_missileModel;
+            PolygonModel               *m_planetModel;
 
             // for rendering everything
             Shader m_shader;