Changeset 10597

Timestamp:

09/27/09 17:14:57 (4 years ago)

Author:

robert

Message:

Added handling of resetting of the texture object format

Location:

OpenSceneGraph/trunk

Files:

• include/osg/Texture (modified) (4 diffs)
• src/osg/Texture.cpp (modified) (4 diffs)
• src/osgWrappers/osg/Texture.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/include/osg/Texture

@@ -976 +976 @@
             inline void setAllocated(bool allocated=true) { _allocated = allocated; }
 
-            inline void setAllocated(GLint     numMipmapLevels,
+            void setAllocated(GLint     numMipmapLevels,
                               GLenum    internalFormat,
                               GLsizei   width,
                               GLsizei   height,
                               GLsizei   depth,
-                              GLint     border)
-            {
-                _allocated=true;
-                _profile.set(numMipmapLevels,internalFormat,width,height,depth,border);
-            }
+                              GLint     border);
 
             inline bool isAllocated() const { return _allocated; }
@@ -1020 +1016 @@
             void addToBack(TextureObject* to);
             void orphan(TextureObject* to);
+            void remove(TextureObject* to);
+
             unsigned int size() const { return _profile._size * _numOfTextureObjects; }
 
@@ -1025 +1023 @@
 
             bool checkConsistency() const;
+
+            TextureObjectManager* getParent() { return _parent; }
 
         protected:
@@ -1086 +1086 @@
             void releaseTextureObject(TextureObject* to);
 
+            TextureObjectSet* getTextureObjectSet(const TextureProfile& profile);
 
             void newFrame(osg::FrameStamp* fs);

OpenSceneGraph/trunk/src/osg/Texture.cpp

@@ -77 +77 @@
 }
 
+void Texture::TextureObject::setAllocated(GLint     numMipmapLevels,
+                                          GLenum    internalFormat,
+                                          GLsizei   width,
+                                          GLsizei   height,
+                                          GLsizei   depth,
+                                          GLint     border)
+{
+    _allocated=true;
+    if (!match(_profile._target,numMipmapLevels,internalFormat,width,height,depth,border))
+    {
+        _profile.set(numMipmapLevels,internalFormat,width,height,depth,border);
+
+        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);
+        }
+    }
+}
+
 void Texture::TextureProfile::computeSize()
 {
@@ -210 +236 @@
         _orphanedTextureObjects.push_back(to);
 
-        if (to->_previous!=0)
-        {
-            (to->_previous)->_next = to->_next;
-        }
-        else
-        {
-            // 'to' was head so assign _head to the next in list
-            _head = to->_next;
-        }
-
-        if (to->_next!=0)
-        {
-            (to->_next)->_previous = to->_previous;
-        }
-        else
-        {
-            // 'to' was tail so assing tail to the previous in list
-            _tail = to->_previous;
-        }
-
-        // reset the 'to' list pointers as it's no longer in the active list.
-        to->_next = 0;
-        to->_previous = 0;
+        remove(to);
 
 #if 0
@@ -571 +575 @@
 #endif
 }
+
+void Texture::TextureObjectSet::remove(Texture::TextureObject* to)
+{
+    if (to->_previous!=0)
+    {
+        (to->_previous)->_next = to->_next;
+    }
+    else
+    {
+        // 'to' was head so assign _head to the next in list
+        _head = to->_next;
+    }
+
+    if (to->_next!=0)
+    {
+        (to->_next)->_previous = to->_previous;
+    }
+    else
+    {
+        // 'to' was tail so assing tail to the previous in list
+        _tail = to->_previous;
+    }
+
+    // reset the 'to' list pointers as it's no longer in the active list.
+    to->_next = 0;
+    to->_previous = 0;
+}
+
 
 Texture::TextureObjectManager::TextureObjectManager(unsigned int contextID):
@@ -632 +664 @@
 
     Texture::TextureProfile profile(target,numMipmapLevels,internalFormat,width,height,depth,border);
+    TextureObjectSet* tos = getTextureObjectSet(profile);
+    return tos->takeOrGenerate(const_cast<Texture*>(texture));
+}
+
+Texture::TextureObjectSet* Texture::TextureObjectManager::getTextureObjectSet(const TextureProfile& profile)
+{
     osg::ref_ptr<Texture::TextureObjectSet>& tos = _textureSetMap[profile];
     if (!tos) tos = new Texture::TextureObjectSet(this, profile);
-    return tos->takeOrGenerate(const_cast<Texture*>(texture));
+    return tos.get();
 }
 

OpenSceneGraph/trunk/src/osgWrappers/osg/Texture.cpp

@@ -886 +886 @@
                   "",
                   "");
+        I_Method1(osg::Texture::TextureObjectSet *, getTextureObjectSet, IN, const osg::Texture::TextureProfile &, profile,
+                  Properties::NON_VIRTUAL,
+                  __TextureObjectSet_P1__getTextureObjectSet__C5_TextureProfile_R1,
+                  "",
+                  "");
         I_Method1(void, newFrame, IN, osg::FrameStamp *, fs,
                   Properties::NON_VIRTUAL,
@@ -1034 +1039 @@
                   "",
                   "");
+        I_Method1(void, remove, IN, osg::Texture::TextureObject *, to,
+                  Properties::NON_VIRTUAL,
+                  __void__remove__TextureObject_P1,
+                  "",
+                  "");
         I_Method0(unsigned int, size,
                   Properties::NON_VIRTUAL,
@@ -1049 +1059 @@
                   "",
                   "");
+        I_Method0(osg::Texture::TextureObjectManager *, getParent,
+                  Properties::NON_VIRTUAL,
+                  __TextureObjectManager_P1__getParent,
+                  "",
+                  "");
+        I_SimpleProperty(osg::Texture::TextureObjectManager *, Parent, 
+                         __TextureObjectManager_P1__getParent, 
+                         0);
 END_REFLECTOR