Clifford Wolf:

	OpenCSG support looks ok now



git-svn-id: http://svn.clifford.at/openscad/trunk@27 b57f626f-c46c-0410-a088-ec61d464b74c

1 files changed, 12 insertions, 0 deletions

diff --git a/mainwin.cc b/mainwin.cc
index 166e1df..30e90ad 100644
--- a/mainwin.cc
+++ b/mainwin.cc
@@ -511,6 +511,17 @@ static void renderGLThrownTogether(void *vp)
 	MainWindow *m = (MainWindow*)vp;
 	if (m->root_chain) {
 		glDepthFunc(GL_LEQUAL);
+#if 0
+		glUseProgram(m->screen->shaderinfo[0]);
+		for (int i = 0; i < m->root_chain->polysets.size(); i++) {
+			if (m->root_chain->types[i] == CSGTerm::DIFFERENCE) {
+				m->root_chain->polysets[i]->render_surface(PolySet::COLOR_CUTOUT, m->screen->shaderinfo);
+			} else {
+				m->root_chain->polysets[i]->render_surface(PolySet::COLOR_MATERIAL, m->screen->shaderinfo);
+			}
+		}
+		glUseProgram(0);
+#else
 		for (int i = 0; i < m->root_chain->polysets.size(); i++) {
 			if (m->root_chain->types[i] == CSGTerm::DIFFERENCE) {
 				m->root_chain->polysets[i]->render_surface(PolySet::COLOR_CUTOUT);
@@ -520,6 +531,7 @@ static void renderGLThrownTogether(void *vp)
 				m->root_chain->polysets[i]->render_edges(PolySet::COLOR_MATERIAL);
 			}
 		}
+#endif
 	}
 }