Skip to content
Snippets Groups Projects
Commit 50c8675c authored by Lars Hoerttrich's avatar Lars Hoerttrich
Browse files

[#57] renamed from pbrMaterial to PBRMaterial

parent 53cf2d62
No related branches found
No related tags found
1 merge request!44Resolve "Material (Modul)"
Pipeline #25626 failed
...@@ -12,8 +12,8 @@ set(vkcv_material_include ${PROJECT_SOURCE_DIR}/include) ...@@ -12,8 +12,8 @@ set(vkcv_material_include ${PROJECT_SOURCE_DIR}/include)
set(vkcv_material_sources set(vkcv_material_sources
${vkcv_material_include}/vkcv/material/Material.hpp ${vkcv_material_include}/vkcv/material/Material.hpp
${vkcv_material_source}/vkcv/material/Material.cpp ${vkcv_material_source}/vkcv/material/Material.cpp
${vkcv_material_include}/vkcv/material/pbrMetallicRoughness.hpp ${vkcv_material_include}/vkcv/material/PBRMetallicRoughness.hpp
${vkcv_material_source}/vkcv/material/pbrMetallicRoughness.cpp ${vkcv_material_source}/vkcv/material/PBRMetallicRoughness.cpp
) )
# adding source files to the module # adding source files to the module
......
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
namespace vkcv::material namespace vkcv::material
{ {
class Core; class Core;
class pbrMaterial : Material class PBRMaterial : Material
{ {
public: public:
pbrMaterial() = delete; PBRMaterial() = delete;
pbrMaterial(const ImageHandle &colorImg, PBRMaterial(const ImageHandle &colorImg,
const SamplerHandle &colorSmp, const SamplerHandle &colorSmp,
const ImageHandle &normalImg, const ImageHandle &normalImg,
const SamplerHandle &normalSmp, const SamplerHandle &normalSmp,
......
#include "vkcv/material/pbrMetallicRoughness.hpp" #include "vkcv/material/PBRMetallicRoughness.hpp"
namespace vkcv::material namespace vkcv::material
{ {
pbrMaterial::pbrMaterial(const ImageHandle &colorImg, PBRMaterial::PBRMaterial(const ImageHandle &colorImg,
const SamplerHandle &colorSmp, const SamplerHandle &colorSmp,
const ImageHandle &normalImg, const ImageHandle &normalImg,
const SamplerHandle &normalSmp, const SamplerHandle &normalSmp,
...@@ -19,7 +19,7 @@ namespace vkcv::material ...@@ -19,7 +19,7 @@ namespace vkcv::material
m_DescriptorSetHandle(setHandle) m_DescriptorSetHandle(setHandle)
{} {}
std::vector<DescriptorBinding> pbrMaterial::getDescriptorBindings() noexcept std::vector<DescriptorBinding> PBRMaterial::getDescriptorBindings() noexcept
{ {
return {{DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT}, return {{DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT},
{DescriptorType::SAMPLER , 1, ShaderStage::FRAGMENT}, {DescriptorType::SAMPLER , 1, ShaderStage::FRAGMENT},
...@@ -28,7 +28,7 @@ namespace vkcv::material ...@@ -28,7 +28,7 @@ namespace vkcv::material
{DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT}, {DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT},
{DescriptorType::SAMPLER , 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 //Test if Images and samplers valid, if not use default
if (m_ColorTexture) { if (m_ColorTexture) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment