Changeset 8316 in orxonox.OLD for trunk/src/lib/graphics/importer/static_model.cc

Timestamp:

Jun 11, 2006, 1:57:27 PM (19 years ago)

Author:

bensch

Message:

trunk: fixed most -Wall warnings… but there are still many missing :/

File:

• trunk/src/lib/graphics/importer/static_model.cc (modified) (15 diffs)

trunk/src/lib/graphics/importer/static_model.cc

@@ -386 +386 @@
   }
   ++this->groupCount;
+  return true;
 }
 
@@ -558 +559 @@
   this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount -2;
   this->faceCount += this->currentGroup->currentFace->vertexCount -2;
+  return true;
 }
 
@@ -591 +593 @@
   this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount - 2;
   this->faceCount += this->currentGroup->currentFace->vertexCount -2;
+  return true;
 }
 
@@ -606 +609 @@
   if (this->currentGroup->faceCount == 0)
     this->currentGroup->faceCount++;
+  return true;
 }
 
@@ -621 +625 @@
   if (this->currentGroup->faceCount == 0)
     this->currentGroup->faceCount++;
+  return true;
 }
 
@@ -637 +642 @@
 
   Vector* normArray = new Vector [vertices.size()/3];
-  for (int i=0; i<vertices.size()/3;i++)
+  for (unsigned int i=0; i<vertices.size()/3;i++)
     normArray[i] = Vector(.0,.0,.0);
 
-  int firstTouch;
-  int secondTouch;
   Vector prevV;
   Vector nextV;
@@ -668 +671 @@
 
         curElem = firstElem;
-        for (int j=0; j<tmpFace->vertexCount; j++)
+        for (unsigned int j = 0; j < tmpFace->vertexCount; j++)
         {
           if (!(nextElem = curElem->next))
@@ -696 +699 @@
   }
 
-  for (int i=0; i < this->vertices.size()/3;i++)
+  for (unsigned int i=0; i < this->vertices.size()/3;i++)
   {
     normArray[i].normalize();
@@ -705 +708 @@
   }
   delete[] normArray;
+  return true;
 }
 
@@ -741 +745 @@
           glEnd();
         this->currentGroup->faceMode = 0;
-        Material* tmpMat;
         if (tmpFace->material != NULL)
         {
@@ -797 +800 @@
     this->currentGroup = this->currentGroup->next;
   }
+  return true;
 }
 
@@ -933 +937 @@
   PRINTF(5)("importing grafical Element to openGL.\n");
 
-  if (elem->texCoordNumber != -1)
-  {
-    if (likely(elem->texCoordNumber < this->pModelInfo.numTexCoor))
+  if (elem->texCoordNumber > -1)
+  {
+    if (likely((unsigned int)elem->texCoordNumber < this->pModelInfo.numTexCoor))
       glTexCoord2fv(&this->vTexture[0] + elem->texCoordNumber * 2);
     else
@@ -941 +945 @@
                 elem->texCoordNumber, this->pModelInfo.numTexCoor);
   }
-  if (elem->normalNumber != -1)
-  {
-    if (likely(elem->normalNumber < this->pModelInfo.numNormals))
+  if (elem->normalNumber > -1)
+  {
+    if (likely((unsigned int)elem->normalNumber < this->pModelInfo.numNormals))
       glNormal3fv(&this->normals[0] + elem->normalNumber * 3);
     else
@@ -949 +953 @@
                 elem->normalNumber, this->pModelInfo.numNormals);
   }
-  if (elem->vertexNumber != -1)
-  {
-    if (likely(elem->vertexNumber < this->pModelInfo.numVertices))
+  if (elem->vertexNumber > -1)
+  {
+    if (likely((unsigned int)elem->vertexNumber < this->pModelInfo.numVertices))
       glVertex3fv(&this->vertices[0]+ elem->vertexNumber * 3);
     else
@@ -958 +962 @@
   }
 
+  return true;
 }