KJ16609/FGL-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes naming for MaterialProperties

Browse Source
This commit is contained in:
kj16609
2025-07-07 07:30:30 -04:00
parent 9ab6723a43
commit 2b905786ec
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/engine/assets/material/Material.cpp
View File

@@ -24,24 +24,24 @@ namespace fgl::engine
};
// PBR
data.color.color_texture_id = getTexID( pbr.color_tex );
data.color.color_factors = pbr.color_factors;
data.color.color_texture_id = getTexID( m_pbr.m_color_tex );
data.color.color_factors = m_pbr.m_color_factors;
data.metallic.metallic_texture_id = getTexID( pbr.metallic_roughness_tex );
data.metallic.roughness_factor = pbr.roughness_factor;
data.metallic.metallic_factor = pbr.metallic_factor;
data.metallic.metallic_texture_id = getTexID( m_pbr.m_metallic_roughness_tex );
data.metallic.roughness_factor = m_pbr.m_roughness_factor;
data.metallic.metallic_factor = m_pbr.m_metallic_factor;
// Normal
data.normal.normal_texture_id = getTexID( normal.texture );
data.normal.normal_tex_scale = normal.scale;
data.normal.normal_texture_id = getTexID( m_normal.m_texture );
data.normal.normal_tex_scale = m_normal.m_scale;
// Occlusion
data.occlusion.occlusion_texture_id = getTexID( occlusion.texture );
data.occlusion.occlusion_tex_strength = occlusion.strength;
data.occlusion.occlusion_texture_id = getTexID( m_occlusion.m_texture );
data.occlusion.occlusion_tex_strength = m_occlusion.m_strength;
// Emissive
data.emissive.emissive_texture_id = getTexID( emissive.texture );
data.emissive.emissive_factors = emissive.factors;
data.emissive.emissive_texture_id = getTexID( m_emissive.m_texture );
data.emissive.emissive_factors = m_emissive.m_factors;
}
DeviceMaterialData MaterialProperties::data() const
@@ -63,7 +63,7 @@ namespace fgl::engine
Texture::getDescriptorSet().bindTexture( 0, texture );
Texture::getDescriptorSet().update();
if ( !this->pbr.color_tex ) this->pbr.color_tex = texture;
if ( !this->m_pbr.m_color_tex ) this->m_pbr.m_color_tex = texture;
}
Material::Material() : m_id( material_id_counter.getID() )
@@ -89,9 +89,9 @@ namespace fgl::engine
return true;
};
return checkTex( properties.pbr.color_tex ) && checkTex( properties.pbr.metallic_roughness_tex )
&& checkTex( properties.normal.texture ) && checkTex( properties.occlusion.texture )
&& checkTex( properties.emissive.texture );
return checkTex( properties.m_pbr.m_color_tex ) && checkTex( properties.m_pbr.m_metallic_roughness_tex )
&& checkTex( properties.m_normal.m_texture ) && checkTex( properties.m_occlusion.m_texture )
&& checkTex( properties.m_emissive.m_texture );
}
std::shared_ptr< Material > Material::createMaterial()

30
src/engine/assets/material/Material.hpp
View File

@@ -44,31 +44,31 @@ namespace fgl::engine
{
struct
{
std::shared_ptr< Texture > color_tex {};
glm::vec4 color_factors { 0.0f };
std::shared_ptr< Texture > m_color_tex {};
glm::vec4 m_color_factors { 0.0f };
std::shared_ptr< Texture > metallic_roughness_tex;
float metallic_factor { 0.0f };
float roughness_factor { 0.0f };
} pbr;
std::shared_ptr< Texture > m_metallic_roughness_tex;
float m_metallic_factor { 0.0f };
float m_roughness_factor { 0.0f };
} m_pbr;
struct
{
float scale { 0.0f };
std::shared_ptr< Texture > texture;
} normal;
float m_scale { 0.0f };
std::shared_ptr< Texture > m_texture;
} m_normal;
struct
{
float strength { 0.0f };
std::shared_ptr< Texture > texture;
} occlusion;
float m_strength { 0.0f };
std::shared_ptr< Texture > m_texture;
} m_occlusion;
struct
{
glm::vec3 factors { 0.0f };
std::shared_ptr< Texture > texture;
} emissive;
glm::vec3 m_factors { 0.0f };
std::shared_ptr< Texture > m_texture;
} m_emissive;
void writeData( DeviceMaterialData& data ) const;
DeviceMaterialData data() const;