diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2013-09-13 01:03:27 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2013-09-13 01:03:27 (GMT) |
| commit | 30fd8b250af29c16dc25013b4aceb91cf51a7432 (patch) | |
| tree | 426ea407c087c6dfa4d75e0200a45f6df69b692a /src/export_png.cc | |
| parent | d6a57b89682ed7991744dc142e9af21d5e74cb83 (diff) | |
little tweaks, cleanups, tab fixing, eliminating comments
Diffstat (limited to 'src/export_png.cc')
| -rw-r--r-- | src/export_png.cc | 19 |
1 files changed, 7 insertions, 12 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) |