Changeset 8682

Timestamp:

07/25/08 15:45:07

Author:

robert

Message:

Added ImageSequence? to .ive plugin, added support for multiple ImageThreads? in osgDB::ImagePager?

Files:

• OpenSceneGraph/trunk/include/osg/ImageSequence (modified) (1 diff)
• OpenSceneGraph/trunk/include/osgDB/ImagePager (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osg/ImageSequence.cpp (modified) (3 diffs)
• OpenSceneGraph/trunk/src/osgDB/ImagePager.cpp (modified) (5 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/ive/CMakeLists.txt (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/ive/DataInputStream.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/ive/DataInputStream.h (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgPlugins/ive/DataOutputStream.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/ive/DataOutputStream.h (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgPlugins/ive/ImageSequence.cpp (added)
• OpenSceneGraph/trunk/src/osgPlugins/ive/ImageSequence.h (added)
• OpenSceneGraph/trunk/src/osgPlugins/ive/IveVersion.h (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgPlugins/ive/ReadWrite.h (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgPlugins/ive/Texture1D.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/ive/Texture2D.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/ive/Texture3D.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/ive/TextureCubeMap.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/ive/TextureRectangle.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/include/osg/ImageSequence

@@ -106 +106 @@
-        Images::iterator                _imageIterator;
-        double                          _imageIteratorTime;
+        
+        typedef std::pair< std::string, osg::ref_ptr<osg::Image> >  FileNameImagePair;
+        typedef std::list< FileNameImagePair >  FileNameImageList;
+        
+        FileNameImageList               _filesRequested;
-
-};

OpenSceneGraph/trunk/include/osgDB/ImagePager

@@ -67 +67 @@
-            std::string     _name;
-        };
+
+
+        ImageThread* getImageThread(unsigned int i) { return _imageThreads[i].get(); }
+        
+        const ImageThread* getImageThread(unsigned int i) const { return _imageThreads[i].get(); }
+
+        unsigned int getNumImageThreads() const { return _imageThreads.size(); }
+        
-
-        virtual void requestImageFile(const std::string& fileName,osg::Object* attachmentPoint, double timeToMergeBy, const osg::FrameStamp* framestamp);
@@ -145 +153 @@
-        
-        osg::ref_ptr<ReadQueue>     _readQueue;
-        osg::ref_ptr<ImageThread>   _imageThread;
-        
+        typedef std::vector< osg::ref_ptr<ImageThread> > ImageThreads;
+        ImageThreads                _imageThreads;
+        
+        osg::ref_ptr<RequestQueue>  _completedQueue;
-};
-

OpenSceneGraph/trunk/src/osg/ImageSequence.cpp

@@ -104 +104 @@
-{
-    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    computeTimePerImage();
-
-_imageIterator==_images.end()
+
+data()==0
-    {
-        _imageIterator = _images.begin();
@@ -170 +214 @@
-            {
-                _fileNamesIteratorTime += _timePerImage;
-
-
+//
+//
-                ++_fileNamesIterator;
-
@@ -182 +226 @@
-                }
-
+                _filesRequested.push_back(FileNameImagePair(*_fileNamesIterator,0));
-                irh->requestImageFile(*_fileNamesIterator, this, _fileNamesIteratorTime, fs);
-

OpenSceneGraph/trunk/src/osgDB/ImagePager.cpp

@@ -200 +200 @@
-                else
-                {
-
-
-
-
-
+
+
+
+
-                }
-            }
-
-        }
-
-        else
-        {
@@ -243 +241 @@
-    
-    _readQueue = new ReadQueue(this,"Image Queue");
-
+
+
+
+
-}
-
@@ -255 +256 @@
-    int result = 0;
-
-
+
+
+
+
+
+
-
-    // release the frameBlock and _databasePagerThreadBlock in case its holding up thread cancellation.
-    _readQueue->release();
-
-
+
+
+
+
+
+
-
-    _done = true;
@@ -290 +301 @@
-            _startThreadCalled = true;
-            _done = false;
-            _imageThread->startThread();
-            
+            for(ImageThreads::iterator itr = _imageThreads.begin();
+                itr != _imageThreads.end();
+                ++itr)
+            {
+                (*itr)->startThread();
+            }
+            
-        }
-    }
@@ -299 +316 @@
-{
-    //osg::notify(osg::NOTICE)<<"ImagePager::requiresUpdateSceneGraph()"<<std::endl;
-false
+!(_completedQueue->_requestList.empty())
-}
-
-void ImagePager::updateSceneGraph(double currentFrameTime)
-{
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

OpenSceneGraph/trunk/src/osgPlugins/ive/CMakeLists.txt

@@ -47 +47 @@
-    HeightFieldLayer.cpp
-    Image.cpp
+    ImageSequence.cpp
-    ImageLayer.cpp
-    Impostor.cpp
@@ -154 +155 @@
-    HeightFieldLayer.h
-    Image.h
+    ImageSequence.h
-    ImageLayer.h
-    Impostor.h

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

@@ -51 +51 @@
-#include "Scissor.h"
-#include "Image.h"
+#include "ImageSequence.h"
-#include "PointSprite.h"
-#include "Multisample.h"
@@ -955 +956 @@
-    
-    return image;
+}
+
+osg::Image* DataInputStream::readImage()
+{
+    if ( getVersion() >= VERSION_0029 )
+    {
+        int id = peekInt();
+        if(id == IVEIMAGESEQUENCE)
+        {
+            osg::ImageSequence* image = new osg::ImageSequence();
+            ((ive::ImageSequence*)image)->read(this);
+            return image;
+        }
+        else
+        {
+            readInt();
+            IncludeImageMode includeImg = (IncludeImageMode)readChar();
+            return readImage(includeImg);
+        }
+    }
+    else
+    {
+        IncludeImageMode includeImg = (IncludeImageMode)readChar();
+        return readImage(includeImg);
+    }
-}
-

OpenSceneGraph/trunk/src/osgPlugins/ive/DataInputStream.h

@@ -92 +92 @@
-    osg::Image* readImage(std::string s);
-    osg::Image* readImage(IncludeImageMode mode);
+    osg::Image* readImage();
-    osg::StateSet* readStateSet();
-    osg::StateAttribute* readStateAttribute();

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

@@ -54 +54 @@
-#include "Scissor.h"
-#include "Image.h"
+#include "ImageSequence.h"
-#include "PointSprite.h"
-#include "Multisample.h"
@@ -1095 +1096 @@
-}
-
+void DataOutputStream::writeImage(osg::Image *image)
+{
+    if ( getVersion() >= VERSION_0029)
+    {
+        osg::ImageSequence* is = dynamic_cast<osg::ImageSequence*>(image);
+        if (is)
+        {
+            ((ive::ImageSequence*)(is))->write(this);
+        }
+        else
+        {
+            writeInt(IVEIMAGE);
+            writeChar(getIncludeImageMode());
+            writeImage(getIncludeImageMode(),image);
+        }
+    }
+    else
+    {
+        writeChar(getIncludeImageMode());
+        writeImage(getIncludeImageMode(),image);
+    }
+}
+
-void DataOutputStream::writeImage(IncludeImageMode mode, osg::Image *image)
-{

OpenSceneGraph/trunk/src/osgPlugins/ive/DataOutputStream.h

@@ -95 +95 @@
-    void writeNode(const osg::Node* sa);
-    void writeImage(IncludeImageMode mode, osg::Image *image);
+    void writeImage(osg::Image *image);
-
-    void writeLayer(const osgTerrain::Layer* layer);

OpenSceneGraph/trunk/src/osgPlugins/ive/IveVersion.h

@@ -38 +38 @@
-#define VERSION_0027 27
-#define VERSION_0028 28
+#define VERSION_0029 29
-
-8
+9
-
-/* The BYTE_SEX tag is used to check the endian

OpenSceneGraph/trunk/src/osgPlugins/ive/ReadWrite.h

@@ -39 +39 @@
-#define IVEAUTOTRANSFORM                0x00000030
-#define IVEOCCLUSIONQUERYNODE           0x00000031
+#define IVEIMAGESEQUENCE                0x00000032
-
-// Node callbacks

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

@@ -34 +34 @@
-
-    // Should we include images date in stream
-
-
-
-
+
-}
-
@@ -56 +53 @@
-        
-        // Should we read image data from stream
-
-
-
+
-        if(image) {
-            setImage(image);

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

@@ -34 +34 @@
-
-    // Should we include images date in stream
-
-
-
-
+
-}
-
@@ -55 +52 @@
-        // Read image.
-        
-
-
-
-
+
-        if(image) {
-            setImage(image);

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

@@ -34 +34 @@
-
-    // Should we include images date in stream
-
-
-
-
+
-}
-
@@ -56 +53 @@
-        
-        // Should we read image data from stream
-
-
-
+
-        if(image) {
-            setImage(image);

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

@@ -39 +39 @@
-    out->writeInt(getNumMipmapLevels());
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-
@@ -75 +87 @@
-        setNumMipmapLevels((unsigned int)in->readInt());
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        
-    }

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

@@ -34 +34 @@
-
-    // Should we include images date in stream
-
-
-
-
+
-}
-
@@ -56 +53 @@
-        
-        // Should we read image data from stream
-
-
-
+
-        if(image) {
-            setImage(image);