Changeset c94a699 in opengl-game

Timestamp:

Jun 22, 2018, 3:20:13 AM (6 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

5527206

Parents:

c3c3158

Message:

Fix rendering of textured objects

File:

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

new-game.cpp

@@ -362 +362 @@
       1.0f, 0.0f, 0.0f,
    };
-   obj.texcoords = {
-      1.0f, 1.0f,
-      0.0f, 1.0f,
-      0.0f, 0.0f,
-      1.0f, 1.0f,
-      0.0f, 0.0f,
-      1.0f, 0.0f
-   };
+   obj.texcoords = { 0.0f };
    obj.selected_colors = {
       0.0f, 1.0f, 0.0f,
@@ -396 +389 @@
        0.5f, -0.5f,  0.0f,
    };
-   obj.colors = {
-      1.0f, 0.0f, 0.0f,
-      0.0f, 0.0f, 1.0f,
-      0.0f, 1.0f, 0.0f,
-      0.0f, 1.0f, 0.0f,
-      0.0f, 0.0f, 1.0f,
-      1.0f, 0.0f, 0.0f,
-   };
+   obj.colors = { 0.0f };
    obj.texcoords = {
       1.0f, 1.0f,
@@ -1501 +1487 @@
          it = objects.erase(it);
       } else {
-         points_buffer_size += it->points.size() * sizeof(GLfloat);
-         textures_buffer_size += it->texcoords.size() * sizeof(GLfloat);
+         points_buffer_size += it->num_points * sizeof(GLfloat) * 3;
+         textures_buffer_size += it->num_points * sizeof(GLfloat) * 2;
          ubo_buffer_size += 16 * sizeof(GLfloat);
          model_mat_idx_buffer_size += it->num_points * sizeof(GLuint);