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

2
include/Nazara/Graphics/Camera.inl
View File

@@ -10,7 +10,7 @@ namespace Nz
{
inline Camera::Camera(const RenderTarget* renderTarget, ProjectionType projectionType) :
m_renderTarget(nullptr),
m_clearColor(Color::Black),
m_clearColor(Color::Black()),
m_fov(90.f),
m_renderOrder(0),
m_projectionType(projectionType),

2
include/Nazara/Graphics/DirectionalLight.inl
View File

@@ -11,7 +11,7 @@ namespace Nz
{
inline DirectionalLight::DirectionalLight() :
Light(SafeCast<UInt8>(BasicLightType::Directional)),
m_color(Color::White),
m_color(Color::White()),
m_ambientFactor(0.2f),
m_diffuseFactor(1.f)
{

2
include/Nazara/Graphics/PointLight.inl
View File

@@ -11,7 +11,7 @@ namespace Nz
{
inline PointLight::PointLight() :
Light(SafeCast<UInt8>(BasicLightType::Point)),
m_color(Color::White),
m_color(Color::White()),
m_position(Vector3f::Zero()),
m_ambientFactor(0.2f),
m_diffuseFactor(1.f)

2
include/Nazara/Graphics/SpotLight.inl
View File

@@ -11,7 +11,7 @@ namespace Nz
{
inline SpotLight::SpotLight() :
Light(SafeCast<UInt8>(BasicLightType::Spot)),
m_color(Color::White),
m_color(Color::White()),
m_position(Vector3f::Zero()),
m_ambientFactor(0.2f),
m_diffuseFactor(1.f)

14
include/Nazara/Graphics/Tilemap.hpp
View File

@@ -37,12 +37,12 @@ namespace Nz
inline void EnableIsometricMode(bool isometric);
inline void EnableTile(const Vector2ui& tilePos, const Rectf& coords, const Color& color = Color::White, std::size_t materialIndex = 0U);
inline void EnableTile(const Vector2ui& tilePos, const Rectui& rect, const Color& color = Color::White, std::size_t materialIndex = 0U);
inline void EnableTiles(const Rectf& coords, const Color& color = Color::White, std::size_t materialIndex = 0U);
inline void EnableTiles(const Rectui& rect, const Color& color = Color::White, std::size_t materialIndex = 0U);
inline void EnableTiles(const Vector2ui* tilesPos, std::size_t tileCount, const Rectf& coords, const Color& color = Color::White, std::size_t materialIndex = 0U);
inline void EnableTiles(const Vector2ui* tilesPos, std::size_t tileCount, const Rectui& rect, const Color& color = Color::White, std::size_t materialIndex = 0U);
inline void EnableTile(const Vector2ui& tilePos, const Rectf& coords, const Color& color = Color::White(), std::size_t materialIndex = 0U);
inline void EnableTile(const Vector2ui& tilePos, const Rectui& rect, const Color& color = Color::White(), std::size_t materialIndex = 0U);
inline void EnableTiles(const Rectf& coords, const Color& color = Color::White(), std::size_t materialIndex = 0U);
inline void EnableTiles(const Rectui& rect, const Color& color = Color::White(), std::size_t materialIndex = 0U);
inline void EnableTiles(const Vector2ui* tilesPos, std::size_t tileCount, const Rectf& coords, const Color& color = Color::White(), std::size_t materialIndex = 0U);
inline void EnableTiles(const Vector2ui* tilesPos, std::size_t tileCount, const Rectui& rect, const Color& color = Color::White(), std::size_t materialIndex = 0U);
inline const Vector2ui& GetMapSize() const;
const std::shared_ptr<MaterialInstance>& GetMaterial(std::size_t i) const override;
@@ -60,7 +60,7 @@ namespace Nz
struct Tile
{
std::size_t layerIndex = 0U;
Color color = Color::White;
Color color = Color::White();
Rectf textureCoords = Rectf::Zero();
bool enabled = false;
};