1 files changed, 17 insertions, 25 deletions

diff --git a/src/OpenCSGRenderer.cc b/src/OpenCSGRenderer.cc
index 69013e9..f07b900 100644
--- a/src/OpenCSGRenderer.cc
+++ b/src/OpenCSGRenderer.cc
@@ -24,9 +24,13 @@
  *
  */
 
+#include <GL/glew.h>
 #include "OpenCSGRenderer.h"
 #include "polyset.h"
 #include "csgterm.h"
+#ifdef ENABLE_OPENCSG
+#  include <opencsg.h>
+#endif
 
 class OpenCSGPrim : public OpenCSG::Primitive
 {
@@ -53,11 +57,6 @@ OpenCSGRenderer::OpenCSGRenderer(CSGChain *root_chain, CSGChain *highlights_chai
 
 void OpenCSGRenderer::draw(bool showfaces, bool showedges) const
 {
-	static int glew_initialized = 0;
-	if (!glew_initialized) {
-		glew_initialized = 1;
-		glewInit();
-	}
 	if (this->root_chain) {
 		GLint *shaderinfo = this->shaderinfo;
 		if (!shaderinfo[0]) shaderinfo = NULL;
@@ -76,20 +75,17 @@ void OpenCSGRenderer::renderCSGChain(CSGChain *chain, GLint *shaderinfo,
 {
 	std::vector<OpenCSG::Primitive*> primitives;
 	int j = 0;
-	for (int i = 0;; i++)
-	{
+	for (int i = 0;; i++) {
 		bool last = i == chain->polysets.size();
-
-		if (last || chain->types[i] == CSGTerm::TYPE_UNION)
-		{
+		if (last || chain->types[i] == CSGTerm::TYPE_UNION) {
 			if (j+1 != i) {
-				OpenCSG::render(primitives);
+				 OpenCSG::render(primitives);
 				glDepthFunc(GL_EQUAL);
 			}
-			if (shaderinfo)
-				glUseProgram(shaderinfo[0]);
+			if (shaderinfo) glUseProgram(shaderinfo[0]);
 			for (; j < i; j++) {
 				double *m = chain->matrices[j];
+				double *c = chain->colors[j];
 				glPushMatrix();
 				glMultMatrixd(m);
 				int csgmode = chain->types[j] == CSGTerm::TYPE_DIFFERENCE ? PolySet::CSGMODE_DIFFERENCE : PolySet::CSGMODE_NORMAL;
@@ -97,12 +93,12 @@ void OpenCSGRenderer::renderCSGChain(CSGChain *chain, GLint *shaderinfo,
 					chain->polysets[j]->render_surface(PolySet::COLORMODE_HIGHLIGHT, PolySet::csgmode_e(csgmode + 20), m, shaderinfo);
 				} else if (background) {
 					chain->polysets[j]->render_surface(PolySet::COLORMODE_BACKGROUND, PolySet::csgmode_e(csgmode + 10), m, shaderinfo);
-				} else if (m[16] >= 0 || m[17] >= 0 || m[18] >= 0) {
+				} else if (c[0] >= 0 || c[1] >= 0 || c[2] >= 0) {
 					// User-defined color from source
-					glColor4d(m[16], m[17], m[18], m[19]);
+					glColor4dv(c);
 					if (shaderinfo) {
-						glUniform4f(shaderinfo[1], m[16], m[17], m[18], m[19]);
-						glUniform4f(shaderinfo[2], (m[16]+1)/2, (m[17]+1)/2, (m[18]+1)/2, 1.0);
+						glUniform4f(shaderinfo[1], c[0], c[1], c[2], c[3]);
+						glUniform4f(shaderinfo[2], (c[0]+1)/2, (c[1]+1)/2, (c[2]+1)/2, 1.0);
 					}
 					chain->polysets[j]->render_surface(PolySet::COLORMODE_NONE, PolySet::csgmode_e(csgmode), m, shaderinfo);
 				} else if (chain->types[j] == CSGTerm::TYPE_DIFFERENCE) {
@@ -112,8 +108,7 @@ void OpenCSGRenderer::renderCSGChain(CSGChain *chain, GLint *shaderinfo,
 				}
 				glPopMatrix();
 			}
-			if (shaderinfo)
-				glUseProgram(0);
+			if (shaderinfo) glUseProgram(0);
 			for (unsigned int k = 0; k < primitives.size(); k++) {
 				delete primitives[k];
 			}
@@ -121,18 +116,15 @@ void OpenCSGRenderer::renderCSGChain(CSGChain *chain, GLint *shaderinfo,
 			primitives.clear();
 		}
 
-		if (last)
-			break;
+		if (last) break;
 
 		OpenCSGPrim *prim = new OpenCSGPrim(chain->types[i] == CSGTerm::TYPE_DIFFERENCE ?
 				OpenCSG::Subtraction : OpenCSG::Intersection, chain->polysets[i]->convexity);
 		prim->p = chain->polysets[i];
 		prim->m = chain->matrices[i];
 		prim->csgmode = chain->types[i] == CSGTerm::TYPE_DIFFERENCE ? PolySet::CSGMODE_DIFFERENCE : PolySet::CSGMODE_NORMAL;
-		if (highlight)
-			prim->csgmode += 20;
-		else if (background)
-			prim->csgmode += 10;
+		if (highlight) prim->csgmode += 20;
+		else if (background) prim->csgmode += 10;
 		primitives.push_back(prim);
 	}
 }