sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor material system (#382)

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-10-31 19:53:41 +01:00
committed by GitHub
parent 0a8048809c
commit dc6ce8427c
156 changed files with 3633 additions and 4569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Widgets/ImageWidget.inl
View File

@@ -12,7 +12,7 @@ namespace Nz
return m_sprite->GetColor();
}
inline const std::shared_ptr<Material>& ImageWidget::GetMaterial() const
inline const std::shared_ptr<MaterialInstance>& ImageWidget::GetMaterial() const
{
return m_sprite->GetMaterial();
}
@@ -27,7 +27,7 @@ namespace Nz
m_sprite->SetColor(color);
}
inline void ImageWidget::SetMaterial(const std::shared_ptr<Material>& texture)
inline void ImageWidget::SetMaterial(const std::shared_ptr<MaterialInstance>& texture)
{
m_sprite->SetMaterial(texture);
UpdatePreferredSize();