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

Timestamp:

06/22/08 05:24:22 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -19 +19 @@
 mVboId(-1)
 {
+        mHasTexture = (mTexCoords != NULL);
+
         Prepare();
 
         if (delData)
         {
-                delete [] mVertices; mVertices = NULL;
-                delete [] mNormals;  mNormals = NULL;
-                //if (mTexCoords) delete [] mTexCoords; mTexCoords = NULL;
+                DEL_ARRAY_PTR(mVertices);
+                DEL_ARRAY_PTR(mNormals);
+                DEL_ARRAY_PTR(mTexCoords);
         }
 }
@@ -32 +34 @@
 Geometry::~Geometry()
 {
-        if (mVertices) delete [] mVertices;     
-        if (mNormals) delete [] mNormals;
-        if (mTexCoords) delete [] mTexCoords;
+        DEL_ARRAY_PTR(mVertices);
+        DEL_ARRAY_PTR(mNormals);
+        DEL_ARRAY_PTR(mTexCoords);
 
         // delete vbo
@@ -65 +67 @@
 
         glGenBuffersARB(1, &mVboId);
-        
         glBindBufferARB(GL_ARRAY_BUFFER_ARB, mVboId);
 
@@ -93 +94 @@
         {
                 glBindBufferARB(GL_ARRAY_BUFFER_ARB, mVboId);
-                glVertexPointer(3, GL_FLOAT, 0, (char *)NULL);  
+                
+                if (mHasTexture)
+                        glTexCoordPointer(2, GL_FLOAT, 0, (char *)NULL + 2 * mNumVertices * sizeof(Vector3));
+
                 glNormalPointer(GL_FLOAT, 0, (char *)NULL + mNumVertices * sizeof(Vector3));
 
-                if (mTexCoords)
-                        glTexCoordPointer(2, GL_FLOAT, 0, (char *)NULL + 2 * mNumVertices * sizeof(Vector3));
+                glVertexPointer(3, GL_FLOAT, 0, (char *)NULL);  
 
                 state->SetCurrentVboId(mVboId);