Add Progress Bar Widget (#132)
* Started Checkbox Widget (buggy) * Added features * Added enabling feature * Almost finished Checkbox * Bugfix * Bugfixes * Use a better name * Optimizations * Added explicit colors * ... * changed lots of things * Almost finished CheckboxWidget * Almost almost finished * Use better UTF8 box * Edited encode resources script to encode SDK resources * Finished checkbox widget * Forgot to delete old function * Forgot to delete todo comment * Fix Travis compilation * Fix Travis compilation a second time * Fix Travis Compilation a third time * Fix indentation * Fix Files encoding * Moved CheckboxState enum in (new) Enum.hpp * Probably looks like more generated now * Reorder CheckboxWidget members * Reorder checkbox state members * Reorder members 2... * Oops * Reorder members functions * Fix encoding * Fix files encoding * Forgot to fix one file encoding * Fix SDK Server * Fix encoding again -_- * Oops * Added ProgressBarWidget * Finished (?) Progress Bar Widget * Optimize Checkbox Widget * Fix .gitignore * Removed .vs in gitignore * Moved Enums into Widgets folder * Bugfix * Fix Encode Resources script * Remove double line feeds * Rename SetNextState to SwitchToNextState * Added ProgressBarWidget * Finished (?) Progress Bar Widget
This commit is contained in:
S6066
Jérôme Leclercq
parent
4df9c94eb0
commit
81f7e943df
|
|
@ -5,9 +5,10 @@
|
||||||
#ifndef NDK_WIDGETS_GLOBAL_HPP
|
#ifndef NDK_WIDGETS_GLOBAL_HPP
|
||||||
#define NDK_WIDGETS_GLOBAL_HPP
|
#define NDK_WIDGETS_GLOBAL_HPP
|
||||||
|
|
||||||
#include <NDK/Widgets/CheckboxWidget.hpp>
|
|
||||||
#include <NDK/Widgets/ButtonWidget.hpp>
|
#include <NDK/Widgets/ButtonWidget.hpp>
|
||||||
|
#include <NDK/Widgets/CheckboxWidget.hpp>
|
||||||
#include <NDK/Widgets/LabelWidget.hpp>
|
#include <NDK/Widgets/LabelWidget.hpp>
|
||||||
|
#include <NDK/Widgets/ProgressBarWidget.hpp>
|
||||||
#include <NDK/Widgets/TextAreaWidget.hpp>
|
#include <NDK/Widgets/TextAreaWidget.hpp>
|
||||||
|
|
||||||
#endif // NDK_WIDGETS_GLOBAL_HPP
|
#endif // NDK_WIDGETS_GLOBAL_HPP
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,106 @@
|
||||||
|
// Copyright (C) 2017 Samy Bensaid
|
||||||
|
// This file is part of the "Nazara Development Kit"
|
||||||
|
// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#ifndef NDK_WIDGETS_PROGRESSBARWIDGET_HPP
|
||||||
|
#define NDK_WIDGETS_PROGRESSBARWIDGET_HPP
|
||||||
|
|
||||||
|
#include <NDK/Prerequesites.hpp>
|
||||||
|
#include <NDK/BaseWidget.hpp>
|
||||||
|
#include <Nazara/Renderer/Texture.hpp>
|
||||||
|
#include <Nazara/Utility/SimpleTextDrawer.hpp>
|
||||||
|
#include <Nazara/Graphics/Sprite.hpp>
|
||||||
|
#include <Nazara/Graphics/TextSprite.hpp>
|
||||||
|
#include <Nazara/Core/Color.hpp>
|
||||||
|
#include <Nazara/Math/Vector2.hpp>
|
||||||
|
#include <Nazara/Math/Vector3.hpp>
|
||||||
|
|
||||||
|
namespace Ndk
|
||||||
|
{
|
||||||
|
class World;
|
||||||
|
|
||||||
|
class NDK_API ProgressBarWidget : public BaseWidget
|
||||||
|
{
|
||||||
|
friend class Sdk;
|
||||||
|
|
||||||
|
public:
|
||||||
|
ProgressBarWidget(BaseWidget* parent = nullptr);
|
||||||
|
ProgressBarWidget(const ProgressBarWidget&) = delete;
|
||||||
|
ProgressBarWidget(ProgressBarWidget&&) = default;
|
||||||
|
~ProgressBarWidget() = default;
|
||||||
|
|
||||||
|
//virtual ProgressBarWidget* Clone() const = 0;
|
||||||
|
|
||||||
|
inline void EnableText(bool enable = true);
|
||||||
|
inline void EnableBorder(bool enable = true);
|
||||||
|
|
||||||
|
inline bool IsTextEnabled() const;
|
||||||
|
inline bool IsBorderEnabled() const;
|
||||||
|
|
||||||
|
|
||||||
|
inline unsigned GetPercentageValue() const;
|
||||||
|
inline Nz::Vector2f GetProgressBarSize() const;
|
||||||
|
inline Nz::Vector2f GetProgressBarBorderSize() const;
|
||||||
|
inline float GetTextMargin() const;
|
||||||
|
|
||||||
|
|
||||||
|
inline const Nz::Color& GetBarBackgroundColor() const;
|
||||||
|
inline const Nz::Color& GetBarBackgroundCornerColor() const;
|
||||||
|
inline const Nz::Color& GetBarColor() const;
|
||||||
|
inline const Nz::Color& GetBarCornerColor() const;
|
||||||
|
|
||||||
|
inline const Nz::TextureRef& GetBarBackgroundTexture() const;
|
||||||
|
inline const Nz::TextureRef& GetBarTexture() const;
|
||||||
|
|
||||||
|
static const Nz::Color& GetDefaultBarColor();
|
||||||
|
static const Nz::Color& GetDefaultBarCornerColor();
|
||||||
|
static const Nz::Color& GetDefaultBarBackgroundColor();
|
||||||
|
static const Nz::Color& GetDefaultBarBackgroundCornerColor();
|
||||||
|
|
||||||
|
|
||||||
|
inline void SetBarBackgroundColor(const Nz::Color& globalColor, const Nz::Color& cornerColor);
|
||||||
|
inline void SetBarBackgroundTexture(Nz::TextureRef texture, bool resetColors = true);
|
||||||
|
inline void SetBarColor(const Nz::Color& globalColor, const Nz::Color& cornerColor);
|
||||||
|
inline void SetBarTexture(Nz::TextureRef texture, bool resetColors = true);
|
||||||
|
|
||||||
|
|
||||||
|
inline void SetPercentageValue(unsigned percentage);
|
||||||
|
inline void SetTextMargin(float margin);
|
||||||
|
inline void SetTextColor(const Nz::Color& color);
|
||||||
|
|
||||||
|
inline void ResizeToContent() override {}
|
||||||
|
|
||||||
|
NazaraSignal(OnValueChanged, const ProgressBarWidget* /*progressBar*/);
|
||||||
|
|
||||||
|
private:
|
||||||
|
void Layout() override;
|
||||||
|
inline void UpdateText();
|
||||||
|
|
||||||
|
|
||||||
|
EntityHandle m_borderEntity;
|
||||||
|
EntityHandle m_barEntity;
|
||||||
|
EntityHandle m_textEntity;
|
||||||
|
|
||||||
|
static Nz::Color s_borderColor;
|
||||||
|
static Nz::Color s_barBackgroundColor;
|
||||||
|
static Nz::Color s_barBackgroundCornerColor;
|
||||||
|
static Nz::Color s_barColor;
|
||||||
|
static Nz::Color s_barCornerColor;
|
||||||
|
Nz::Color m_textColor;
|
||||||
|
|
||||||
|
Nz::SpriteRef m_borderSprite;
|
||||||
|
Nz::SpriteRef m_barBackgroundSprite;
|
||||||
|
Nz::SpriteRef m_barSprite;
|
||||||
|
Nz::TextSpriteRef m_textSprite;
|
||||||
|
|
||||||
|
static float s_borderScale;
|
||||||
|
float m_textMargin;
|
||||||
|
unsigned m_value;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#include <NDK/Widgets/ProgressBarWidget.inl>
|
||||||
|
|
||||||
|
#endif // NDK_WIDGETS_PROGRESSBARWIDGET_HPP
|
||||||
|
|
@ -0,0 +1,156 @@
|
||||||
|
// Copyright (C) 2017 Samy Bensaid
|
||||||
|
// This file is part of the "Nazara Development Kit"
|
||||||
|
// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
|
||||||
|
|
||||||
|
namespace Ndk
|
||||||
|
{
|
||||||
|
inline void ProgressBarWidget::EnableText(bool enable)
|
||||||
|
{
|
||||||
|
m_textEntity->Enable(enable);
|
||||||
|
Layout();
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void ProgressBarWidget::EnableBorder(bool enable)
|
||||||
|
{
|
||||||
|
m_borderEntity->Enable(enable);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline bool ProgressBarWidget::IsTextEnabled() const
|
||||||
|
{
|
||||||
|
return m_textEntity->IsEnabled();
|
||||||
|
}
|
||||||
|
|
||||||
|
inline bool ProgressBarWidget::IsBorderEnabled() const
|
||||||
|
{
|
||||||
|
return m_borderEntity->IsEnabled();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
inline unsigned ProgressBarWidget::GetPercentageValue() const
|
||||||
|
{
|
||||||
|
return m_value;
|
||||||
|
}
|
||||||
|
|
||||||
|
inline Nz::Vector2f ProgressBarWidget::GetProgressBarSize() const
|
||||||
|
{
|
||||||
|
Nz::Vector3f progressBarSize = m_borderSprite->GetBoundingVolume().obb.localBox.GetLengths();
|
||||||
|
|
||||||
|
if (IsTextEnabled())
|
||||||
|
{
|
||||||
|
Nz::Vector3f textSize = m_textSprite->GetBoundingVolume().obb.localBox.GetLengths();
|
||||||
|
progressBarSize -= { textSize.x + m_textMargin, 0.f, 0.f };
|
||||||
|
}
|
||||||
|
|
||||||
|
return { progressBarSize.x, progressBarSize.y };
|
||||||
|
}
|
||||||
|
|
||||||
|
inline Nz::Vector2f ProgressBarWidget::GetProgressBarBorderSize() const
|
||||||
|
{
|
||||||
|
Nz::Vector2f barSize = GetProgressBarSize();
|
||||||
|
return { barSize.y / s_borderScale, barSize.y / s_borderScale };
|
||||||
|
}
|
||||||
|
|
||||||
|
inline float ProgressBarWidget::GetTextMargin() const
|
||||||
|
{
|
||||||
|
return m_textMargin;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
inline const Nz::Color& ProgressBarWidget::GetBarBackgroundColor() const
|
||||||
|
{
|
||||||
|
return m_barBackgroundSprite->GetColor();
|
||||||
|
}
|
||||||
|
|
||||||
|
inline const Nz::Color& ProgressBarWidget::GetBarBackgroundCornerColor() const
|
||||||
|
{
|
||||||
|
return m_barBackgroundSprite->GetCornerColor(Nz::RectCorner_LeftTop);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline const Nz::Color& ProgressBarWidget::GetBarColor() const
|
||||||
|
{
|
||||||
|
return m_barSprite->GetColor();
|
||||||
|
}
|
||||||
|
|
||||||
|
inline const Nz::Color& ProgressBarWidget::GetBarCornerColor() const
|
||||||
|
{
|
||||||
|
return m_barSprite->GetCornerColor(Nz::RectCorner_LeftTop);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
inline const Nz::TextureRef& ProgressBarWidget::GetBarBackgroundTexture() const
|
||||||
|
{
|
||||||
|
return m_barBackgroundSprite->GetMaterial()->GetDiffuseMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
inline const Nz::TextureRef& ProgressBarWidget::GetBarTexture() const
|
||||||
|
{
|
||||||
|
return m_barSprite->GetMaterial()->GetDiffuseMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
inline void ProgressBarWidget::SetBarBackgroundColor(const Nz::Color& globalColor, const Nz::Color& cornerColor)
|
||||||
|
{
|
||||||
|
m_barBackgroundSprite->SetColor(globalColor);
|
||||||
|
m_barBackgroundSprite->SetCornerColor(Nz::RectCorner_LeftTop, cornerColor);
|
||||||
|
m_barBackgroundSprite->SetCornerColor(Nz::RectCorner_RightTop, cornerColor);
|
||||||
|
m_barBackgroundSprite->SetCornerColor(Nz::RectCorner_LeftBottom, globalColor);
|
||||||
|
m_barBackgroundSprite->SetCornerColor(Nz::RectCorner_RightBottom, globalColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void ProgressBarWidget::SetBarBackgroundTexture(Nz::TextureRef texture, bool resetColors)
|
||||||
|
{
|
||||||
|
m_barBackgroundSprite->SetTexture(texture, false);
|
||||||
|
|
||||||
|
if (resetColors)
|
||||||
|
SetBarBackgroundColor(Nz::Color::White, Nz::Color::White);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void ProgressBarWidget::SetBarColor(const Nz::Color& globalColor, const Nz::Color& cornerColor)
|
||||||
|
{
|
||||||
|
m_barSprite->SetColor(globalColor);
|
||||||
|
m_barSprite->SetCornerColor(Nz::RectCorner_LeftTop, cornerColor);
|
||||||
|
m_barSprite->SetCornerColor(Nz::RectCorner_RightTop, cornerColor);
|
||||||
|
m_barSprite->SetCornerColor(Nz::RectCorner_LeftBottom, globalColor);
|
||||||
|
m_barSprite->SetCornerColor(Nz::RectCorner_RightBottom, globalColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void ProgressBarWidget::SetBarTexture(Nz::TextureRef texture, bool resetColors)
|
||||||
|
{
|
||||||
|
m_barSprite->SetTexture(texture, false);
|
||||||
|
|
||||||
|
if (resetColors)
|
||||||
|
SetBarColor(Nz::Color::White, Nz::Color::White);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
inline void ProgressBarWidget::SetPercentageValue(unsigned percentage)
|
||||||
|
{
|
||||||
|
m_value = percentage;
|
||||||
|
OnValueChanged(this);
|
||||||
|
Layout();
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void ProgressBarWidget::SetTextMargin(float margin)
|
||||||
|
{
|
||||||
|
m_textMargin = margin;
|
||||||
|
|
||||||
|
if (IsTextEnabled())
|
||||||
|
Layout();
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void ProgressBarWidget::SetTextColor(const Nz::Color& color)
|
||||||
|
{
|
||||||
|
m_textColor = color;
|
||||||
|
UpdateText();
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void ProgressBarWidget::UpdateText()
|
||||||
|
{
|
||||||
|
if (IsTextEnabled())
|
||||||
|
{
|
||||||
|
Nz::Vector2f size = GetContentSize();
|
||||||
|
m_textSprite->Update(Nz::SimpleTextDrawer::Draw(Nz::String::Number(m_value).Append('%'),
|
||||||
|
static_cast<unsigned>(std::min(size.x, size.y) / 2.f), 0u, m_textColor));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,104 @@
|
||||||
|
// Copyright (C) 2017 Samy Bensaid
|
||||||
|
// This file is part of the "Nazara Development Kit"
|
||||||
|
// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
|
||||||
|
|
||||||
|
#include <NDK/World.hpp>
|
||||||
|
#include <NDK/Widgets/ProgressBarWidget.hpp>
|
||||||
|
#include <Nazara/Utility/Image.hpp>
|
||||||
|
#include <NDK/Components/NodeComponent.hpp>
|
||||||
|
#include <NDK/Components/GraphicsComponent.hpp>
|
||||||
|
|
||||||
|
namespace Ndk
|
||||||
|
{
|
||||||
|
float ProgressBarWidget::s_borderScale { 16.f };
|
||||||
|
Nz::Color ProgressBarWidget::s_borderColor { Nz::Color::Black };
|
||||||
|
Nz::Color ProgressBarWidget::s_barBackgroundColor { Nz::Color { 225, 225, 225 } };
|
||||||
|
Nz::Color ProgressBarWidget::s_barBackgroundCornerColor { Nz::Color { 255, 255, 255 } };
|
||||||
|
Nz::Color ProgressBarWidget::s_barColor { Nz::Color { 0, 225, 0 } };
|
||||||
|
Nz::Color ProgressBarWidget::s_barCornerColor { Nz::Color { 220, 255, 220 } };
|
||||||
|
|
||||||
|
ProgressBarWidget::ProgressBarWidget(BaseWidget* parent) :
|
||||||
|
BaseWidget(parent),
|
||||||
|
m_textColor { Nz::Color::Black },
|
||||||
|
m_textMargin { 16.f },
|
||||||
|
m_value { 0u }
|
||||||
|
{
|
||||||
|
m_borderSprite = Nz::Sprite::New(Nz::Material::New("Basic2D"));
|
||||||
|
m_barBackgroundSprite = Nz::Sprite::New(Nz::Material::New("Basic2D"));
|
||||||
|
m_barSprite = Nz::Sprite::New(Nz::Material::New("Basic2D"));
|
||||||
|
|
||||||
|
m_borderSprite->SetColor(s_borderColor);
|
||||||
|
SetBarBackgroundColor(s_barBackgroundColor, s_barBackgroundCornerColor);
|
||||||
|
SetBarColor(s_barColor, s_barCornerColor);
|
||||||
|
|
||||||
|
|
||||||
|
m_borderEntity = CreateEntity();
|
||||||
|
m_borderEntity->AddComponent<NodeComponent>().SetParent(this);
|
||||||
|
m_borderEntity->AddComponent<GraphicsComponent>().Attach(m_borderSprite);
|
||||||
|
|
||||||
|
m_barEntity = CreateEntity();
|
||||||
|
m_barEntity->AddComponent<NodeComponent>().SetParent(this);
|
||||||
|
GraphicsComponent& graphics = m_barEntity->AddComponent<GraphicsComponent>();
|
||||||
|
|
||||||
|
graphics.Attach(m_barBackgroundSprite, 1);
|
||||||
|
graphics.Attach(m_barSprite, 2);
|
||||||
|
|
||||||
|
|
||||||
|
m_textSprite = Nz::TextSprite::New();
|
||||||
|
m_textEntity = CreateEntity();
|
||||||
|
|
||||||
|
m_textEntity->AddComponent<NodeComponent>().SetParent(this);
|
||||||
|
m_textEntity->AddComponent<GraphicsComponent>().Attach(m_textSprite);
|
||||||
|
|
||||||
|
UpdateText();
|
||||||
|
Layout();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const Nz::Color& ProgressBarWidget::GetDefaultBarColor()
|
||||||
|
{
|
||||||
|
return s_barColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
const Nz::Color& ProgressBarWidget::GetDefaultBarCornerColor()
|
||||||
|
{
|
||||||
|
return s_barCornerColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
const Nz::Color& ProgressBarWidget::GetDefaultBarBackgroundColor()
|
||||||
|
{
|
||||||
|
return s_barBackgroundColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
const Nz::Color& ProgressBarWidget::GetDefaultBarBackgroundCornerColor()
|
||||||
|
{
|
||||||
|
return s_barBackgroundCornerColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void ProgressBarWidget::Layout()
|
||||||
|
{
|
||||||
|
Nz::Vector2f origin = GetContentOrigin();
|
||||||
|
Nz::Vector2f size = GetContentSize();
|
||||||
|
Nz::Vector2f progressBarSize = size;
|
||||||
|
|
||||||
|
if (IsTextEnabled())
|
||||||
|
{
|
||||||
|
UpdateText();
|
||||||
|
|
||||||
|
Nz::Vector3f textSize = m_textSprite->GetBoundingVolume().obb.localBox.GetLengths();
|
||||||
|
m_textEntity->GetComponent<NodeComponent>().SetPosition(origin.x + size.x - textSize.x, origin.y + size.y / 2.f - textSize.y);
|
||||||
|
|
||||||
|
progressBarSize -= { textSize.x + m_textMargin, 0.f };
|
||||||
|
}
|
||||||
|
|
||||||
|
m_borderSprite->SetSize(progressBarSize);
|
||||||
|
Nz::Vector2f borderSize = GetProgressBarBorderSize();
|
||||||
|
|
||||||
|
m_barBackgroundSprite->SetSize(progressBarSize - (borderSize * 2.f));
|
||||||
|
m_barSprite->SetSize((progressBarSize.x - (borderSize.x * 2.f)) / 100.f * static_cast<float>(m_value), progressBarSize.y - (borderSize.y * 2.f));
|
||||||
|
|
||||||
|
m_borderEntity->GetComponent<NodeComponent>().SetPosition(origin.x, origin.y);
|
||||||
|
m_barEntity->GetComponent<NodeComponent>().SetPosition(origin.x + borderSize.x, origin.y + borderSize.y);
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue