diff --git a/data/shaders/shadowmap/cubemapdisplay.frag b/data/shaders/shadowmapomni/cubemapdisplay.frag similarity index 100% rename from data/shaders/shadowmap/cubemapdisplay.frag rename to data/shaders/shadowmapomni/cubemapdisplay.frag diff --git a/data/shaders/shadowmap/cubemapdisplay.frag.spv b/data/shaders/shadowmapomni/cubemapdisplay.frag.spv similarity index 100% rename from data/shaders/shadowmap/cubemapdisplay.frag.spv rename to data/shaders/shadowmapomni/cubemapdisplay.frag.spv diff --git a/data/shaders/shadowmap/cubemapdisplay.vert b/data/shaders/shadowmapomni/cubemapdisplay.vert similarity index 100% rename from data/shaders/shadowmap/cubemapdisplay.vert rename to data/shaders/shadowmapomni/cubemapdisplay.vert diff --git a/data/shaders/shadowmap/cubemapdisplay.vert.spv b/data/shaders/shadowmapomni/cubemapdisplay.vert.spv similarity index 100% rename from data/shaders/shadowmap/cubemapdisplay.vert.spv rename to data/shaders/shadowmapomni/cubemapdisplay.vert.spv diff --git a/data/shaders/shadowmap/generate-spirv.bat b/data/shaders/shadowmapomni/generate-spirv.bat similarity index 100% rename from data/shaders/shadowmap/generate-spirv.bat rename to data/shaders/shadowmapomni/generate-spirv.bat diff --git a/data/shaders/shadowmap/offscreen.frag b/data/shaders/shadowmapomni/offscreen.frag similarity index 100% rename from data/shaders/shadowmap/offscreen.frag rename to data/shaders/shadowmapomni/offscreen.frag diff --git a/data/shaders/shadowmap/offscreen.frag.spv b/data/shaders/shadowmapomni/offscreen.frag.spv similarity index 100% rename from data/shaders/shadowmap/offscreen.frag.spv rename to data/shaders/shadowmapomni/offscreen.frag.spv diff --git a/data/shaders/shadowmap/offscreen.vert b/data/shaders/shadowmapomni/offscreen.vert similarity index 100% rename from data/shaders/shadowmap/offscreen.vert rename to data/shaders/shadowmapomni/offscreen.vert diff --git a/data/shaders/shadowmap/offscreen.vert.spv b/data/shaders/shadowmapomni/offscreen.vert.spv similarity index 100% rename from data/shaders/shadowmap/offscreen.vert.spv rename to data/shaders/shadowmapomni/offscreen.vert.spv diff --git a/data/shaders/shadowmap/scene.frag b/data/shaders/shadowmapomni/scene.frag similarity index 100% rename from data/shaders/shadowmap/scene.frag rename to data/shaders/shadowmapomni/scene.frag diff --git a/data/shaders/shadowmap/scene.frag.spv b/data/shaders/shadowmapomni/scene.frag.spv similarity index 100% rename from data/shaders/shadowmap/scene.frag.spv rename to data/shaders/shadowmapomni/scene.frag.spv diff --git a/data/shaders/shadowmap/scene.vert b/data/shaders/shadowmapomni/scene.vert similarity index 100% rename from data/shaders/shadowmap/scene.vert rename to data/shaders/shadowmapomni/scene.vert diff --git a/data/shaders/shadowmap/scene.vert.spv b/data/shaders/shadowmapomni/scene.vert.spv similarity index 100% rename from data/shaders/shadowmap/scene.vert.spv rename to data/shaders/shadowmapomni/scene.vert.spv diff --git a/shadowmappingomni/shadowmappingomni.cpp b/shadowmappingomni/shadowmappingomni.cpp index fa6fbfa9..5cbccbf9 100644 --- a/shadowmappingomni/shadowmappingomni.cpp +++ b/shadowmappingomni/shadowmappingomni.cpp @@ -940,11 +940,11 @@ public: std::array shaderStages; #ifdef USE_GLSL - shaderStages[0] = loadShaderGLSL("./../data/shaders/shadowmap/scene.vert", VK_SHADER_STAGE_VERTEX_BIT); - shaderStages[1] = loadShaderGLSL("./../data/shaders/shadowmap/scene.frag", VK_SHADER_STAGE_FRAGMENT_BIT); + shaderStages[0] = loadShaderGLSL("./../data/shaders/shadowmapomni/scene.vert", VK_SHADER_STAGE_VERTEX_BIT); + shaderStages[1] = loadShaderGLSL("./../data/shaders/shadowmapomni/scene.frag", VK_SHADER_STAGE_FRAGMENT_BIT); #else - shaderStages[0] = loadShader("./../data/shaders/shadowmap/scene.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); - shaderStages[1] = loadShader("./../data/shaders/shadowmap/scene.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); + shaderStages[0] = loadShader("./../data/shaders/shadowmapomni/scene.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); + shaderStages[1] = loadShader("./../data/shaders/shadowmapomni/scene.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); #endif VkGraphicsPipelineCreateInfo pipelineCreateInfo = @@ -969,11 +969,11 @@ public: // Cube map display pipeline #ifdef USE_GLSL - shaderStages[0] = loadShaderGLSL("./../data/shaders/shadowmap/cubemapdisplay.vert", VK_SHADER_STAGE_VERTEX_BIT); - shaderStages[1] = loadShaderGLSL("./../data/shaders/shadowmap/cubemapdisplay.frag", VK_SHADER_STAGE_FRAGMENT_BIT); + shaderStages[0] = loadShaderGLSL("./../data/shaders/shadowmapomni/cubemapdisplay.vert", VK_SHADER_STAGE_VERTEX_BIT); + shaderStages[1] = loadShaderGLSL("./../data/shaders/shadowmapomni/cubemapdisplay.frag", VK_SHADER_STAGE_FRAGMENT_BIT); #else - shaderStages[0] = loadShader("./../data/shaders/shadowmap/cubemapdisplay.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); - shaderStages[1] = loadShader("./../data/shaders/shadowmap/cubemapdisplay.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); + shaderStages[0] = loadShader("./../data/shaders/shadowmapomni/cubemapdisplay.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); + shaderStages[1] = loadShader("./../data/shaders/shadowmapomni/cubemapdisplay.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); #endif rasterizationState.cullMode = VK_CULL_MODE_FRONT_BIT; err = vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipelines.cubeMap); @@ -981,11 +981,11 @@ public: // Offscreen pipeline #ifdef USE_GLSL - shaderStages[0] = loadShaderGLSL("./../data/shaders/shadowmap/offscreen.vert", VK_SHADER_STAGE_VERTEX_BIT); - shaderStages[1] = loadShaderGLSL("./../data/shaders/shadowmap/offscreen.frag", VK_SHADER_STAGE_FRAGMENT_BIT); + shaderStages[0] = loadShaderGLSL("./../data/shaders/shadowmapomni/offscreen.vert", VK_SHADER_STAGE_VERTEX_BIT); + shaderStages[1] = loadShaderGLSL("./../data/shaders/shadowmapomni/offscreen.frag", VK_SHADER_STAGE_FRAGMENT_BIT); #else - shaderStages[0] = loadShader("./../data/shaders/shadowmap/offscreen.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); - shaderStages[1] = loadShader("./../data/shaders/shadowmap/offscreen.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); + shaderStages[0] = loadShader("./../data/shaders/shadowmapomni/offscreen.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); + shaderStages[1] = loadShader("./../data/shaders/shadowmapomni/offscreen.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); #endif rasterizationState.cullMode = VK_CULL_MODE_BACK_BIT;