Changeset 13041 for OpenSceneGraph/trunk/src/osgManipulator/Projector.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/osgManipulator/Projector.cpp (modified) (9 diffs)

OpenSceneGraph/trunk/src/osgManipulator/Projector.cpp

@@ -31 +31 @@
     // An explanation of the algorithm can be found at
     // http://www.geometryalgorithms.com/Archive/algorithm_0106/algorithm_0106.htm
-    
+
     osg::LineSegment::vec_type u = l1.end() - l1.start(); u.normalize();
     osg::LineSegment::vec_type v = l2.end() - l2.start(); v.normalize();
@@ -75 +75 @@
 }
 
-bool getPlaneLineIntersection(const osg::Vec4d& plane, 
-                              const osg::Vec3d& lineStart, const osg::Vec3d& lineEnd, 
+bool getPlaneLineIntersection(const osg::Vec4d& plane,
+                              const osg::Vec3d& lineStart, const osg::Vec3d& lineEnd,
                               osg::Vec3d& isect)
 {
@@ -95 +95 @@
 }
 
-bool getSphereLineIntersection(const osg::Sphere& sphere, 
-                               const osg::Vec3d& lineStart, const osg::Vec3d& lineEnd, 
+bool getSphereLineIntersection(const osg::Sphere& sphere,
+                               const osg::Vec3d& lineStart, const osg::Vec3d& lineEnd,
                                osg::Vec3d& frontISect, osg::Vec3d& backISect)
 {
@@ -105 +105 @@
     double B = 2.0f * (lineDirection * v);
     double C = v * v - sphere.getRadius() * sphere.getRadius();
-    
+
     double discriminant = B * B - 4.0f * C;
 
@@ -121 +121 @@
 }
 
-bool getUnitCylinderLineIntersection(const osg::Vec3d& lineStart, const osg::Vec3d& lineEnd, 
+bool getUnitCylinderLineIntersection(const osg::Vec3d& lineStart, const osg::Vec3d& lineEnd,
                                      osg::Vec3d& isectFront, osg::Vec3d& isectBack)
 {
@@ -153 +153 @@
 
 bool getCylinderLineIntersection(const osg::Cylinder& cylinder,
-                                 const osg::Vec3d& lineStart, const osg::Vec3d& lineEnd, 
+                                 const osg::Vec3d& lineStart, const osg::Vec3d& lineEnd,
                                  osg::Vec3d& isectFront, osg::Vec3d& isectBack)
 {
@@ -162 +162 @@
                                * osg::Matrix::scale(oneOverRadius, oneOverRadius, oneOverRadius)
                                * osg::Matrix(cylinder.getRotation().inverse());
-                               
+
     // Transform the lineStart and lineEnd into the unit cylinder space.
     osg::Vec3d unitCylLineStart = lineStart * toUnitCylInZ;
@@ -170 +170 @@
     osg::Vec3d unitCylIsectFront, unitCylIsectBack;
     if (! getUnitCylinderLineIntersection(unitCylLineStart, unitCylLineEnd, unitCylIsectFront, unitCylIsectBack))
-        return false;    
+        return false;
 
     // Transform back from unit cylinder space.
     osg::Matrix invToUnitCylInZ(osg::Matrix::inverse(toUnitCylInZ));
     isectFront = unitCylIsectFront * invToUnitCylInZ;
-    isectBack = unitCylIsectBack * invToUnitCylInZ;    
+    isectBack = unitCylIsectBack * invToUnitCylInZ;
 
     return true;
@@ -182 +182 @@
 osg::Vec3d getLocalEyeDirection(const osg::Vec3d& eyeDir, const osg::Matrix& localToWorld)
 {
-    // To take a normal from world to local you need to transform it by the transpose of the inverse of the 
+    // To take a normal from world to local you need to transform it by the transpose of the inverse of the
     // world to local matrix. Pre-multiplying is equivalent to doing a post-multiplication of the transpose.
     osg::Vec3d localEyeDir = localToWorld * eyeDir;