Changeset cd1cb0f in opengl-game for vulkan-game.cpp

Timestamp:

Dec 24, 2019, 12:48:49 AM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

0fe8433

Parents:

a79be34

git-author:

Dmitry Portnoy <dmitry.portnoy@…> (12/22/19 03:45:12)

git-committer:

Dmitry Portnoy <dmitry.portnoy@…> (12/24/19 00:48:49)

Message:

In VulkanGame, make the ship move when the player holds down the right or left arrow keys

File:

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

vulkan-game.cpp

@@ -508 +508 @@
 
    createSyncObjects();
+
+   shipPipeline.getObjects()[0].model_base =
+      translate(mat4(1.0f), vec3(0.0f, -1.2f, 1.65f)) *
+      scale(mat4(1.0f), vec3(0.1f, 0.1f, 0.1f));
 }
 
@@ -608 +612 @@
       }
 
+      // Check which keys are held down
+
+      if (gui->keyPressed(SDL_SCANCODE_LEFT)) {
+         transformObject(shipPipeline.getObjects()[0], translate(mat4(1.0f), vec3(-0.01f, 0.0f, 0.0f)));
+      } else if (gui->keyPressed(SDL_SCANCODE_RIGHT)) {
+         transformObject(shipPipeline.getObjects()[0], translate(mat4(1.0f), vec3(0.01f, 0.0f, 0.0f)));
+      }
+
       renderUI();
       renderScene();
@@ -623 +635 @@
    float time = chrono::duration<float, chrono::seconds::period>(currentTime - startTime).count();
 
+   // TODO: Will need to change this to go through all objects of all pipelines and update their model mats
+
    so_Object.model =
       translate(mat4(1.0f), vec3(0.0f, -2.0f, -0.0f)) *
       rotate(mat4(1.0f), time * radians(90.0f), vec3(0.0f, 0.0f, 1.0f));
 
-   so_Ship.model =
-      translate(mat4(1.0f), vec3(0.0f, -1.2f, 1.65f)) *
-      scale(mat4(1.0f), vec3(0.1f, 0.1f, 0.1f));
+   so_Ship.model = shipPipeline.getObjects()[0].model_transform * shipPipeline.getObjects()[0].model_base;
 
    VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_scenePipeline[currentImage], object_VP_mats);