Changeset 340 for experimental/distortionNG/extViewer.cpp

Timestamp:

Mar 24, 2012, 10:00:11 AM (12 years ago)

Author:

Torben Dannhauer

Message:

The intersection works and the selector highlighter is set and displayed correctly.
Next steps:

• use a variable to control whether distortion setup is active or not. temporarily track the Ctrl Key to enably(push or disable(release) the edit mode.
• Hide the highlighter and disable the intersection/drag tracking on diabled edit mode.
• catch up dragging values and translate them in the correct coordinate frame.
• apply dragging values:
• a) either on the texture coordinate while the grid is constant,
• b) or apply them on the grid node coordinates while the texture coordinates are constant (check/compare solutions!)

File:

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

experimental/distortionNG/extViewer.cpp

@@ -148 +148 @@
                 geom->setTexCoordArray(1,texcoords1);
 
-        //// Quads grid
+        // Quads grid
+        for ( unsigned int row=0; row<rows-1; row++ )   // each strip consists of two affected vertex rows, so we need only row-1 strips.
+        {
+                osg::ref_ptr<osg::DrawElementsUInt> de = new osg::DrawElementsUInt(GL_QUAD_STRIP, columns*2);   // columns*2 = number of involved vertices for this strip.
+                for ( unsigned int col=0; col<columns; col++ )
+                {
+                        (*de)[col*2 + 0] = row*columns + col;
+                        (*de)[col*2 + 1] = (row+1)*columns + col;
+                }
+                geom->addPrimitiveSet( de.get() );
+        }
+
+        //// Triangle grid
         //for ( unsigned int row=0; row<rows-1; row++ ) // each strip consists of two affected vertex rows, so we need only row-1 strips.
         //{
-        //      osg::ref_ptr<osg::DrawElementsUInt> de = new osg::DrawElementsUInt(GL_QUAD_STRIP, columns*2);   // columns*2 = number of involved vertices for this strip.
+        //      osg::ref_ptr<osg::DrawElementsUInt> de = new osg::DrawElementsUInt(osg::PrimitiveSet::TRIANGLE_STRIP, columns * 2 );    
         //      for ( unsigned int col=0; col<columns; col++ )
         //      {
@@ -159 +171 @@
         //      geom->addPrimitiveSet( de.get() );
         //}
-
-        // Triangle grid
-        for ( unsigned int row=0; row<rows-1; row++ )   // each strip consists of two affected vertex rows, so we need only row-1 strips.
-        {
-                osg::ref_ptr<osg::DrawElementsUInt> de = new osg::DrawElementsUInt(osg::PrimitiveSet::TRIANGLE_STRIP, columns * 2 );    
-                for ( unsigned int col=0; col<columns; col++ )
-                {
-                        (*de)[col*2 + 0] = row*columns + col;
-                        (*de)[col*2 + 1] = (row+1)*columns + col;
-                }
-                geom->addPrimitiveSet( de.get() );
-        }
 
         return geom.release();
@@ -340 +340 @@
                 geode->getOrCreateStateSet()->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
                 geode->getOrCreateStateSet()->setAttributeAndModes( new osg::PolygonOffset(1.0f, 1.0f) );
-                osg::ref_ptr<distortionHandler> selector = new distortionHandler( camera, distortionMesh );
+                osg::ref_ptr<distortionHandler> selectorHandler = new distortionHandler( camera, distortionMesh );
                 osg::ref_ptr<osg::Group> root = new osg::Group;
                 root->addChild(geode);
-                root->addChild(selector->createVertexHighlighter());
-                addEventHandler( selector.get() );
+                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() );
                 camera->addChild(root);
                 // Avoid that the highlighter is culled away