diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-22 16:31:55 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-22 16:31:55 +0200 |
commit | 8bb223e67955904c14e26a980927d313272ed22b (patch) | |
tree | aa59cbd36f30485af4720f1055ad6be92caf88ef /src/graphics/common/color.h | |
parent | 4531ac88d3c022866d564be40c20593de4c70bfc (diff) | |
download | colobot-8bb223e67955904c14e26a980927d313272ed22b.tar.gz colobot-8bb223e67955904c14e26a980927d313272ed22b.tar.bz2 colobot-8bb223e67955904c14e26a980927d313272ed22b.zip |
Templates for new implementation
- added template of classes/structs for new implementation
- changed #include paths
- updated README files
Diffstat (limited to 'src/graphics/common/color.h')
-rw-r--r-- | src/graphics/common/color.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/graphics/common/color.h b/src/graphics/common/color.h index 1f04594..146e515 100644 --- a/src/graphics/common/color.h +++ b/src/graphics/common/color.h @@ -19,20 +19,23 @@ #pragma once -// TODO namespace Gfx { struct Color { - - float r, g, b, a; - + float r, g, b, a; + + Color(float aR = 0.0f, float aG = 0.0f, float aB = 0.0f, float aA = 0.0f) + : r(aR), g(aG), b(aB), a(aA) {} }; struct ColorHSV { - float h,s,v; + float h, s, v; + + ColorHSV(float aH = 0.0f, float aS = 0.0f, float aV = 0.0f) + : h(aH), s(aS), v(aV) {} }; @@ -40,8 +43,8 @@ long RetColor(float intensity); long RetColor(Color intensity); Color RetColor(long intensity); -void RGB2HSV(Color src, ColorHSV &dest); -void HSV2RGB(ColorHSV src, Color &dest); +void RGB2HSV(Color src, ColorHSV &dest); +void HSV2RGB(ColorHSV src, Color &dest); -}; +}; // namespace Gfx |