Skip to content
Snippets Groups Projects
Verified Commit 80b5d9c2 authored by Tobias Frisch's avatar Tobias Frisch
Browse files

[#57] Renamed files to match class and made other attributes const

parent 72c14e6f
No related branches found
No related tags found
1 merge request!44Resolve "Material (Modul)"
Pipeline #26031 passed
...@@ -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/PBRMaterial.hpp
${vkcv_material_source}/vkcv/material/pbrMetallicRoughness.cpp ${vkcv_material_source}/vkcv/material/PBRMaterial.cpp
) )
# adding source files to the module # adding source files to the module
......
...@@ -40,8 +40,7 @@ namespace vkcv::material ...@@ -40,8 +40,7 @@ namespace vkcv::material
public: public:
PBRMaterial() = delete; PBRMaterial() = delete;
const ImageHandle m_ColorTexture; const ImageHandle m_ColorTexture;
const SamplerHandle m_ColorSampler; const SamplerHandle m_ColorSampler;
...@@ -58,12 +57,12 @@ namespace vkcv::material ...@@ -58,12 +57,12 @@ namespace vkcv::material
const SamplerHandle m_EmissiveSampler; const SamplerHandle m_EmissiveSampler;
// //
vec4 m_BaseColorFactor; const vec4 m_BaseColorFactor;
float m_MetallicFactor; const float m_MetallicFactor;
float m_RoughnessFactor; const float m_RoughnessFactor;
float m_NormalScale; const float m_NormalScale;
float m_OcclusionStrength; const float m_OcclusionStrength;
vec3 m_EmissiveFactor; const vec3 m_EmissiveFactor;
/* /*
* Returns the material's necessary descriptor bindings which serves as its descriptor layout * Returns the material's necessary descriptor bindings which serves as its descriptor layout
......
#include "vkcv/material/pbrMetallicRoughness.hpp" #include "vkcv/material/PBRMaterial.hpp"
namespace vkcv::material namespace vkcv::material
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment