Changeset 10597 for OpenSceneGraph/trunk/include/osg/Texture

Timestamp:

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

Author:

robert

Message:

Added handling of resetting of the texture object format

Files:

• OpenSceneGraph/trunk/include/osg/Texture (modified) (4 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);