diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/export_png.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/export_png.cc b/src/export_png.cc index 1382693..1c4a268 100644 --- a/src/export_png.cc +++ b/src/export_png.cc @@ -33,14 +33,14 @@ void export_png_with_cgal(CGAL_Nef_polyhedron *root_N, Camera &cam, std::ostream } if (cam.camtype == Camera::NULL_CAMERA) { - csgInfo.glview->setCamera( cam ); - } else { VectorCamera vcam; vcam.center = getBoundingCenter(bbox); double radius = getBoundingRadius(bbox); Vector3d cameradir(1, 1, -0.5); vcam.eye = vcam.center - radius*2*cameradir; csgInfo.glview->setCamera( vcam ); + } else { + csgInfo.glview->setCamera( cam ); } //std::cerr << center << "\n"; @@ -77,8 +77,6 @@ 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.camtype == Camera::NULL_CAMERA) { - csgInfo.glview->setCamera( cam ); - } else { VectorCamera vcam; vcam.center << 0,0,0; double radius = 1.0; @@ -90,6 +88,8 @@ void export_png_with_opencsg(Tree &tree, Camera &cam, std::ostream &output) Vector3d cameradir(1, 1, -0.5); vcam.eye = vcam.center - radius*1.8*cameradir; csgInfo.glview->setCamera( vcam ); + } else { + csgInfo.glview->setCamera( cam ); } csgInfo.glview->setRenderer(&opencsgRenderer); |