Changeset 4ece3bf in opengl-game

Timestamp:

Jan 21, 2020, 6:14:09 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

5a1ace0

Parents:

3e8cc8b

Message:

In VulkanGame, add the ability to delete asteroids and move them at a constant speed

Files:

• game-gui-sdl.cpp (modified) (1 diff)
• new-game.cpp (modified) (1 diff)
• notes.txt (added)
• shaders/asteroid.vert (modified) (2 diffs)
• vulkan-game.cpp (modified) (7 diffs)
• vulkan-game.hpp (modified) (2 diffs)

game-gui-sdl.cpp

@@ -127 +127 @@
          case SDL_AUDIODEVICEADDED:
          case SDL_AUDIODEVICEREMOVED:
+         case SDL_TEXTINPUT:
          case SDL_TEXTEDITING: // TODO: Research this one later
             event->type = UI_EVENT_UNKNOWN;

new-game.cpp

@@ -731 +731 @@
       // temporary code to get around vsync issue in OSX Sierra
       if (elapsedTime < (1.0f / TARGET_FPS)) {
-        continue;
+         continue;
       }
 

shaders/asteroid.vert

@@ -5 +5 @@
    mat4 model;
    float hp;
+   bool deleted;
 };
 
@@ -42 +43 @@
   light2_position_eye = vec3(ubo.view * vec4(light2_position_world, 1.0));
 
-  gl_Position = ubo.proj * vec4(position_eye, 1.0);
+  if (sbo.objects[obj_index].deleted) {
+     gl_Position = vec4(0.0, 0.0, 2.0, 1.0);
+  } else {
+    gl_Position = ubo.proj * vec4(position_eye, 1.0);
+  }
 }

vulkan-game.cpp

@@ -98 +98 @@
    SDL_VERSION(&sdlVersion);
 
-   cout << "SDL " << sdlVersion.major << "." << sdlVersion.minor << "." << sdlVersion.patch << endl;
+   cout << "SDL "<<
+      to_string(sdlVersion.major) << "." <<
+      to_string(sdlVersion.minor) << "." <<
+      to_string(sdlVersion.patch) << endl;
 
    font = TTF_OpenFont("assets/fonts/lazy.ttf", 28);
@@ -600 +603 @@
       scale(mat4(1.0f), vec3(0.1f, 0.1f, 0.1f));
 
-   //vec3 pos = vec3(getRandomNum(-1.3f, 1.3f), -1.2f, getRandomNum(-5.5f, -4.5f));
-   vec3 pos = vec3(getRandomNum(-1.3f, 1.3f), -1.2f, -2.0f);
+   // vec3 pos = vec3(getRandomNum(-1.3f, 1.3f), -1.2f, getRandomNum(-5.5f, -4.5f));
+   // vec3 pos = vec3(getRandomNum(-1.3f, 1.3f), -1.2f, -2.0f);
+   // vec3 pos = vec3(1.0f, -1.2f, -1.0f);
+   vec3 pos = vec3(0.0504826f, -1.2f, 1.0f);
 
    asteroidObjects[0].model_base =
@@ -608 +613 @@
       scale(mat4(1.0f), vec3(0.1f, 0.1f, 0.1f));
    asteroidObjects[0].model_transform = mat4(1.0); // Might not be needed
+
+   so_Asteroid.hp = 10.0f;
+   so_Asteroid.deleted = 0;
 }
 
@@ -655 +663 @@
    bool quit = false;
 
+   curTime = SDL_GetPerformanceCounter();
+
    while (!quit) {
+
+      prevTime = curTime;
+      curTime = SDL_GetPerformanceCounter();
+
+      elapsedTime = (double)((curTime - prevTime) * 1000 / (double)SDL_GetPerformanceFrequency());
+
       gui->processEvents();
 
@@ -693 +709 @@
 
                   createCommandBuffers();
+               } else if (e.key.keycode == SDL_SCANCODE_Z) {
+                  cout << "Deleting asteroid..." << endl;
+                  so_Asteroid.deleted = so_Asteroid.deleted == 0 ? 1 : 0;
                } else {
                   cout << "Key event detected" << endl;
@@ -717 +736 @@
       // Check which keys are held down
 
+      float shipSpeed = 0.0005f;
+      float asteroidSpeed = 0.002f;
+
       if (gui->keyPressed(SDL_SCANCODE_LEFT)) {
-         transformObject(shipObjects[0], translate(mat4(1.0f), vec3(-0.01f, 0.0f, 0.0f)));
+         transformObject(shipObjects[0], translate(mat4(1.0f), vec3(-shipSpeed * elapsedTime, 0.0f, 0.0f)));
       } else if (gui->keyPressed(SDL_SCANCODE_RIGHT)) {
-         transformObject(shipObjects[0], translate(mat4(1.0f), vec3(0.01f, 0.0f, 0.0f)));
+         transformObject(shipObjects[0], translate(mat4(1.0f), vec3(shipSpeed * elapsedTime, 0.0f, 0.0f)));
       }
 
-      // this code moves the asteroids
-      transformObject(asteroidObjects[0], translate(mat4(1.0f), vec3(0.0f, 0.0f, 0.04f)));
+      if (gui->keyPressed(SDL_SCANCODE_DOWN)) {
+         transformObject(asteroidObjects[0], translate(mat4(1.0f), vec3(0.0f, 0.0f, asteroidSpeed * elapsedTime)));
+      }
 
       renderUI();
@@ -750 +773 @@
 
    so_Asteroid.model = asteroidObjects[0].model_transform * asteroidObjects[0].model_base;
-   so_Asteroid.hp = 10.0;
 
    VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_scenePipeline[currentImage], object_VP_mats);

vulkan-game.hpp

@@ -70 +70 @@
    alignas(16) mat4 model;
    alignas(4) float hp;
+   alignas(4) unsigned int deleted;
 };
 
@@ -194 +195 @@
       UBO_VP_mats asteroid_VP_mats;
       SBO_Asteroid so_Asteroid;
+
+      Uint64 curTime, prevTime;
+      double elapsedTime;
 
       bool initWindow(int width, int height, unsigned char guiFlags);