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

Widgets: Improve theme

Browse Source 
- move simple styles classes ton their own file
- add button hovered texture
- add button hovered/pressed texture
- add label style
This commit is contained in:
Jérôme Leclercq
2021-11-30 12:42:05 +01:00
parent b20897a2fb
commit 461a06ab8c
10 changed files with 343 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
src/Nazara/Widgets/DefaultWidgetTheme.cpp
View File

@@ -6,10 +6,7 @@
#include <Nazara/Graphics/BasicMaterial.hpp>
#include <Nazara/Graphics/Material.hpp>
#include <Nazara/Graphics/MaterialPass.hpp>
#include <Nazara/Graphics/Components/GraphicsComponent.hpp>
#include <Nazara/Utility/Components/NodeComponent.hpp>
#include <Nazara/Widgets/ButtonWidget.hpp>
#include <Nazara/Widgets/Canvas.hpp>
#include <Nazara/Widgets/SimpleWidgetStyles.hpp>
#include <Nazara/Widgets/Widgets.hpp>
#include <Nazara/Widgets/Debug.hpp>
@@ -21,9 +18,17 @@ namespace Nz
#include <Nazara/Widgets/Resources/DefaultStyle/Button.png.h>
};
const UInt8 ButtonHoveredImage[] = {
#include <Nazara/Widgets/Resources/DefaultStyle/ButtonHovered.png.h>
};
const UInt8 ButtonPressedImage[] = {
#include <Nazara/Widgets/Resources/DefaultStyle/ButtonPressed.png.h>
};
const UInt8 ButtonPressedHoveredImage[] = {
#include <Nazara/Widgets/Resources/DefaultStyle/ButtonPressedHovered.png.h>
};
}
DefaultWidgetTheme::DefaultWidgetTheme()
@@ -32,90 +37,35 @@ namespace Nz
texParams.renderDevice = Graphics::Instance()->GetRenderDevice();
texParams.loadFormat = PixelFormat::RGBA8_SRGB;
auto CreateMaterialFromTexture = [](std::shared_ptr<Texture> texture)
{
std::shared_ptr<MaterialPass> buttonMaterialPass = std::make_shared<MaterialPass>(BasicMaterial::GetSettings());
buttonMaterialPass->EnableDepthBuffer(true);
buttonMaterialPass->EnableDepthWrite(false);
std::shared_ptr<Material> material = std::make_shared<Material>();
material->AddPass("ForwardPass", buttonMaterialPass);
BasicMaterial buttonBasicMat(*buttonMaterialPass);
buttonBasicMat.SetDiffuseMap(texture);
return material;
};
// Button material
{
std::shared_ptr<MaterialPass> buttonMaterialPass = std::make_shared<MaterialPass>(BasicMaterial::GetSettings());
buttonMaterialPass->EnableDepthBuffer(true);
buttonMaterialPass->EnableDepthWrite(false);
m_buttonMaterial = std::make_shared<Material>();
m_buttonMaterial->AddPass("ForwardPass", buttonMaterialPass);
BasicMaterial buttonBasicMat(*buttonMaterialPass);
buttonBasicMat.SetDiffuseMap(Texture::LoadFromMemory(ButtonImage, sizeof(ButtonImage), texParams));
}
// Button (pressed) material
{
std::shared_ptr<MaterialPass> buttonMaterialPass = std::make_shared<MaterialPass>(BasicMaterial::GetSettings());
buttonMaterialPass->EnableDepthBuffer(true);
buttonMaterialPass->EnableDepthWrite(false);
m_pressedButtonMaterial = std::make_shared<Material>();
m_pressedButtonMaterial->AddPass("ForwardPass", buttonMaterialPass);
BasicMaterial buttonBasicMat(*buttonMaterialPass);
buttonBasicMat.SetDiffuseMap(Texture::LoadFromMemory(ButtonPressedImage, sizeof(ButtonPressedImage), texParams));
}
m_buttonMaterial = CreateMaterialFromTexture(Texture::LoadFromMemory(ButtonImage, sizeof(ButtonImage), texParams));
m_hoveredButtonMaterial = CreateMaterialFromTexture(Texture::LoadFromMemory(ButtonHoveredImage, sizeof(ButtonHoveredImage), texParams));
m_pressedButtonMaterial = CreateMaterialFromTexture(Texture::LoadFromMemory(ButtonPressedImage, sizeof(ButtonPressedImage), texParams));
m_pressedHoveredMaterial = CreateMaterialFromTexture(Texture::LoadFromMemory(ButtonPressedHoveredImage, sizeof(ButtonPressedHoveredImage), texParams));
}
std::unique_ptr<ButtonWidgetStyle> DefaultWidgetTheme::CreateStyle(ButtonWidget* buttonWidget) const
{
return std::make_unique<DefaultButtonWidgetStyle>(buttonWidget, m_buttonMaterial, m_pressedButtonMaterial);
return std::make_unique<SimpleButtonWidgetStyle>(buttonWidget, m_buttonMaterial, m_hoveredButtonMaterial, m_pressedButtonMaterial, m_pressedHoveredMaterial);
}
DefaultButtonWidgetStyle::DefaultButtonWidgetStyle(ButtonWidget* buttonWidget, std::shared_ptr<Material> defaultMaterial, std::shared_ptr<Material> pressedMaterial) :
ButtonWidgetStyle(buttonWidget),
m_defaultMaterial(std::move(defaultMaterial)),
m_pressedMaterial(std::move(pressedMaterial))
std::unique_ptr<LabelWidgetStyle> DefaultWidgetTheme::CreateStyle(LabelWidget* buttonWidget) const
{
auto& registry = GetRegistry();
UInt32 renderMask = GetRenderMask();
m_sprite = std::make_shared<SlicedSprite>(m_defaultMaterial);
m_gradientEntity = CreateEntity();
registry.emplace<NodeComponent>(m_gradientEntity).SetParent(buttonWidget);
registry.emplace<GraphicsComponent>(m_gradientEntity).AttachRenderable(m_sprite, renderMask);
m_textSprite = std::make_shared<TextSprite>(Widgets::Instance()->GetTransparentMaterial());
m_textEntity = CreateEntity();
registry.emplace<NodeComponent>(m_textEntity).SetParent(buttonWidget);
registry.emplace<GraphicsComponent>(m_textEntity).AttachRenderable(m_textSprite, renderMask);
}
void DefaultButtonWidgetStyle::Layout(const Vector2f& size)
{
m_sprite->SetSize(size);
entt::registry& registry = GetRegistry();
Boxf textBox = m_textSprite->GetAABB();
registry.get<NodeComponent>(m_textEntity).SetPosition(size.x / 2.f - textBox.width / 2.f, size.y / 2.f - textBox.height / 2.f);
}
void DefaultButtonWidgetStyle::OnHoverBegin()
{
}
void DefaultButtonWidgetStyle::OnHoverEnd()
{
m_sprite->SetMaterial(m_defaultMaterial);
}
void DefaultButtonWidgetStyle::OnPress()
{
m_sprite->SetMaterial(m_pressedMaterial);
}
void DefaultButtonWidgetStyle::OnRelease()
{
m_sprite->SetMaterial(m_defaultMaterial);
}
void DefaultButtonWidgetStyle::UpdateText(const AbstractTextDrawer& drawer)
{
m_textSprite->Update(drawer);
return std::make_unique<SimpleLabelWidgetStyle>(buttonWidget, Widgets::Instance()->GetTransparentMaterial());
}
}

34
src/Nazara/Widgets/LabelWidget.cpp
View File

@@ -5,6 +5,7 @@
#include <Nazara/Widgets/LabelWidget.hpp>
#include <Nazara/Graphics/BasicMaterial.hpp>
#include <Nazara/Graphics/Components/GraphicsComponent.hpp>
#include <Nazara/Utility/AbstractTextDrawer.hpp>
#include <Nazara/Utility/Components/NodeComponent.hpp>
#include <Nazara/Widgets/Canvas.hpp>
#include <Nazara/Widgets/Widgets.hpp>
@@ -15,18 +16,29 @@ namespace Nz
LabelWidget::LabelWidget(BaseWidget* parent) :
BaseWidget(parent)
{
m_textSprite = std::make_shared<TextSprite>(Widgets::Instance()->GetTransparentMaterial());
auto& registry = GetRegistry();
m_entity = CreateEntity();
auto& gfxComponent = registry.emplace<GraphicsComponent>(m_entity, IsVisible());
gfxComponent.AttachRenderable(m_textSprite, GetCanvas()->GetRenderMask());
auto& nodeComponent = registry.emplace<NodeComponent>(m_entity);
nodeComponent.SetParent(this);
m_style = GetTheme()->CreateStyle(this);
Layout();
}
void LabelWidget::UpdateText(const AbstractTextDrawer& drawer, float scale)
{
m_style->UpdateText(drawer);
Vector2f size(drawer.GetBounds().GetLengths());
SetMinimumSize(size);
SetPreferredSize(size + Vector2f(20.f, 10.f));
Layout();
}
void LabelWidget::OnMouseEnter()
{
m_style->OnHoverBegin();
}
void LabelWidget::OnMouseExit()
{
m_style->OnHoverEnd();
}
}

