projects
/
mussa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
incorporate drawable and annotations
[mussa.git]
/
alg
/
color.hpp
diff --git
a/alg/color.hpp
b/alg/color.hpp
index abf8b686994ff12c775ce32a3301a51dcada84ec..0c4f3c76759c0c07f1580dcb868ac7f08925a65c 100644
(file)
--- a/
alg/color.hpp
+++ b/
alg/color.hpp
@@
-1,12
+1,17
@@
#ifndef _GLCOLOR_H_
#define _GLCOLOR_H_
#ifndef _GLCOLOR_H_
#define _GLCOLOR_H_
+#include <boost/shared_ptr.hpp>
+
#include <boost/serialization/export.hpp>
#include <boost/serialization/nvp.hpp>
#include <boost/serialization/version.hpp>
#include <ostream>
#include <boost/serialization/export.hpp>
#include <boost/serialization/nvp.hpp>
#include <boost/serialization/version.hpp>
#include <ostream>
+class Color;
+typedef boost::shared_ptr<Color> ColorRef;
+
//! convienece class for handling opengl colors
class Color
{
//! convienece class for handling opengl colors
class Color
{
@@
-15,6
+20,7
@@
public:
Color(const Color &);
//! initialize with red, green, blue, alpha
Color(float r, float g, float b, float a=1.0);
Color(const Color &);
//! initialize with red, green, blue, alpha
Color(float r, float g, float b, float a=1.0);
+ Color(const ColorRef);
//! set all channels simultaneously
void set(float r, float g, float b, float a=1.0);
//! set all channels simultaneously
void set(float r, float g, float b, float a=1.0);
@@
-47,6
+53,5
@@
private:
}
};
BOOST_CLASS_EXPORT(Color)
}
};
BOOST_CLASS_EXPORT(Color)
-
#endif
#endif