Changeset 845a2cb in opengl-game for vulkan-game.hpp

Timestamp:

Apr 22, 2020, 12:58:07 AM (4 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

points-test

Parents:

73a10ca

Message:

test point size

File:

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

vulkan-game.hpp

@@ -57 +57 @@
 };
 
-struct UBO_VP_mats {
-   alignas(16) mat4 view;
-   alignas(16) mat4 proj;
+struct ExplosionVertex {
+   vec3 particleStartVelocity;
+   float particleStartTime;
+   unsigned int objIndex;
 };
 
@@ -76 +77 @@
    alignas(4) vec3 color;
    alignas(4) unsigned int deleted;
+};
+
+struct SSBO_Explosion {
+   alignas(16) mat4 model;
+   alignas(4) float explosionStartTime;
+   alignas(4) float explosionDuration;
+   alignas(4) unsigned int deleted;
+};
+
+struct UBO_VP_mats {
+   alignas(16) mat4 view;
+   alignas(16) mat4 proj;
+};
+
+struct UBO_Explosion {
+   alignas(16) mat4 view;
+   alignas(16) mat4 proj;
+   alignas(4) float cur_time;
 };
 
@@ -175 +194 @@
 
    private:
+      // TODO: Make these consts static
+
       const int MAX_FRAMES_IN_FLIGHT;
 
@@ -180 +201 @@
       const float FAR_CLIP = 100.0f;
       const float FOV_ANGLE = 67.0f; // means the camera lens goes from -33 deg to 33 def
+
+      const int EXPLOSION_PARTICLE_COUNT = 300;
 
       vec3 cam_pos;
@@ -285 +308 @@
 
       UBO_VP_mats laser_VP_mats;
+
+      GraphicsPipeline_Vulkan<ExplosionVertex, SSBO_Explosion> explosionPipeline;
+      vector<SceneObject<ExplosionVertex, SSBO_Explosion>> explosionObjects;
+
+      vector<VkBuffer> uniformBuffers_explosionPipeline;
+      vector<VkDeviceMemory> uniformBuffersMemory_explosionPipeline;
+      vector<VkDescriptorBufferInfo> uniformBufferInfoList_explosionPipeline;
+
+      UBO_Explosion explosion_UBO;
 
       vector<BaseEffectOverTime*> effects;
@@ -334 +366 @@
       void createSyncObjects();
 
-      void addLaser(vec3 start, vec3 end, vec3 color, float width);
-      void translateLaser(size_t index, const vec3& translation);
-      void updateLaserTarget(size_t index);
-      bool getLaserAndAsteroidIntersection(SceneObject<AsteroidVertex, SSBO_Asteroid>& asteroid,
-            vec3& start, vec3& end, vec3& intersection);
-
       // TODO: Since addObject() returns a reference to the new object now,
       // stop using objects.back() to access the object that was just created
@@ -366 +392 @@
       void centerObject(SceneObject<VertexType, SSBOType>& object);
 
+      void addLaser(vec3 start, vec3 end, vec3 color, float width);
+      void translateLaser(size_t index, const vec3& translation);
+      void updateLaserTarget(size_t index);
+      bool getLaserAndAsteroidIntersection(SceneObject<AsteroidVertex, SSBO_Asteroid>& asteroid,
+            vec3& start, vec3& end, vec3& intersection);
+
+      void addExplosion(mat4 model_mat, float duration, float cur_time);
+
       void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags,
             vector<VkBuffer>& buffers, vector<VkDeviceMemory>& buffersMemory,
@@ -380 +414 @@
             void* pUserData);
 };
+
+// Start of specialized no-op functions
+
+template<>
+inline void VulkanGame::centerObject(SceneObject<ExplosionVertex, SSBO_Explosion>& object) {
+}
+
+// End of specialized no-op functions
 
 // TODO: Right now, it's basically necessary to pass the identity matrix in for ssbo.model
@@ -407 +449 @@
    SceneObject<VertexType, SSBOType>& obj = objects.back();
 
-   if (!is_same_v<VertexType, LaserVertex>) {
+   if (!is_same_v<VertexType, LaserVertex> && !is_same_v<VertexType, ExplosionVertex>) {
       centerObject(obj);
    }