Changeset 10606 for OpenSceneGraph/trunk/src/osg/Texture.cpp

Timestamp:

10/06/09 15:42:12 (4 years ago)

Author:

robert

Message:

Fixed the TextureObject?'s + GLBufferObject reassignment to a new set.

Disabled the unref after apply for a Texture classes when the texture pool is enabled

Files:

• OpenSceneGraph/trunk/src/osg/Texture.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/src/osg/Texture.cpp

@@ -91 +91 @@
         if (_set)
         {
-            // remove self from original set
-            _set->remove(this);
-
-            // get the new set for the new profile
-            _set = _set->getParent()->getTextureObjectSet(_profile);
-
-            // register self with new set.
-            _set->addToBack(this);
+            _set->moveToSet(this, _set->getParent()->getTextureObjectSet(_profile));
         }
     }
@@ -384 +377 @@
     addToBack(to.get());
 
-    // osg::notify(osg::NOTICE)<<"Reusing orhpahned TextureObject, _numOfTextureObjects="<<_numOfTextureObjects<<std::endl;
+    osg::notify(osg::NOTICE)<<"Reusing orhpahned TextureObject, _numOfTextureObjects="<<_numOfTextureObjects<<std::endl;
 
     return to.release();
@@ -423 +416 @@
         {
             original_texture->setTextureObject(_contextID,0);
-            // osg::notify(osg::NOTICE)<<"TextureObjectSet="<<this<<": Reusing an active TextureObject "<<to.get()<<" _numOfTextureObjects="<<_numOfTextureObjects<<" width="<<_profile._width<<" height="<<_profile._height<<std::endl;
+            osg::notify(osg::NOTICE)<<"TextureObjectSet="<<this<<": Reusing an active TextureObject "<<to.get()<<" _numOfTextureObjects="<<_numOfTextureObjects<<" width="<<_profile._width<<" height="<<_profile._height<<std::endl;
         }
         else
         {
-            // osg::notify(osg::NOTICE)<<"Reusing a recently orphaned active TextureObject "<<to.get()<<std::endl;
+            osg::notify(osg::NOTICE)<<"Reusing a recently orphaned active TextureObject "<<to.get()<<std::endl;
         }
 
@@ -454 +447 @@
     addToBack(to);
 
-    // osg::notify(osg::NOTICE)<<"Created new TextureObject, _numOfTextureObjects "<<_numOfTextureObjects<<std::endl;
+    osg::notify(osg::NOTICE)<<"Created new TextureObject, _numOfTextureObjects "<<_numOfTextureObjects<<std::endl;
 
     return to;
@@ -601 +594 @@
     to->_next = 0;
     to->_previous = 0;
+}
+
+void Texture::TextureObjectSet::moveToSet(TextureObject* to, TextureObjectSet* set)
+{
+    if (set==this) return;
+    if (!set) return;
+
+    // remove 'to' from original set
+    --_numOfTextureObjects;
+    remove(to);
+
+    // register 'to' with new set.
+    to->_set = set;
+    ++set->_numOfTextureObjects;
+    set->addToBack(to);
 }