Changeset 8633

Timestamp:

07/21/08 11:47:39 (5 years ago)

Author:

robert

Message:

First cut of osgDB::ImagePager? for updating osg::ImageSequence?

Location:

OpenSceneGraph/trunk

Files:

• include/osgViewer/Scene (modified) (3 diffs)
• include/osgViewer/View (modified) (2 diffs)
• src/osgDB/CMakeLists.txt (modified) (2 diffs)
• src/osgDB/DatabasePager.cpp (modified) (1 diff)
• src/osgViewer/CompositeViewer.cpp (modified) (1 diff)
• src/osgViewer/Scene.cpp (modified) (2 diffs)
• src/osgViewer/View.cpp (modified) (1 diff)
• src/osgViewer/Viewer.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osgViewer/Scene

@@ -18 +18 @@
 #include <osgGA/EventVisitor>
 #include <osgDB/DatabasePager>
+#include <osgDB/ImagePager>
 
 #include <osgViewer/Export>
@@ -34 +35 @@
         const osg::Node* getSceneData() const;
 
+
         void setDatabasePager(osgDB::DatabasePager* dp);
         osgDB::DatabasePager* getDatabasePager() { return _databasePager.get(); }
         const osgDB::DatabasePager* getDatabasePager() const { return _databasePager.get(); }
+
+
+        void setImagePager(osgDB::ImagePager* ip);
+        osgDB::ImagePager* getImagePager() { return _imagePager.get(); }
+        const osgDB::ImagePager* getImagePager() const { return _imagePager.get(); }
+
 
         /** Get the Scene object that has the specified node assigned to it.
@@ -56 +64 @@
 
         osg::ref_ptr<osgDB::DatabasePager>  _databasePager;
+        osg::ref_ptr<osgDB::ImagePager>     _imagePager;
 };
 

OpenSceneGraph/trunk/include/osgViewer/View

@@ -72 +72 @@
         const osg::Node* getSceneData() const { return _scene.valid() ? _scene->getSceneData() : 0; }
 
+
         /** Set the View's database pager.*/
         void setDatabasePager(osgDB::DatabasePager* dp);
@@ -80 +81 @@
         /** Get the const View's database pager.*/
         const osgDB::DatabasePager* getDatabasePager() const;
+
+
+        /** Set the View's image pager.*/
+        void setImagePager(osgDB::ImagePager* ip);
+
+        /** Get the View's image pager.*/
+        osgDB::ImagePager* getImagePager();
+
+        /** Get the const View's image pager.*/
+        const osgDB::ImagePager* getImagePager() const;
+
 
         /* Set the EventQueue that View uses to integrate external non window related events.*/

OpenSceneGraph/trunk/src/osgDB/CMakeLists.txt

@@ -21 +21 @@
     ${HEADER_PATH}/FileUtils
     ${HEADER_PATH}/ImageOptions
+    ${HEADER_PATH}/ImagePager
     ${HEADER_PATH}/Input
     ${HEADER_PATH}/Output
@@ -47 +48 @@
     FileUtils.cpp
     ImageOptions.cpp
+    ImagePager.cpp
     Input.cpp
     Output.cpp

OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp

@@ +1 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+*/
+
 #include <osgDB/DatabasePager>
 #include <osgDB/WriteFile>

OpenSceneGraph/trunk/src/osgViewer/CompositeViewer.cpp

@@ -973 +973 @@
         }
 
+        if (scene->getImagePager())
+        {    
+            // synchronize changes required by the DatabasePager thread to the scene graph
+            scene->getImagePager()->updateSceneGraph(_frameStamp->getReferenceTime());
+        }
+
     }
 

OpenSceneGraph/trunk/src/osgViewer/Scene.cpp

@@ -25 +25 @@
 {
     setDatabasePager(osgDB::DatabasePager::create());
+    setImagePager(new osgDB::ImagePager);
     
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_sceneCacheMutex);
@@ -72 +73 @@
 }
 
+void Scene::setImagePager(osgDB::ImagePager* ip)
+{
+    _imagePager = ip;
+}
+
 
 Scene* Scene::getScene(osg::Node* node)

OpenSceneGraph/trunk/src/osgViewer/View.cpp

@@ -296 +296 @@
 {
     return _scene->getDatabasePager();
+}
+
+
+void View::setImagePager(osgDB::ImagePager* dp)
+{
+    _scene->setImagePager(dp);
+}
+
+osgDB::ImagePager* View::getImagePager()
+{
+    return _scene->getImagePager();
+}
+
+const osgDB::ImagePager* View::getImagePager() const
+{
+    return _scene->getImagePager();
 }
 

OpenSceneGraph/trunk/src/osgViewer/Viewer.cpp

@@ -892 +892 @@
     }
 
+    if (_scene->getImagePager())
+    {    
+        // synchronize changes required by the DatabasePager thread to the scene graph
+        _scene->getImagePager()->updateSceneGraph(_frameStamp->getReferenceTime());
+    }
+
     if (_updateOperations.valid())
     {