Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/p3d/ReaderWriterP3D.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/p3d/ReaderWriterP3D.cpp (modified) (37 diffs)

OpenSceneGraph/trunk/src/osgPlugins/p3d/ReaderWriterP3D.cpp

@@ -1 @@
-    /* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield 
+    /* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield
  *
- * This software is open source and may be redistributed and/or modified under  
+ * This software is open source and may be redistributed and/or modified under
  * the terms of the GNU General Public License (GPL) version 2.0.
  * The full license is in LICENSE.txt file included with this distribution,.
- * 
+ *
  * This software 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
  * include LICENSE.txt for more details.
 */
@@ -67 +67 @@
         _alignmentMap["RIGHT_CENTER"] = osgText::Text::RIGHT_CENTER;
         _alignmentMap["RIGHT_BOTTOM"] = osgText::Text::RIGHT_BOTTOM;
-        
+
         _alignmentMap["LEFT_BASE_LINE"] = osgText::Text::LEFT_BASE_LINE;
         _alignmentMap["CENTER_BASE_LINE"] = osgText::Text::CENTER_BASE_LINE;
@@ -102 +102 @@
         _notifyLevel = osg::INFO;
     }
-    
+
     virtual const char* className() const
     {
@@ -109 +109 @@
 
     virtual bool acceptsExtension(const std::string& extension) const
-    { 
+    {
         return osgDB::equalCaseInsensitive(extension,"p3d") ||
                osgDB::equalCaseInsensitive(extension,"xml") ;
@@ -131 +131 @@
 
     void parseLayer(osgPresentation::SlideShowConstructor& constructor, osgDB::XmlNode*cur) const;
- 
+
     void parseBullets(osgPresentation::SlideShowConstructor& constructor, osgDB::XmlNode*cur, bool inheritPreviousLayers, bool defineAsBaseLayer) const;
     void parseText(osgPresentation::SlideShowConstructor& constructor, osgDB::XmlNode*cur, bool inheritPreviousLayers, bool defineAsBaseLayer) const;
 
     void parsePage (osgPresentation::SlideShowConstructor& constructor, osgDB::XmlNode*cur) const;
-    
+
     void parseSlide (osgPresentation::SlideShowConstructor& constructor, osgDB::XmlNode*cur, bool parseTitles=true, bool parseLayers=true) const;
 
@@ -149 +149 @@
         else return osg::Vec4(0.0f,0.0f,0.0f,1.0f);
     }
-    
+
     inline osg::Vec4 accumulateRotation(const osg::Vec4& lhs, const osg::Vec4& rhs) const
     {
@@ -169 +169 @@
     inline bool read(const char* str, osg::Vec3& value) const;
     inline bool read(const char* str, osg::Vec4& value) const;
-    
+
     inline bool read(const std::string& str, int& value) const;
     inline bool read(const std::string& str, float& value) const;
@@ -191 +191 @@
     bool getProperty(osgDB::XmlNode*cur, const char* token, osgText::Text::AlignmentType& value) const;
     bool getProperty(osgDB::XmlNode*cur, const char* token, osgText::Text::CharacterSizeMode& value) const;
-    
+
     bool getProperties(osgDB::XmlNode*cur, osgPresentation::SlideShowConstructor::PositionData& value) const;
     bool getProperties(osgDB::XmlNode*cur, osgPresentation::SlideShowConstructor::FontData& value) const;
@@ -197 +197 @@
     bool getProperties(osgDB::XmlNode*cur, osgPresentation::SlideShowConstructor::ImageData& value) const;
     bool getJumpProperties(osgDB::XmlNode*cur, bool& relativeJump, int& slideNum, int& layerNum) const;
- 
+
     bool getKeyPositionInner(osgDB::XmlNode*cur, osgPresentation::KeyPosition& keyPosition) const;
     bool getKeyPosition(osgDB::XmlNode*cur, osgPresentation::KeyPosition& keyPosition) const;
@@ -207 +207 @@
     typedef std::map<std::string, unsigned int> StringKeyMap;
 
-    std::string expandEnvVarsInFileName(const std::string& filename) const; 
+    std::string expandEnvVarsInFileName(const std::string& filename) const;
 
 
@@ -215 +215 @@
     CharacterSizeModeMap    _characterSizeModeMap;
     StringKeyMap            _stringKeyMap;
-    
+
     typedef std::map<std::string, osg::ref_ptr<osgDB::XmlNode> > TemplateMap;
     mutable TemplateMap _templateMap;
@@ -231 +231 @@
     std::string argument(filename);
     std::string::size_type start_pos = argument.find("${");
-    
+
     while (start_pos != std::string::npos)
-    {        
+    {
         std::string::size_type end_pos = argument.find("}",start_pos);
         if (start_pos != std::string::npos)
@@ -483 +483 @@
 bool ReaderWriterP3DXML::getProperties(osgDB::XmlNode*cur, osgPresentation::SlideShowConstructor::PositionData& value) const
 {
-    bool propertiesRead=false;    
+    bool propertiesRead=false;
 
     osg::Vec3 position(0.0f,1.0f,0.0f);
@@ -501 +501 @@
         else if (str=="slide") value.frame = osgPresentation::SlideShowConstructor::SLIDE;
         else OSG_NOTIFY(_notifyLevel)<<"Parser error - coordinate_frame=\""<<str<<"\" unrecongonized value"<<std::endl;
-        
+
         OSG_NOTIFY(_notifyLevel)<<"read coordinate_frame "<< ((value.frame==osgPresentation::SlideShowConstructor::MODEL) ? "osgPresentation::SlideShowConstructor::MODEL" : "osgPresentation::SlideShowConstructor::SLIDE")<<std::endl;
     }
@@ -507 +507 @@
     if (value.frame==osgPresentation::SlideShowConstructor::SLIDE)
     {
-        
+
         if (getProperty(cur, "position", str))
         {
@@ -516 +516 @@
             osg::Vec2 vec2;
             osg::Vec3 vec3;
-        
+
             bool fail = false;
             if (str=="center") value.position.set(0.5f,.5f,0.0f);
@@ -536 +536 @@
 
             propertiesRead = true;
-            
+
             bool fail = false;
             if (str=="center") value.position.set(0.0f,1.0f,0.0f);
@@ -547 +547 @@
     }
 
-    
+
     if (getProperty(cur, "scale", scale))
     {
@@ -637 +637 @@
     if (getTrimmedProperty(cur, "path", str))
     {
-    
+
         value.absolute_path = false;
         value.inverse_path = false;
@@ -747 +747 @@
 bool ReaderWriterP3DXML::getProperties(osgDB::XmlNode*cur, osgPresentation::SlideShowConstructor::FontData& value) const
 {
-    bool propertiesRead=false;    
-    
+    bool propertiesRead=false;
+
     OSG_NOTIFY(_notifyLevel)<<"in getProperties(FontData)"<<std::endl;
 
@@ -789 +789 @@
 bool ReaderWriterP3DXML::getProperties(osgDB::XmlNode*cur, osgPresentation::SlideShowConstructor::ModelData& value) const
 {
-    bool propertiesRead=false;    
-    
+    bool propertiesRead=false;
+
     OSG_NOTIFY(_notifyLevel)<<"in getProperties(ModelData)"<<std::endl;
 
@@ -810 +810 @@
 bool ReaderWriterP3DXML::getProperties(osgDB::XmlNode*cur, osgPresentation::SlideShowConstructor::ImageData& value) const
 {
-    bool propertiesRead=false;    
-    
+    bool propertiesRead=false;
+
     OSG_NOTIFY(_notifyLevel)<<"in getProperties(ImageData)"<<std::endl;
 
@@ -880 +880 @@
         OSG_NOTIFY(_notifyLevel)<<"read texcoord_scale \""<<value.texcoord_scale<<"\""<<std::endl;
     }
-    
+
     if (getProperty(cur, "texcoord_rotate", value.texcoord_rotate))
     {
@@ -894 +894 @@
     bool propertyRead = false;
 
-    if (getProperty(cur, "slide", slideNum)) 
+    if (getProperty(cur, "slide", slideNum))
     {
         OSG_INFO<<"slide "<<slideNum<<std::endl;
@@ -931 +931 @@
     {
         constructor.addModel(filename,
-                             positionRead ? positionData : constructor.getModelPositionData(), 
+                             positionRead ? positionData : constructor.getModelPositionData(),
                              modelData);
     }
@@ -1032 +1032 @@
 
     if (getProperty(cur, "options", volumeData.options)) {}
-    
+
     // check for draggers required
     std::string dragger;
@@ -1055 +1055 @@
 
     std::string filename = cur->getTrimmedContents();
-    if (!filename.empty()) 
+    if (!filename.empty())
     {
         constructor.addVolume(filename,
@@ -1101 +1101 @@
 
 
-    if (!filenameLeft.empty() && !filenameRight.empty()) 
+    if (!filenameLeft.empty() && !filenameRight.empty())
         constructor.addStereoImagePair(filenameLeft,imageDataLeft,
                                        filenameRight, imageDataRight,
@@ -1203 +1203 @@
             {
                 OSG_INFO<<"Layer Jump "<<relativeJump<<","<< slideNum<<", "<<layerNum<<std::endl;
-            
+
                 constructor.setLayerJump(relativeJump, slideNum, layerNum);
             }
@@ -1316 +1316 @@
             getProperty(cur, "options", options);
 
-            constructor.addGraph(cur->getTrimmedContents(), 
+            constructor.addGraph(cur->getTrimmedContents(),
                                  positionRead ? positionData : constructor.getImagePositionData(),
                                  imageData);
@@ -1611 +1611 @@
                 int layerNum;
                 if (getProperty(cur, "layer", layerNum))
-                {            
+                {
                     constructor.selectLayer(layerNum);
                 }
@@ -1716 +1716 @@
         }
 
-        
+
         osgDB::ReaderWriter::ReadResult readFileCache(ObjectType type, const std::string& filename, const osgDB::Options* options)
         {
@@ -2219 +2219 @@
         {
             bool fontRead = getProperties(cur,constructor.getTitleFontDataDefault());
-            if (fontRead) 
+            if (fontRead)
             {
                 OSG_INFO<<"Title font details read"<<std::endl;
@@ -2227 +2227 @@
         {
             bool fontRead = getProperties(cur,constructor.getTextFontDataDefault());
-            if (fontRead) 
+            if (fontRead)
             {
                 OSG_INFO<<"Text font details read"<<std::endl;
@@ -2285 +2285 @@
             int slideNum;
             if (getProperty(cur, "slide", slideNum))
-            {            
+            {
                 constructor.selectSlide(slideNum);
                 parseSlide (constructor, cur);
@@ -2306 +2306 @@
             std::string name;
             if (getProperty(cur, "name", name))
-            {            
+            {
                 _templateMap[name] = cur;
                 std::cout<<"Defining template slide "<<name<<std::endl;
@@ -2314 +2314 @@
 
     osgDB::getDataFilePathList() = previousPaths;
-    
+
     return constructor.takePresentation();
 }