Changeset 8316 in orxonox.OLD for trunk/src/lib/collision_detection

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 :/

Location:

trunk/src/lib/collision_detection

Files:

• cd_engine.cc (modified) (1 diff)
• obb_tree.cc (modified) (1 diff)
• obb_tree_node.cc (modified) (4 diffs)

trunk/src/lib/collision_detection/cd_engine.cc

@@ -99 +99 @@
   if( likely( this->terrain != NULL))
   {
-    Quadtree* q = dynamic_cast<Terrain*>(this->terrain)->ssp->getQuadtree();
+//    Quadtree* q = dynamic_cast<Terrain*>(this->terrain)->ssp->getQuadtree();
 //    QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
   }
-  
+
   if( likely( this->bspManager != NULL))
   {

trunk/src/lib/collision_detection/obb_tree.cc

@@ -74 +74 @@
   /* triangles indexes created */
   int* triangleIndexes = new int[modelInf.numTriangles];
-  for( int i = 0; i < modelInf.numTriangles; ++i)
+  for(unsigned int i = 0; i < modelInf.numTriangles; ++i)
     triangleIndexes[i] = i;
 

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -152 +152 @@
   Vector    p, q, r;                                 //!< holder of the polygon data, much more conveniant to work with Vector than sVec3d
   Vector    t1, t2;                                  //!< temporary values
-  float     covariance[3][3] = {0,0,0, 0,0,0, 0,0,0};//!< the covariance matrix
-  const float*   tmpVec = NULL;                           //!< a temp saving place for sVec3Ds
+  float     covariance[3][3] = {{0,0,0}, {0,0,0}, {0,0,0}};//!< the covariance matrix
 
   /* fist compute all the convex hull face/facelets and centroids */
@@ -275 +274 @@
   PRINTF(4)("Calculate Box Axis\n");
   /* now get the axis length */
-  float               halfLength[3];                         //!< half length of the axis
   float               tmpLength;                             //!< tmp save point for the length
   Plane               p0(box.axis[0], box.center);           //!< the axis planes
@@ -371 +369 @@
   PRINTF(4)("Separating along the longest axis\n");
   /* get the closest vertex near the center */
-  float               dist = 999999.0f;                    //!< the smallest distance to each vertex
   float               tmpDist;                             //!< variable to save diverse distances temporarily
-  int                 vertexIndex;                         //!< index of the vertex near the center
   Plane               middlePlane(box.axis[longestAxisIndex], box.center); //!< the middle plane
-  const sVec3D*       tmpVec;                              //!< temp simple 3D vector
 
 
@@ -662 +657 @@
         glBegin(GL_POINTS);
         glColor3f(0.3, 0.8, 0.54);
-        for( int i = 0; i < this->bvElement->modelInf->numVertices*3; i+=3)
+        for(unsigned int i = 0; i < this->bvElement->modelInf->numVertices*3; i+=3)
           glVertex3f(this->bvElement->modelInf->pVertices[i],
                      this->bvElement->modelInf->pVertices[i+1],