Changeset 3294 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Geometry.cpp

Timestamp:

01/29/09 18:46:32 (15 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Geometry.cpp (modified) (7 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Geometry.cpp

@@ -37 +37 @@
         mHasTexture = (mTexCoords != NULL);
         mHasTangents = (mTangents != NULL);
-
+/*
+        mIndices = new unsigned int[mNumVertices];
+
+        for (int i = 0; i < mNumVertices; ++ i)
+        {
+                mIndices[i] = i;
+        }*/
+
+        // prepare vbos
         Prepare();
 
-        mIndices = new unsigned int[mNumVertices];
-
-        for (int i = 0; i < mNumVertices; ++ i)
-        {
-                mIndices[i] = i;
-        }
-
         if (delData)
         {
                 DEL_ARRAY_PTR(mVertices);
+                DEL_ARRAY_PTR(mIndices);
                 DEL_ARRAY_PTR(mNormals);
                 DEL_ARRAY_PTR(mTexCoords);
@@ -65 +67 @@
         DEL_ARRAY_PTR(mIndices);
 
-        // delete vbo
+        // delete vbos
         glDeleteBuffersARB(1, &mVboId);
+        glDeleteBuffersARB(1, &mVboId2);
 }
 
@@ -144 +147 @@
 
         glBufferDataARB(GL_ARRAY_BUFFER_ARB, dataSize * sizeof(float), 
-                            (float *)data, GL_STATIC_DRAW_ARB);
+                            data, GL_STATIC_DRAW_ARB);
 
         glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
 
-        glGenBuffersARB(1, &mVboId2);
-        
-        glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, mVboId2);
-        glBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, mNumVertices * sizeof(unsigned int), 
-                            mIndices, GL_STATIC_DRAW_ARB);
-
-        int bufferSize;
-        glGetBufferParameterivARB(GL_ELEMENT_ARRAY_BUFFER_ARB, GL_BUFFER_SIZE_ARB, &bufferSize);
-        // cout << "Index Array in VBO: " << bufferSize << " bytes\n";
-
-        glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
+
+        ///////////
+        //-- the index array
+
+        if (mIndices)
+        {
+                glGenBuffersARB(1, &mVboId2);
+
+                glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, mVboId2);
+                glBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, mNumVertices * sizeof(unsigned int), 
+                        mIndices, GL_STATIC_DRAW_ARB);
+
+                int bufferSize;
+                glGetBufferParameterivARB(GL_ELEMENT_ARRAY_BUFFER_ARB, GL_BUFFER_SIZE_ARB, &bufferSize);
+                //cout << "Index Array in VBO: " << bufferSize << " bytes\n" << "id: " << mVboId2 << endl;
+
+                glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
+        }
 
         // data handled by graphics driver from now on
@@ -175 +185 @@
         {
                 glBindBufferARB(GL_ARRAY_BUFFER_ARB, mVboId);
-                //glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, mVboId2);
 
                 int currentPointer;
@@ -182 +191 @@
                 if (mHasTangents)
                 {
-                        //glClientActiveTextureARB(GL_TEXTURE1_ARB);
-                        //glTexCoordPointer(2, GL_FLOAT, (char *)NULL + mNumVertices * sizeof(Vector3));
-
                         glColorPointer(3, GL_FLOAT, 0, (char *)NULL + mNumVertices * 2 * sizeof(Vector3));
                         currentPointer = mNumVertices * 3 * sizeof(Vector3);
-                        //glClientActiveTextureARB(GL_TEXTURE0_ARB);
-
                 }
                 else
@@ -201 +205 @@
 
                 glVertexPointer(3, GL_FLOAT, 0, (char *)NULL);  
+                //glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, mVboId2);
+
                 /// update state
                 state->SetCurrentVboId(mVboId);
@@ -206 +212 @@
 
         glDrawArrays(GL_TRIANGLES, 0, mNumVertices);
-        //glDrawElements(GL_TRIANGLES, mNumVertices, GL_UNSIGNED_INT, mIndices);
         //glDrawElements(GL_TRIANGLES, mNumVertices, GL_UNSIGNED_INT, 0); 
-
-        //glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
-        //glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
 
         if (mHasTangents) glDisableClientState(GL_COLOR_ARRAY);