Changeset 10055

Timestamp:

04/21/09 12:20:56 (4 years ago)

Author:

robert

Message:

Fix for handling case of no graphics contexts being registered.

Merged from svn/trunk using:

svn merge -r 10053:10054 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp

Files:

• OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgDB/DatabasePager.cpp (modified) (13 diffs, 1 prop)

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgDB/DatabasePager.cpp

@@ -112 +112 @@
 {
 public:
-    FindCompileableGLObjectsVisitor(DatabasePager::DataToCompile& dataToCompile, 
+    FindCompileableGLObjectsVisitor(DatabasePager::DataToCompile* dataToCompile,
                                bool changeAutoUnRef, bool valueAutoUnRef,
                                bool changeAnisotropy, float valueAnisotropy,
@@ -128 +128 @@
             _kdTreeBuilder = osgDB::Registry::instance()->getKdTreeBuilder()->clone();
         }
-        
-    }
-    
+    }
+
     META_NodeVisitor("osgDB","FindCompileableGLObjectsVisitor")
-    
+
     virtual void apply(osg::Node& node)
     {
@@ -139 +138 @@
         traverse(node);
     }
-    
+
     virtual void apply(osg::Geode& geode)
     {
         apply(geode.getStateSet());
-    
+
         for(unsigned int i=0;i<geode.getNumDrawables();++i)
         {
@@ -150 +149 @@
 
         traverse(geode);
-        
+
         if (_kdTreeBuilder.valid())
         {
             geode.accept(*_kdTreeBuilder);
         }
-        
-    }
-    
+    }
+
     inline void apply(osg::StateSet* stateset)
     {
@@ -182 +180 @@
                             texture->setMaxAnisotropy(_valueAnisotropy);
                     }
-                    
+
                     if (!_pager->isCompiled(texture))
                     {
@@ -198 +196 @@
                 }
             }
-            if (compileStateSet)
-            {
-                _dataToCompile.first.insert(stateset);
-            }
-
-        }
-    }
-    
+            if (compileStateSet && _dataToCompile)
+            {
+                _dataToCompile->first.insert(stateset);
+            }
+
+        }
+    }
+
     inline void apply(osg::Drawable* drawable)
     {
@@ -212 +210 @@
 
         _drawableSet.insert(drawable);
-        
+
         apply(drawable->getStateSet());
-        
+
         switch(_drawablePolicy)
         {
@@ -241 +239 @@
         // XXX This "compiles" VBOs too, but compilation doesn't do
         // anything for VBOs, does it?
-        if (drawable->getUseDisplayList() && !_pager->isCompiled(drawable))
+        if (_dataToCompile && drawable->getUseDisplayList() && !_pager->isCompiled(drawable))
         {
             // osg::notify(osg::NOTICE)<<"  Found compilable drawable"<<std::endl;
-            _dataToCompile.second.push_back(drawable);
-        }
-    }
-    
-    DatabasePager::DataToCompile&           _dataToCompile;
+            _dataToCompile->second.push_back(drawable);
+        }
+    }
+    
+    DatabasePager::DataToCompile*           _dataToCompile;
     bool                                    _changeAutoUnRef;
     bool                                    _valueAutoUnRef;
@@ -596 +594 @@
                 ActiveGraphicsContexts::iterator itr = _pager->_activeGraphicsContexts.begin();
 
-                DataToCompile& dtc = databaseRequest->_dataToCompileMap[*itr];
-                ++itr;                
+                DataToCompile* dtc = 0;
+                if (itr != _pager->_activeGraphicsContexts.end())
+                {
+                    dtc = &(databaseRequest->_dataToCompileMap[*itr]);
+                    ++itr;
+                }
 
                 // find all the compileable rendering objects
@@ -620 +622 @@
                     !_pager->_activeGraphicsContexts.empty())
                 {
-                    if (!dtc.first.empty() || !dtc.second.empty())
+                    if (!dtc->first.empty() || !dtc->second.empty())
                     {
                         loadedObjectsNeedToBeCompiled = true;                
@@ -629 +631 @@
                             ++itr)
                         {
-                            databaseRequest->_dataToCompileMap[*itr] = dtc;
+                            databaseRequest->_dataToCompileMap[*itr] = *dtc;
                         }
                     }
@@ -645 +647 @@
 
                     // find all the compileable rendering objects
-                    DatabasePager::FindCompileableGLObjectsVisitor frov(dtc, 
+                    DatabasePager::FindCompileableGLObjectsVisitor frov(&dtc,
                                                          _pager->_changeAutoUnRef, _pager->_valueAutoUnRef,
                                                          _pager->_changeAnisotropy, _pager->_valueAnisotropy,
@@ -1494 +1496 @@
     }
 
-    META_NodeVisitor("osgDB","FindCompileableGLObjectsVisitor")
+    META_NodeVisitor("osgDB","MarkPagedLODsVisitor")
 
     virtual void apply(osg::PagedLOD& plod)