Skip to content
Snippets Groups Projects
Commit 6f65d9fd authored by Sebastian Gaida's avatar Sebastian Gaida
Browse files

Merge branch 'develop' into 89-mehrere-fenster-abhangigkeiten-von-core-zu-fenster-swapchain-etc

# Conflicts:
#	projects/first_mesh/src/main.cpp
#	projects/first_scene/src/main.cpp
#	projects/first_triangle/src/main.cpp
#	projects/mesh_shader/src/main.cpp
#	projects/particle_simulation/src/main.cpp
#	projects/voxelization/src/main.cpp
parents 9d931fc6 b44d10ca
No related branches found
No related tags found
1 merge request!90Resolve "Mehrere Fenster, Abhängigkeiten von Core zu Fenster+Swapchain etc"
Pipeline #27048 failed
Showing
with 15 additions and 8 deletions
...@@ -22,7 +22,7 @@ int main(int argc, const char** argv) { ...@@ -22,7 +22,7 @@ int main(int argc, const char** argv) {
vkcv::asset::Scene mesh; vkcv::asset::Scene mesh;
const char* path = argc > 1 ? argv[1] : "resources/cube/cube.gltf"; const char* path = argc > 1 ? argv[1] : "assets/cube/cube.gltf";
int result = vkcv::asset::loadScene(path, mesh); int result = vkcv::asset::loadScene(path, mesh);
if (result == 1) { if (result == 1) {
...@@ -73,12 +73,12 @@ int main(int argc, const char** argv) { ...@@ -73,12 +73,12 @@ int main(int argc, const char** argv) {
vkcv::ShaderProgram firstMeshProgram; vkcv::ShaderProgram firstMeshProgram;
vkcv::shader::GLSLCompiler compiler; vkcv::shader::GLSLCompiler compiler;
compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("resources/shaders/shader.vert"), compiler.compile(vkcv::ShaderStage::VERTEX, std::filesystem::path("assets/shaders/shader.vert"),
[&firstMeshProgram](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { [&firstMeshProgram](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) {
firstMeshProgram.addShader(shaderStage, path); firstMeshProgram.addShader(shaderStage, path);
}); });
compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("resources/shaders/shader.frag"), compiler.compile(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("assets/shaders/shader.frag"),
[&firstMeshProgram](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) { [&firstMeshProgram](vkcv::ShaderStage shaderStage, const std::filesystem::path& path) {
firstMeshProgram.addShader(shaderStage, path); firstMeshProgram.addShader(shaderStage, path);
}); });
...@@ -153,8 +153,15 @@ int main(int argc, const char** argv) { ...@@ -153,8 +153,15 @@ int main(int argc, const char** argv) {
setWrites.samplerWrites = { vkcv::SamplerDescriptorWrite(1, sampler) }; setWrites.samplerWrites = { vkcv::SamplerDescriptorWrite(1, sampler) };
core.writeDescriptorSet(descriptorSet, setWrites); core.writeDescriptorSet(descriptorSet, setWrites);
vkcv::ImageHandle depthBuffer = core.createImage(vk::Format::eD32Sfloat, windowWidth, windowHeight, 1, false).getHandle(); auto swapchainExtent = core.getSwapchain(windowHandle).getExtent();
vkcv::ImageHandle depthBuffer = core.createImage(
vk::Format::eD32Sfloat,
swapchainExtent.width,
swapchainExtent.height,
1, false
).getHandle();
const vkcv::ImageHandle swapchainInput = vkcv::ImageHandle::createSwapchainImageHandle(); const vkcv::ImageHandle swapchainInput = vkcv::ImageHandle::createSwapchainImageHandle();
...@@ -181,11 +188,11 @@ int main(int argc, const char** argv) { ...@@ -181,11 +188,11 @@ int main(int argc, const char** argv) {
continue; continue;
} }
if ((swapchainWidth != windowWidth) || ((swapchainHeight != windowHeight))) { if ((swapchainWidth != swapchainExtent.width) || ((swapchainHeight != swapchainExtent.height))) {
depthBuffer = core.createImage(vk::Format::eD32Sfloat, swapchainWidth, swapchainHeight).getHandle(); depthBuffer = core.createImage(vk::Format::eD32Sfloat, swapchainWidth, swapchainHeight).getHandle();
windowWidth = swapchainWidth; swapchainExtent.width = swapchainWidth;
windowHeight = swapchainHeight; swapchainExtent.height = swapchainHeight;
} }
auto end = std::chrono::system_clock::now(); auto end = std::chrono::system_clock::now();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment