diff options
| author | Marius Kintel <marius@kintel.net> | 2013-05-25 19:21:17 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-05-25 19:21:17 (GMT) |
| commit | 9740232b080ac3d2fe87309fb51a892faf6ea913 (patch) | |
| tree | 974ac256413de1111a085d12cad7bc3f755792dd /src/renderer.h | |
| parent | fef8dba56bae76f6e876656cee603fc895fa0955 (diff) | |
| parent | e60744776193d5dc3f22e7a4a9f3afa8b8664e30 (diff) | |
Merge branch 'master' into issue364
Diffstat (limited to 'src/renderer.h')
| -rw-r--r-- | src/renderer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/renderer.h b/src/renderer.h index 2bc482d..f70b4e1 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -2,6 +2,7 @@ #define RENDERER_H_ #include "system-gl.h" +#include "linalg.h" #ifdef _MSC_VER // NULL #include <cstdlib> @@ -25,8 +26,10 @@ public: COLORMODE_BACKGROUND_EDGES }; + virtual bool getColor(ColorMode colormode, Color4f &col) const; virtual void setColor(const float color[4], GLint *shaderinfo = NULL) const; virtual void setColor(ColorMode colormode, GLint *shaderinfo = NULL) const; + virtual void setColor(ColorMode colormode, const float color[4], GLint *shaderinfo = NULL) const; }; #endif // RENDERER_H |