Changeset aa7e5f0 in opengl-game
- Timestamp:
- Apr 4, 2021, 9:13:46 PM (3 years ago)
- Branches:
- feature/imgui-sdl
- Children:
- cefdf23
- Parents:
- 7865c5b
- Files:
-
- 3 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
VulkanGame.vcxproj
r7865c5b raa7e5f0 188 188 <None Include="shaders\asteroid.frag" /> 189 189 <None Include="shaders\asteroid.vert" /> 190 <None Include="shaders\explosion.frag" /> 191 <None Include="shaders\explosion.vert" /> 192 <None Include="shaders\laser.frag" /> 193 <None Include="shaders\laser.vert" /> 190 194 <None Include="shaders\overlay.frag" /> 191 195 <None Include="shaders\overlay.vert" /> 192 <None Include="shaders\ scene.frag" />193 <None Include="shaders\ scene.vert" />196 <None Include="shaders\model.frag" /> 197 <None Include="shaders\model.vert" /> 194 198 <None Include="shaders\ship.frag" /> 195 199 <None Include="shaders\ship.vert" /> -
VulkanGame.vcxproj.filters
r7865c5b raa7e5f0 95 95 <ItemGroup> 96 96 <None Include="assets\laser.xcf" /> 97 <None Include="shaders\asteroid.frag" /> 98 <None Include="shaders\asteroid.vert" /> 99 <None Include="shaders\overlay.frag" /> 100 <None Include="shaders\overlay.vert" /> 101 <None Include="shaders\scene.frag" /> 102 <None Include="shaders\scene.vert" /> 103 <None Include="shaders\ship.frag" /> 104 <None Include="shaders\ship.vert" /> 97 <None Include="shaders\asteroid.frag"> 98 <Filter>shaders</Filter> 99 </None> 100 <None Include="shaders\asteroid.vert"> 101 <Filter>shaders</Filter> 102 </None> 103 <None Include="shaders\ship.frag"> 104 <Filter>shaders</Filter> 105 </None> 106 <None Include="shaders\ship.vert"> 107 <Filter>shaders</Filter> 108 </None> 109 <None Include="shaders\overlay.vert"> 110 <Filter>shaders</Filter> 111 </None> 112 <None Include="shaders\overlay.frag"> 113 <Filter>shaders</Filter> 114 </None> 115 <None Include="shaders\explosion.frag"> 116 <Filter>shaders</Filter> 117 </None> 118 <None Include="shaders\explosion.vert"> 119 <Filter>shaders</Filter> 120 </None> 121 <None Include="shaders\laser.frag"> 122 <Filter>shaders</Filter> 123 </None> 124 <None Include="shaders\laser.vert"> 125 <Filter>shaders</Filter> 126 </None> 127 <None Include="shaders\model.frag"> 128 <Filter>shaders</Filter> 129 </None> 130 <None Include="shaders\model.vert"> 131 <Filter>shaders</Filter> 132 </None> 105 133 </ItemGroup> 106 134 <ItemGroup> … … 141 169 <UniqueIdentifier>{7a1e3c9c-c984-4cf9-9c02-9a4332a7ce92}</UniqueIdentifier> 142 170 </Filter> 171 <Filter Include="shaders"> 172 <UniqueIdentifier>{3cca3074-6c74-4e28-b5cf-05662306a067}</UniqueIdentifier> 173 </Filter> 143 174 </ItemGroup> 144 175 </Project> -
vulkan-game.cpp
r7865c5b raa7e5f0 342 342 343 343 modelPipeline.createDescriptorSetLayout(); 344 modelPipeline.createPipeline("shaders/ scene-vert.spv", "shaders/scene-frag.spv");344 modelPipeline.createPipeline("shaders/model-vert.spv", "shaders/model-frag.spv"); 345 345 modelPipeline.createDescriptorPool(swapChainImages); 346 346 modelPipeline.createDescriptorSets(swapChainImages); … … 2103 2103 2104 2104 modelPipeline.updateRenderPass(renderPass); 2105 modelPipeline.createPipeline("shaders/ scene-vert.spv", "shaders/scene-frag.spv");2105 modelPipeline.createPipeline("shaders/model-vert.spv", "shaders/model-frag.spv"); 2106 2106 modelPipeline.createDescriptorPool(swapChainImages); 2107 2107 modelPipeline.createDescriptorSets(swapChainImages);
Note:
See TracChangeset
for help on using the changeset viewer.