Changeset aa7e5f0 in opengl-game


Ignore:
Timestamp:
Apr 4, 2021, 9:13:46 PM (4 years ago)
Author:
Dmitry Portnoy <dportnoy@…>
Branches:
feature/imgui-sdl
Children:
cefdf23
Parents:
7865c5b
Message:

Rename the scene.* shaders to model.*

Files:
3 edited
2 moved

Legend:

Unmodified
Added
Removed

  • VulkanGame.vcxproj

    r7865c5b raa7e5f0  
    188188    <None Include="shaders\asteroid.frag" />
    189189    <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" />
    190194    <None Include="shaders\overlay.frag" />
    191195    <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" />
    194198    <None Include="shaders\ship.frag" />
    195199    <None Include="shaders\ship.vert" />

  • VulkanGame.vcxproj.filters

    r7865c5b raa7e5f0  
    9595  <ItemGroup>
    9696    <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>
    105133  </ItemGroup>
    106134  <ItemGroup>
    … …  
    141169      <UniqueIdentifier>{7a1e3c9c-c984-4cf9-9c02-9a4332a7ce92}</UniqueIdentifier>
    142170    </Filter>
     171    <Filter Include="shaders">
     172      <UniqueIdentifier>{3cca3074-6c74-4e28-b5cf-05662306a067}</UniqueIdentifier>
     173    </Filter>
    143174  </ItemGroup>
    144175</Project>

  • vulkan-game.cpp

    r7865c5b raa7e5f0  
    342342
    343343   modelPipeline.createDescriptorSetLayout();
    344    modelPipeline.createPipeline("shaders/scene-vert.spv", "shaders/scene-frag.spv");
     344   modelPipeline.createPipeline("shaders/model-vert.spv", "shaders/model-frag.spv");
    345345   modelPipeline.createDescriptorPool(swapChainImages);
    346346   modelPipeline.createDescriptorSets(swapChainImages);
    … …  
    21032103
    21042104   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");
    21062106   modelPipeline.createDescriptorPool(swapChainImages);
    21072107   modelPipeline.createDescriptorSets(swapChainImages);
Note: See TracChangeset for help on using the changeset viewer.