Changeset 13041 for OpenSceneGraph/trunk/src/osgSim/SphereSegment.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/osgSim/SphereSegment.cpp (modified) (46 diffs)

OpenSceneGraph/trunk/src/osgSim/SphereSegment.cpp

@@ -230 +230 @@
         //getOrCreateStateSet()->setAttributeAndModes(new osg::LineWidth(2.0),osg::StateAttribute::OFF);
     }
-    
+
     virtual osg::BoundingBox computeBound() const;
 
@@ -305 +305 @@
     _elevMax = elev + elevRange;
 
-    // Calculate the azimuth range, cater for trig ambiguities    
+    // Calculate the azimuth range, cater for trig ambiguities
     float az = atan2(vec.x(), vec.y());
 
@@ -909 +909 @@
 
     const std::type_info&  _t;
-    
+
 protected:
 
@@ -931 +931 @@
 
     const std::type_info&  _t;
-    
+
 protected:
 
@@ -984 +984 @@
 {
     public:
-    
+
         typedef std::pair<osg::Matrix, osg::Polytope> MatrixPolytopePair;
         typedef std::vector<MatrixPolytopePair> PolytopeStack;
-    
+
         struct Hit
         {
@@ -999 +999 @@
             osg::ref_ptr<osg::Drawable> _drawable;
         };
-    
+
         typedef std::vector<Hit> HitList;
 
@@ -1010 +1010 @@
             _polytopeStack.back().second.setAndTransformProvidingInverse(polytope, _polytopeStack.back().first);
         }
-        
+
         META_NodeVisitor("osgSim","PolytopeVisitor")
 
@@ -1018 +1018 @@
             _hits.clear();
         }
-            
+
         void apply(osg::Node& node)
         {
@@ -1035 +1035 @@
                 osg::Matrix matrix = _polytopeStack.back().first;
                 transform.computeLocalToWorldMatrix(matrix, this);
-                
+
                 _polytopeStack.push_back(MatrixPolytopePair());
                 _polytopeStack.back().first = matrix;
@@ -1041 +1041 @@
 
                 traverse(transform);
-                
+
                 _polytopeStack.back();
             }
@@ -1058 +1058 @@
 
                 }
-            
+
                 traverse(node);
             }
@@ -1066 +1066 @@
 
     protected:
-        
+
         PolytopeStack   _polytopeStack;
         HitList         _hits;
@@ -1076 +1076 @@
 {
     OSG_INFO<<"Creating line intersection between sphere segment and subgraph."<<std::endl;
-    
+
     osg::BoundingBox bb = getBoundingBox();
 
     osg::Polytope polytope;
-    polytope.add(osg::Plane(1.0,0.0,0.0,-bb.xMin())); 
-    polytope.add(osg::Plane(-1.0,0.0,0.0,bb.xMax())); 
-    polytope.add(osg::Plane(0.0,1.0,0.0,-bb.yMin())); 
-    polytope.add(osg::Plane(0.0,-1.0,0.0,bb.yMax())); 
-    polytope.add(osg::Plane(0.0,0.0,1.0,-bb.zMin())); 
-    polytope.add(osg::Plane(0.0,0.0,-1.0,bb.zMax())); 
-    
+    polytope.add(osg::Plane(1.0,0.0,0.0,-bb.xMin()));
+    polytope.add(osg::Plane(-1.0,0.0,0.0,bb.xMax()));
+    polytope.add(osg::Plane(0.0,1.0,0.0,-bb.yMin()));
+    polytope.add(osg::Plane(0.0,-1.0,0.0,bb.yMax()));
+    polytope.add(osg::Plane(0.0,0.0,1.0,-bb.zMin()));
+    polytope.add(osg::Plane(0.0,0.0,-1.0,bb.zMax()));
+
     osg::Plane pl;
     pl.set(osg::Vec3(-1.0,0.0,0.0), bb.corner(0));
     PolytopeVisitor polytopeVisitor(transform, polytope);
-    
+
     subgraph->accept(polytopeVisitor);
 
@@ -1112 +1112 @@
         all_lines.insert(all_lines.end(), lines.begin(), lines.end());
     }
-    
+
     // join all the lines that have ends that are close together..
 
