Changeset 13191 for OpenSceneGraph/trunk/src/osgPlugins/ive/ImageSequence.cpp

Timestamp:

05/24/13 19:16:57 (4 hours ago)

Author:

robert

Message:

Resrtuctured the use of static's in the Uniform::getNameID() method to avoid problems under Android.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ive/ImageSequence.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgPlugins/ive/ImageSequence.cpp

@@ -38 +38 @@
     out->writeDouble(getLength());
 
-    out->writeUInt(getFileNames().size());
-    for(FileNames::iterator itr = getFileNames().begin();
-        itr != getFileNames().end();
+    out->writeUInt(getImageDataList().size());
+    for(ImageDataList::iterator itr = getImageDataList().begin();
+        itr != getImageDataList().end();
         ++itr)
     {
-        out->writeString(*itr);
+        out->writeString(itr->_filename);
     }
 
-    if (getFileNames().empty())
+    if (getImageDataList().empty())
     {
-        out->writeUInt(getImages().size());
-        for(Images::iterator itr = getImages().begin();
-            itr != getImages().end();
-            ++itr)
-        {
-            out->writeImage(itr->get());
-        }
+        out->writeUInt(0);
     }