diff options
author | Stijn Buys <ingar@osirion.org> | 2008-02-21 21:01:17 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2008-02-21 21:01:17 +0000 |
commit | 71b6b902732bfc0c53033d58f91a6b1e70e8371f (patch) | |
tree | 0ff75879667ff985c9d69f8057727f6c805ad8b4 /src/math | |
parent | 8aa04fc836116a58f8ffd1e0c3539b9ea8a94ddf (diff) |
more minor updates
Diffstat (limited to 'src/math')
-rw-r--r-- | src/math/color.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/math/color.cc b/src/math/color.cc index 9a07b7c..05f3b4c 100644 --- a/src/math/color.cc +++ b/src/math/color.cc @@ -91,7 +91,7 @@ Color operator*(float scalar, const Color& color) } std::ostream &operator<<(std::ostream &os, const Color &c) { - os << c.red() << " " << c.green() << " " << c.blue() << " " << c.alpha(); + os << c.red() << " " << c.green() << " " << c.blue(); // << " " << c.alpha(); return os; } @@ -101,7 +101,8 @@ std::istream &operator>>(std::istream & is, Color & color) is >> r; is >> g; is >> b; - is >> a; + //is >> a; + a = 1.0; color = Color(r,g,b,a); return (is); } |