138
src/Nazara/Widgets/SimpleWidgetStyles.cpp Normal file
View File

@@ -0,0 +1,138 @@
// Copyright (C) 2021 Jérôme "Lynix" Leclercq (lynix680@gmail.com)
// This file is part of the "Nazara Engine - Widgets module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Widgets/SimpleWidgetStyles.hpp>
#include <Nazara/Graphics/Components/GraphicsComponent.hpp>
#include <Nazara/Utility/Components/NodeComponent.hpp>
#include <Nazara/Widgets/ButtonWidget.hpp>
#include <Nazara/Widgets/Canvas.hpp>
#include <Nazara/Widgets/LabelWidget.hpp>
#include <Nazara/Widgets/Widgets.hpp>
#include <Nazara/Widgets/Debug.hpp>
namespace Nz
{
SimpleButtonWidgetStyle::SimpleButtonWidgetStyle(ButtonWidget* buttonWidget, std::shared_ptr<Material> material, std::shared_ptr<Material> hoveredMaterial, std::shared_ptr<Material> pressedMaterial, std::shared_ptr<Material> pressedHoveredMaterial) :
ButtonWidgetStyle(buttonWidget),
m_hoveredMaterial(std::move(hoveredMaterial)),
m_material(std::move(material)),
m_pressedMaterial(std::move(pressedMaterial)),
m_pressedHoveredMaterial(std::move(pressedHoveredMaterial)),
m_isHovered(false),
m_isPressed(false)
{
assert(m_material);
auto& registry = GetRegistry();
UInt32 renderMask = GetRenderMask();
m_sprite = std::make_shared<SlicedSprite>(m_material);
m_textSprite = std::make_shared<TextSprite>(Widgets::Instance()->GetTransparentMaterial());
m_spriteEntity = CreateGraphicsEntity();
registry.get<GraphicsComponent>(m_spriteEntity).AttachRenderable(m_sprite, renderMask);
m_textEntity = CreateGraphicsEntity();
registry.get<GraphicsComponent>(m_textEntity).AttachRenderable(m_textSprite, renderMask);
}
void SimpleButtonWidgetStyle::Layout(const Vector2f& size)
{
m_sprite->SetSize(size);
entt::registry& registry = GetRegistry();
Boxf textBox = m_textSprite->GetAABB();
registry.get<NodeComponent>(m_textEntity).SetPosition(size.x / 2.f - textBox.width / 2.f, size.y / 2.f - textBox.height / 2.f);
}
void SimpleButtonWidgetStyle::OnHoverBegin()
{
m_isHovered = true;
UpdateMaterial(m_isHovered, m_isPressed);
}
void SimpleButtonWidgetStyle::OnHoverEnd()
{
m_isHovered = false;
UpdateMaterial(m_isHovered, m_isPressed);
}
void SimpleButtonWidgetStyle::OnPress()
{
m_isPressed = true;
UpdateMaterial(m_isHovered, m_isPressed);
}
void SimpleButtonWidgetStyle::OnRelease()
{
m_isPressed = false;
UpdateMaterial(m_isHovered, m_isPressed);
}
void SimpleButtonWidgetStyle::UpdateText(const AbstractTextDrawer& drawer)
{
m_textSprite->Update(drawer);
}
void SimpleButtonWidgetStyle::UpdateMaterial(bool hovered, bool pressed)
{
if (pressed && hovered && m_pressedHoveredMaterial)
m_sprite->SetMaterial(m_pressedHoveredMaterial);
else if (pressed && m_pressedMaterial)
m_sprite->SetMaterial(m_pressedMaterial);
else if (hovered && m_hoveredMaterial)
m_sprite->SetMaterial(m_hoveredMaterial);
else
m_sprite->SetMaterial(m_material);
}
SimpleLabelWidgetStyle::SimpleLabelWidgetStyle(LabelWidget* labelWidget, std::shared_ptr<Material> material, std::shared_ptr<Material> hoveredMaterial) :
LabelWidgetStyle(labelWidget),
m_hoveredMaterial(std::move(hoveredMaterial)),
m_material(std::move(material))
{
assert(m_material);
auto& registry = GetRegistry();
UInt32 renderMask = GetRenderMask();
m_textSprite = std::make_shared<TextSprite>(m_material);
m_entity = CreateGraphicsEntity();
registry.get<GraphicsComponent>(m_entity).AttachRenderable(m_textSprite, renderMask);
}
void SimpleLabelWidgetStyle::Layout(const Vector2f& size)
{
entt::registry& registry = GetRegistry();
Boxf textBox = m_textSprite->GetAABB();
registry.get<NodeComponent>(m_entity).SetPosition(size.x / 2.f - textBox.width / 2.f, size.y / 2.f - textBox.height / 2.f);
}
void SimpleLabelWidgetStyle::OnHoverBegin()
{
UpdateMaterial(true);
}
void SimpleLabelWidgetStyle::OnHoverEnd()
{
UpdateMaterial(false);
}
void SimpleLabelWidgetStyle::UpdateMaterial(bool hovered)
{
if (hovered && m_hoveredMaterial)
m_textSprite->SetMaterial(m_hoveredMaterial);
else
m_textSprite->SetMaterial(m_material);
}
void SimpleLabelWidgetStyle::UpdateText(const AbstractTextDrawer& drawer)
{
m_textSprite->Update(drawer);
}
}

