nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

colour: use floats for values

Browse Source 
double is way too much precision for almost every application. we can
always add more templates or other insanity later.
This commit is contained in:
Danny Robson 2014-12-16 15:12:44 +11:00
parent 5956d0421e
commit 6f23e39459
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
colour.cpp
View File

@ -28,12 +28,12 @@ using namespace util;
//-----------------------------------------------------------------------------
const util::colour util::colour::WHITE ({ 1.0, 1.0, 1.0, 1.0 });
const util::colour util::colour::BLACK ({ 0.0, 0.0, 0.0, 1.0 });
const util::colour util::colour::WHITE ({ 1, 1, 1, 1 });
const util::colour util::colour::BLACK ({ 0, 0, 0, 1 });
const util::colour util::colour::RED ({ 1.0, 0.0, 0.0, 1.0 });
const util::colour util::colour::GREEN ({ 0.0, 1.0, 0.0, 1.0 });
const util::colour util::colour::BLUE ({ 0.0, 0.0, 1.0, 1.0 });
const util::colour util::colour::RED ({ 1, 0, 0, 1 });
const util::colour util::colour::GREEN ({ 0, 1, 0, 1 });
const util::colour util::colour::BLUE ({ 0, 0, 1, 1 });
//-----------------------------------------------------------------------------
@ -43,14 +43,14 @@ const util::colour util::colour::BLUE ({ 0.0, 0.0, 1.0, 1.0 });
//! json::type_error.
const json::node&
operator>> (const json::node &node, colour &c) {
c.red = node[0].as_number ();
c.green = node[1].as_number ();
c.blue = node[2].as_number ();
c.red = static_cast<float> (node[0].as_number ());
c.green = static_cast<float> (node[1].as_number ());
c.blue = static_cast<float> (node[2].as_number ());
try {
c.alpha = node[3].as_number ();
c.alpha = static_cast<float> (node[3].as_number ());
} catch (...) {
c.alpha = 1.0;
c.alpha = 1;
}
return node;
@ -62,10 +62,10 @@ namespace util {
template<>
colour
random (void) {
return colour ({ range<double>::UNIT.random (),
range<double>::UNIT.random (),
range<double>::UNIT.random (),
range<double>::UNIT.random () });
return colour ({ range<float>::UNIT.random (),
range<float>::UNIT.random (),
range<float>::UNIT.random (),
range<float>::UNIT.random () });
}
template <>
@ -77,7 +77,7 @@ namespace util {
//-----------------------------------------------------------------------------
std::ostream&
operator<< (std::ostream &os, const util::colour &c) {
util::operator<< (std::ostream &os, const util::colour &c) {
os << "colour(" << c.red << ", " << c.green << ", " << c.blue << ", " << c.alpha << ")";
return os;
}

13
colour.hpp
View File

@ -27,10 +27,10 @@
namespace util {
/// An RGBA colour POD type.
struct colour {
double red;
double green;
double blue;
double alpha;
float red;
float green;
float blue;
float alpha;
static const colour WHITE;
static const colour BLACK;
@ -39,9 +39,8 @@ namespace util {
static const colour GREEN;
};
std::ostream& operator<< (std::ostream&, const util::colour&);
const json::node& operator>> (const json::node&, util::colour&);
}
std::ostream& operator<< (std::ostream&, const util::colour&);
const json::node& operator>> (const json::node&, util::colour&);
#endif