Changeset cbe946d in opengl-game

Timestamp:

Aug 23, 2019, 3:59:12 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

d53ef6a

Parents:

6544020

Message:

Add separate shaders for the scene and overlay to the Vulkan project and add some notes about future work

Files:

• NewOpenGLGame.vcxproj (modified) (2 diffs)
• README.txt (modified) (4 diffs)
• VulkanGame.vcxproj (modified) (1 diff)
• vulkan-game.cpp (modified) (1 diff)

NewOpenGLGame.vcxproj

@@ -136 +136 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>glew32s.lib;glfw3.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
@@ -148 +149 @@
     <ClCompile Include="new-game.cpp" />
     <ClCompile Include="StackWalker.cpp" />
-    <ClCompile Include="stb_image.cpp" />
     <ClCompile Include="utils.cpp" />
   </ItemGroup>

README.txt

@@ +1 @@
+NOTE: NewOpenGLGame uses a 32-bit build, whule VulkanGame uses a 64-bit build.
+Because of this, it's necessary to switch the glfw3 lib files when switching projects.
+TODO: Make NewOpenGLGame work with a 64-bit build
+
 Installation Instructions for Linux
 ---------------------------------------
@@ -33 +37 @@
 ---------------------------------------
 
-Download the precompiled 32bit binaries of GLFW and GLEW. Create lib/ and
+Download the pre=compiled 32bit binaries of GLFW and GLEW. Create lib/ and
 include/ folders in the root opengl-game directory you cloned.
 Copy the include/GL/ and include/GLFW/ folders into your include/ folder.
@@ -55 +59 @@
 Create an include directory inside the opengl-game folder
 
-Download GLM and copy the glm folder into /include
+Download GLM and copy the glm folder into your include directory
+
+Download the 64bit pre-compiledbinaries of GLFW3
+ - Copy lib-vc2019/glfw3.lib into your lib directory
+ - Copy the whole include/GLFW directory into your include directory
 
 Download the SDL2 pre-built Windows binaries
@@ -61 +69 @@
  - Copy the contents of lib/x64 to lib
 
-Download the SDL_image Visual C++ development libraries from https://www.libsdl.org/projects/SDL_image/
+Download the SDL2_image Visual C++ development libraries from https://www.libsdl.org/projects/SDL_image/
+Download the SDL2_ttf Visual C++ development libraries from https://www.libsdl.org/projects/SDL_ttf/
+(Might use SDL2_gfx later as well)
 
-Download the SDL_ttf Visual C++ development libraries from https://www.libsdl.org/projects/SDL_ttf/
+Copy the 64-bit static libraries to the lib directory you created above
 
 TODO: Figure out how to do static compilation with SDL2
+
+Since I'm currently using dynamic SDL2 libraries for Windows, some DLLs from sdl2-ttf and sdl2-image
 
 Download the vulkan sdk

VulkanGame.vcxproj

@@ -150 +150 @@
     <None Include="compile.bat" />
     <None Include="compile.sh" />
-    <None Include="shaders\shader.frag" />
-    <None Include="shaders\shader.vert" />
+    <None Include="shaders\overlay.frag" />
+    <None Include="shaders\overlay.vert" />
+    <None Include="shaders\scene.frag" />
+    <None Include="shaders\scene.vert" />
   </ItemGroup>
   <ItemGroup>

vulkan-game.cpp

@@ -75 +75 @@
    static VkVertexInputBindingDescription getBindingDescription() {
       VkVertexInputBindingDescription bindingDescription = {};
+
+      // Since there is only one array of vertex data, we use binding = 0
+      // I'll probably do that for the foreseeable future
+      // I can calculate the stride myself given info about all the varying attributes
+
+      // In new-game.cpp, it looks like I had a C++ struct for each shader type anyway,
+      // so I can use the same pattern for this as well probably
 
       bindingDescription.binding = 0;