Merge branch 'develop' of gitlab.uni-koblenz.de:vulkan2021/vkcv-framework into...

Merge branch 'develop' of gitlab.uni-koblenz.de:vulkan2021/vkcv-framework into 76-descriptor-in-multiple-shader-stages

Merge branch 'develop' of gitlab.uni-koblenz.de:vulkan2021/vkcv-framework into...
f32c2548 · Artur Wasmut · 9bd9cf11 · eab9f823 · f32c2548 · f32c2548
Commit f32c2548 authored 3 years ago by Artur Wasmut
--- a/projects/voxelization/resources/Sponza/Textures/Thorn_Norm.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Thorn_Norm.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Thorn_Spec.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Thorn_Spec.jpg
--- a/projects/voxelization/resources/Sponza/Textures/VaseRound_Diff.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/VaseRound_Diff.jpg
--- a/projects/voxelization/resources/Sponza/Textures/VaseRound_Norm.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/VaseRound_Norm.jpg
--- a/projects/voxelization/resources/Sponza/Textures/VaseRound_Spec.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/VaseRound_Spec.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Vase_Diff.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Vase_Diff.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Vase_Hanging_Diff.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Vase_Hanging_Diff.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Vase_Hanging_Norm.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Vase_Hanging_Norm.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Vase_Hanging_Spec.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Vase_Hanging_Spec.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Vase_Norm.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Vase_Norm.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Vase_spec.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Vase_spec.jpg
--- a/projects/voxelization/resources/Sponza/Textures/white.png
+++ b/projects/voxelization/resources/Sponza/Textures/white.png
--- a/projects/voxelization/resources/Sponza/sponza_arch_diff.png
+++ b/projects/voxelization/resources/Sponza/sponza_arch_diff.png
--- a/projects/voxelization/resources/Sponza/sponza_ceiling_a_diff.png
+++ b/projects/voxelization/resources/Sponza/sponza_ceiling_a_diff.png
--- a/projects/voxelization/resources/Sponza/sponza_column_a_diff.png
+++ b/projects/voxelization/resources/Sponza/sponza_column_a_diff.png
--- a/projects/voxelization/resources/Sponza/sponza_column_b_diff.png
+++ b/projects/voxelization/resources/Sponza/sponza_column_b_diff.png
--- a/projects/voxelization/resources/Sponza/sponza_column_c_diff.png
+++ b/projects/voxelization/resources/Sponza/sponza_column_c_diff.png
--- a/projects/voxelization/resources/Sponza/sponza_curtain_blue_diff.png
+++ b/projects/voxelization/resources/Sponza/sponza_curtain_blue_diff.png
--- a/projects/voxelization/resources/Sponza/sponza_curtain_diff.png
+++ b/projects/voxelization/resources/Sponza/sponza_curtain_diff.png
--- a/projects/voxelization/resources/Sponza/sponza_curtain_green_diff.png
+++ b/projects/voxelization/resources/Sponza/sponza_curtain_green_diff.png