Changeset 683dd55 in opengl-game

Timestamp:

Nov 22, 2019, 4:47:52 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

8e02b6b

Parents:

1908591

Message:

Add a getObjects() method to the GraphicsPipeline_Vulkan class that returns a reference to the list of objects added to the pipeline, and use that method instead of the numPlanes variable to keep track of the number of textured planes. Also, update the shader compilation batch file and add header files as dependencies to the vulkangame target in the makefile.

Files:

• compile.bat (modified) (2 diffs)
• graphics-pipeline_vulkan.hpp (modified) (3 diffs)
• makefile (modified) (1 diff)
• vulkan-game.cpp (modified) (4 diffs)
• vulkan-game.hpp (modified) (1 diff)

compile.bat

@@ -1 +1 @@
 echo off
 setlocal enabledelayedexpansion
+
+cd shaders
 
 set VULKAN_SDK_PATH=D:\VulkanSDK\1.1.108.0
@@ -10 +12 @@
    %VULKAN_SDK_PATH%\Bin\glslangValidator.exe -V %%f -o %%~nf-!ext!.spv
 )
+
+cd ..

graphics-pipeline_vulkan.hpp

@@ -56 +56 @@
       void createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage);
 
+      const vector<SceneObject<VertexType>>& getObjects();
       bool addObject(const vector<VertexType>& vertices, vector<uint16_t> indices, VkCommandPool commandPool,
          VkQueue graphicsQueue);
@@ -104 +105 @@
 }
 
+// TODO: Verify that vertex capacity and index capacity are both > 0
 template<class VertexType>
 GraphicsPipeline_Vulkan<VertexType>::GraphicsPipeline_Vulkan(VkPhysicalDevice physicalDevice, VkDevice device,
@@ -406 +408 @@
 
 template<class VertexType>
+const vector<SceneObject<VertexType>>& GraphicsPipeline_Vulkan<VertexType>::getObjects() {
+   return objects;
+}
+
+template<class VertexType>
 bool GraphicsPipeline_Vulkan<VertexType>::addObject(const vector<VertexType>& vertices, vector<uint16_t> indices,
       VkCommandPool commandPool, VkQueue graphicsQueue) {

makefile

@@ -59 +59 @@
         $(CC) $(CXX_FLAGS) -o $@ $^ $(LIB_FLAGS) -DGAMEGUI_INCLUDE_VULKAN
 
-vulkangame: main-vulkan.cpp vulkan-game.cpp crash-logger.cpp logger.cpp vulkan-utils.cpp game-gui-sdl.cpp
-        $(CC) $(CXX_FLAGS) -o $@ $^ $(LIB_FLAGS) -DGAMEGUI_INCLUDE_VULKAN
+SRC_FILES = main-vulkan.cpp vulkan-game.cpp crash-logger.cpp logger.cpp vulkan-utils.cpp game-gui-sdl.cpp
+HEADER_FILES = vulkan-game.hpp crash-logger.hpp logger.hpp vulkan-utils.hpp game-gui-sdl.hpp game-gui.hpp graphics-pipeline_vulkan.hpp
+
+vulkangame: $(SRC_FILES) $(HEADER_FILES)
+        $(CC) $(CXX_FLAGS) -o $@ $(SRC_FILES) $(LIB_FLAGS) -DGAMEGUI_INCLUDE_VULKAN
 
 .PHONY: shaders

vulkan-game.cpp

@@ -248 +248 @@
    cout << "Created all the graphics pipelines" << endl;
 
-   numPlanes = 2;
-
    createCommandBuffers();
 
@@ -255 +253 @@
 }
 
+// TODO: Maybe changes the name to initScene() or something similar
 void VulkanGame::initMatrices() {
    cam_pos = vec3(0.0f, 0.0f, 2.0f);
@@ -299 +298 @@
                } else if (e.key.keycode == SDL_SCANCODE_SPACE) {
                   cout << "Adding a plane" << endl;
-                  float zOffset = -2.0f + (0.5f * numPlanes);
+                  float zOffset = -2.0f + (0.5f * modelPipeline.getObjects().size());
 
                   vkDeviceWaitIdle(device);
@@ -314 +313 @@
 
                   createCommandBuffers();
-
-                  numPlanes++;
                } else {
                   cout << "Key event detected" << endl;

vulkan-game.hpp

@@ -113 +113 @@
 
       size_t currentFrame;
-      size_t numPlanes = 0; // temp
 
       bool framebufferResized;