Changeset 10771 in orxonox.OLD for branches/presentation/src/lib

Timestamp:

Jun 27, 2007, 7:01:08 PM (17 years ago)

Author:

nicolasc

Message:

huge diff
cleaned the individual weapons, moved stuff to weapon.{cc,h}
and some minor fixes which popped up then and when

Location:

branches/presentation/src/lib

Files:

• collision_detection/aabb_tree_node.cc (modified) (1 diff)
• collision_detection/obb_tree_node.cc (modified) (2 diffs)
• graphics/importer/static_model.cc (modified) (1 diff)

branches/presentation/src/lib/collision_detection/aabb_tree_node.cc

@@ -882 +882 @@
 
   /* DRAW SEPARATING PLANE */
-  if( drawMode & DRAW_SEPARATING_PLANE || drawMode & DRAW_ALL)
+  if( (drawMode & DRAW_SEPARATING_PLANE) || (drawMode & DRAW_ALL))
   {
     if( !(drawMode & DRAW_SINGLE && depth != 0))

branches/presentation/src/lib/collision_detection/obb_tree_node.cc

@@ -782 +782 @@
 
   /* DRAW POLYGONS */
-  if( drawMode & DRAW_BV_POLYGON || drawMode & DRAW_ALL || drawMode & DRAW_BV_BLENDED)
+  if(( drawMode & DRAW_BV_POLYGON) || (drawMode & DRAW_ALL) || (drawMode & DRAW_BV_BLENDED))
   {
     if (top)
@@ -932 +932 @@
 
   /* DRAW SEPARATING PLANE */
-  if( drawMode & DRAW_SEPARATING_PLANE || drawMode & DRAW_ALL)
+  if( (drawMode & DRAW_SEPARATING_PLANE) || drawMode & DRAW_ALL)
   {
     if( !(drawMode & DRAW_SINGLE && depth != 0))

branches/presentation/src/lib/graphics/importer/static_model.cc

@@ -211 +211 @@
     }
 
-//     printf("adding MP\n");
+
      this->addMountPoint( zAxis, yAxis, center, groupName);
-      // remove the group from the model list (mount points do not need to be drawn) 
-//      std::vector<StaticModelData::Group>::iterator tmpIt =  groupIt; 
-//      groupIt++; 
+     // remove the group from the model list (mount points do not need to be drawn) 
+     // remoing item iterates greoupIt!
      this->data->getGroups().erase(groupIt); 
   }