admin/omath
1
0
Fork 0
mirror of https://github.com/orange-cpp/omath.git synced 2026-02-13 07:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed naming

Browse Source
This commit is contained in:
Orange
2024-09-03 21:28:05 +03:00
parent a2ec1ef418
commit cb8c720f03
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/omath/color.h → include/omath/Color.h
View File

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

2
include/omath/Vector4.h
View File

@@ -14,7 +14,7 @@ namespace omath
public: public:
float w; 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) {}; constexpr Vector4() : Vector3(), w(0.f) {};
[[nodiscard]] [[nodiscard]]

8
source/color.cpp
View File

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

8
tests/UnitTestColor.cpp
View File

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