diff --git a/modules/material/CMakeLists.txt b/modules/material/CMakeLists.txt index c7b204dbf23d48bd1402412092bc43bfe3da2e0f..4035cdd1570352634059473821aafa1147999a93 100644 --- a/modules/material/CMakeLists.txt +++ b/modules/material/CMakeLists.txt @@ -12,8 +12,8 @@ set(vkcv_material_include ${PROJECT_SOURCE_DIR}/include) set(vkcv_material_sources ${vkcv_material_include}/vkcv/material/Material.hpp ${vkcv_material_source}/vkcv/material/Material.cpp - ${vkcv_material_include}/vkcv/material/pbrMetallicRoughness.hpp - ${vkcv_material_source}/vkcv/material/pbrMetallicRoughness.cpp + ${vkcv_material_include}/vkcv/material/PBRMetallicRoughness.hpp + ${vkcv_material_source}/vkcv/material/PBRMetallicRoughness.cpp ) # adding source files to the module diff --git a/modules/material/include/vkcv/material/pbrMetallicRoughness.hpp b/modules/material/include/vkcv/material/pbrMetallicRoughness.hpp index 09068a31e861b2498908f5158613fa98aa5923f6..ded6f0bc72fbf64c4eee9ca59e6d576c8047d9db 100644 --- a/modules/material/include/vkcv/material/pbrMetallicRoughness.hpp +++ b/modules/material/include/vkcv/material/pbrMetallicRoughness.hpp @@ -12,11 +12,11 @@ namespace vkcv::material { class Core; - class pbrMaterial : Material + class PBRMaterial : Material { public: - pbrMaterial() = delete; - pbrMaterial(const ImageHandle &colorImg, + PBRMaterial() = delete; + PBRMaterial(const ImageHandle &colorImg, const SamplerHandle &colorSmp, const ImageHandle &normalImg, const SamplerHandle &normalSmp, diff --git a/modules/material/src/vkcv/material/pbrMetallicRoughness.cpp b/modules/material/src/vkcv/material/pbrMetallicRoughness.cpp index 6177b786ea32d8ebe98388a3944d144c2f62cf0e..38dab241ff63ae121f235071c957b9eab1c66ea7 100644 --- a/modules/material/src/vkcv/material/pbrMetallicRoughness.cpp +++ b/modules/material/src/vkcv/material/pbrMetallicRoughness.cpp @@ -1,9 +1,9 @@ -#include "vkcv/material/pbrMetallicRoughness.hpp" +#include "vkcv/material/PBRMetallicRoughness.hpp" namespace vkcv::material { - pbrMaterial::pbrMaterial(const ImageHandle &colorImg, + PBRMaterial::PBRMaterial(const ImageHandle &colorImg, const SamplerHandle &colorSmp, const ImageHandle &normalImg, const SamplerHandle &normalSmp, @@ -19,7 +19,7 @@ namespace vkcv::material m_DescriptorSetHandle(setHandle) {} - std::vector<DescriptorBinding> pbrMaterial::getDescriptorBindings() noexcept + std::vector<DescriptorBinding> PBRMaterial::getDescriptorBindings() noexcept { return {{DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT}, {DescriptorType::SAMPLER , 1, ShaderStage::FRAGMENT}, @@ -28,7 +28,7 @@ namespace vkcv::material {DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT}, {DescriptorType::SAMPLER , 1, ShaderStage::FRAGMENT}}; } - void pbrMaterial::create(vkcv::Core core) + void PBRMaterial::create(vkcv::Core core) { //Test if Images and samplers valid, if not use default if (m_ColorTexture) {