From bacaa2b1b916f7672e2b971337232caef9cb22a2 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sun, 3 Mar 2013 18:41:37 +0100
Subject: fix bugs in testing


diff --git a/src/GLView.cc b/src/GLView.cc
index 77c3375..6598ed5 100644
--- a/src/GLView.cc
+++ b/src/GLView.cc
@@ -94,9 +94,11 @@ void GLView::setCamera( Camera &cam )
 
 void GLView::paintGL()
 {
-	if (cam.type == Camera::NONE) return;
-	else if (cam.type == Camera::GIMBAL) gimbalCamPaintGL();
+	if (cam.type == Camera::GIMBAL) gimbalCamPaintGL();
 	else if (cam.type == Camera::VECTOR) vectorCamPaintGL();
+	else if (cam.type == Camera::NONE) {
+		fprintf(stderr,"paintGL with null camera\n");
+	}
 }
 
 #ifdef ENABLE_OPENCSG
diff --git a/src/export_png.cc b/src/export_png.cc
index a8c7620..f185e3d 100644
--- a/src/export_png.cc
+++ b/src/export_png.cc
@@ -78,6 +78,7 @@ void export_png_with_opencsg(Tree &tree, Camera &cam, std::ostream &output)
 	OpenCSGRenderer opencsgRenderer(csgInfo.root_chain, csgInfo.highlights_chain, csgInfo.background_chain, csgInfo.glview->shaderinfo);
 
 	if (cam.type == Camera::NONE) {
+		cam.type = Camera::VECTOR;
 		cam.center << 0,0,0;
 	  double radius = 1.0;
 	  if (csgInfo.root_chain) {
diff --git a/tests/cgalpngtest.cc b/tests/cgalpngtest.cc
index a3532af..52205fd 100644
--- a/tests/cgalpngtest.cc
+++ b/tests/cgalpngtest.cc
@@ -156,15 +156,14 @@ int main(int argc, char **argv)
 		bbox = cgalRenderer.polyset->getBoundingBox();
 	}
 	
-	VectorCamera vc;
-	vc.center = getBoundingCenter(bbox);
+	Camera cam(Camera::VECTOR);
+	cam.center = getBoundingCenter(bbox);
 	double radius = getBoundingRadius(bbox);
 	
 	Vector3d cameradir(1, 1, -0.5);
-	vc.eye = vc.center - radius*2*cameradir;
-	csgInfo.glview->setCamera(vc);
-	
-	
+	cam.eye = cam.center - radius*2*cameradir;
+	csgInfo.glview->setCamera( cam );
+
 	csgInfo.glview->setRenderer(&cgalRenderer);
 	csgInfo.glview->paintGL();
 	csgInfo.glview->save(outfile);
diff --git a/tests/csgtestcore.cc b/tests/csgtestcore.cc
index 02ca0be..5820e44 100644
--- a/tests/csgtestcore.cc
+++ b/tests/csgtestcore.cc
@@ -167,8 +167,7 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type)
 	Tree tree(root_node);
 
 	CsgInfo csgInfo = CsgInfo();
-	int result = csgInfo.prep_chains( tree );
-	if ( result == 1 ) return result;
+	if ( !csgInfo.prep_chains( tree ) ) return 1;
 
 	fs::current_path(original_path);
 
@@ -180,18 +179,18 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type)
 	}
 
 	if (sysinfo_dump) cout << info_dump(csgInfo.glview);
-	VectorCamera vc;
-	vc.center << 0,0,0;
+	Camera camera(Camera::VECTOR);
+	camera.center << 0,0,0;
 	double radius = 1.0;
 
 	if (csgInfo.root_chain) {
 		BoundingBox bbox = csgInfo.root_chain->getBoundingBox();
-		vc.center = (bbox.min() + bbox.max()) / 2;
+		camera.center = (bbox.min() + bbox.max()) / 2;
 		radius = (bbox.max() - bbox.min()).norm() / 2;
 	}
 	Vector3d cameradir(1, 1, -0.5);
-	vc.eye = vc.center - radius*1.8*cameradir;
-	csgInfo.glview->setCamera(vc);
+	camera.eye = camera.center - radius*1.8*cameradir;
+	csgInfo.glview->setCamera(camera);
 
 	OpenCSGRenderer opencsgRenderer(csgInfo.root_chain, csgInfo.highlights_chain, csgInfo.background_chain, csgInfo.glview->shaderinfo);
 	ThrownTogetherRenderer thrownTogetherRenderer(csgInfo.root_chain, csgInfo.highlights_chain, csgInfo.background_chain);
-- 
cgit v0.10.1