fixing GLX setup

3 files changed, 15 insertions, 6 deletions

diff --git a/tests/OffscreenContextGLX.cc b/tests/OffscreenContextGLX.cc
index 3523021..41f01f7 100644
--- a/tests/OffscreenContextGLX.cc
+++ b/tests/OffscreenContextGLX.cc
@@ -137,11 +137,12 @@ bool create_glx_dummy_window(OffscreenContext &ctx)
   int attributes[] = {
     GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
     GLX_RENDER_TYPE,   GLX_RGBA_BIT,
-    GLX_RED_SIZE, 1,
-    GLX_GREEN_SIZE, 1,
-    GLX_BLUE_SIZE, 1,
-    GLX_ALPHA_SIZE, 1, // extra stuff for fbo-disbaled on-screen testing.
+    GLX_RED_SIZE, 8,
+    GLX_GREEN_SIZE, 8,
+    GLX_BLUE_SIZE, 8,
+    GLX_ALPHA_SIZE, 8, // extra stuff for fbo-disbaled on-screen testing.
     GLX_DEPTH_SIZE, 24,
+    GLX_STENCIL_SIZE, 8,
     None
   };
 
@@ -271,11 +272,11 @@ OffscreenContext *create_offscreen_context(int w, int h)
   }
   // cerr << glew_dump(0);
 
-/*  ctx->fbo = fbo_new();
+  ctx->fbo = fbo_new();
   if (!fbo_init(ctx->fbo, w, h)) {
     cerr << "GL Framebuffer Object init failed; dumping GLEW info" << endl;
     return NULL;
-  }*/
+  }
 
   return ctx;
 }
diff --git a/tests/cgalpngtest.cc b/tests/cgalpngtest.cc
index bfa92da..cc747fb 100644
--- a/tests/cgalpngtest.cc
+++ b/tests/cgalpngtest.cc
@@ -190,16 +190,19 @@ int main(int argc, char **argv)
 
 	BoundingBox bbox;
 	if (cgalRenderer.polyhedron) {
+		std::cout << "polyhedron\n" ;
 		CGAL::Bbox_3 cgalbbox = cgalRenderer.polyhedron->bbox();
 		bbox = BoundingBox(Vector3d(cgalbbox.xmin(), cgalbbox.ymin(), cgalbbox.zmin()),
 							Vector3d(cgalbbox.xmax(), cgalbbox.ymax(), cgalbbox.zmax()));
 	}
 	else if (cgalRenderer.polyset) {
+		std::cout << "polyset\n" ;
 		bbox = cgalRenderer.polyset->getBoundingBox();
 	}
 
 	Vector3d center = getBoundingCenter(bbox);
 	double radius = getBoundingRadius(bbox);
+	std::cout << "radius: "  << radius << "\n";
 
 	Vector3d cameradir(1, 1, -0.5);
 	Vector3d camerapos = center - radius*2*cameradir;
diff --git a/tests/test_pretty_print.py b/tests/test_pretty_print.py
index c4b5c6c..fce17f5 100755
--- a/tests/test_pretty_print.py
+++ b/tests/test_pretty_print.py
@@ -9,6 +9,11 @@
 
 # todo
 # ban opencsg<2.0 from opencsgtest
+# copy all images, sysinfo.txt to bundle for html/upload (images 
+# can be altered  by subsequent runs)
+# figure out hwo to make the thing run after the test
+# figure out how CTEST treats the logfiles.
+# why is hash differing
 
 import string,sys,re,os,hashlib,subprocess