fixed naming

This commit is contained in:
2024-09-03 21:28:05 +03:00
parent a2ec1ef418
commit cb8c720f03
4 changed files with 12 additions and 14 deletions

View File

@@ -9,7 +9,7 @@
#include "omath/Vector4.h"
namespace omath::color
namespace omath
{
struct HSV
{
@@ -27,8 +27,10 @@ namespace omath::color
Clamp(0.f, 1.f);
}
explicit Color()
;
constexpr explicit Color() : Vector4()
{
}
[[nodiscard]]
constexpr static Color FromRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
{

View File

@@ -14,7 +14,7 @@ namespace omath
public:
float w;
constexpr Vector4(float x = 0.f, float y = 0.f, float z = 0.f, float w = 0.f) : Vector3(x, y, z), w(w) {}
constexpr Vector4(float x, float y, float z, float w) : Vector3(x, y, z), w(w) {}
constexpr Vector4() : Vector3(), w(0.f) {};
[[nodiscard]]

View File

@@ -2,16 +2,12 @@
// Created by vlad on 2/4/24.
//
#include "omath/color.h"
#include "omath/Color.h"
#include <algorithm>
#include <cmath>
namespace omath::color
namespace omath
{
Color::Color() : Vector4(0.f, 0.f, 0.f, 0.f)
{
}
}

View File

@@ -5,7 +5,7 @@
#include <omath/Color.h>
using namespace omath::color;
using namespace omath;
class UnitTestColor : public ::testing::Test
{
@@ -104,9 +104,9 @@ TEST_F(UnitTestColor, PredefinedColors)
// Test non-member function: Blend for Vector3
TEST_F(UnitTestColor, BlendVector3)
{
constexpr omath::color::Color v1(1.0f, 0.0f, 0.0f, 1.f); // Red
constexpr omath::color::Color v2(0.0f, 1.0f, 0.0f, 1.f); // Green
constexpr omath::color::Color blended = Blend(v1, v2, 0.5f);
constexpr Color v1(1.0f, 0.0f, 0.0f, 1.f); // Red
constexpr Color v2(0.0f, 1.0f, 0.0f, 1.f); // Green
constexpr Color blended = Blend(v1, v2, 0.5f);
EXPECT_FLOAT_EQ(blended.x, 0.5f);
EXPECT_FLOAT_EQ(blended.y, 0.5f);
EXPECT_FLOAT_EQ(blended.z, 0.0f);