Skip to content
Snippets Groups Projects
Verified Commit c01f6eb9 authored by Tobias Frisch's avatar Tobias Frisch
Browse files

[#52] Fixed triangle project to compile

parent 77f364a6
No related branches found
No related tags found
1 merge request!41Resolve "Pass additional vertex attributes to cube shader"
Pipeline #25292 failed
...@@ -94,7 +94,7 @@ int main(int argc, const char** argv) { ...@@ -94,7 +94,7 @@ int main(int argc, const char** argv) {
triangleShaderProgram.reflectShader(vkcv::ShaderStage::VERTEX); triangleShaderProgram.reflectShader(vkcv::ShaderStage::VERTEX);
triangleShaderProgram.reflectShader(vkcv::ShaderStage::FRAGMENT); triangleShaderProgram.reflectShader(vkcv::ShaderStage::FRAGMENT);
const vkcv::PipelineConfig trianglePipelineDefinition(triangleShaderProgram, windowWidth, windowHeight, trianglePass); const vkcv::PipelineConfig trianglePipelineDefinition(triangleShaderProgram, windowWidth, windowHeight, trianglePass, {});
vkcv::PipelineHandle trianglePipeline = core.createGraphicsPipeline(trianglePipelineDefinition); vkcv::PipelineHandle trianglePipeline = core.createGraphicsPipeline(trianglePipelineDefinition);
if (!trianglePipeline) if (!trianglePipeline)
...@@ -120,6 +120,8 @@ int main(int argc, const char** argv) { ...@@ -120,6 +120,8 @@ int main(int argc, const char** argv) {
auto resourceHandle = core.createResourceDescription(sets); auto resourceHandle = core.createResourceDescription(sets);
std::cout << "Resource " << resourceHandle << " created." << std::endl; std::cout << "Resource " << resourceHandle << " created." << std::endl;
} }
std::vector<vkcv::VertexBufferBinding> vertexBufferBindings;
/* /*
* BufferHandle triangleVertices = core.createBuffer(vertices); * BufferHandle triangleVertices = core.createBuffer(vertices);
...@@ -147,7 +149,18 @@ int main(int argc, const char** argv) { ...@@ -147,7 +149,18 @@ int main(int argc, const char** argv) {
cameraManager.getCamera().updateView(std::chrono::duration<double>(deltatime).count()); cameraManager.getCamera().updateView(std::chrono::duration<double>(deltatime).count());
const glm::mat4 mvp = cameraManager.getCamera().getProjection() * cameraManager.getCamera().getView(); const glm::mat4 mvp = cameraManager.getCamera().getProjection() * cameraManager.getCamera().getView();
core.renderMesh(trianglePass, trianglePipeline, windowWidth, windowHeight, sizeof(mvp), &mvp, testBuffer.getHandle(), triangleIndexBuffer.getHandle(), 3); core.renderMesh(
trianglePass,
trianglePipeline,
windowWidth,
windowHeight,
sizeof(mvp),
&mvp,
vertexBufferBindings,
triangleIndexBuffer.getHandle(),
3
);
core.endFrame(); core.endFrame();
} }
return 0; return 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment