From 80b5d9c224011a2d455cee03ad25fc989acd3086 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Fri, 25 Jun 2021 14:00:55 +0200
Subject: [PATCH] [#57] Renamed files to match class and made other attributes
const
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
modules/material/CMakeLists.txt | 4 ++--
.../{pbrMetallicRoughness.hpp => PBRMaterial.hpp} | 15 +++++++--------
.../{pbrMetallicRoughness.cpp => PBRMaterial.cpp} | 2 +-
3 files changed, 10 insertions(+), 11 deletions(-)
rename modules/material/include/vkcv/material/{pbrMetallicRoughness.hpp => PBRMaterial.hpp} (93%)
rename modules/material/src/vkcv/material/{pbrMetallicRoughness.cpp => PBRMaterial.cpp} (99%)
diff --git a/modules/material/CMakeLists.txt b/modules/material/CMakeLists.txt
index 748dbac1..d5b654cc 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/PBRMaterial.hpp
+ ${vkcv_material_source}/vkcv/material/PBRMaterial.cpp
)
# adding source files to the module
diff --git a/modules/material/include/vkcv/material/pbrMetallicRoughness.hpp b/modules/material/include/vkcv/material/PBRMaterial.hpp
similarity index 93%
rename from modules/material/include/vkcv/material/pbrMetallicRoughness.hpp
rename to modules/material/include/vkcv/material/PBRMaterial.hpp
index 55d6eb20..09a5214b 100644
--- a/modules/material/include/vkcv/material/pbrMetallicRoughness.hpp
+++ b/modules/material/include/vkcv/material/PBRMaterial.hpp
@@ -40,8 +40,7 @@ namespace vkcv::material
public:
PBRMaterial() = delete;
-
-
+
const ImageHandle m_ColorTexture;
const SamplerHandle m_ColorSampler;
@@ -58,12 +57,12 @@ namespace vkcv::material
const SamplerHandle m_EmissiveSampler;
//
- vec4 m_BaseColorFactor;
- float m_MetallicFactor;
- float m_RoughnessFactor;
- float m_NormalScale;
- float m_OcclusionStrength;
- vec3 m_EmissiveFactor;
+ const vec4 m_BaseColorFactor;
+ const float m_MetallicFactor;
+ const float m_RoughnessFactor;
+ const float m_NormalScale;
+ const float m_OcclusionStrength;
+ const vec3 m_EmissiveFactor;
/*
* Returns the material's necessary descriptor bindings which serves as its descriptor layout
diff --git a/modules/material/src/vkcv/material/pbrMetallicRoughness.cpp b/modules/material/src/vkcv/material/PBRMaterial.cpp
similarity index 99%
rename from modules/material/src/vkcv/material/pbrMetallicRoughness.cpp
rename to modules/material/src/vkcv/material/PBRMaterial.cpp
index 2802e4a6..d27e755c 100644
--- a/modules/material/src/vkcv/material/pbrMetallicRoughness.cpp
+++ b/modules/material/src/vkcv/material/PBRMaterial.cpp
@@ -1,4 +1,4 @@
-#include "vkcv/material/pbrMetallicRoughness.hpp"
+#include "vkcv/material/PBRMaterial.hpp"
namespace vkcv::material
--
GitLab