merge end stuff

game/developer_console.cpp

@@ -49,8 +49,8 @@ namespace developer {
             return false;
         }
 
-        std::cout<<"[developer console] adding developer "
+        //std::cout<<"[developer console] adding developer "
-            "callback for token '" << token << "'" << std::endl;
+        //    "callback for token '" << token << "'" << std::endl;
 
         m_callbacks[token] = cb;
 

game/renderer_polygon_3d/image_texture.cpp

@@ -78,11 +78,11 @@ namespace endofthejedi {
                 NULL, NULL, NULL);
 
 
-        if (color_type == PNG_COLOR_TYPE_RGB) {
+        //if (color_type == PNG_COLOR_TYPE_RGB) {
-            puts("PNG_COLOR_TYPE_RGB");
+        //    puts("PNG_COLOR_TYPE_RGB");
-        } else if (color_type == PNG_COLOR_TYPE_RGBA) {
+        //} else if (color_type == PNG_COLOR_TYPE_RGBA) {
-            puts("PNG_COLOR_TYPE_RGBA");
+        //    puts("PNG_COLOR_TYPE_RGBA");
-        }
+        //}
 
         //update width and height based on png info
 
@@ -95,11 +95,11 @@ namespace endofthejedi {
 
         m_size = glm::vec2();
 
-        puts("#########################################");
+        //puts("#########################################");
-        printf("# PNG: width=%d, height=%d\n", twidth, theight);
+        //printf("# PNG: width=%d, height=%d\n", twidth, theight);
-        printf("# powers of two: w=%d, h=%d\n", pot_width, pot_height);
+        //printf("# powers of two: w=%d, h=%d\n", pot_width, pot_height);
-        printf("# uv scale two: x=%f, y=%f\n", m_uvScale.x, m_uvScale.y);
+        //printf("# uv scale two: x=%f, y=%f\n", m_uvScale.x, m_uvScale.y);
-        puts("#########################################");
+        //puts("#########################################");
 
         // Update the png info struct.
         png_read_update_info(png_ptr, info_ptr);

game/renderer_polygon_3d/renderer_polygon_3d.cpp

@@ -9,8 +9,7 @@
 #include "developer_console.hpp"
 
 namespace endofthejedi {
-    void RendererPolygon3d::setup()
+void RendererPolygon3d::setup() {
-    {
         m_lastTime = -1.0;
 
     //std::cout << "setup polygon 3d" << std::endl;
@@ -39,7 +38,7 @@ namespace endofthejedi {
     addModel("../data/mesh/ship_ufo.stl", &m_shipModel);
 
         m_texture = nullptr;
-        m_backgroundTexturePath = "../data/img/background_3.png";
+    m_backgroundTexturePath = "../data/img/stars_nebular.png";
         loadBackgroundTexture();
 
     m_postprocess_shader.init();
@@ -88,15 +87,15 @@ namespace endofthejedi {
         glActiveTexture(GL_TEXTURE0);
         m_texture->loadPng();
 
-        std::cout<<"texture loading: " << m_texture->valid() << std::endl;
+        //std::cout<<"texture loading: " << m_texture->valid() << std::endl;
         if (!m_texture->valid()) {
             std::cout<<"loading failed!";
             return;
             //exit(-1);
         }
 
-        glm::vec2 s = m_texture->size();
+        //glm::vec2 s = m_texture->size();
-        std::cout<<"texture size is " << s.x << " X " << s.y << std::endl;
+        //std::cout<<"texture size is " << s.x << " X " << s.y << std::endl;
     }
 
     void RendererPolygon3d::renderBackgroundImage()
@@ -574,7 +573,7 @@ void RendererPolygon3d::renderMissiles() {
             glm::mat4 model = computeModelMatrix(ship);
             glUniformMatrix4fv(m_shader_game_objects.location("model"), 1, GL_FALSE, glm::value_ptr(model));
 
-            glm::vec3 c = ship->color;
+            glm::vec3 c = glm::vec3(0.1, 1.0, 0.2);
             glUniform3f(m_shader_game_objects.location("materialColor"), c.x, c.y, c.z);
 
             m_shipModel->render();
@@ -681,6 +680,7 @@ void RendererPolygon3d::renderMissiles() {
             }
             glEnd();
         }
+    glLineWidth(1.0f);
         glPolygonMode(GL_FRONT, GL_FILL);
     }
 

game/renderer_polygon_3d/renderer_polygon_3d.hpp

@@ -35,7 +35,6 @@ namespace endofthejedi {
 
         private:
             void renderPlanets();
-    void renderSun();
             void renderMissiles();
             void renderShips();
             void renderParticles();

game/state/state.cpp

@@ -139,7 +139,7 @@ namespace game {
             return false;
         }
 
-        Ship *ship = new Ship(generateId(), spawnPos, player->color, m_shipRadius);
+        Ship *ship = new Ship(generateId(), spawnPos, m_shipRadius);
         player->ship = ship;
         ships.push_back(ship);
 
@@ -164,10 +164,18 @@ namespace game {
 		Player *player = playerForId(playerId);
 		if (player != nullptr) {
 			for (Missile *missile : player->missiles) {
+        player->missiles.remove(missile);
 				missile->player = nullptr;
+                m_nextEvents.push_back(new MissileEvent(LifeCycle::Destroy, missile));
+			}
+
+            if (player->ship != nullptr) {
+                ships.remove(player->ship);
+                m_nextEvents.push_back(new ShipEvent(LifeCycle::Destroy, player->ship));
 			}
 
 			players.remove(player);
+            delete(player);
 		}
     }
 
@@ -226,8 +234,9 @@ namespace game {
         (void) dt;
         for (Player *player : players) {
             if (player->alive) {
-                player->energy += dt * ENERGY_PER_DT;
+                player->energy += dt;
             }
+
             // try to execute as much queued commands as possible.
             while (player->hasCommandInQueue()) {
                 Command *command = player->peekCommand();
@@ -533,6 +542,16 @@ namespace game {
                         }
                     break;
 
+                    case EventType::Ship:
+                    {
+                            auto *se = static_cast<ShipEvent*>(evt);
+                            //std::cout<<"got missile delete event, finally deleting missile #"
+                            //    << me->object()->id << std::endl;
+
+                            delete(se->object());
+                        }
+                    break;
+
                     case EventType::Missile:
                     {
                             auto *me = static_cast<MissileEvent*>(evt);