Changeset aa7707d in opengl-game

Timestamp:

Jul 25, 2020, 8:05:57 PM (4 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master

Children:

681dbe8

Parents:

6bfd91c

Message:

Update the Vulkan SDK version and get the latest code compiling on Windows

Files:

• VulkanGame.vcxproj (modified) (3 diffs)
• compile.bat (modified) (1 diff)
• gui/button.cpp (modified) (2 diffs)
• gui/panel.cpp (modified) (3 diffs)
• main-vulkan.cpp (modified) (1 diff)
• vulkan-game.cpp (modified) (1 diff)
• vulkan-game.hpp (modified) (1 diff)

VulkanGame.vcxproj

@@ -71 +71 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>include;D:\VulkanSDK\1.1.108.0\Include;$(IncludePath)</IncludePath>
-    <LibraryPath>lib;D:\VulkanSDK\1.1.108.0\Lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>include;D:\VulkanSDK\1.2.135.0\Include;$(IncludePath)</IncludePath>
+    <LibraryPath>lib;D:\VulkanSDK\1.2.135.0\Lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -135 +135 @@
     <ClCompile Include="FileStackWalker.cpp" />
     <ClCompile Include="game-gui-sdl.cpp" />
+    <ClCompile Include="gui\button.cpp" />
+    <ClCompile Include="gui\game-screen.cpp" />
+    <ClCompile Include="gui\main-screen.cpp" />
+    <ClCompile Include="gui\panel.cpp" />
+    <ClCompile Include="gui\screen.cpp" />
+    <ClCompile Include="gui\ui-element.cpp" />
     <ClCompile Include="logger.cpp" />
     <ClCompile Include="main-vulkan.cpp" />
@@ -151 +157 @@
     <ClInclude Include="graphics-pipeline.hpp" />
     <ClInclude Include="graphics-pipeline_vulkan.hpp" />
+    <ClInclude Include="gui\button.hpp" />
+    <ClInclude Include="gui\game-screen.hpp" />
+    <ClInclude Include="gui\main-screen.hpp" />
+    <ClInclude Include="gui\panel.hpp" />
+    <ClInclude Include="gui\screen.hpp" />
+    <ClInclude Include="gui\ui-element.hpp" />
     <ClInclude Include="logger.hpp" />
     <ClInclude Include="StackWalker.h" />

compile.bat

@@ -4 +4 @@
 cd shaders
 
-set VULKAN_SDK_PATH=D:\VulkanSDK\1.1.108.0
+set VULKAN_SDK_PATH=D:\VulkanSDK\1.2.135.0
 
 for %%f in (*.vert *.frag) do (

gui/button.cpp

@@ -2 +2 @@
 
 #include <SDL2/SDL_ttf.h>
-#include <SDL2/SDL2_gfxPrimitives.h>
+// #include <SDL2/SDL2_gfxPrimitives.h>
 
 #include "../vulkan-game.hpp"
@@ -72 +72 @@
    uint8_t colorA = cur_color & 0xFF;
 
+   /*
    boxRGBA(&this->renderer, this->x + x, this->y + y, this->x + this->width, this->y + this->height,
       colorR, colorG, colorB, colorA);
+   */
 
    SDL_Rect rect = {

gui/panel.cpp

@@ -3 +3 @@
 #include <iostream>
 
-#include <SDL2/SDL2_gfxPrimitives.h>
+// #include <SDL2/SDL2_gfxPrimitives.h>
 
 using namespace std;
@@ -42 +42 @@
    SDL_RenderClear(&this->renderer);
 
+   /*
    roundedBoxRGBA(&this->renderer, 0, 0, this->width, this->height,
       8, 0x33, 0x33, 0x33, 0xFF);
+   */
 
    int borderThickness = 1;
@@ -52 +54 @@
    uint8_t colorA = this->color & 0xFF;
 
+   /*
    roundedBoxRGBA(&this->renderer, borderThickness, borderThickness,
       this->width - borderThickness, this->height - borderThickness,
       8, colorR, colorG, colorB, colorA);
+   */
 
    for (UIElement*& uiElement : this->uiElements) {

main-vulkan.cpp

@@ -1 @@
-#include "vulkan-game.hpp"
-
 #include <iostream>
 
 #include "consts.hpp"
 #include "crash-logger.hpp"
+
+#include "vulkan-game.hpp"
 
 using namespace std;

vulkan-game.cpp

@@ -1731 +1731 @@
       if (closestAsteroid != nullptr) {
          // TODO: Use some sort of smart pointer instead
-         eot = new EffectOverTime(asteroidPipeline, asteroidObjects, closestAsteroidIndex,
+         eot = new EffectOverTime<AsteroidVertex, SSBO_Asteroid>(asteroidPipeline, asteroidObjects, closestAsteroidIndex,
             offset_of(&SSBO_Asteroid::hp), -20.0f);
          effects.push_back(eot);

vulkan-game.hpp

@@ -2 +2 @@
 #define _VULKAN_GAME_H
 
+#include <algorithm>
 #include <chrono>
 #include <map>