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

Remove unnecessary scalar product for colour

Browse Source
This commit is contained in:
Danny Robson 2012-06-13 14:41:02 +10:00
parent 15a573f3a7
commit 393d380001
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
colour.cpp
View File

@ -20,20 +20,14 @@
#include "colour.hpp" #include "colour.hpp"
#include "range.hpp" #include "range.hpp"
//-----------------------------------------------------------------------------
using namespace util; using namespace util;
colour&
colour::operator*= (double v) {
red *= v;
green *= v;
blue *= v;
alpha *= v;
return *this;
}
//-----------------------------------------------------------------------------
const json::node& const json::node&
util::operator>> (const json::node &node, colour &c) { util::operator>> (const json::node &node, colour &c) {
c.red = node[0].as_number (); c.red = node[0].as_number ();
@ -50,6 +44,7 @@ util::operator>> (const json::node &node, colour &c) {
} }
//-----------------------------------------------------------------------------
namespace util { namespace util {
template<> template<>
colour colour
@ -67,6 +62,7 @@ namespace util {
} }
//-----------------------------------------------------------------------------
std::ostream& std::ostream&
util::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 << ")"; os << "colour(" << c.red << ", " << c.green << ", " << c.blue << ", " << c.alpha << ")";

2
colour.hpp
View File

@ -27,8 +27,6 @@
namespace util { namespace util {
struct colour { struct colour {
colour& operator*= (double);
double red; double red;
double green; double green;
double blue; double blue;