@@ -1121 +1121 @@
 {
     OSG_INFO<<"Creating line intersection between sphere segment and subgraph."<<std::endl;
-    
+
     osg::BoundingBox bb = getBoundingBox();
 
     osg::Polytope polytope;
-    polytope.add(osg::Plane(1.0,0.0,0.0,-bb.xMin())); 
-    polytope.add(osg::Plane(-1.0,0.0,0.0,bb.xMax())); 
-    polytope.add(osg::Plane(0.0,1.0,0.0,-bb.yMin())); 
-    polytope.add(osg::Plane(0.0,-1.0,0.0,bb.yMax())); 
-    polytope.add(osg::Plane(0.0,0.0,1.0,-bb.zMin())); 
-    polytope.add(osg::Plane(0.0,0.0,-1.0,bb.zMax())); 
-    
+    polytope.add(osg::Plane(1.0,0.0,0.0,-bb.xMin()));
+    polytope.add(osg::Plane(-1.0,0.0,0.0,bb.xMax()));
+    polytope.add(osg::Plane(0.0,1.0,0.0,-bb.yMin()));
+    polytope.add(osg::Plane(0.0,-1.0,0.0,bb.yMax()));
+    polytope.add(osg::Plane(0.0,0.0,1.0,-bb.zMin()));
+    polytope.add(osg::Plane(0.0,0.0,-1.0,bb.zMax()));
+
     osg::Plane pl;
     pl.set(osg::Vec3(-1.0,0.0,0.0), bb.corner(0));
     PolytopeVisitor polytopeVisitor(transform, polytope);
-    
+
     subgraph->accept(polytopeVisitor);
 
@@ -1156 +1156 @@
         group->addChild(computeIntersectionSubgraph(itr->_matrix, itr->_drawable.get()));
     }
-    
+
     // join all the lines that have ends that are close together..
 
@@ -1189 +1189 @@
 
     protected:
-    
+
         SortFunctor& operator = (const SortFunctor&) { return *this; }
     };
@@ -1376 +1376 @@
 
                 double rad2 = vertex.length2();
-                double length_xy = sqrtf(vertex.x()*vertex.x() + vertex.y()*vertex.y());        
+                double length_xy = sqrtf(vertex.x()*vertex.x() + vertex.y()*vertex.y());
                 double elevation = atan2((double)vertex.z(),length_xy);
 
@@ -1495 +1495 @@
                 if (_inside_radiusSurface==_numVertices &&
                     _inside_leftRightSurfaces==_numVertices &&
-                    _inside_topSurface==_numVertices && 
+                    _inside_topSurface==_numVertices &&
                     _inside_bottomSurface==_numVertices) return Region::INSIDE;
 
@@ -1513 +1513 @@
                 if ((surfaceType!=RADIUS_SURFACE && _inside_radiusSurface!=0) &&
                     (surfaceType!=LEFT_SURFACE && _inside_leftSurface!=0) &&
-                    (surfaceType!=RIGHT_SURFACE && _inside_rightSurface!=0) && 
-                    (surfaceType!=TOP_SURFACE && _inside_topSurface!=0) && 
+                    (surfaceType!=RIGHT_SURFACE && _inside_rightSurface!=0) &&
+                    (surfaceType!=TOP_SURFACE && _inside_topSurface!=0) &&
                     (surfaceType!=BOTTOM_SURFACE && _inside_bottomSurface!=0)) return false;
 
@@ -1575 +1575 @@
 
         osg::Vec3       _centre;
-        double          _radius; 
+        double          _radius;
         double          _azMin, _azMax, _elevMin, _elevMax;
 
@@ -1615 +1615 @@
             {
                 ++_numOutside;
-                return; 
+                return;
             }
 
@@ -1790 +1790 @@
             if (itr==_edges.end())
             {
-                edge->addTriangle(tri);            
+                edge->addTriangle(tri);
                 _edges.insert(edge);
                 return edge.get();
@@ -1997 +1997 @@
 
 
-        // handle a paired of surfaces that work to enclose a convex region, which means that 
+        // handle a paired of surfaces that work to enclose a convex region, which means that
         // points can be inside either surface to be valid, and be outside both surfaces to be invalid.
         template<class I>
@@ -2077 +2077 @@
                                 possible2 = false;
                             }
-                            else 
+                            else
                             {
                                 OSG_INFO<<"start point, 2 near to end than 1"<<std::endl;
@@ -2140 +2140 @@
                                     possible2 = false;
                                 }
-                                else 
+                                else
                                 {
                                     OSG_INFO<<"end point, 2 near to end than 1"<<std::endl;
@@ -2293 +2293 @@
                             _distance = distance;
                         }
-                    }               
+                    }
                 }
             };
@@ -2336 +2336 @@
             while (unfusedLines.size()>=1)
             {
-                // generate a set of line pairs to establish which 
+                // generate a set of line pairs to establish which
                 // line pair has the minimum distance.
                 typedef std::multiset<LinePair> LinePairSet;
@@ -2353 +2353 @@
                     }
                 }
-                
+
                 if (linePairs.empty())
                 {
@@ -2421 +2421 @@
                     // copy across all but fuse end of line1
                     for(int i=openEnd1;
-                        i != fuseEnd1; 
+                        i != fuseEnd1;
                         i += direction1)
                     {
@@ -2442 +2442 @@
                     // copy across from the next point in from fuseEnd2 to the openEnd2.
                     for(int j=fuseEnd2 + direction2;
-                        j != openEnd2 + direction2; 
+                        j != openEnd2 + direction2;
                         j += direction2)
                     {
@@ -2471 +2471 @@
                 _generatedLines.insert(_generatedLines.end(), unfusedLines.begin(), unfusedLines.end());
 
-            }        
+            }
         }
 
