Changeset 8e8aed6 in opengl-game for new-game.cpp

Timestamp:

Oct 17, 2018, 4:58:33 AM (6 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

446e55d

Parents:

25b47d7

Message:

Fix some g++ compiler warnings

File:

• new-game.cpp (modified) (8 diffs)

new-game.cpp

@@ -795 +795 @@
 
          // this code moves the asteroids
-         for (int i = 0; i < objects.size(); i++) {
+         for (unsigned int i = 0; i < objects.size(); i++) {
             if (objects[i]->type == TYPE_ASTEROID && !objects[i]->deleted) {
                transformObject(*objects[i], translate(mat4(1.0f), vec3(0.0f, 0.0f, 0.04f)), ubo);
@@ -1242 +1242 @@
 
    obj->normals.reserve(obj->points.size());
-   for (int i = 0; i < obj->points.size(); i += 9) {
+   for (unsigned int i = 0; i < obj->points.size(); i += 9) {
       vec3 point1 = vec3(obj->points[i], obj->points[i + 1], obj->points[i + 2]);
       vec3 point2 = vec3(obj->points[i + 3], obj->points[i + 4], obj->points[i + 5]);
@@ -1330 +1330 @@
 
    // start from the second point
-   for (int i = 3; i < obj->points.size(); i += 3) {
+   for (unsigned int i = 3; i < obj->points.size(); i += 3) {
       if (min_x > obj->points[i]) {
          min_x = obj->points[i];
@@ -1367 +1367 @@
       obj->bounding_radius = radius_z;
 
-   for (int i = 0; i < obj->points.size(); i += 3) {
+   for (unsigned int i = 0; i < obj->points.size(); i += 3) {
       obj->points[i] -= obj->bounding_center.x;
       obj->points[i + 1] -= obj->bounding_center.y;
@@ -2022 +2022 @@
 
    glBindBuffer(GL_ARRAY_BUFFER, model_mat_idx_vbo);
-   for (int i = 0; i < obj.num_points; i++) {
+   for (unsigned int i = 0; i < obj.num_points; i++) {
       glBufferSubData(GL_ARRAY_BUFFER, (obj.vertex_vbo_offset + i) * sizeof(GLuint), sizeof(GLuint), &obj.ubo_offset);
    }
@@ -2068 +2068 @@
    // TODO: A lot of the values calculated here can be calculated once and saved when the laser is created,
    // and then re-used here
-
-   mat4 new_model_transform = translate(mat4(1.0f), translation) * laser->model_transform;
 
    vec3 start = vec3(laser->model_transform * vec4(0.0f, 0.0f, 0.0f, 1.0f));
@@ -2284 +2282 @@
    */
 
-   stringstream ss;
-   ss << "FPS:   " << fps;
-
    {
       ImGui::SetNextWindowSize(ImVec2(95, 46), ImGuiCond_Once);
@@ -2295 +2290 @@
          ImGuiWindowFlags_NoMove);
       ImGui::Text("Score: ???");
-      ImGui::Text(ss.str().c_str());
+      ImGui::Text("FPS:   %f", fps);
       ImGui::End();
    }