Changeset 329 for experimental/distortionNG/distortionNG.cpp

Timestamp:

Mar 3, 2012, 1:22:05 AM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• experimental/distortionNG/distortionNG.cpp (modified) (4 diffs)

experimental/distortionNG/distortionNG.cpp

@@ -27 +27 @@
         _highlighter->setUseDisplayList( false );
         _highlighter->setUseVertexBufferObjects( true );
-        _highlighter->setVertexArray( new osg::Vec3Array(1) );
+        _highlighter->setVertexArray( new osg::Vec3Array(1) );  // The highlighter vertex is updated by computeSelectedVertex(..)
         _highlighter->setColorArray( colors.get() );
         _highlighter->setColorBinding( osg::Geometry::BIND_OVERALL );
@@ -54 +54 @@
                         osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector = new osgUtil::LineSegmentIntersector(osgUtil::Intersector::WINDOW, ea.getX(), ea.getY());
                         osgUtil::IntersectionVisitor iv( intersector.get() );
-                        viewer->getCamera()->accept( iv );
+                        //viewer->getCamera()->accept( iv );
+                        _camera->accept( iv );
                 
                         if ( intersector->containsIntersections() )
@@ -93 +94 @@
         if ( !vertices || !selVertices )
                 return;
+        
+        OSG_NOTIFY(osg::ALWAYS)<<"size of vertices="<<vertices->size()<<std::endl;
+        OSG_NOTIFY(osg::ALWAYS)<<"size of selVertices="<<selVertices->size()<<std::endl;
 
         osg::Vec3 point = result.getWorldIntersectPoint();
         osg::Matrix matrix = osg::computeLocalToWorld( result.nodePath );       // To compute the intersection vertices in world coordinates not in model coordinates
-        //std::cout << "Intersection-indices: Size=" << result.indexList.size() << std::endl;
+        OSG_NOTIFY(osg::ALWAYS) << "Intersection-indices: Size=" << result.indexList.size() << std::endl;
         const std::vector<unsigned int>& selIndices = result.indexList;
         {
                 double maxRatio = 0.0;
                 int closestVertexIndex = 0;
-                for ( unsigned int i=0; i<3 && i<result.ratioList.size(); i++ ) //iterate through rations and search for max
+                for ( unsigned int i=0; i<3 && i<result.ratioList.size(); i++ ) //iterate through rations and search for maxRation=nearestVertex
                 {
                         if(result.ratioList[i] > maxRatio)
@@ -108 +112 @@
                                 closestVertexIndex = result.indexList[i];
                         }
+                        OSG_NOTIFY(osg::ALWAYS)<<"maxRatio="<<maxRatio<<std::endl;
+                        OSG_NOTIFY(osg::ALWAYS)<<"closestVertexIndex="<<closestVertexIndex<<std::endl;
                 }
+                OSG_NOTIFY(osg::ALWAYS)<<"nearest vertex: X="<<(*vertices)[closestVertexIndex].x()<<" Y="<<(*vertices)[closestVertexIndex].y()<<" Z="<<(*vertices)[closestVertexIndex].z()<<std::endl;
                 osg::Vec3 vertex = (*vertices)[closestVertexIndex] * matrix;
-                selVertices->front() = vertex;
+
+                selVertices->front() = vertex;          
+                OSG_NOTIFY(osg::ALWAYS)<<"selected vertice: X="<<vertex.x()<<" Y="<<vertex.y()<<" Z="<<vertex.z()<<std::endl;
         }
-
         selVertices->dirty();
         _highlighter->dirtyBound();