Changeset 353 for experimental/distortionNG/extViewer.cpp

Timestamp:

Apr 21, 2012, 9:49:26 PM (12 years ago)

Author:

Torben Dannhauer

Message:

DistortionManipulator? is working (alpha stadium)

File:

• experimental/distortionNG/extViewer.cpp (modified) (2 diffs)

experimental/distortionNG/extViewer.cpp

@@ -20 +20 @@
 #include "distortionNG.h"
 
+#include <osg/Switch>
 #include <osg/PolygonOffset>
 #include <osg/Texture2D>
@@ -273 +274 @@
         camera->setViewMatrix(osg::Matrix::identity());
 
-                osg::ref_ptr<osg::Group> root = new osg::Group;
-                root->addChild(geode);  // add mesh to root so camera renders mesh (and  thus render the scene)
+                osg::ref_ptr<osg::Switch> root = _distortionSet->getDistortionInternals();
+                root->addChild(geode, true);    // adds mesh,shader,.. so camera renders mesh (and  thus render the scene)
                 camera->addChild(root);
 
-                // selector
-                //geode->getOrCreateStateSet()->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
-                //geode->getOrCreateStateSet()->setAttributeAndModes( new osg::PolygonOffset(1.0f, 1.0f) );
-                //osg::ref_ptr<distortionHandler> selectorHandler = new distortionHandler( camera, distortionMesh );
-                //osg::Geode* selectorHighlighter = selectorHandler->createVertexHighlighter();
-                //selectorHighlighter->setCullingActive(false); // disable the culling for the selector, otherwise the selector is culled away on the edge.
-                //root->addChild(selectorHighlighter);
-                //addEventHandler( selectorHandler.get() );// should be in main.cpp
+                _distortionSet->setDistortionCamera( camera );
+
+                // Ensure selector is visible:
+                geode->getOrCreateStateSet()->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
+                geode->getOrCreateStateSet()->setAttributeAndModes( new osg::PolygonOffset(1.0f, 1.0f) );
                 
-                //// Avoid that the highlighter is culled away
-                //osg::CullSettings::CullingMode mode = camera->getCullingMode();
-                //camera->setCullingMode( mode & (~osg::CullSettings::SMALL_FEATURE_CULLING) );
-
         camera->setName("Dist Cam");