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

OpenSceneGraph/trunk/src/osgPlugins/geo/geoActions.cpp

@@ -298 +298 @@
         float v=*in;
         *out=rangelist.begin()->getVal();
-        for (std::vector<geoRange>::const_iterator itr=rangelist.begin(); 
+        for (std::vector<geoRange>::const_iterator itr=rangelist.begin();
         itr<rangelist.end(); itr++) {
             if (v>=itr->getMin() && v<=itr->getMax()) *out=itr->getVal();
@@ -357 +357 @@
         case DB_DSK_ROTATE_ACTION:
             //std::cout << node->getName() << " v: " << getVar() << " rotion " << DEG2RAD(getValue()) << std::endl;
-            mtr->preMult( osg::Matrix::translate(-centre)* 
+            mtr->preMult( osg::Matrix::translate(-centre)*
                 osg::Matrix::rotate(DEG2RAD(getValue()),axis)* // nov 2003 negative rotation convention
                 osg::Matrix::translate(centre));
@@ -394 +394 @@
             }
         }
-    } else if (act==DB_DSK_TRANSLATE_ACTION) {            
+    } else if (act==DB_DSK_TRANSLATE_ACTION) {
         const geoField *gfd=grec->getField(GEO_DB_TRANSLATE_ACTION_INPUT_VAR);
         if (gfd) {
@@ -414 +414 @@
             }
         }
-    } else if (act==DB_DSK_SCALE_ACTION) {     // Nov 2002 not yet implemented in the modeller!       
+    } else if (act==DB_DSK_SCALE_ACTION) {     // Nov 2002 not yet implemented in the modeller!
     }
     return ok;
@@ -430 +430 @@
             case DB_DSK_ROTATE_ACTION:
                 //std::cout << dr->getName() << " v: " << getVar() << " rotion " << DEG2RAD(getValue()) << std::endl;
-                *mtr = (*mtr)*osg::Matrix::translate(-getCentre())* 
-                    osg::Matrix::rotate(DEG2RAD(getValue()),getAxis())* 
+                *mtr = (*mtr)*osg::Matrix::translate(-getCentre())*
+                    osg::Matrix::rotate(DEG2RAD(getValue()),getAxis())*
                     osg::Matrix::translate(getCentre());
                 break;
@@ -464 +464 @@
             }
         }
-    } else if (act==DB_DSK_TRANSLATE_ACTION) {            
+    } else if (act==DB_DSK_TRANSLATE_ACTION) {
         const geoField *gfd=grec->getField(GEO_DB_TRANSLATE_ACTION_INPUT_VAR);
         if (gfd) {
@@ -484 +484 @@
             }
         }
-    } else if (act==DB_DSK_SCALE_ACTION) {     // Nov 2002 not yet implemented in the modeller!       
+    } else if (act==DB_DSK_SCALE_ACTION) {     // Nov 2002 not yet implemented in the modeller!
     }
     return ok;
@@ -548 +548 @@
 }
 
-void geoStrContentBehaviour::doaction(osg::Drawable* /*node*/) 
+void geoStrContentBehaviour::doaction(osg::Drawable* /*node*/)
 { // do new text
 #ifdef USETEXT // buggy text feb 2003
@@ -688 +688 @@
                     }
                 }
-            } 
+            }
             if (newpos) {
                 osg::Vec3Array* vtxa = dynamic_cast<osg::Vec3Array*>(gm->getVertexArray());