Changeset 1f81ecc in opengl-game for vulkan-game.hpp

Timestamp:

Apr 19, 2020, 3:06:51 AM (4 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

3950236

Parents:

237cbec

Message:

Add the ability for the ship to fire a laser from either of its wings

File:

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

vulkan-game.hpp

@@ -233 +233 @@
       float spawnRate_asteroid = 0.5;
       float lastSpawn_asteroid;
+
+      unsigned int leftLaserIdx = -1;
+
+      unsigned int rightLaserIdx = -1;
 
       bool initWindow(int width, int height, unsigned char guiFlags);
@@ -265 +269 @@
       void createSyncObjects();
 
+      void addLaser(vec3 start, vec3 end, vec3 color, float width);
+      void translateLaser(size_t index, const vec3& translation);
+
       // TODO: Since addObject() returns a reference to the new object now,
       // stop using objects.back() to access the object that was just created
@@ -277 +284 @@
       void updateObject(vector<SceneObject<VertexType, SSBOType>>& objects,
             GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline, size_t index);
+
+      template<class VertexType, class SSBOType>
+      void updateObjectVertices(GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline,
+            SceneObject<VertexType, SSBOType>& obj, size_t index);
 
       template<class VertexType>
@@ -327 +338 @@
 
    SceneObject<VertexType, SSBOType>& obj = objects.back();
-   centerObject(obj);
+
+   if (!is_same_v<VertexType, LaserVertex>) {
+      centerObject(obj);
+   }
 
    bool storageBufferResized = pipeline.addObject(obj.vertices, obj.indices, obj.ssbo,
@@ -366 +380 @@
 }
 
+template<class VertexType, class SSBOType>
+void VulkanGame::updateObjectVertices(GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline,
+      SceneObject<VertexType, SSBOType>& obj, size_t index) {
+   pipeline.updateObjectVertices(index, obj.vertices, this->commandPool, this->graphicsQueue);
+}
+
 template<class VertexType>
 vector<VertexType> VulkanGame::addVertexNormals(vector<VertexType> vertices) {