Changeset 9184 in orxonox.OLD for branches/presentation/src

Timestamp:

Jul 5, 2006, 6:25:03 AM (18 years ago)

Author:

patrick

Message:

box gets drawn now

Location:

branches/presentation/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (3 diffs)
• lib/collision_detection/obb_tree_node.h (modified) (1 diff)
• story_entities/game_world.cc (modified) (1 diff)
• world_entities/weapons/aiming_system.cc (modified) (1 diff)

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

@@ -57 +57 @@
   this->nodeRight = NULL;
   this->bvElement = NULL;
-
-  this->flag = false;
 
   this->triangleIndexList1 = NULL;
@@ -111 +109 @@
   this->bvElement->axis[1] = Vector(0,1,0);
   this->bvElement->axis[2] = Vector(0,0,1);
-
-
-  PRINTF(0)("half length %f, %f, %f\n", this->bvElement->halfLength[0], this->bvElement->halfLength[1], this->bvElement->halfLength[2]);
-  PRINTF(0)("center:\n");
-  this->bvElement->center.debug();
-
-  this->flag = true;
 }
 
@@ -708 +699 @@
 void OBBTreeNode::drawBV(int depth, int drawMode, const Vector& color,  bool top) const
 {
-
-  if( !this->flag)
-    return;
-
-  PRINTF(0)("bv box\n");
 
   /* this function can be used to draw the triangles and/or the points only  */

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

@@ -80 +80 @@
 
     WorldEntity*        owner;
-    bool flag;
+
 };
 

branches/presentation/src/story_entities/game_world.cc

@@ -469 +469 @@
       this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
-  this->dataTank->objectManager->getObjectList(OM_GROUP_01));
+    this->dataTank->objectManager->getObjectList(OM_GROUP_01));
 
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),

branches/presentation/src/world_entities/weapons/aiming_system.cc

@@ -63 +63 @@
   this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
 
-  this->range = 10.0f;
+  this->range = 30.0f;
   this->sideLength = 2.0f;