Changeset b8efa56 in opengl-game for vulkan-game.hpp

Timestamp:

Apr 10, 2021, 1:46:51 AM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

4a777d2

Parents:

8d92284

git-author:

Dmitry Portnoy <dportnoy@…> (04/10/21 01:46:46)

git-committer:

Dmitry Portnoy <dportnoy@…> (04/10/21 01:46:51)

Message:

In VulkanGame, change the asteroid pipeline to use ModelVertex

File:

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

vulkan-game.hpp

@@ -22 +22 @@
 
 #include "consts.hpp"
-#include "vulkan-utils.hpp"
 #include "graphics-pipeline_vulkan.hpp"
 #include "game-gui-sdl.hpp"
+#include "utils.hpp"
+#include "vulkan-utils.hpp"
 
 using namespace glm;
@@ -47 +48 @@
    vec3 color;
    vec2 texCoord;
-   vec3 normal;
-   unsigned int objIndex;
-};
-
-struct AsteroidVertex {
-   vec3 pos;
-   vec3 color;
    vec3 normal;
    unsigned int objIndex;
@@ -122 +116 @@
    vec3 center; // currently only matters for asteroids
    float radius; // currently only matters for asteroids
-   SceneObject<AsteroidVertex, SSBO_Asteroid>* targetAsteroid; // currently only used for lasers
+   SceneObject<ModelVertex, SSBO_Asteroid>* targetAsteroid; // currently only used for lasers
 };
 
@@ -303 +297 @@
       GraphicsPipeline_Vulkan<ModelVertex, SSBO_ModelObject> modelPipeline;
       GraphicsPipeline_Vulkan<ModelVertex, SSBO_ModelObject> shipPipeline;
-      GraphicsPipeline_Vulkan<AsteroidVertex, SSBO_Asteroid> asteroidPipeline;
+      GraphicsPipeline_Vulkan<ModelVertex, SSBO_Asteroid> asteroidPipeline;
       GraphicsPipeline_Vulkan<LaserVertex, SSBO_Laser> laserPipeline;
       GraphicsPipeline_Vulkan<ExplosionVertex, SSBO_Explosion> explosionPipeline;
@@ -331 +325 @@
       UBO_VP_mats ship_VP_mats;
 
-      vector<SceneObject<AsteroidVertex, SSBO_Asteroid>> asteroidObjects;
+      vector<SceneObject<ModelVertex, SSBO_Asteroid>> asteroidObjects;
 
       vector<VkBuffer> uniformBuffers_asteroidPipeline;
@@ -364 +358 @@
 
       unsigned int leftLaserIdx = -1;
-      EffectOverTime<AsteroidVertex, SSBO_Asteroid>* leftLaserEffect = nullptr;
+      EffectOverTime<ModelVertex, SSBO_Asteroid>* leftLaserEffect = nullptr;
 
       unsigned int rightLaserIdx = -1;
-      EffectOverTime<AsteroidVertex, SSBO_Asteroid>* rightLaserEffect = nullptr;
+      EffectOverTime<ModelVertex, SSBO_Asteroid>* rightLaserEffect = nullptr;
 
       /*** High-level vars ***/
@@ -453 +447 @@
       void translateLaser(size_t index, const vec3& translation);
       void updateLaserTarget(size_t index);
-      bool getLaserAndAsteroidIntersection(SceneObject<AsteroidVertex, SSBO_Asteroid>& asteroid,
+      bool getLaserAndAsteroidIntersection(SceneObject<ModelVertex, SSBO_Asteroid>& asteroid,
             vec3& start, vec3& end, vec3& intersection);