Changeset 13191 for OpenSceneGraph/trunk/src/osgDB/ImagePager.cpp

Timestamp:

05/16/13 17:52:29 (2 days ago)

Author:

robert

Message:

Added support for setting the left/right cull masks

Files:

• OpenSceneGraph/trunk/src/osgDB/ImagePager.cpp (modified) (7 diffs)

OpenSceneGraph/trunk/src/osgDB/ImagePager.cpp

@@ -84 +84 @@
     // note this will mean that only one ImageSequence can be properly managed at one time,
     // this hack will be removed once a better system for managing expiry of requests is introduced.
-    clear();
+    // clear();
 
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_requestMutex);
@@ -91 +91 @@
     databaseRequest->_requestQueue = this;
 
-    OSG_INFO<<"ImagePager::ReadQueue::add(..), size()="<<_requestList.size()<<std::endl;
+    OSG_INFO<<"ImagePager::ReadQueue::add("<<databaseRequest->_fileName<<"), size()="<<_requestList.size()<<std::endl;
 
     updateBlock();
@@ -207 +207 @@
         if (imageRequest.valid())
         {
-            osg::ref_ptr<osg::Image> image = osgDB::readImageFile(imageRequest->_fileName);
+            // OSG_NOTICE<<"doing readImageFile("<<imageRequest->_fileName<<") index to assign = "<<imageRequest->_attachmentIndex<<std::endl;
+            osg::ref_ptr<osg::Image> image = osgDB::readImageFile(imageRequest->_fileName, imageRequest->_readOptions.get());
             if (image.valid())
             {
+                // OSG_NOTICE<<"   successful readImageFile("<<imageRequest->_fileName<<") index to assign = "<<imageRequest->_attachmentIndex<<std::endl;
+                
                 osg::ImageSequence* is = dynamic_cast<osg::ImageSequence*>(imageRequest->_attachmentPoint.get());
                 if (is)
@@ -267 +270 @@
     _completedQueue = new RequestQueue;
     _imageThreads.push_back(new ImageThread(this, ImageThread::HANDLE_ALL_REQUESTS, "Image Thread 1"));
+#if 1
     _imageThreads.push_back(new ImageThread(this, ImageThread::HANDLE_ALL_REQUESTS, "Image Thread 2"));
     _imageThreads.push_back(new ImageThread(this, ImageThread::HANDLE_ALL_REQUESTS, "Image Thread 3"));
@@ -272 +276 @@
     _imageThreads.push_back(new ImageThread(this, ImageThread::HANDLE_ALL_REQUESTS, "Image Thread 5"));
     _imageThreads.push_back(new ImageThread(this, ImageThread::HANDLE_ALL_REQUESTS, "Image Thread 6"));
-
+#endif
     // 1 second
     _preLoadTime = 1.0;
@@ -315 +319 @@
 }
 
-void ImagePager::requestImageFile(const std::string& fileName,osg::Object* attachmentPoint, int attachmentIndex, double timeToMergeBy, const osg::FrameStamp*)
-{
-    OSG_INFO<<"ImagePager::requestNodeFile("<<fileName<<")"<<std::endl;
+void ImagePager::requestImageFile(const std::string& fileName, osg::Object* attachmentPoint, int attachmentIndex, double timeToMergeBy, const osg::FrameStamp* framestamp, osg::ref_ptr<osg::Referenced>& imageRequest, const osg::Referenced* options)
+{
+
+    osgDB::Options* readOptions = dynamic_cast<osgDB::Options*>(const_cast<osg::Referenced*>(options));
+    if (!readOptions)
+    {
+       readOptions = Registry::instance()->getOptions();
+    }
+
+    bool alreadyAssigned = dynamic_cast<ImageRequest*>(imageRequest.get()) && (imageRequest->referenceCount()>1);
+    if (alreadyAssigned)
+    {
+        // OSG_NOTICE<<"ImagePager::requestImageFile("<<fileName<<") alreadyAssigned"<<std::endl;
+        return;
+    }
 
     osg::ref_ptr<ImageRequest> request = new ImageRequest;
@@ -325 +341 @@
     request->_attachmentIndex = attachmentIndex;
     request->_requestQueue = _readQueue.get();
+    request->_readOptions = readOptions;
+
+    imageRequest = request;
+
+    // OSG_NOTICE<<"ImagePager::requestImageFile("<<fileName<<") new request."<<std::endl;
 
     _readQueue->add(request.get());