summaryrefslogtreecommitdiffstats
path: root/src/graphics/core/color.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/graphics/core/color.cpp')
-rw-r--r--src/graphics/core/color.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/graphics/core/color.cpp b/src/graphics/core/color.cpp
index f241227..1f9d7a5 100644
--- a/src/graphics/core/color.cpp
+++ b/src/graphics/core/color.cpp
@@ -14,16 +14,19 @@
// * You should have received a copy of the GNU General Public License
// * along with this program. If not, see http://www.gnu.org/licenses/.
-// color.cpp
#include "graphics/core/color.h"
#include "math/func.h"
-Gfx::ColorHSV Gfx::RGB2HSV(Gfx::Color color)
+// Graphics module namespace
+namespace Gfx {
+
+
+ColorHSV RGB2HSV(Color color)
{
- Gfx::ColorHSV result;
+ ColorHSV result;
float min = Math::Min(color.r, color.g, color.b);
float max = Math::Max(color.r, color.g, color.b);
@@ -61,9 +64,9 @@ Gfx::ColorHSV Gfx::RGB2HSV(Gfx::Color color)
return result;
}
-Gfx::Color Gfx::HSV2RGB(Gfx::ColorHSV color)
+Color HSV2RGB(ColorHSV color)
{
- Gfx::Color result;
+ Color result;
color.h = Math::Norm(color.h)*360.0f;
color.s = Math::Norm(color.s);
@@ -101,3 +104,5 @@ Gfx::Color Gfx::HSV2RGB(Gfx::ColorHSV color)
return result;
}
+
+} // namespace Gfx