diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-02-24 18:33:11 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-02-24 18:33:11 (GMT) |
| commit | 76c5d5b55c66505af98ddbed70ca5e21719d3bb1 (patch) | |
| tree | 3576a2c3cd9d7f5182f594d1d4d9491f6371c55e /src/GLView.h | |
| parent | 707118ce9485f1c703bf6cc99bad3affc2a48c10 (diff) | |
merge enable_opencsg_shaders into GLView, remove duplicate code
from QGLView and OffscreenView
Diffstat (limited to 'src/GLView.h')
| -rw-r--r-- | src/GLView.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/GLView.h b/src/GLView.h index 041c4a5..aa5a677 100644 --- a/src/GLView.h +++ b/src/GLView.h @@ -3,10 +3,11 @@ /* GLView: A basic OpenGL rectangle for rendering images. -Inherited by QGLview (for QT GUI) and OffscreenView. +Inherited by QGLview (for Qt GUI) and OffscreenView (used in tests and +for offscreen command-line rendering). There are two different types of cameras. A 'gimbal' based camera set -using position & euler-angles (object_trans/object_rot/distance) and a +using translation & euler-angles (object_trans/object_rot/distance) and a 'plain' camera set using eye-position, 'look at' center point, and 'up' */ @@ -64,7 +65,7 @@ public: GLint shaderinfo[11]; bool is_opencsg_capable; bool has_shaders; -// void enable_opencsg_shaders(); + void enable_opencsg_shaders(); virtual void display_opencsg_warning() = 0; bool opencsg_support; int opencsg_id; |