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

1
include/Nazara/Widgets/ButtonWidget.hpp
View File

@@ -16,7 +16,6 @@
namespace Nz
{
class AbstractTextDrawer;
class MaterialPass;
class NAZARA_WIDGETS_API ButtonWidget : public BaseWidget
{

2
include/Nazara/Widgets/CheckboxWidget.hpp
View File

@@ -16,8 +16,6 @@
namespace Nz
{
class MaterialPass;
class NAZARA_WIDGETS_API CheckboxWidget : public BaseWidget
{
public:

28
include/Nazara/Widgets/DefaultWidgetTheme.hpp
View File

@@ -34,20 +34,20 @@ namespace Nz
DefaultWidgetTheme& operator=(DefaultWidgetTheme&&) = default;
private:
std::shared_ptr<Material> m_buttonMaterial;
std::shared_ptr<Material> m_buttonHoveredMaterial;
std::shared_ptr<Material> m_buttonPressedHoveredMaterial;
std::shared_ptr<Material> m_buttonPressedMaterial;
std::shared_ptr<Material> m_checkboxBackgroundMaterial;
std::shared_ptr<Material> m_checkboxBackgroundHoveredMaterial;
std::shared_ptr<Material> m_checkboxCheckMaterial;
std::shared_ptr<Material> m_checkboxTristateMaterial;
std::shared_ptr<Material> m_hoveredMaterial;
std::shared_ptr<Material> m_scrollbarBackgroundHorizontalMaterial;
std::shared_ptr<Material> m_scrollbarBackgroundVerticalMaterial;
std::shared_ptr<Material> m_scrollbarButtonMaterial;
std::shared_ptr<Material> m_scrollbarButtonHoveredMaterial;
std::shared_ptr<Material> m_scrollbarButtonGrabbedMaterial;
std::shared_ptr<MaterialInstance> m_buttonMaterial;
std::shared_ptr<MaterialInstance> m_buttonHoveredMaterial;
std::shared_ptr<MaterialInstance> m_buttonPressedHoveredMaterial;
std::shared_ptr<MaterialInstance> m_buttonPressedMaterial;
std::shared_ptr<MaterialInstance> m_checkboxBackgroundMaterial;
std::shared_ptr<MaterialInstance> m_checkboxBackgroundHoveredMaterial;
std::shared_ptr<MaterialInstance> m_checkboxCheckMaterial;
std::shared_ptr<MaterialInstance> m_checkboxTristateMaterial;
std::shared_ptr<MaterialInstance> m_hoveredMaterial;
std::shared_ptr<MaterialInstance> m_scrollbarBackgroundHorizontalMaterial;
std::shared_ptr<MaterialInstance> m_scrollbarBackgroundVerticalMaterial;
std::shared_ptr<MaterialInstance> m_scrollbarButtonMaterial;
std::shared_ptr<MaterialInstance> m_scrollbarButtonHoveredMaterial;
std::shared_ptr<MaterialInstance> m_scrollbarButtonGrabbedMaterial;
};
}

25
include/Nazara/Widgets/ImageButtonWidget.hpp
View File

@@ -16,14 +16,13 @@
namespace Nz
{
class AbstractTextDrawer;
class MaterialPass;
class NAZARA_WIDGETS_API ImageButtonWidget : public BaseWidget
{
public:
inline ImageButtonWidget(BaseWidget* parent, std::shared_ptr<Material> material);
inline ImageButtonWidget(BaseWidget* parent, std::shared_ptr<Material> material, float cornerSize, float cornerTexCoords);
ImageButtonWidget(BaseWidget* parent, std::shared_ptr<Material> material, std::shared_ptr<Material> hoveredMaterial, std::shared_ptr<Material> pressedMaterial, float cornerSize, float cornerTexCoords);
inline ImageButtonWidget(BaseWidget* parent, std::shared_ptr<MaterialInstance> material);
inline ImageButtonWidget(BaseWidget* parent, std::shared_ptr<MaterialInstance> material, float cornerSize, float cornerTexCoords);
ImageButtonWidget(BaseWidget* parent, std::shared_ptr<MaterialInstance> material, std::shared_ptr<MaterialInstance> hoveredMaterial, std::shared_ptr<MaterialInstance> pressedMaterial, float cornerSize, float cornerTexCoords);
ImageButtonWidget(const ImageButtonWidget&) = delete;
ImageButtonWidget(ImageButtonWidget&&) = default;
~ImageButtonWidget() = default;
@@ -31,16 +30,16 @@ namespace Nz
inline const Color& GetColor() const;
inline float GetCornerSize() const;
inline float GetCornerTexCoords() const;
inline const std::shared_ptr<Material>& GetHoveredMaterial() const;
inline const std::shared_ptr<Material>& GetMaterial() const;
inline const std::shared_ptr<Material>& GetPressedMaterial() const;
inline const std::shared_ptr<MaterialInstance>& GetHoveredMaterial() const;
inline const std::shared_ptr<MaterialInstance>& GetMaterial() const;
inline const std::shared_ptr<MaterialInstance>& GetPressedMaterial() const;
inline const Rectf& GetTextureCoords() const;
inline void SetColor(const Color& color);
inline void SetCorner(float size, float texcoords);
inline void SetHoveredMaterial(std::shared_ptr<Material> material);
inline void SetMaterial(std::shared_ptr<Material> material);
inline void SetPressedMaterial(std::shared_ptr<Material> material);
inline void SetHoveredMaterial(std::shared_ptr<MaterialInstance> material);
inline void SetMaterial(std::shared_ptr<MaterialInstance> material);
inline void SetPressedMaterial(std::shared_ptr<MaterialInstance> material);
inline void SetTextureCoords(const Rectf& coords);
ImageButtonWidget& operator=(const ImageButtonWidget&) = delete;
@@ -61,9 +60,9 @@ namespace Nz
void UpdatePreferredSize();
std::unique_ptr<ImageButtonWidgetStyle> m_style;
std::shared_ptr<Material> m_hoveredMaterial;
std::shared_ptr<Material> m_material;
std::shared_ptr<Material> m_pressedMaterial;
std::shared_ptr<MaterialInstance> m_hoveredMaterial;
std::shared_ptr<MaterialInstance> m_material;
std::shared_ptr<MaterialInstance> m_pressedMaterial;
Color m_color;
Rectf m_textureCoords;
float m_cornerSize;

16
include/Nazara/Widgets/ImageButtonWidget.inl
View File

@@ -7,12 +7,12 @@
namespace Nz
{
inline ImageButtonWidget::ImageButtonWidget(BaseWidget* parent, std::shared_ptr<Material> material) :
inline ImageButtonWidget::ImageButtonWidget(BaseWidget* parent, std::shared_ptr<MaterialInstance> material) :
ImageButtonWidget(parent, std::move(material), {}, {}, 0.f, 0.f)
{
}
inline ImageButtonWidget::ImageButtonWidget(BaseWidget* parent, std::shared_ptr<Material> material, float cornerSize, float cornerTexCoords) :
inline ImageButtonWidget::ImageButtonWidget(BaseWidget* parent, std::shared_ptr<MaterialInstance> material, float cornerSize, float cornerTexCoords) :
ImageButtonWidget(parent, std::move(material), {}, {}, cornerSize, cornerTexCoords)
{
}
@@ -32,17 +32,17 @@ namespace Nz
return m_cornerTexCoords;
}
inline const std::shared_ptr<Material>& ImageButtonWidget::GetHoveredMaterial() const
inline const std::shared_ptr<MaterialInstance>& ImageButtonWidget::GetHoveredMaterial() const
{
return m_hoveredMaterial;
}
inline const std::shared_ptr<Material>& ImageButtonWidget::GetMaterial() const
inline const std::shared_ptr<MaterialInstance>& ImageButtonWidget::GetMaterial() const
{
return m_material;
}
inline const std::shared_ptr<Material>& ImageButtonWidget::GetPressedMaterial() const
inline const std::shared_ptr<MaterialInstance>& ImageButtonWidget::GetPressedMaterial() const
{
return m_pressedMaterial;
}
@@ -67,14 +67,14 @@ namespace Nz
m_style->OnUpdate();
}
inline void ImageButtonWidget::SetHoveredMaterial(std::shared_ptr<Material> material)
inline void ImageButtonWidget::SetHoveredMaterial(std::shared_ptr<MaterialInstance> material)
{
m_hoveredMaterial = std::move(material);
m_style->OnUpdate();
}
inline void ImageButtonWidget::SetMaterial(std::shared_ptr<Material> material)
inline void ImageButtonWidget::SetMaterial(std::shared_ptr<MaterialInstance> material)
{
m_material = std::move(material);
UpdatePreferredSize();
@@ -82,7 +82,7 @@ namespace Nz
m_style->OnUpdate();
}
inline void ImageButtonWidget::SetPressedMaterial(std::shared_ptr<Material> material)
inline void ImageButtonWidget::SetPressedMaterial(std::shared_ptr<MaterialInstance> material)
{
m_pressedMaterial = std::move(material);

6
include/Nazara/Widgets/ImageWidget.hpp
View File

@@ -17,17 +17,17 @@ namespace Nz
class NAZARA_WIDGETS_API ImageWidget : public BaseWidget
{
public:
ImageWidget(BaseWidget* parent, std::shared_ptr<Material> material);
ImageWidget(BaseWidget* parent, std::shared_ptr<MaterialInstance> material);
ImageWidget(const ImageWidget&) = delete;
ImageWidget(ImageWidget&&) = default;
~ImageWidget() = default;
inline const Color& GetColor() const;
inline const std::shared_ptr<Material>& GetMaterial() const;
inline const std::shared_ptr<MaterialInstance>& GetMaterial() const;
inline const Rectf& GetTextureCoords() const;
inline void SetColor(const Color& color);
inline void SetMaterial(const std::shared_ptr<Material>& texture);
inline void SetMaterial(const std::shared_ptr<MaterialInstance>& texture);
inline void SetTextureCoords(const Rectf& coords);
inline void SetTextureRect(const Rectf& rect);

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();

1
include/Nazara/Widgets/ScrollbarButtonWidget.hpp
View File

@@ -16,7 +16,6 @@
namespace Nz
{
class AbstractTextDrawer;
class MaterialPass;
class NAZARA_WIDGETS_API ScrollbarButtonWidget : public BaseWidget
{

64
include/Nazara/Widgets/SimpleWidgetStyles.hpp
View File

@@ -40,10 +40,10 @@ namespace Nz
struct StyleConfig
{
std::shared_ptr<Material> hoveredMaterial;
std::shared_ptr<Material> material;
std::shared_ptr<Material> pressedMaterial;
std::shared_ptr<Material> pressedHoveredMaterial;
std::shared_ptr<MaterialInstance> hoveredMaterial;
std::shared_ptr<MaterialInstance> material;
std::shared_ptr<MaterialInstance> pressedMaterial;
std::shared_ptr<MaterialInstance> pressedHoveredMaterial;
float cornerSize;
float cornerTexCoords;
};
@@ -52,10 +52,10 @@ namespace Nz
virtual void UpdateMaterial(bool hovered, bool pressed);
private:
std::shared_ptr<Material> m_hoveredMaterial;
std::shared_ptr<Material> m_material;
std::shared_ptr<Material> m_pressedMaterial;
std::shared_ptr<Material> m_pressedHoveredMaterial;
std::shared_ptr<MaterialInstance> m_hoveredMaterial;
std::shared_ptr<MaterialInstance> m_material;
std::shared_ptr<MaterialInstance> m_pressedMaterial;
std::shared_ptr<MaterialInstance> m_pressedHoveredMaterial;
std::shared_ptr<SlicedSprite> m_sprite;
std::shared_ptr<TextSprite> m_textSprite;
entt::entity m_spriteEntity;
@@ -87,10 +87,10 @@ namespace Nz
struct StyleConfig
{
std::shared_ptr<Material> backgroundMaterial;
std::shared_ptr<Material> backgroundHoveredMaterial;
std::shared_ptr<Material> checkMaterial;
std::shared_ptr<Material> tristateMaterial;
std::shared_ptr<MaterialInstance> backgroundMaterial;
std::shared_ptr<MaterialInstance> backgroundHoveredMaterial;
std::shared_ptr<MaterialInstance> checkMaterial;
std::shared_ptr<MaterialInstance> tristateMaterial;
float backgroundCornerSize;
float backgroundCornerTexCoords;
};
@@ -99,10 +99,10 @@ namespace Nz
virtual void UpdateMaterial(bool hovered);
private:
std::shared_ptr<Material> m_checkMaterial;
std::shared_ptr<Material> m_hoveredMaterial;
std::shared_ptr<Material> m_material;
std::shared_ptr<Material> m_tristateMaterial;
std::shared_ptr<MaterialInstance> m_checkMaterial;
std::shared_ptr<MaterialInstance> m_hoveredMaterial;
std::shared_ptr<MaterialInstance> m_material;
std::shared_ptr<MaterialInstance> m_tristateMaterial;
std::shared_ptr<Sprite> m_checkSprite;
std::shared_ptr<SlicedSprite> m_backgroundSprite;
entt::entity m_backgroundEntity;
@@ -135,7 +135,7 @@ namespace Nz
struct StyleConfig
{
std::shared_ptr<Material> hoveredMaterial;
std::shared_ptr<MaterialInstance> hoveredMaterial;
float hoveredCornerSize;
float hoveredCornerTexCoords;
};
@@ -154,7 +154,7 @@ namespace Nz
class NAZARA_WIDGETS_API SimpleLabelWidgetStyle : public LabelWidgetStyle
{
public:
SimpleLabelWidgetStyle(LabelWidget* labelWidget, std::shared_ptr<Material> material, std::shared_ptr<Material> hoveredMaterial = {});
SimpleLabelWidgetStyle(LabelWidget* labelWidget, std::shared_ptr<MaterialInstance> material, std::shared_ptr<MaterialInstance> hoveredMaterial = {});
SimpleLabelWidgetStyle(const SimpleLabelWidgetStyle&) = delete;
SimpleLabelWidgetStyle(SimpleLabelWidgetStyle&&) = default;
~SimpleLabelWidgetStyle() = default;
@@ -174,8 +174,8 @@ namespace Nz
virtual void UpdateMaterial(bool hovered);
private:
std::shared_ptr<Material> m_hoveredMaterial;
std::shared_ptr<Material> m_material;
std::shared_ptr<MaterialInstance> m_hoveredMaterial;
std::shared_ptr<MaterialInstance> m_material;
std::shared_ptr<TextSprite> m_textSprite;
entt::entity m_entity;
};
@@ -196,8 +196,8 @@ namespace Nz
SimpleScrollAreaWidgetStyle& operator=(SimpleScrollAreaWidgetStyle&&) = default;
private:
std::shared_ptr<Material> m_hoveredMaterial;
std::shared_ptr<Material> m_material;
std::shared_ptr<MaterialInstance> m_hoveredMaterial;
std::shared_ptr<MaterialInstance> m_material;
std::shared_ptr<TextSprite> m_textSprite;
entt::entity m_entity;
};
@@ -221,8 +221,8 @@ namespace Nz
struct StyleConfig
{
std::shared_ptr<Material> backgroundHorizontalMaterial;
std::shared_ptr<Material> backgroundVerticalMaterial;
std::shared_ptr<MaterialInstance> backgroundHorizontalMaterial;
std::shared_ptr<MaterialInstance> backgroundVerticalMaterial;
};
private:
@@ -257,10 +257,10 @@ namespace Nz
struct StyleConfig
{
std::shared_ptr<Material> material;
std::shared_ptr<Material> grabbedMaterial;
std::shared_ptr<Material> grabbedHoveredMaterial;
std::shared_ptr<Material> hoveredMaterial;
std::shared_ptr<MaterialInstance> material;
std::shared_ptr<MaterialInstance> grabbedMaterial;
std::shared_ptr<MaterialInstance> grabbedHoveredMaterial;
std::shared_ptr<MaterialInstance> hoveredMaterial;
float cornerSize;
float cornerTexCoords;
};
@@ -270,10 +270,10 @@ namespace Nz
private:
StyleConfig m_config;
std::shared_ptr<Material> m_hoveredMaterial;
std::shared_ptr<Material> m_material;
std::shared_ptr<Material> m_pressedMaterial;
std::shared_ptr<Material> m_pressedHoveredMaterial;
std::shared_ptr<MaterialInstance> m_hoveredMaterial;
std::shared_ptr<MaterialInstance> m_material;
std::shared_ptr<MaterialInstance> m_pressedMaterial;
std::shared_ptr<MaterialInstance> m_pressedHoveredMaterial;
std::shared_ptr<SlicedSprite> m_sprite;
entt::entity m_entity;
bool m_isHovered;

24
include/Nazara/Widgets/WidgetTheme.hpp
View File

@@ -56,18 +56,18 @@ namespace Nz
struct Config
{
std::shared_ptr<Material> scrollbarButtonDownMaterial;
std::shared_ptr<Material> scrollbarButtonDownHoveredMaterial;
std::shared_ptr<Material> scrollbarButtonDownPressedMaterial;
std::shared_ptr<Material> scrollbarButtonLeftMaterial;
std::shared_ptr<Material> scrollbarButtonLeftHoveredMaterial;
std::shared_ptr<Material> scrollbarButtonLeftPressedMaterial;
std::shared_ptr<Material> scrollbarButtonRightMaterial;
std::shared_ptr<Material> scrollbarButtonRightHoveredMaterial;
std::shared_ptr<Material> scrollbarButtonRightPressedMaterial;
std::shared_ptr<Material> scrollbarButtonUpMaterial;
std::shared_ptr<Material> scrollbarButtonUpHoveredMaterial;
std::shared_ptr<Material> scrollbarButtonUpPressedMaterial;
std::shared_ptr<MaterialInstance> scrollbarButtonDownMaterial;
std::shared_ptr<MaterialInstance> scrollbarButtonDownHoveredMaterial;
std::shared_ptr<MaterialInstance> scrollbarButtonDownPressedMaterial;
std::shared_ptr<MaterialInstance> scrollbarButtonLeftMaterial;
std::shared_ptr<MaterialInstance> scrollbarButtonLeftHoveredMaterial;
std::shared_ptr<MaterialInstance> scrollbarButtonLeftPressedMaterial;
std::shared_ptr<MaterialInstance> scrollbarButtonRightMaterial;
std::shared_ptr<MaterialInstance> scrollbarButtonRightHoveredMaterial;
std::shared_ptr<MaterialInstance> scrollbarButtonRightPressedMaterial;
std::shared_ptr<MaterialInstance> scrollbarButtonUpMaterial;
std::shared_ptr<MaterialInstance> scrollbarButtonUpHoveredMaterial;
std::shared_ptr<MaterialInstance> scrollbarButtonUpPressedMaterial;
float scrollbarButtonCornerSize;
float scrollbarButtonCornerTexcoords;
};

14
include/Nazara/Widgets/Widgets.hpp
View File

@@ -16,7 +16,6 @@
namespace Nz
{
class Material;
class MaterialPass;
class NAZARA_WIDGETS_API Widgets : public ModuleBase<Widgets>
{
@@ -30,21 +29,16 @@ namespace Nz
Widgets(Config config);
~Widgets() = default;
inline const std::shared_ptr<Material>& GetOpaqueMaterial() const;
inline const std::shared_ptr<MaterialPass>& GetOpaqueMaterialPass() const;
inline const std::shared_ptr<Material>& GetTransparentMaterial() const;
inline const std::shared_ptr<MaterialPass>& GetTransparentMaterialPass() const;
inline const std::shared_ptr<MaterialInstance>& GetOpaqueMaterial() const;
inline const std::shared_ptr<MaterialInstance>& GetTransparentMaterial() const;
struct Config {};
private:
void CreateDefaultMaterials();
std::shared_ptr<Material> m_opaqueMaterial;
std::shared_ptr<Material> m_transparentMaterial;
std::shared_ptr<MaterialPass> m_opaqueMaterialPass;
std::shared_ptr<MaterialPass> m_transparentMaterialPass;
std::shared_ptr<MaterialInstance> m_opaqueMaterial;
std::shared_ptr<MaterialInstance> m_transparentMaterial;
static Widgets* s_instance;
};

14
include/Nazara/Widgets/Widgets.inl
View File

@@ -7,25 +7,15 @@
namespace Nz
{
inline const std::shared_ptr<Material>& Widgets::GetOpaqueMaterial() const
inline const std::shared_ptr<MaterialInstance>& Widgets::GetOpaqueMaterial() const
{
return m_opaqueMaterial;
}
inline const std::shared_ptr<MaterialPass>& Widgets::GetOpaqueMaterialPass() const
{
return m_opaqueMaterialPass;
}
inline const std::shared_ptr<Material>& Widgets::GetTransparentMaterial() const
inline const std::shared_ptr<MaterialInstance>& Widgets::GetTransparentMaterial() const
{
return m_transparentMaterial;
}
inline const std::shared_ptr<MaterialPass>& Widgets::GetTransparentMaterialPass() const
{
return m_transparentMaterialPass;
}
}
#include <Nazara/Widgets/DebugOff.hpp>