Changeset 13191 for OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osg/ImageSequence.cpp

Timestamp:

05/25/13 12:09:23 (23 hours ago)

Author:

robert

Message:

From Farshid Lashkari, " small update to TangentSpaceGenerator? to support QUAD_STRIP primitive types."

Files:

• OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osg/ImageSequence.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osg/ImageSequence.cpp

@@ -108 +108 @@
     fw.indent()<<"Length "<<is.getLength()<<std::endl;
 
-    if (!is.getFileNames().empty())
+    if (is.getNumImageData()>0)
     {
         fw.indent()<<"FileNames {"<<std::endl;
         fw.moveIn();
 
-        const osg::ImageSequence::FileNames& names = is.getFileNames();
-        for(osg::ImageSequence::FileNames::const_iterator itr = names.begin();
-            itr != names.end();
+        const osg::ImageSequence::ImageDataList& id = is.getImageDataList();
+        for(osg::ImageSequence::ImageDataList::const_iterator itr = id.begin();
+            itr != id.end();
             ++itr)
         {
-            fw.indent()<<fw.wrapString(*itr)<<std::endl;
-        }
-
-        fw.moveOut();
-        fw.indent()<<"}"<<std::endl;
-    }
-    else
-    {
-        fw.indent()<<"Images {"<<std::endl;
-        fw.moveIn();
-
-        const osg::ImageSequence::Images& images = is.getImages();
-        for(osg::ImageSequence::Images::const_iterator itr = images.begin();
-            itr != images.end();
-            ++itr)
-        {
-            if (!(*itr)->getFileName().empty()) fw.indent()<<fw.wrapString((*itr)->getFileName())<<std::endl;
+            fw.indent()<<fw.wrapString(itr->_filename)<<std::endl;
         }