@@ -2556 +2556 @@
 
                 double div = d2-d1;
-                if (div==0.0) 
+                if (div==0.0)
                 {
                     edge->_intersectionType = TriangleIntersectOperator::Edge::NO_INTERSECTION;
@@ -2587 +2587 @@
 
             double div = d2-d1;
-            if (div==0.0) 
+            if (div==0.0)
             {
                 return v1;
@@ -2603 +2603 @@
             return _lowerOutside ? _plane.distance(v) : -_plane.distance(v) ;
         }
-    
+
     protected:
-        
+
         AzimPlaneIntersector& operator = (const AzimPlaneIntersector&) { return *this; }
     };
@@ -2744 +2744 @@
             return _lowerOutside ? computedElev-_elev : _elev-computedElev ;
         }
-        
+
     protected:
-    
+
         ElevationIntersector& operator = (const ElevationIntersector&) { return *this; }
 
@@ -2876 +2876 @@
 
     protected:
-    
+
         RadiusIntersector& operator = (const RadiusIntersector&) { return *this; }
 
@@ -2889 +2889 @@
     osg::Geometry* geometry = dynamic_cast<osg::Geometry*>(drawable);
     if (!geometry) return SphereSegment::LineList();
-    
+
     // get vertices from geometry, return empty handed if a Vec3Array not present.
     osg::Vec3Array* vertices = dynamic_cast<osg::Vec3Array*>(geometry->getVertexArray());
     if (!vertices) return SphereSegment::LineList();
-    
+
     typedef osg::TriangleIndexFunctor<TriangleIntersectOperator> TriangleIntersectFunctor;
     TriangleIntersectFunctor tif;
- 
+
     tif._centre = _centre;
     tif._radius = _radius;
@@ -2905 +2905 @@
 
     tif.computePositionAndRegions(matrix, *vertices);
- 
+
     // traverse the triangles in the Geometry dedicating intersections
     geometry->accept(tif);
-    
+
     OSG_INFO<<"_numOutside = "<<tif._numOutside<<std::endl;
     OSG_INFO<<"_numInside = "<<tif._numInside<<std::endl;
@@ -2916 +2916 @@
     tif.removeDuplicateTriangles();
     tif.buildEdges();
-    
-    
+
+
     RadiusIntersector radiusIntersector(tif);
     AzimPlaneIntersector azMinIntersector(tif,_azMin, true);
@@ -2957 +2957 @@
         if (azimRange<=osg::PI)
         {
-            // trim the radius and elevation intersection lines by the azimMin 
+            // trim the radius and elevation intersection lines by the azimMin
             tif.trim(radiusLines, azMinIntersector);
             tif.trim(elevMinLines, azMinIntersector);
             tif.trim(elevMaxLines, azMinIntersector);
 
-            // trim the radius and elevation intersection lines by the azimMax 
+            // trim the radius and elevation intersection lines by the azimMax
             tif.trim(radiusLines, azMaxIntersector);
             tif.trim(elevMinLines, azMaxIntersector);
@@ -2981 +2981 @@
     tif.trim(elevMaxLines,radiusIntersector);
 
-    // trim the radius and elevation intersection lines by the elevMin 
+    // trim the radius and elevation intersection lines by the elevMin
     tif.trim(radiusLines, elevMinIntersector);
 
-    // trim the radius and elevation intersection lines by the elevMax 
+    // trim the radius and elevation intersection lines by the elevMax
     tif.trim(radiusLines, elevMaxIntersector);
 
@@ -2993 +2993 @@
     tif._generatedLines.insert(tif._generatedLines.end(), elevMinLines.begin(), elevMinLines.end());
     tif._generatedLines.insert(tif._generatedLines.end(), elevMaxLines.begin(), elevMaxLines.end());
- 
+
     OSG_INFO<<"number of separate lines = "<<tif._generatedLines.size()<<std::endl;
 
@@ -3007 +3007 @@
     tif.joinEnds(joinDistance, false, true);
     OSG_INFO<<"number of separate lines after second join = "<<tif._generatedLines.size()<<std::endl;
- 
+
     return tif._generatedLines;
 }
@@ -3036 +3036 @@
     {
         osg::ShapeDrawable* sd = new osg::ShapeDrawable(new osg::Sphere(tif._originalVertices[i]+tif._centre,radius));
-        
+
         TriangleIntersectFunctor::RegionCounter rc;
         rc.add(tif._regions[i]);
@@ -3053 +3053 @@
             sd->setColor(osg::Vec4(1.0,1.0,1.0,1.0));
         }
-        
+
         geode->addDrawable(sd);
     }