Changeset 3de31cf in opengl-game

Timestamp:

Oct 3, 2019, 3:46:06 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

ee75487

Parents:

7d2b0b9

git-author:

Dmitry Portnoy <dmp1488@…> (10/03/19 03:45:53)

git-committer:

Dmitry Portnoy <dmp1488@…> (10/03/19 03:46:06)

Message:

Add and begin implementing an OpenGL version of the GraphicsPipeline class

Files:

• OpenGLGame.vcxproj (modified) (3 diffs)
• graphics-pipeline_opengl.cpp (added)
• graphics-pipeline_opengl.hpp (added)
• opengl-game.cpp (modified) (1 diff)
• opengl-game.hpp (modified) (2 diffs)

OpenGLGame.vcxproj

@@ -23 +23 @@
     <ClCompile Include="FileStackWalker.cpp" />
     <ClCompile Include="game-gui-glfw.cpp" />
+    <ClCompile Include="graphics-pipeline_opengl.cpp" />
     <ClCompile Include="IMGUI\imgui.cpp" />
     <ClCompile Include="IMGUI\imgui_demo.cpp" />
@@ -39 +40 @@
     <ClInclude Include="game-gui-glfw.hpp" />
     <ClInclude Include="game-gui.hpp" />
+    <ClInclude Include="graphics-pipeline.hpp" />
+    <ClInclude Include="graphics-pipeline_opengl.hpp" />
     <ClInclude Include="IMGUI\imgui.h" />
     <ClInclude Include="IMGUI\imgui_internal.h" />
@@ -48 +51 @@
     <ClInclude Include="opengl-game.hpp" />
     <ClInclude Include="StackWalker.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="gl-shaders\asteroid.frag" />
+    <None Include="gl-shaders\asteroid.vert" />
+    <None Include="gl-shaders\explosion.frag" />
+    <None Include="gl-shaders\explosion.vert" />
+    <None Include="gl-shaders\laser.frag" />
+    <None Include="gl-shaders\laser.vert" />
+    <None Include="gl-shaders\ship.frag" />
+    <None Include="gl-shaders\ship.vert" />
   </ItemGroup>
   <PropertyGroup Label="Globals">

opengl-game.cpp

@@ -103 +103 @@
    // Otherwise, it seems they get overridden by ImGui
    ((GameGui_GLFW*)gui)->bindEventHandlers();
+
+   graphicsPipelines.push_back(GraphicsPipeline_OpenGL());
+   graphicsPipelines.back().createPipeline("gl-shaders/ship.vert", "gl-shaders/ship.frag");
+
+   graphicsPipelines.push_back(GraphicsPipeline_OpenGL());
+   graphicsPipelines.back().createPipeline("gl-shaders/asteroid.vert", "gl-shaders/asteroid.frag");
+
+   graphicsPipelines.push_back(GraphicsPipeline_OpenGL());
+   graphicsPipelines.back().createPipeline("gl-shaders/laser.vert", "gl-shaders/laser.frag");
+
+   graphicsPipelines.push_back(GraphicsPipeline_OpenGL());
+   graphicsPipelines.back().createPipeline("gl-shaders/explosion.vert", "gl-shaders/explosion.frag");
+
+   cout << "Created " << graphicsPipelines.size() << " graphics pipelines" << endl;
 }
 

opengl-game.hpp

@@ -6 +6 @@
 
 #include "game-gui-glfw.hpp"
+#include "graphics-pipeline_opengl.hpp"
 
 class OpenGLGame {
@@ -16 +17 @@
    private:
       GameGui* gui;
+
+      vector<GraphicsPipeline_OpenGL> graphicsPipelines;
+
       GLFWwindow* window;