Changeset 13041 for OpenSceneGraph/trunk/src/osgUtil/IntersectVisitor.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgUtil/IntersectVisitor.cpp (modified) (31 diffs)

OpenSceneGraph/trunk/src/osgUtil/IntersectVisitor.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -88 +88 @@
 const osg::Vec3 Hit::getWorldIntersectNormal() const
 {
-    if (_inverse.valid()) 
-    {
-        osg::Vec3 norm = osg::Matrix::transform3x3(*_inverse,_intersectNormal); 
+    if (_inverse.valid())
+    {
+        osg::Vec3 norm = osg::Matrix::transform3x3(*_inverse,_intersectNormal);
         norm.normalize();
         return norm;
@@ -155 +155 @@
     LineSegment* ns = new LineSegment;
 
-    if (_model_inverse.valid()) 
+    if (_model_inverse.valid())
     {
         if (_view_inverse.valid())
@@ -163 +163 @@
         }
         else
-        { 
+        {
             ns->mult(*seg,*(_model_inverse));
         }
@@ -175 +175 @@
         *ns = *seg;
     }
-    
+
     _segList.push_back(LineSegmentPair(seg,ns));
 }
@@ -185 +185 @@
     // override the default node visitor mode.
     setTraversalMode(NodeVisitor::TRAVERSE_ACTIVE_CHILDREN);
-    
+
     // Initialize eyepoint to 0,0,0
     setEyePoint(Vec3(0.0f,0.0f,0.0f));
@@ -245 +245 @@
     if (cis && (cis->_model_inverse.valid() || cis->_view_inverse.valid()))
     {
-        
+
         osg::Vec3 eyePoint = _pseudoEyePoint;
         if (cis->_view_inverse.valid()) eyePoint = eyePoint * (*(cis->_view_inverse));
         if (cis->_model_inverse.valid()) eyePoint = eyePoint * (*(cis->_model_inverse));
-        
+
         //OSG_NOTICE<<"IntersectVisitor::getEyePoint()"<<eyePoint<<std::endl;
 
@@ -263 +263 @@
 {
     if (!seg) return;
-    
+
     if (!seg->valid())
     {
@@ -270 +270 @@
         return;
     }
-    
+
     IntersectState* cis = _intersectStateStack.back().get();
-    
+
     if (cis->_segList.size()>=32)
     {
@@ -306 +306 @@
         nis->_view_matrix = cis->_view_matrix;
         nis->_view_inverse = cis->_view_inverse;
-        
+
         // set up new model matrix
         nis->_model_matrix = matrix;
@@ -373 +373 @@
     {
         IntersectState* cis = _intersectStateStack.back().get();
-        if (!cis->_segmentMaskStack.empty()) 
+        if (!cis->_segmentMaskStack.empty())
             cis->_segmentMaskStack.push_back(cis->_segmentMaskStack.back());
         else
             cis->_segmentMaskStack.push_back(0xffffffff);
-        
+
         return true;
     }
@@ -407 +407 @@
         _normal(normal),
         _r1(r1),
-        _v1(v1),        
+        _v1(v1),
         _r2(r2),
-        _v2(v2),        
+        _v2(v2),
         _r3(r3),
         _v3(v3) {}
@@ -416 +416 @@
     const osg::Vec3     _normal;
     float               _r1;
-    const osg::Vec3*    _v1;        
+    const osg::Vec3*    _v1;
     float               _r2;
-    const osg::Vec3*    _v2;        
+    const osg::Vec3*    _v2;
     float               _r3;
-    const osg::Vec3*    _v3;        
+    const osg::Vec3*    _v3;
 
 protected:
@@ -440 +440 @@
     float _ratio;
     bool _hit;
-    
-    
+
+
 
     typedef std::multimap<float,TriangleHit> TriangleHitList;
-    
+
     TriangleHitList _thl;
 
@@ -459 +459 @@
         set(seg,ratio);
     }
-    
+
     void set(const LineSegment& seg,float ratio=FLT_MAX)
     {
@@ -524 +524 @@
             if (ds31<d231) return;
         }
-        
+
 
         float r3;
@@ -530 +530 @@
         else if (d312!=0.0f) r3 = ds12/d312;
         else return; // the triangle and the line must be parallel intersection.
-        
+
         float r1;
         if (ds23==0.0f) r1=0.0f;
         else if (d123!=0.0f) r1 = ds23/d123;
         else return; // the triangle and the line must be parallel intersection.
-        
+
         float r2;
         if (ds31==0.0f) r2=0.0f;
@@ -550 +550 @@
             r3 *= inv_total_r;
         }
-        
+
         Vec3 in = v1*r1+v2*r2+v3*r3;
         if (!in.valid())
@@ -570 +570 @@
         float r = d/_length;
 
-        
+
         if (treatVertexDataAsTemporary)
         {
@@ -605 +605 @@
             if (ti._hit)
             {
-            
+
                 osg::Geometry* geometry = drawable.asGeometry();
-                
+
 
                 for(TriangleIntersect::TriangleHitList::iterator thitr=ti._thl.begin();
@@ -613 +613 @@
                     ++thitr)
                 {
-                
+
                     Hit hit;
                     hit._nodePath = _nodePath;
@@ -623 +623 @@
 
                     TriangleHit& triHit = thitr->second;
-                    
+
                     hit._ratio = thitr->first;
                     hit._primitiveIndex = triHit._index;
@@ -633 +633 @@
 
                     hit._intersectNormal = triHit._normal;
-                    
+
                     if (geometry)
                     {
@@ -645 +645 @@
                         }
                     }
-                    
+
 
                     _segHitList[sitr->first.get()].push_back(hit);
@@ -670 +670 @@
         intersect(*geode.getDrawable(i));
     }
-    
+
     leaveNode();
 }
@@ -747 +747 @@
     setLODSelectionMode(USE_SEGMENT_START_POINT_AS_EYE_POINT_FOR_LOD_LEVEL_SELECTION);
 
-    if (viewport && 
-        mx >= static_cast<float>(viewport->x()) && 
+    if (viewport &&
+        mx >= static_cast<float>(viewport->x()) &&
         my >= static_cast<float>(viewport->y()) &&
         mx < static_cast<float>(viewport->x()+viewport->width()) &&
@@ -778 +778 @@
             OSG_NOTICE<<"Warning: PickVisitor not set up correctly, picking errors likely"<<std::endl;
         }
-        
+
 
         addLineSegment(lineSegment);
@@ -805 +805 @@
 void PickVisitor::apply(osg::Projection& projection)
 {
-    runNestedPickVisitor( projection, 
-                          _lastViewport.get(), 
+    runNestedPickVisitor( projection,
+                          _lastViewport.get(),
                           projection.getMatrix(),
                           _lastViewMatrix,
@@ -822 +822 @@
                 runNestedPickVisitor( camera,
                                       camera.getViewport() ? camera.getViewport() : _lastViewport.get(),
-                                      _lastProjectionMatrix * camera.getProjectionMatrix(), 
+                                      _lastProjectionMatrix * camera.getProjectionMatrix(),
                                       _lastViewMatrix * camera.getViewMatrix(),
                                       _mx, _my );
@@ -830 +830 @@
                 runNestedPickVisitor( camera,
                                       camera.getViewport() ? camera.getViewport() : _lastViewport.get(),
-                                      camera.getProjectionMatrix() * _lastProjectionMatrix, 
+                                      camera.getProjectionMatrix() * _lastProjectionMatrix,
                                       camera.getViewMatrix() * _lastViewMatrix,
                                       _mx, _my );
@@ -839 +839 @@
             runNestedPickVisitor( camera,
                                   camera.getViewport() ? camera.getViewport() : _lastViewport.get(),
-                                  camera.getProjectionMatrix(), 
+                                  camera.getProjectionMatrix(),
                                   camera.getViewMatrix(),
                                   _mx, _my );