From 50c8675c1a131b9291399007866af06947469c2d Mon Sep 17 00:00:00 2001
From: Lars Hoerttrich <larshoerttrich@uni-koblenz.de>
Date: Sat, 12 Jun 2021 11:37:43 +0200
Subject: [PATCH] [#57] renamed from pbrMaterial to PBRMaterial
---
modules/material/CMakeLists.txt | 4 ++--
.../include/vkcv/material/pbrMetallicRoughness.hpp | 6 +++---
.../material/src/vkcv/material/pbrMetallicRoughness.cpp | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/modules/material/CMakeLists.txt b/modules/material/CMakeLists.txt
index c7b204db..4035cdd1 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 09068a31..ded6f0bc 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 6177b786..38dab241 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) {
--
GitLab