Changeset 985 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoMeshStripifier.cpp

Timestamp:

05/24/06 13:48:26 (18 years ago)

Author:

gumbau

Message:

 

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoMeshStripifier.cpp (modified) (9 diffs)

GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoMeshStripifier.cpp

@@ -649 +649 @@
        return arbitrary 
   */
-  if (x==4)
+//  if (x==4)
     return id1;
 }
@@ -3234 +3234 @@
     return ties_array[1];
   printf("There is an error trying to break sequential triangle \n");
+  return -1;
 }
 
@@ -8118 +8119 @@
   
   // get the length of the fname.
-  flength       =       strlen(fname);
+  flength       =       int(strlen(fname));
 
   // make a new string in memory one larger than fname.
@@ -8185 +8186 @@
 void CustomStripifier::miReadFile(char *fname, char *file_open, FILE *bands, Geometry::SubMesh *geoSubMesh)
 {
-  BOOL  texture;
-        BOOL    normal;
-        BOOL    normal_and_texture;
-  char  *all;
-        char    *ptr;
-        char    *ptr2;
-  char  aux[255];
-        FILE    *file;
-  float center[3];
-  int           num2;
   int           face_id =       0;
-  int           aux1;
-        int             aux2;
-        int             aux3;
-  int           swaps;
-        int             strips;
-        int             triangles;
   int           vert_count;
-        int             loop;
         int             num_vert=0;
   int           vertex;
-        int             vertex2;
   int           temp[MAX1];
         int             i       =       0;
@@ -8215 +8198 @@
          * Faces
          */
-        for(int j = 0; j < geoSubMesh->mIndexCount; j = j + 3)
+        for(unsigned int j = 0; j < geoSubMesh->mIndexCount; j = j + 3)
         {
                 
@@ -8259 +8242 @@
         FILE                                                            *bands;
         char                                                            *file_open;
-  float                                                         norm_difference;
         int                                                                     i;
-        int                                                                     j;
-  int                                                                   swaps;
-        int                                                                     strips;
-        int                                                                     triangles;
+        unsigned int                                            j;
         int                                                                     f;
         int                                                                     t;
         int                                                                     tr;
-        int                                                                     g;
         int                                                                     num_buffers     =       0;
         int                                                                     cost                            =       0;
@@ -8276 +8254 @@
         int                                                                     num_texture     = 0;
         int                                                                     num_tris    = 0;
-        int                                                                     totalIndices;
         int                                                                     totalStripIndices;
-        unsigned int                            lui_Index;
+
         Geometry::SubMesh*      geoSubMesh;
   mi_vector_tipo                        v_indices;
@@ -8294 +8271 @@
 
 
-        //      2006-02-14
         //      Progress bar.
         float   percent;
-        percent =       100.0 / (geoMesh->mSubMeshCount * 10.0);
+        percent =       float(100.0 / (geoMesh->mSubMeshCount * 10.0));
         //--------------------------
 
         //      For all submeshes.
-        for(int k = 0; k < geoMesh->mSubMeshCount; k++)
+        for(unsigned int k = 0; k < geoMesh->mSubMeshCount; k++)
         {
                 //      Leaves submesh doesn't stripify.
@@ -8317 +8293 @@
                         geoSubMesh->mType       =       GEO_TRIANGLE_STRIPS;
 
-                        num_vert        =       geoSubMesh->mVertexBuffer->mVertexCount;
-                        num_faces       =       geoSubMesh->mIndexCount / 3;
+                        num_vert        =       int(geoSubMesh->mVertexBuffer->mVertexCount);
+                        num_faces       =       int(geoSubMesh->mIndexCount / 3);
                         num_tris        =       num_faces;