summaryrefslogtreecommitdiff
path: root/tests/OffscreenView.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-08-01 23:43:29 (GMT)
committerMarius Kintel <marius@kintel.net>2011-08-01 23:43:29 (GMT)
commit0846b4c2ea2eefa643917c928035fd34abf5126f (patch)
tree14d177f1b47e620b727dfc2166aa33ef083555fb /tests/OffscreenView.cc
parent8dc35b539b996de45ef51db1635b4de8d6ba9244 (diff)
Minor updates. This works now, but needs a bugfix in OpenCSG
Diffstat (limited to 'tests/OffscreenView.cc')
-rw-r--r--tests/OffscreenView.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/OffscreenView.cc b/tests/OffscreenView.cc
index b7ee8c7..3740c69 100644
--- a/tests/OffscreenView.cc
+++ b/tests/OffscreenView.cc
@@ -1,14 +1,15 @@
#include <GL/glew.h>
#include "OffscreenView.h"
+#include <opencsg.h>
#include "Renderer.h"
-#include "OffscreenContext.h"
#include <math.h>
#define FAR_FAR_AWAY 100000.0
OffscreenView::OffscreenView(size_t width, size_t height)
- : orthomode(false), showaxes(false), showfaces(false), showedges(false), viewer_distance(500)
+ : orthomode(false), showaxes(true), showfaces(true), showedges(false), viewer_distance(500)
{
+ for (int i = 0; i < 10; i++) this->shaderinfo[i] = 0;
this->ctx = create_offscreen_context(width, height);
initializeGL();
resizeGL(width, height);
@@ -218,9 +219,8 @@ void OffscreenView::paintGL()
glColor3d(1.0, 0.0, 0.0);
if (this->renderer) {
-#if defined(ENABLE_MDI) && defined(ENABLE_OPENCSG)
- // FIXME: This belongs in the OpenCSG renderer, but it doesn't know about this ID yet
- OpenCSG::setContext(this->opencsg_id);
+#ifdef ENABLE_OPENCSG
+ OpenCSG::setContext(0);
#endif
this->renderer->draw(showfaces, showedges);
}
contact: Jan Huwald // Impressum