Changeset 10600 for OpenSceneGraph/trunk/src/osgWrappers/osg/Image.cpp

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/src/osgWrappers/osg/Image.cpp (modified) (6 diffs)

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

@@ -53 +53 @@
 BEGIN_OBJECT_REFLECTOR(osg::Image)
         I_DeclaringFile("osg/Image");
-        I_BaseType(osg::Object);
+        I_BaseType(osg::BufferData);
         I_Constructor0(____Image,
                        "",
@@ -86 +86 @@
                   "return the name of the object's class type. ",
                   "Must be defined by derived classes. ");
+        I_Method0(const GLvoid *, getDataPointer,
+                  Properties::VIRTUAL,
+                  __C5_GLvoid_P1__getDataPointer,
+                  "",
+                  "");
+        I_Method0(unsigned int, getTotalDataSize,
+                  Properties::VIRTUAL,
+                  __unsigned_int__getTotalDataSize,
+                  "",
+                  "");
         I_Method1(int, compare, IN, const osg::Image &, rhs,
                   Properties::VIRTUAL,
@@ -311 +321 @@
                   "Ensure image dimensions are a power of two. ",
                   "Mipmapped textures require the image dimensions to be power of two and are within the maxiumum texture size for the host machine. ");
-        I_Method0(void, dirty,
-                  Properties::NON_VIRTUAL,
-                  __void__dirty,
-                  "Dirty the image, which increments the modified count, to force osg::Texture to reload the image. ",
-                  "");
-        I_Method1(void, setModifiedCount, IN, unsigned int, value,
-                  Properties::NON_VIRTUAL,
-                  __void__setModifiedCount__unsigned_int,
-                  "Set the modified count value. ",
-                  "Used by osg::Texture when using texture subloading. ");
-        I_Method0(unsigned int, getModifiedCount,
-                  Properties::NON_VIRTUAL,
-                  __unsigned_int__getModifiedCount,
-                  "Get modified count value. ",
-                  "Used by osg::Texture when using texture subloading. ");
         I_Method0(bool, isMipmap,
                   Properties::NON_VIRTUAL,
@@ -448 +443 @@
                          __AllocationMode__getAllocationMode, 
                          __void__setAllocationMode__AllocationMode);
+        I_SimpleProperty(const GLvoid *, DataPointer, 
+                         __C5_GLvoid_P1__getDataPointer, 
+                         0);
         I_SimpleProperty(GLenum, DataType, 
                          __GLenum__getDataType, 
@@ -466 +464 @@
                          __C5_MipmapDataType_R1__getMipmapLevels, 
                          __void__setMipmapLevels__C5_MipmapDataType_R1);
-        I_SimpleProperty(unsigned int, ModifiedCount, 
-                         __unsigned_int__getModifiedCount, 
-                         __void__setModifiedCount__unsigned_int);
         I_SimpleProperty(osg::Image::Origin, Origin, 
                          __Origin__getOrigin, 
@@ -490 +485 @@
                          __unsigned_int__getRowSizeInBytes, 
                          0);
+        I_SimpleProperty(unsigned int, TotalDataSize, 
+                         __unsigned_int__getTotalDataSize, 
+                         0);
         I_SimpleProperty(unsigned int, TotalSizeInBytes, 
                          __unsigned_int__getTotalSizeInBytes,