23
src/Nazara/Widgets/WidgetTheme.cpp
View File

@@ -3,6 +3,8 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Widgets/WidgetTheme.hpp>
#include <Nazara/Graphics/Components/GraphicsComponent.hpp>
#include <Nazara/Utility/Components/NodeComponent.hpp>
#include <Nazara/Widgets/Canvas.hpp>
#include <Nazara/Widgets/Debug.hpp>
@@ -12,11 +14,23 @@ namespace Nz
BaseWidgetStyle::~BaseWidgetStyle() = default;
entt::entity BaseWidgetStyle::CreateGraphicsEntity()
{
auto& registry = GetRegistry();
entt::entity entity = CreateEntity();
registry.emplace<GraphicsComponent>(entity, m_widgetOwner->IsVisible());
registry.emplace<NodeComponent>(entity).SetParent(m_widgetOwner);
return entity;
}
UInt32 BaseWidgetStyle::GetRenderMask() const
{
return m_widgetOwner->GetCanvas()->GetRenderMask();
}
void ButtonWidgetStyle::OnHoverBegin()
{
}
@@ -32,4 +46,13 @@ namespace Nz
void ButtonWidgetStyle::OnRelease()
{
}
void LabelWidgetStyle::OnHoverBegin()
{
}
void LabelWidgetStyle::OnHoverEnd()
{
}
}