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

added color

Browse Source
This commit is contained in:
Orange
2024-05-07 02:12:16 +03:00
parent f5105ad366
commit f996f10b4c
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/uml/color.h
View File

@@ -3,11 +3,20 @@
// //
#pragma once #pragma once
#include "uml/Vector3.h" #include "uml/Vector3.h"
#include <cstdint> #include <cstdint>
#include "uml/Vector4.h"
namespace uml::color namespace uml::color
{ {
[[nodiscard]] [[nodiscard]]
Vector3 Blend(const Vector3& first, const Vector3& second, float ratio); Vector3 Blend(const Vector3& first, const Vector3& second, float ratio);
class Color : public Vector4
{
public:
[[nodiscard]] Color Blend(const Color& other, float ratio) const;
};
} }

10
source/color.cpp
View File

@@ -3,11 +3,17 @@
// //
#include "uml/color.h" #include "uml/color.h"
#include <algorithm>
namespace uml::color namespace uml::color
{ {
Vector3 Blend(const uml::Vector3 &first, const uml::Vector3 &second, float ratio) Vector3 Blend(const Vector3 &first, const Vector3 &second, float ratio)
{ {
return first * (1.f - ratio) + second * ratio; return first * (1.f - std::clamp(ratio, 0.f, 1.f)) + second * ratio;
}
Color Color::Blend(const Color &other, float ratio) const
{
} }
} }