Changeset 52a02e6 in opengl-game for vulkan-game.hpp

Timestamp:

Apr 26, 2020, 6:08:05 PM (4 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master

Children:

4a9416a

Parents:

73a10ca

git-author:

Dmitry Portnoy <dmitry.portnoy@…> (04/26/20 17:55:49)

git-committer:

Dmitry Portnoy <dmitry.portnoy@…> (04/26/20 18:08:05)

Message:

Add a primitive topology parameter to the GraphicsPipeline_Vulkan constructor

File:

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

vulkan-game.hpp

@@ -57 +57 @@
 };
 
-struct UBO_VP_mats {
-   alignas(16) mat4 view;
-   alignas(16) mat4 proj;
-};
-
 struct SSBO_ModelObject {
    alignas(16) mat4 model;
@@ -76 +71 @@
    alignas(4) vec3 color;
    alignas(4) unsigned int deleted;
+};
+
+struct UBO_VP_mats {
+   alignas(16) mat4 view;
+   alignas(16) mat4 proj;
 };
 
@@ -175 +175 @@
 
    private:
+      // TODO: Make these consts static
+
       const int MAX_FRAMES_IN_FLIGHT;
 
@@ -334 +336 @@
       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
@@ -365 +361 @@
       template<class VertexType, class SSBOType>
       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 createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags,