Changeset 1051 for GTP/trunk/Lib/Geom

Timestamp:

06/23/06 13:42:41 (19 years ago)

Author:

gumbau

Message:

Vertex arrays

Location:

GTP/trunk/Lib/Geom/shared

Files:

• GTGeometry/GTGeometry.suo (modified) (previous)
• GeoTool/src/GeoMeshView.cpp (modified) (5 diffs)

GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshView.cpp

@@ -686 +686 @@
         {
                 //      Paint the current strip.
-                glBegin(GL_TRIANGLE_STRIP);
 
                 //      First index of the strip.
@@ -697 +696 @@
                 //}
 
+                int size= 0;
                 //      If is the final strip
                 if (strip       == (geosubmesh->mStripCount - 1))
@@ -702 +702 @@
                         //      The end of the index array.
                         indexEnd        = &geosubmesh->mIndex[geosubmesh->mIndexCount];
+            size= indexEnd - indexBegin;
                 }
                 else
@@ -708 +709 @@
                         indexEnd        = geosubmesh->mStrip[strip + 1];
 
+                for (index = indexBegin; index < indexEnd; index++)
+                {
+                        size++;
+                }
                         //      Remove degenerated
                         //indexEnd--;
@@ -729 +734 @@
                 }
 
-                //      For each index of the strip.
-                for (index = indexBegin; index < indexEnd; index++)
-                {
-                        position        =       indexBegin[i];
-
-                        //      Gets the vertex normal.
-                        vector3 =       geosubmesh->mVertexBuffer->mNormal[position];
-
-                        x                               =       vector3[0];
-                        y                               =       vector3[1];
-                        z                               =       vector3[2];
-
-                        //      Sets the vertex normal.
-                        glNormal3f(x,y,z);
-
-                        // set the texture coordinates if needed
-                        if (usetex)
-                        {
-                                vector2 = geosubmesh->mVertexBuffer->mTexCoords[position];
-                                x                               =       vector2[0];
-                                y                               =       vector2[1];
-                                glTexCoord2f(x,y);
-                        }
-
-                        //      Gets the vertex coordinates.
-                        vector3 =       geosubmesh->mVertexBuffer->mPosition[position];
-
-                        x                               =       vector3[0];
-                        y                               =       vector3[1];
-                        z                               =       vector3[2];
-
-
-                        //      Sets the vertex position.
-                        glVertex3f(x,y,z);
-
-                        //      Increments i.
-                        i++;
-                }
-
-                glEnd();
+
+        //VERTEX ARRAYS
+        glEnableClientState(GL_VERTEX_ARRAY);
+        glEnableClientState(GL_NORMAL_ARRAY);
+        if (usetex)
+                glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+        else
+                glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+                glVertexPointer(3, GL_FLOAT, 0, geosubmesh->mVertexBuffer->mPosition);
+                glNormalPointer(GL_FLOAT, 0, geosubmesh->mVertexBuffer->mNormal);
+                if (usetex)
+                        glTexCoordPointer(2, GL_FLOAT, 0, geosubmesh->mVertexBuffer->mTexCoords);
+
+                glDrawElements( GL_TRIANGLE_STRIP,
+                        size
+                        ,
+                        GL_UNSIGNED_INT,
+                        indexBegin
+                        );
+
+        if (submesh==leavesSubMesh)
+        {
+                glDisable(GL_ALPHA_TEST);
+                glLightModeli(GL_LIGHT_MODEL_TWO_SIDE,0);
+        }
 
         }