Changeset 13191 for OpenSceneGraph/trunk/src/osgWrappers/serializers/osg/ImageSequence.cpp

Timestamp:

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

Author:

robert

Message:

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

Files:

• OpenSceneGraph/trunk/src/osgWrappers/serializers/osg/ImageSequence.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/src/osgWrappers/serializers/osg/ImageSequence.cpp

@@ -7 +7 @@
 static bool checkFileNames( const osg::ImageSequence& image )
 {
-    return image.getNumImageFiles()>0;
+    return image.getNumImageData()>0;
 }
 
@@ -24 +24 @@
 static bool writeFileNames( osgDB::OutputStream& os, const osg::ImageSequence& image )
 {
-    const osg::ImageSequence::FileNames& files = image.getFileNames();
-    os.writeSize(files.size()); os << os.BEGIN_BRACKET << std::endl;
-    for ( osg::ImageSequence::FileNames::const_iterator itr=files.begin();
-          itr!=files.end(); ++itr )
+    const osg::ImageSequence::ImageDataList& imageDataList = image.getImageDataList();
+    os.writeSize(imageDataList.size()); os << os.BEGIN_BRACKET << std::endl;
+    for ( osg::ImageSequence::ImageDataList::const_iterator itr=imageDataList.begin();
+          itr!=imageDataList.end();
+          ++itr )
     {
-        os.writeWrappedString( *itr );
+        os.writeWrappedString( itr->_filename );
         os << std::endl;
     }
@@ -39 +40 @@
 static bool checkImages( const osg::ImageSequence& image )
 {
-    return image.getNumImages()>0;
+    return false;
 }
 
@@ -54 +55 @@
 }
 
-static bool writeImages( osgDB::OutputStream& os, const osg::ImageSequence& image )
+static bool writeImages( osgDB::OutputStream& os, const osg::ImageSequence& image)
 {
-    const osg::ImageSequence::Images& images = image.getImages();
-    os.writeSize(images.size()); os << os.BEGIN_BRACKET << std::endl;
-    for ( osg::ImageSequence::Images::const_iterator itr=images.begin();
-          itr!=images.end(); ++itr )
+    const osg::ImageSequence::ImageDataList& imageDataList = image.getImageDataList();
+    os.writeSize(imageDataList.size()); os << os.BEGIN_BRACKET << std::endl;
+    for ( osg::ImageSequence::ImageDataList::const_iterator itr=imageDataList.begin();
+          itr!=imageDataList.end();
+          ++itr )
     {
-        os.writeObject( (*itr).get() );
+        os.writeObject( (*itr)._image.get() );
     }
     os << os.END_BRACKET << std::endl;