Changes in / [3d96d13:446e55d] in opengl-game

Files:

• TODO.txt (modified) (1 diff)
• new-game.cpp (modified) (4 diffs)

TODO.txt

@@ +1 @@
+DEBUGGING
+==========
+-Read the sections about shader debugging, starting from line 59
+
 TODO
 ==========

new-game.cpp

@@ -215 +215 @@
 
 double fps;
-unsigned int score = 0;
 
 vec3 cam_pos;
@@ -810 +809 @@
                if (((Asteroid*)objects[i])->hp <= 0) {
                   removeObjectFromScene(*objects[i], ubo);
-                  score++;
                }
             }
@@ -2287 +2285 @@
    */
 
-   stringstream ssScore, ssFps;
-   ssScore << "Score: " << score;
-   ssFps << "FPS:   " << fps;
-
    {
       ImGui::SetNextWindowSize(ImVec2(95, 46), ImGuiCond_Once);
@@ -2298 +2292 @@
          ImGuiWindowFlags_NoResize |
          ImGuiWindowFlags_NoMove);
-<<<<<<< HEAD
-      ImGui::Text(ssScore.str().c_str());
-      ImGui::Text(ssFps.str().c_str());
-=======
       ImGui::Text("Score: ???");
       ImGui::Text("FPS:   %f", fps);
->>>>>>> 446e55df316c547047dc0eb5c46189c6958dba21
       ImGui::End();
    }