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

OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgAnimation/ReaderWriter.cpp

@@ -1 @@
-/*  -*-c++-*- 
+/*  -*-c++-*-
  *  Copyright (C) 2008 Cedric Pinson <cedric.pinson@plopbyte.net>
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library 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
  * OpenSceneGraph Public License for more details.
  */
@@ -55 +55 @@
         fr[3].getFloat(att[2]);
         fr[4].getFloat(att[3]);
-        
+
         fr += 5;
         iteratorAdvanced = true;
@@ -67 +67 @@
         fr[2].getFloat(pos[1]);
         fr[3].getFloat(pos[2]);
-        
+
         fr += 4;
         iteratorAdvanced = true;
@@ -79 +79 @@
         fr[2].getFloat(scale[1]);
         fr[3].getFloat(scale[2]);
-        
+
         fr += 4;
         iteratorAdvanced = true;
@@ -87 +87 @@
     if (fr.matchSequence("InvBindMatrixInSkeletonSpace {"))
     {
-        Matrix matrix; 
+        Matrix matrix;
         if (readMatrix(matrix,fr, "InvBindMatrixInSkeletonSpace"))
         {
@@ -96 +96 @@
     if (fr.matchSequence("MatrixInSkeletonSpace {"))
     {
-        Matrix matrix; 
+        Matrix matrix;
         if (readMatrix(matrix,fr, "MatrixInSkeletonSpace"))
         {
@@ -127 +127 @@
 
 
-bool Skeleton_readLocalData(Object& obj, Input& fr) 
-{ 
+bool Skeleton_readLocalData(Object& obj, Input& fr)
+{
     return false;
 }
-bool Skeleton_writeLocalData(const Object& obj, Output& fr) 
-{
-    return true; 
+bool Skeleton_writeLocalData(const Object& obj, Output& fr)
+{
+    return true;
 }
 RegisterDotOsgWrapperProxy g_SkeletonProxy
@@ -150 +150 @@
     bool iteratorAdvanced = false;
     std::string name = "unknown";
-    if (fr.matchSequence("name %s")) 
+    if (fr.matchSequence("name %s"))
     {
         if (fr[1].getStr())
@@ -160 +160 @@
 
     std::string target = "unknown";
-    if (fr.matchSequence("target %s")) 
+    if (fr.matchSequence("target %s"))
     {
         if (fr[1].getStr())
@@ -171 +171 @@
 // we dont need this info
     float weight = 1.0;
-    if (fr.matchSequence("weight %f")) 
+    if (fr.matchSequence("weight %f"))
     {
         fr[1].getFloat(weight);
@@ -196 +196 @@
     }
 
-    if (fr.matchSequence("weight %f")) 
+    if (fr.matchSequence("weight %f"))
     {
         float weight;
@@ -204 +204 @@
         anim.setWeight(weight);
     }
-    
-    if (fr.matchSequence("duration %f")) 
+
+    if (fr.matchSequence("duration %f"))
     {
         float duration;
@@ -214 +214 @@
     }
 
-    if (fr.matchSequence("starttime %f")) 
+    if (fr.matchSequence("starttime %f"))
     {
         float starttime;
@@ -224 +224 @@
 
     int nbChannels = 0;
-    if (fr.matchSequence("num_channels %i")) 
+    if (fr.matchSequence("num_channels %i"))
     {
         fr[1].getInt(nbChannels);
@@ -231 +231 @@
     }
 
-    for (int i = 0; i < nbChannels; i++) 
-    {
-        if (fr.matchSequence("DoubleLinearChannel {")) 
+    for (int i = 0; i < nbChannels; i++)
+    {
+        if (fr.matchSequence("DoubleLinearChannel {"))
         {
             fr += 2;
@@ -241 +241 @@
             if (Animation_readChannel(channel, fr))
                 iteratorAdvanced = true;
-                 
+
             int nbKeys;
-            if (fr.matchSequence("Keyframes %i {")) 
+            if (fr.matchSequence("Keyframes %i {"))
             {
                 fr[1].getInt(nbKeys);
@@ -249 +249 @@
                 iteratorAdvanced = true;
 
-                for (int k = 0; k < nbKeys; k++) 
+                for (int k = 0; k < nbKeys; k++)
                 {
                     double v;
@@ -270 +270 @@
                 fr += 1;
         }
-        else if (fr.matchSequence("FloatLinearChannel {")) 
+        else if (fr.matchSequence("FloatLinearChannel {"))
         {
             fr += 2;
@@ -278 +278 @@
             if (Animation_readChannel(channel, fr))
                 iteratorAdvanced = true;
-                 
+
             int nbKeys;
-            if (fr.matchSequence("Keyframes %i {")) 
+            if (fr.matchSequence("Keyframes %i {"))
             {
                 fr[1].getInt(nbKeys);
@@ -286 +286 @@
                 iteratorAdvanced = true;
 
-                for (int k = 0; k < nbKeys; k++) 
+                for (int k = 0; k < nbKeys; k++)
                 {
                     float v;
@@ -307 +307 @@
                 fr += 1;
         }
-        else if (fr.matchSequence("Vec2LinearChannel {")) 
+        else if (fr.matchSequence("Vec2LinearChannel {"))
         {
             fr += 2;
@@ -315 +315 @@
             if (Animation_readChannel(channel, fr))
                 iteratorAdvanced = true;
-                 
+
             int nbKeys;
-            if (fr.matchSequence("Keyframes %i {")) 
+            if (fr.matchSequence("Keyframes %i {"))
             {
                 fr[1].getInt(nbKeys);
@@ -323 +323 @@
                 iteratorAdvanced = true;
 
-                for (int k = 0; k < nbKeys; k++) 
+                for (int k = 0; k < nbKeys; k++)
                 {
                     osg::Vec2 v;
@@ -345 +345 @@
                 fr += 1;
         }
-        else if (fr.matchSequence("Vec3LinearChannel {")) 
+        else if (fr.matchSequence("Vec3LinearChannel {"))
         {
             fr += 2;
@@ -353 +353 @@
             if (Animation_readChannel(channel, fr))
                 iteratorAdvanced = true;
-                 
+
             int nbKeys;
-            if (fr.matchSequence("Keyframes %i {")) 
+            if (fr.matchSequence("Keyframes %i {"))
             {
                 fr[1].getInt(nbKeys);
@@ -361 +361 @@
                 iteratorAdvanced = true;
 
-                for (int k = 0; k < nbKeys; k++) 
+                for (int k = 0; k < nbKeys; k++)
                 {
                     osg::Vec3 v;
@@ -384 +384 @@
                 fr += 1;
         }
-        else if (fr.matchSequence("Vec4LinearChannel {")) 
+        else if (fr.matchSequence("Vec4LinearChannel {"))
         {
             fr += 2;
@@ -392 +392 @@
             if (Animation_readChannel(channel, fr))
                 iteratorAdvanced = true;
-                 
+
             int nbKeys;
-            if (fr.matchSequence("Keyframes %i {")) 
+            if (fr.matchSequence("Keyframes %i {"))
             {
                 fr[1].getInt(nbKeys);
@@ -400 +400 @@
                 iteratorAdvanced = true;
 
-                for (int k = 0; k < nbKeys; k++) 
+                for (int k = 0; k < nbKeys; k++)
                 {
                     osg::Vec4 v;
@@ -424 +424 @@
                 fr += 1;
         }
-        else if (fr.matchSequence("QuatSphericalLinearChannel {")) 
+        else if (fr.matchSequence("QuatSphericalLinearChannel {"))
         {
             fr += 2;
@@ -432 +432 @@
             if (Animation_readChannel(channel, fr))
                 iteratorAdvanced = true;
-                 
+
             int nbKeys;
-            if (fr.matchSequence("Keyframes %i {")) 
+            if (fr.matchSequence("Keyframes %i {"))
             {
                 fr[1].getInt(nbKeys);
@@ -440 +440 @@
                 iteratorAdvanced = true;
 
-                for (int k = 0; k < nbKeys; k++) 
+                for (int k = 0; k < nbKeys; k++)
                 {
                     osg::Quat q;
@@ -465 +465 @@
         }
         // Deprecated
-        // Reading of old channel info 
+        // Reading of old channel info
         // Kept here for easy conversion of old .osg data to new format
-        else if (fr.matchSequence("Channel {")) 
+        else if (fr.matchSequence("Channel {"))
         {
             fr += 2;
 
             std::string name = "unknown";
-            if (fr.matchSequence("name %s")) 
+            if (fr.matchSequence("name %s"))
             {
                 if (fr[1].getStr())
@@ -480 +480 @@
             }
             std::string target = "unknown";
-            if (fr.matchSequence("target %s")) 
+            if (fr.matchSequence("target %s"))
             {
                 if (fr[1].getStr())
@@ -490 +490 @@
             std::string type = "unknown";
             int nbKeys;
-            if (fr.matchSequence("Keyframes %s %i {")) 
+            if (fr.matchSequence("Keyframes %s %i {"))
             {
                 if (fr[1].getStr())
@@ -499 +499 @@
 
                 osgAnimation::Channel* channel = 0;
-                if (type == "Quat") 
+                if (type == "Quat")
                 {
                     osgAnimation::QuatSphericalLinearChannel* c = new osgAnimation::QuatSphericalLinearChannel;
@@ -505 +505 @@
                     channel = c;
                 }
-                else if (type == "Vec3") 
+                else if (type == "Vec3")
                 {
                     osgAnimation::Vec3LinearChannel* c = new osgAnimation::Vec3LinearChannel;
@@ -512 +512 @@
                 }
 
-                if (channel) 
+                if (channel)
                 {
-                    for (int k = 0; k < nbKeys; k++) 
+                    for (int k = 0; k < nbKeys; k++)
                     {
-                        if (type == "Quat") 
+                        if (type == "Quat")
                         {
                             osg::Quat q;
@@ -531 +531 @@
                             iteratorAdvanced = true;
                         }
-                        else if (type == "Vec3") 
+                        else if (type == "Vec3")
                         {
                             osg::Vec3 v;
@@ -577 +577 @@
         fw.indent() << "Keyframes " << kfc->size() << " {" << std::endl;
         fw.moveIn();
-        for (unsigned int k = 0; k < kfc->size(); k++) 
+        for (unsigned int k = 0; k < kfc->size(); k++)
         {
             fw.indent() << "key " << (*kfc)[k].getTime() << " " <<  (*kfc)[k].getValue() << std::endl;
@@ -592 +592 @@
     const osgAnimation::Animation& anim = dynamic_cast<const osgAnimation::Animation&>(obj);
 
-    switch (anim.getPlayMode()) 
+    switch (anim.getPlayMode())
     {
     case osgAnimation::Animation::ONCE:
@@ -603 +603 @@
         fw.indent() << "playmode LOOP" << std::endl;
         break;
-    case osgAnimation::Animation::PPONG: 
+    case osgAnimation::Animation::PPONG:
         fw.indent() << "playmode PPONG" << std::endl;
         break;
@@ -615 +615 @@
 
     fw.indent() << "num_channels " << anim.getChannels().size()  << std::endl;
-    for (unsigned int i = 0; i < anim.getChannels().size(); i++) 
+    for (unsigned int i = 0; i < anim.getChannels().size(); i++)
     {
         osgAnimation::Channel* pChannel = anim.getChannels()[i].get();
@@ -699 +699 @@
 
 
-bool AnimationManagerBase_readLocalData(osgAnimation::AnimationManagerBase& manager, Input& fr) 
+bool AnimationManagerBase_readLocalData(osgAnimation::AnimationManagerBase& manager, Input& fr)
 {
     int nbAnims = 0;
     bool iteratorAdvanced = false;
 
-    if (fr.matchSequence("num_animations %i")) 
+    if (fr.matchSequence("num_animations %i"))
     {
         fr[1].getInt(nbAnims);
@@ -715 +715 @@
         Object* o = fr.readObject();
         osgAnimation::Animation* a = dynamic_cast<osgAnimation::Animation*>(o);
-        if (a) 
+        if (a)
         {
             manager.registerAnimation(a);
             iteratorAdvanced = true;
-        } 
+        }
         else
-            osg::notify(osg::WARN)<<"Warning: can't read an animation object"<< std::endl;        
+            osg::notify(osg::WARN)<<"Warning: can't read an animation object"<< std::endl;
     }
 
@@ -728 +728 @@
 
 
-bool BasicAnimationManager_readLocalData(Object& obj, Input& fr) 
+bool BasicAnimationManager_readLocalData(Object& obj, Input& fr)
 {
     osgAnimation::BasicAnimationManager& manager = dynamic_cast<osgAnimation::BasicAnimationManager&>(obj);
@@ -734 +734 @@
 }
 
-bool TimelineAnimationManager_readLocalData(Object& obj, Input& fr) 
+bool TimelineAnimationManager_readLocalData(Object& obj, Input& fr)
 {
     osgAnimation::TimelineAnimationManager& manager = dynamic_cast<osgAnimation::TimelineAnimationManager&>(obj);
@@ -749 +749 @@
     {
         if (!fw.writeObject(**it))
-            osg::notify(osg::WARN)<<"Warning: can't write an animation object"<< std::endl;        
+            osg::notify(osg::WARN)<<"Warning: can't write an animation object"<< std::endl;
     }
     return true;
@@ -788 +788 @@
 
 
-bool RigGeometry_readLocalData(Object& obj, Input& fr) 
+bool RigGeometry_readLocalData(Object& obj, Input& fr)
 {
     osgAnimation::RigGeometry& geom = dynamic_cast<osgAnimation::RigGeometry&>(obj);
@@ -795 +795 @@
     int nbGroups = 0;
     bool iteratorAdvanced = false;
-    if (fr.matchSequence("num_influences %i")) 
+    if (fr.matchSequence("num_influences %i"))
     {
         fr[1].getInt(nbGroups);
@@ -802 +802 @@
     }
 
-    for (int i = 0; i < nbGroups; i++) 
+    for (int i = 0; i < nbGroups; i++)
     {
         int nbVertexes = 0;
         std::string name;
-        if (fr.matchSequence("osgAnimation::VertexInfluence %s %i {")) 
+        if (fr.matchSequence("osgAnimation::VertexInfluence %s %i {"))
         {
             name = fr[1].getStr();
@@ -817 +817 @@
         vi.setName(name);
         vi.reserve(nbVertexes);
-        for (int j = 0; j < nbVertexes; j++) 
+        for (int j = 0; j < nbVertexes; j++)
         {
             int index = -1;
             float weight = 1;
-            if (fr.matchSequence("%i %f")) 
+            if (fr.matchSequence("%i %f"))
             {
                 fr[0].getInt(index);
@@ -830 +830 @@
             vi.push_back(osgAnimation::VertexIndexWeight(index, weight));
         }
-        if (fr.matchSequence("}")) 
+        if (fr.matchSequence("}"))
         {
             fr+=1;
@@ -849 +849 @@
 }
 
-bool RigGeometry_writeLocalData(const Object& obj, Output& fw) 
+bool RigGeometry_writeLocalData(const Object& obj, Output& fw)
 {
     const osgAnimation::RigGeometry& geom = dynamic_cast<const osgAnimation::RigGeometry&>(obj);
@@ -857 +857 @@
     fw.indent() << "num_influences "  << vm->size() << std::endl;
     fw.moveIn();
-    for (osgAnimation::VertexInfluenceMap::const_iterator it = vm->begin(); it != vm->end(); ++it) 
+    for (osgAnimation::VertexInfluenceMap::const_iterator it = vm->begin(); it != vm->end(); ++it)
     {
         std::string name = it->first;
@@ -865 +865 @@
         fw.moveIn();
         const osgAnimation::VertexInfluence& vi = it->second;
-        for (osgAnimation::VertexInfluence::const_iterator itv = vi.begin(); itv != vi.end(); itv++) 
+        for (osgAnimation::VertexInfluence::const_iterator itv = vi.begin(); itv != vi.end(); itv++)
         {
             fw.indent() << itv->first << " " << itv->second << std::endl;
@@ -889 +889 @@
 
 
-bool MorphGeometry_readLocalData(Object& obj, Input& fr) 
+bool MorphGeometry_readLocalData(Object& obj, Input& fr)
 {
     osgAnimation::MorphGeometry& geom = dynamic_cast<osgAnimation::MorphGeometry&>(obj);
@@ -947 +947 @@
 
                 float weight = 1.0;
-                if (fr.matchSequence("weight %f")) 
+                if (fr.matchSequence("weight %f"))
                 {
                     fr[1].getFloat(weight);
@@ -966 +966 @@
 }
 
-bool MorphGeometry_writeLocalData(const Object& obj, Output& fw) 
+bool MorphGeometry_writeLocalData(const Object& obj, Output& fw)
 {
     const osgAnimation::MorphGeometry& geom = dynamic_cast<const osgAnimation::MorphGeometry&>(obj);
@@ -977 +977 @@
 
     fw.indent() << "morphNormals ";
-    if (geom.getMorphNormals()) 
+    if (geom.getMorphNormals())
         fw << "TRUE" << std::endl;
-    else 
+    else
         fw << "FALSE" << std::endl;
 
@@ -1033 +1033 @@
 
 
-bool UpdateSkeleton_readLocalData(Object& obj, Input& fr) 
+bool UpdateSkeleton_readLocalData(Object& obj, Input& fr)
 {
     bool iteratorAdvanced = false;
@@ -1055 +1055 @@
 
 
-bool UpdateMorph_readLocalData(Object& obj, Input& fr) 
+bool UpdateMorph_readLocalData(Object& obj, Input& fr)
 {
     bool iteratorAdvanced = false;