Changeset 10600 for OpenSceneGraph/trunk/src/osgWrappers/osg/State.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/State.cpp (modified) (4 diffs)

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

@@ -332 +332 @@
                   "dirty the vertex, normal, color, tex coords, secondary color, fog coord and index arrays. ",
                   "");
-        I_Method1(void, setCurrentVertexBufferObject, IN, osg::VertexBufferObject *, vbo,
-                  Properties::NON_VIRTUAL,
-                  __void__setCurrentVertexBufferObject__osg_VertexBufferObject_P1,
-                  "",
-                  "");
-        I_Method0(const osg::VertexBufferObject *, getCurrentVertexBufferObject,
-                  Properties::NON_VIRTUAL,
-                  __C5_VertexBufferObject_P1__getCurrentVertexBufferObject,
-                  "",
-                  "");
-        I_Method1(void, bindVertexBufferObject, IN, const osg::VertexBufferObject *, vbo,
-                  Properties::NON_VIRTUAL,
-                  __void__bindVertexBufferObject__C5_osg_VertexBufferObject_P1,
+        I_Method1(void, setCurrentVertexBufferObject, IN, osg::GLBufferObject *, vbo,
+                  Properties::NON_VIRTUAL,
+                  __void__setCurrentVertexBufferObject__osg_GLBufferObject_P1,
+                  "",
+                  "");
+        I_Method0(const osg::GLBufferObject *, getCurrentVertexBufferObject,
+                  Properties::NON_VIRTUAL,
+                  __C5_GLBufferObject_P1__getCurrentVertexBufferObject,
+                  "",
+                  "");
+        I_Method1(void, bindVertexBufferObject, IN, osg::GLBufferObject *, vbo,
+                  Properties::NON_VIRTUAL,
+                  __void__bindVertexBufferObject__osg_GLBufferObject_P1,
                   "",
                   "");
@@ -352 +352 @@
                   "",
                   "");
-        I_Method1(void, setCurrentElementBufferObject, IN, osg::ElementBufferObject *, ebo,
-                  Properties::NON_VIRTUAL,
-                  __void__setCurrentElementBufferObject__osg_ElementBufferObject_P1,
-                  "",
-                  "");
-        I_Method0(const osg::ElementBufferObject *, getCurrentElementBufferObject,
-                  Properties::NON_VIRTUAL,
-                  __C5_ElementBufferObject_P1__getCurrentElementBufferObject,
-                  "",
-                  "");
-        I_Method1(void, bindElementBufferObject, IN, const osg::ElementBufferObject *, ebo,
-                  Properties::NON_VIRTUAL,
-                  __void__bindElementBufferObject__C5_osg_ElementBufferObject_P1,
+        I_Method1(void, setCurrentElementBufferObject, IN, osg::GLBufferObject *, ebo,
+                  Properties::NON_VIRTUAL,
+                  __void__setCurrentElementBufferObject__osg_GLBufferObject_P1,
+                  "",
+                  "");
+        I_Method0(const osg::GLBufferObject *, getCurrentElementBufferObject,
+                  Properties::NON_VIRTUAL,
+                  __C5_GLBufferObject_P1__getCurrentElementBufferObject,
+                  "",
+                  "");
+        I_Method1(void, bindElementBufferObject, IN, osg::GLBufferObject *, ebo,
+                  Properties::NON_VIRTUAL,
+                  __void__bindElementBufferObject__osg_GLBufferObject_P1,
                   "",
                   "");
@@ -372 +372 @@
                   "",
                   "");
-        I_Method1(void, setCurrentPixelBufferObject, IN, osg::PixelBufferObject *, pbo,
-                  Properties::NON_VIRTUAL,
-                  __void__setCurrentPixelBufferObject__osg_PixelBufferObject_P1,
-                  "",
-                  "");
-        I_Method0(const osg::PixelBufferObject *, getCurrentPixelBufferObject,
-                  Properties::NON_VIRTUAL,
-                  __C5_PixelBufferObject_P1__getCurrentPixelBufferObject,
-                  "",
-                  "");
-        I_Method1(void, bindPixelBufferObject, IN, const osg::PixelBufferObject *, pbo,
-                  Properties::NON_VIRTUAL,
-                  __void__bindPixelBufferObject__C5_osg_PixelBufferObject_P1,
+        I_Method1(void, setCurrentPixelBufferObject, IN, osg::GLBufferObject *, pbo,
+                  Properties::NON_VIRTUAL,
+                  __void__setCurrentPixelBufferObject__osg_GLBufferObject_P1,
+                  "",
+                  "");
+        I_Method0(const osg::GLBufferObject *, getCurrentPixelBufferObject,
+                  Properties::NON_VIRTUAL,
+                  __C5_GLBufferObject_P1__getCurrentPixelBufferObject,
+                  "",
+                  "");
+        I_Method1(void, bindPixelBufferObject, IN, osg::GLBufferObject *, pbo,
+                  Properties::NON_VIRTUAL,
+                  __void__bindPixelBufferObject__osg_GLBufferObject_P1,
                   "",
                   "");
@@ -831 +831 @@
                          __unsigned_int__getContextID, 
                          __void__setContextID__unsigned_int);
-        I_SimpleProperty(osg::ElementBufferObject *, CurrentElementBufferObject, 
-                         0, 
-                         __void__setCurrentElementBufferObject__osg_ElementBufferObject_P1);
-        I_SimpleProperty(osg::PixelBufferObject *, CurrentPixelBufferObject, 
-                         0, 
-                         __void__setCurrentPixelBufferObject__osg_PixelBufferObject_P1);
-        I_SimpleProperty(osg::VertexBufferObject *, CurrentVertexBufferObject, 
-                         0, 
-                         __void__setCurrentVertexBufferObject__osg_VertexBufferObject_P1);
+        I_SimpleProperty(osg::GLBufferObject *, CurrentElementBufferObject, 
+                         0, 
+                         __void__setCurrentElementBufferObject__osg_GLBufferObject_P1);
+        I_SimpleProperty(osg::GLBufferObject *, CurrentPixelBufferObject, 
+                         0, 
+                         __void__setCurrentPixelBufferObject__osg_GLBufferObject_P1);
+        I_SimpleProperty(osg::GLBufferObject *, CurrentVertexBufferObject, 
+                         0, 
+                         __void__setCurrentVertexBufferObject__osg_GLBufferObject_P1);
         I_SimpleProperty(const osg::Viewport *, CurrentViewport, 
                          __C5_Viewport_P1__getCurrentViewport,