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

Core: Make Color constexpr

Browse Source
This commit is contained in:
SirLynix
2022-12-29 12:13:00 +01:00
parent 3d88746060
commit 9a553e5e9d
38 changed files with 227 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Utility/Formats/MTLParser.hpp
View File

@@ -35,9 +35,9 @@ namespace Nz
struct Material
{
Color ambient = Color::White;
Color diffuse = Color::White;
Color specular = Color::White;
Color ambient = Color::White();
Color diffuse = Color::White();
Color specular = Color::White();
std::string alphaMap;
std::string ambientMap;
std::string bumpMap;

4
include/Nazara/Utility/SimpleTextDrawer.hpp
View File

@@ -60,9 +60,9 @@ namespace Nz
inline SimpleTextDrawer& operator=(const SimpleTextDrawer& drawer);
inline SimpleTextDrawer& operator=(SimpleTextDrawer&& drawer) noexcept;
static inline SimpleTextDrawer Draw(const std::string& str, unsigned int characterSize, TextStyleFlags style = TextStyle_Regular, const Color& color = Color::White);
static inline SimpleTextDrawer Draw(const std::string& str, unsigned int characterSize, TextStyleFlags style = TextStyle_Regular, const Color& color = Color::White());
static inline SimpleTextDrawer Draw(const std::string& str, unsigned int characterSize, TextStyleFlags style, const Color& color, float outlineThickness, const Color& outlineColor);
static inline SimpleTextDrawer Draw(const std::shared_ptr<Font>& font, const std::string& str, unsigned int characterSize, TextStyleFlags style = TextStyle_Regular, const Color& color = Color::White);
static inline SimpleTextDrawer Draw(const std::shared_ptr<Font>& font, const std::string& str, unsigned int characterSize, TextStyleFlags style = TextStyle_Regular, const Color& color = Color::White());
static inline SimpleTextDrawer Draw(const std::shared_ptr<Font>& font, const std::string& str, unsigned int characterSize, TextStyleFlags style, const Color& color, float outlineThickness, const Color& outlineColor);
private:

4
include/Nazara/Utility/SimpleTextDrawer.inl
View File

@@ -8,8 +8,8 @@
namespace Nz
{
inline SimpleTextDrawer::SimpleTextDrawer() :
m_color(Color::White),
m_outlineColor(Color::Black),
m_color(Color::White()),
m_outlineColor(Color::Black()),
m_style(TextStyle_Regular),
m_colorUpdated(true),
m_glyphUpdated(true),