diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/export_png.cc | 19 | ||||
| -rw-r--r-- | src/openscad.cc | 2 |
2 files changed, 8 insertions, 13 deletions
diff --git a/src/export_png.cc b/src/export_png.cc index 07c4398..744d681 100644 --- a/src/export_png.cc +++ b/src/export_png.cc @@ -41,9 +41,6 @@ void export_png_with_cgal(CGAL_Nef_polyhedron *root_N, Camera &cam, std::ostream cam.eye = cam.center - radius*2*cameradir; } - //std::cerr << center << "\n"; - //std::cerr << radius << "\n"; - glview->setCamera( cam ); glview->setRenderer(&cgalRenderer); glview->paintGL(); @@ -60,8 +57,8 @@ enum Previewer { OPENCSG, THROWN } previewer; void export_png_preview_common( Tree &tree, Camera &cam, std::ostream &output, Previewer previewer = OPENCSG ) { - CsgInfo csgInfo = CsgInfo(); - if ( !csgInfo.compile_chains( tree ) ) { + CsgInfo csgInfo = CsgInfo(); + if ( !csgInfo.compile_chains( tree ) ) { fprintf(stderr,"Couldn't initialize CSG chains\n"); return; } @@ -74,7 +71,7 @@ void export_png_preview_common( Tree &tree, Camera &cam, std::ostream &output, P } Renderer *renderer; - if ( previewer == OPENCSG) { + if ( previewer == OPENCSG ) { #ifdef ENABLE_OPENCSG OpenCSGRenderer openCSGRenderer(csgInfo.root_chain, csgInfo.highlights_chain, csgInfo.background_chain, csgInfo.glview->shaderinfo); renderer = &openCSGRenderer; @@ -97,15 +94,13 @@ void export_png_preview_common( Tree &tree, Camera &cam, std::ostream &output, P } csgInfo.glview->setCamera( cam ); + csgInfo.glview->setRenderer( renderer ); #ifdef ENABLE_OPENCSG - csgInfo.glview->setRenderer(renderer); - OpenCSG::setContext(0); - OpenCSG::setOption(OpenCSG::OffscreenSetting, OpenCSG::FrameBufferObject); -#else - csgInfo.glview->setRenderer(renderer); + OpenCSG::setContext( 0 ); + OpenCSG::setOption( OpenCSG::OffscreenSetting, OpenCSG::FrameBufferObject ); #endif csgInfo.glview->paintGL(); - csgInfo.glview->save(output); + csgInfo.glview->save( output ); } void export_png_with_opencsg(Tree &tree, Camera &cam, std::ostream &output) diff --git a/src/openscad.cc b/src/openscad.cc index 56b8acf..c202c88 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -88,7 +88,7 @@ static void help(const char *progname) "%*s[ --camera=translatex,y,z,rotx,y,z,dist | \\\n" "%*s --camera=eyex,y,z,centerx,y,z ] \\\n" "%*s[ --imgsize=width,height ] [ --projection=(o)rtho|(p)ersp] \\\n" - "%*s[ --render | --preview[=throwntogether] ] \\\n" + "%*s[ --render | --preview[=throwntogether] ] \\\n" "%*sfilename\n", progname, tab, "", tab, "", tab, "", tab, "", tab, "", tab, ""); exit(1); |