Changeset 13041 for OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgViewer/View.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/osgWrappers/deprecated-dotosg/osgViewer/View.cpp (modified) (14 diffs)

OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgViewer/View.cpp

@@ -26 +26 @@
 {
     bool iteratorAdvanced = false;
-    
+
     if (fr[0].matchWord(keyword) && fr[1].isOpenBracket())
     {
@@ -52 +52 @@
         }
         iteratorAdvanced = true;
-    }        
-        
+    }
+
     return iteratorAdvanced;
 }
@@ -94 +94 @@
         }
         ++fr;
-        
+
         itrAdvanced = true;
 
@@ -100 +100 @@
         {
             unsigned int numPixels = 256;
-        
+
             osg::Image* image = new osg::Image;
             image->allocateImage(1,numPixels,1,GL_LUMINANCE,GL_FLOAT);
-        
+
             float intensityMultiplier = 0.01f;
             float* ptr = reinterpret_cast<float*>(image->data());
@@ -132 +132 @@
                         intensity = above_itr->second * intensityMultiplier;
                     }
-                    
-                }
-                
+
+                }
+
                 *ptr++ = intensity;
             }
-            
+
             return image;
         }
-        
+
     }
     return 0;
@@ -158 +158 @@
         unsigned int screenNum = 0;
         unsigned int intensityFormat = 8;
-        osg::Matrix matrix; 
+        osg::Matrix matrix;
         std::string filename;
         osg::ref_ptr<osg::Image> intensityMap;
@@ -175 +175 @@
             if (fr.read("intensityFormat",intensityFormat)) local_itrAdvanced = true;
             if (readMatrix(matrix,fr,"projectorMatrix")) local_itrAdvanced = true;
-            
+
             if (!local_itrAdvanced) ++fr;
         }
-        
+
         // skip trailing '}'
         ++fr;
-        
-        iteratorAdvanced = true;
-        
+
+        iteratorAdvanced = true;
+
         if (!filename.empty())
         {
@@ -206 +206 @@
     int height = 1024;
     unsigned int screenNum = 0;
-    
+
     if (fr.read("setUpViewOnSingleScreen",screenNum))
     {
@@ -212 +212 @@
         iteratorAdvanced = true;
     }
-    
+
     if (fr.read("setUpViewAcrossAllScreens"))
     {
@@ -218 +218 @@
         iteratorAdvanced = true;
     }
-    
+
     if (fr.read("setUpViewInWindow",x,y,width,height,screenNum))
     {
         view.setUpViewInWindow(x, y, width, height, screenNum);
     }
-    
+
     if (fr.read("setUpViewInWindow",x,y,width,height))
     {
@@ -236 +236 @@
         iteratorAdvanced = true;
     }
-    
+
     if (fr.matchSequence("Slaves {"))
     {
@@ -249 +249 @@
             else ++fr;
         }
-        
+
         // skip trailing '}'
         ++fr;
-        
-        iteratorAdvanced = true;
-
-    }
-    
+
+        iteratorAdvanced = true;
+
+    }
+
     return iteratorAdvanced;
 }
@@ -270 +270 @@
         fw.writeObject(*view.getCamera());
     }
-    
+
     if (view.getNumSlaves() != 0)
     {
         fw.indent()<<"Slaves {"<<std::endl;
         fw.moveIn();
-    
+
         for(unsigned int i=0; i<view.getNumSlaves(); ++i)
         {
@@ -284 +284 @@
             }
         }
-        
+
         fw.moveOut();
         fw.indent()<<"}"<<std::endl;
     }
-    
+
     return true;
 }