Changeset 10600 for OpenSceneGraph/trunk/include/osg/Image

Timestamp:

10/01/09 22:19:42 (4 years ago)

Author:

robert

Message:

Introduced new BufferObject? design + implementation in preperation of implementing a pool system for buffer objects

Files:

• OpenSceneGraph/trunk/include/osg/Image (modified) (5 diffs)

OpenSceneGraph/trunk/include/osg/Image

@@ -62 +62 @@
 
 /** Image class for encapsulating the storage texture image data. */
-class OSG_EXPORT Image : public Object
+class OSG_EXPORT Image : public BufferData
 {
 
@@ -77 +77 @@
         virtual const char* libraryName() const { return "osg"; }
         virtual const char* className() const { return "Image"; }
+
+        virtual const GLvoid*   getDataPointer() const { return data(); }
+        virtual unsigned int    getTotalDataSize() const { return getTotalSizeInBytesIncludingMipmaps(); }
 
         /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */
@@ -253 +256 @@
         */
         void ensureValidSizeForTexturing(GLint maxTextureSize);
-      
-        /** Dirty the image, which increments the modified count, to force osg::Texture to reload the image. */
-        inline void dirty() { ++_modifiedCount; if (_bufferObject.valid()) _bufferObject->dirty(); }      
-      
-        /** Set the modified count value. Used by osg::Texture when using texture subloading. */
-        inline void setModifiedCount(unsigned int value) { _modifiedCount=value; }
-
-        /** Get modified count value. Used by osg::Texture when using texture subloading. */
-        inline unsigned int getModifiedCount() const { return _modifiedCount; }
-
 
         static bool isPackedType(GLenum type);
@@ -317 +310 @@
 
         /** Set the optional PixelBufferObject used to map the image memory efficiently to graphics memory. */ 
-        void setPixelBufferObject(PixelBufferObject* buffer) { _bufferObject = buffer; if (_bufferObject.valid()) _bufferObject->setImage(this); }
-
-        /** Get the PixelBufferObject.*/ 
-        PixelBufferObject* getPixelBufferObject() { return _bufferObject.get(); }
-
-        /** Get the const PixelBufferObject.*/ 
-        const PixelBufferObject* getPixelBufferObject() const { return _bufferObject.get(); }
+        void setPixelBufferObject(PixelBufferObject* buffer) { setBufferObject(buffer); }
+
+        /** Get the PixelBufferObject.*/
+        PixelBufferObject* getPixelBufferObject() { return dynamic_cast<PixelBufferObject*>(_bufferObject.get()); }
+
+        /** Get the const PixelBufferObject.*/
+        const PixelBufferObject* getPixelBufferObject() const { return dynamic_cast<const PixelBufferObject*>(_bufferObject.get()); }
        
-        virtual void update(NodeVisitor* /*nv*/) {}        
+        virtual void update(NodeVisitor* /*nv*/) {}
 
         /** method for sending pointer events to images that are acting as front ends to interactive surfaces such as a vnc or browser window.  Return true if handled. */
@@ -361 +354 @@
         
         void setData(unsigned char* data,AllocationMode allocationMode);
-
-        unsigned int _modifiedCount;
 
         MipmapDataType _mipmapData;