diff --git a/Renderer/Pipeline.cpp b/Renderer/Pipeline.cpp index dacd86e..b5a83b5 100644 --- a/Renderer/Pipeline.cpp +++ b/Renderer/Pipeline.cpp @@ -105,7 +105,7 @@ GraphicsPipeline::GraphicsPipeline(vk::Device dev, const std::vector& sh const auto color_blend_attachment = vk::PipelineColorBlendAttachmentState{ .blendEnable = vk::False, - .colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG + .colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eA, }; diff --git a/Renderer/Renderer.cpp b/Renderer/Renderer.cpp index d7dcdfb..8b4243e 100644 --- a/Renderer/Renderer.cpp +++ b/Renderer/Renderer.cpp @@ -14,6 +14,16 @@ #include + +const static std::vector triangle = { + {{ 1.0, -1.0, 1.0 }, { 1.0, 0.0 }}, + {{ 1.0, 1.0, 1.0 }, { 1.0, 1.0 }}, + {{-1.0, 1.0, 1.0 }, { 0.0, 1.0 }}, + {{-1.0, 1.0, 1.0 }, { 0.0, 1.0 }}, + {{-1.0, -1.0, 1.0 }, { 0.0, 0.0 }}, + {{ 1.0, -1.0, 1.0 }, { 1.0, 0.0 }}, +}; + using namespace std::string_literals; Renderer::Renderer(Window& win) : win(win) { @@ -169,14 +179,6 @@ Renderer::Renderer(Window& win) : win(win) { command_buffer = std::make_unique(dev, queue_family); - - /* basic triangle */ - const std::vector triangle = { - {{ 1.0, 1.0, -50.0 }, {1.0, 0.0}}, - {{-1.0, 1.0, -50.0 }, {0.0, 0.0}}, - {{ 0.0,-1.0, -50.0 }, {0.0, 1.0}}, - }; - vertex_buffer = std::make_unique(phys_dev, dev, triangle.size()); uniform_buffer = std::make_unique(phys_dev, dev); @@ -266,12 +268,12 @@ void Renderer::draw() { const auto p = glm::perspective(glm::radians(90.0f), static_cast(swapchain->extent.width) / static_cast(swapchain->extent.height), 0.01f, 50.0f); uniform_buffer->upload(UniformData{ - .mvp = p * glm::rotate(glm::mat4(1.0), glm::radians(static_cast(frame)), glm::vec3(1.0, 1.0, 1.0)), + //.mvp = p * glm::rotate(glm::mat4(1.0), glm::radians(static_cast(frame)), glm::vec3(1.0, 1.0, 1.0)), .time = static_cast(frame), }); - command_buffer->draw(9, 1, 0, 0); + command_buffer->draw(std::size(triangle), 1, 0, 0); command_buffer->command_buffer.endRenderPass(); diff --git a/assets/shaders/basic.frag b/assets/shaders/basic.frag index 9b961c0..347d294 100644 --- a/assets/shaders/basic.frag +++ b/assets/shaders/basic.frag @@ -9,5 +9,5 @@ layout (set = 0, binding = 0) uniform Matrices { }; void main() { - FragColor = vec4(cos(time), 1.0, 0.0, 1.0); + FragColor = vec4(1.0, 1.0, 1.0, 1.0); } \ No newline at end of file diff --git a/assets/shaders/basic.frag.spv b/assets/shaders/basic.frag.spv index 925aa70..80131c7 100644 Binary files a/assets/shaders/basic.frag.spv and b/assets/shaders/basic.frag.spv differ diff --git a/assets/shaders/basic.vert b/assets/shaders/basic.vert index 3ed02c6..378c838 100644 --- a/assets/shaders/basic.vert +++ b/assets/shaders/basic.vert @@ -10,6 +10,6 @@ layout (set = 0, binding = 0) uniform Matrices { }; void main() { - gl_Position = mpv*vec4(aPos, 1.0); + gl_Position = vec4(aPos, 1.0); texCoord = aTexCoord; } \ No newline at end of file diff --git a/assets/shaders/basic.vert.spv b/assets/shaders/basic.vert.spv index 8b0dbc5..1c39b82 100644 Binary files a/assets/shaders/basic.vert.spv and b/assets/shaders/basic.vert.spv differ diff --git a/pleascach.exe b/pleascach.exe new file mode 100644 index 0000000..a98be2d Binary files /dev/null and b/pleascach.exe differ