Changeset 914bb99 in opengl-game for vulkan-game.cpp
- Timestamp:
- Apr 9, 2021, 3:26:38 PM (3 years ago)
- Branches:
- feature/imgui-sdl
- Children:
- a00eb06
- Parents:
- 5049354
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
vulkan-game.cpp
r5049354 r914bb99 135 135 {{ 0.5f, -0.5f, 0.0f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}}, 136 136 {{ 0.5f, 0.5f, 0.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}}, 137 {{-0.5f, 0.5f, 0.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}} 138 }), { 139 0, 1, 2, 2, 3, 0 137 {{ 0.5f, 0.5f, 0.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}}, 138 {{-0.5f, 0.5f, 0.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}, 139 {{-0.5f, -0.5f, 0.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}} 140 }), { 141 0, 1, 2, 3, 4, 5 140 142 }, { 141 143 mat4(1.0f) … … 151 153 {{ 0.5f, -0.5f, 0.0f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}}, 152 154 {{ 0.5f, 0.5f, 0.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}}, 153 {{-0.5f, 0.5f, 0.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}} 154 }), { 155 0, 1, 2, 2, 3, 0 155 {{ 0.5f, 0.5f, 0.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}}, 156 {{-0.5f, 0.5f, 0.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}, 157 {{-0.5f, -0.5f, 0.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}} 158 }), { 159 0, 1, 2, 3, 4, 5 156 160 }, { 157 161 mat4(1.0f) … … 573 577 modelPipeline = GraphicsPipeline_Vulkan<ModelVertex, SSBO_ModelObject>( 574 578 VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, physicalDevice, device, renderPass, 575 { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, swapChainImages, 16, 24, 10);579 { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, swapChainImages, 24, 24, 10); 576 580 577 581 shipPipeline = GraphicsPipeline_Vulkan<ShipVertex, SSBO_ModelObject>( … … 664 668 io.WantCaptureMouse) { 665 669 if (sdlEvent.type == SDL_MOUSEWHEEL || sdlEvent.type == SDL_MOUSEBUTTONDOWN || 666 sdlEvent.type == SDL_MOUSEBUTTONUP) {670 sdlEvent.type == SDL_MOUSEBUTTONUP) { 667 671 continue; 668 672 } … … 703 707 {{ 0.5f, -0.5f, 0.0f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}}, 704 708 {{ 0.5f, 0.5f, 0.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}}, 705 {{-0.5f, 0.5f, 0.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}} 709 {{ 0.5f, 0.5f, 0.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}}, 710 {{-0.5f, 0.5f, 0.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}, 711 {{-0.5f, -0.5f, 0.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}} 706 712 }), { 707 0, 1, 2, 2, 3, 0713 0, 1, 2, 3, 4, 5 708 714 }, { 709 715 mat4(1.0f)
Note:
See TracChangeset
for help on using the changeset viewer.