Changeset 1add0ed in opengl-game

Timestamp:

Mar 22, 2020, 10:22:54 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

2ff4d3e

Parents:

22217d4

Message:

Set model_base and call updateObject()to control the initial position of the textured squares instead of manually changing the z-coordinate of their points

File:

• vulkan-game.cpp (modified) (5 diffs)

vulkan-game.cpp

@@ -233 +233 @@
    addObject(modelObjects, modelPipeline,
       addObjectIndex<ModelVertex>(modelObjects.size(), {
-         {{-0.5f, -0.5f, -2.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
-         {{ 0.5f, -0.5f, -2.0f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
-         {{ 0.5f,  0.5f, -2.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
-         {{-0.5f,  0.5f, -2.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
+         {{-0.5f, -0.5f,  0.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
+         {{ 0.5f, -0.5f,  0.0f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
+         {{ 0.5f,  0.5f,  0.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
+         {{-0.5f,  0.5f,  0.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
       }), {
          0, 1, 2, 2, 3, 0
@@ -243 +243 @@
       }, false);
 
+   modelObjects.back().model_base =
+      translate(mat4(1.0f), vec3(0.0f, 0.0f, -2.0f));
+
+   updateObject(modelObjects, modelPipeline, modelObjects.size() - 1);
+
    addObject(modelObjects, modelPipeline,
       addObjectIndex<ModelVertex>(modelObjects.size(), {
-         {{-0.5f, -0.5f, -1.5f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
-         {{ 0.5f, -0.5f, -1.5f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
-         {{ 0.5f,  0.5f, -1.5f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
-         {{-0.5f,  0.5f, -1.5f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
+         {{-0.5f, -0.5f,  0.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
+         {{ 0.5f, -0.5f,  0.0f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
+         {{ 0.5f,  0.5f,  0.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
+         {{-0.5f,  0.5f,  0.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
       }), {
          0, 1, 2, 2, 3, 0
@@ -254 +259 @@
          mat4(1.0f)
       }, false);
+
+   modelObjects.back().model_base =
+      translate(mat4(1.0f), vec3(0.0f, 0.0f, -1.5f));
+
+   updateObject(modelObjects, modelPipeline, modelObjects.size() - 1);
 
    modelPipeline.createDescriptorSetLayout();
@@ -623 +633 @@
                   addObject(modelObjects, modelPipeline,
                      addObjectIndex<ModelVertex>(modelObjects.size(), {
-                        {{-0.5f, -0.5f,  zOffset}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
-                        {{ 0.5f, -0.5f,  zOffset}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
-                        {{ 0.5f,  0.5f,  zOffset}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
-                        {{-0.5f,  0.5f,  zOffset}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
+                        {{-0.5f, -0.5f,  0.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
+                        {{ 0.5f, -0.5f,  0.0f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
+                        {{ 0.5f,  0.5f,  0.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
+                        {{-0.5f,  0.5f,  0.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
                      }), {
                         0, 1, 2, 2, 3, 0
@@ -632 +642 @@
                         mat4(1.0f)
                      }, true);
+
+                  modelObjects.back().model_base =
+                     translate(mat4(1.0f), vec3(0.0f, 0.0f, zOffset));
+
+                  updateObject(modelObjects, modelPipeline, modelObjects.size() - 1);
                } else {
                   cout << "Key event detected" << endl;