Changeset 71

Timestamp:

Jul 20, 2010, 9:33:09 PM (14 years ago)

Author:

Torben Dannhauer

Message:

further cleanup in initializing distortion and sky_silverlining

File:

• osgVisual/src/core/visual_core.cpp (modified) (1 diff)

osgVisual/src/core/visual_core.cpp

@@ -65 +65 @@
         viewer->setSceneData( rootNode );
 
+        osg::Group* distortedSceneGraph = NULL;
 #ifdef USE_DISTORTION
         // Initialize distortion
+        OSG_NOTIFY( osg::ALWAYS ) << "Using distortion." << std::endl;
         distortion = new visual_distortion( viewer, arguments );
         distortion->initialize( rootNode, viewer->getCamera()->getClearColor() );
+        distortedSceneGraph = distortion->getDistortedSceneGraph();
 #endif
 
 #ifdef USE_SKY_SILVERLINING
         // Initialize sky
+        OSG_NOTIFY( osg::ALWAYS ) << "Using Sky without distortion." << std::endl;
         sky = new visual_skySilverLining( viewer );
-        #ifdef USE_DISTORTION
-                if ( distortion.valid() )
-                {
-                        OSG_NOTIFY( osg::ALWAYS ) << "Using sky with distortion." << std::endl;
-                        sky->init( distortion->getDistortedSceneGraph(), rootNode);
-                }
-        #else
-                OSG_NOTIFY( osg::ALWAYS ) << "Using Sky without distortion." << std::endl;
-                sky->init(NULL, rootNode);
-        #endif
+        sky->init(distortedSceneGraph, rootNode);
 #endif