diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-13 22:48:35 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-13 22:48:35 +0200 |
commit | b735913debff93c1a6444ec731cd4bf99ae2a5c2 (patch) | |
tree | efa532d3b4231e5ffd6df8eddcb0ec8cf5d4b28b /src/graphics/common/color.cpp | |
parent | b5d16ef340208bbe1a76f33f7498fb168f6405b6 (diff) | |
download | colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.tar.gz colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.tar.bz2 colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.zip |
FPOINT -> Math::Point & other math functions
- changed FPOINT to Math::Point and some functions
from math module to the new implementation
- moved old function and FPOINT struct declarations to math3d.cpp
- removed some unused functions in math module
- fixed some #include dependencies
- moved #define STRICT and #define D3D_OVERLOADS to compile options
Diffstat (limited to 'src/graphics/common/color.cpp')
-rw-r--r-- | src/graphics/common/color.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/graphics/common/color.cpp b/src/graphics/common/color.cpp index bc5cf5d..6bffba4 100644 --- a/src/graphics/common/color.cpp +++ b/src/graphics/common/color.cpp @@ -73,8 +73,8 @@ void RGB2HSV(D3DCOLORVALUE src, ColorHSV &dest) { float min, max, delta; - min = Min(src.r, src.g, src.b); - max = Max(src.r, src.g, src.b); + min = Math::Min(src.r, src.g, src.b); + max = Math::Max(src.r, src.g, src.b); dest.v = max; // intensity @@ -114,9 +114,9 @@ void HSV2RGB(ColorHSV src, D3DCOLORVALUE &dest) int i; float f,v,p,q,t; - src.h = Norm(src.h)*360.0f; - src.s = Norm(src.s); - src.v = Norm(src.v); + src.h = Math::Norm(src.h)*360.0f; + src.s = Math::Norm(src.s); + src.v = Math::Norm(src.v); if ( src.s == 0.0f ) // zero saturation? { |