Changeset 9174 in orxonox.OLD

Timestamp:

Jul 4, 2006, 10:17:57 PM (18 years ago)

Author:

patrick

Message:

work flush

Location:

branches/presentation/src

Files:

• lib/collision_detection/obb_tree.cc (modified) (1 diff)
• lib/collision_detection/obb_tree_node.cc (modified) (5 diffs)
• lib/collision_detection/obb_tree_node.h (modified) (1 diff)
• world_entities/weapons/aiming_system.cc (modified) (2 diffs)
• world_entities/world_entity.h (modified) (1 diff)

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

@@ -90 +90 @@
 void OBBTree::createBox(Vector start, Vector end)
 {
-  this->rootNode = new OBBTreeNode(*this, NULL, 11);
+  this->rootNode = new OBBTreeNode(*this, NULL, 1);
 
   this->rootNode->createBox(start, end);

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

@@ -57 +57 @@
   this->nodeRight = NULL;
   this->bvElement = NULL;
+
+  this->flag = false;
 
   this->triangleIndexList1 = NULL;
@@ -99 +101 @@
   this->nodeLeft = NULL;
   this->nodeRight = NULL;
+//   this->depth = 0;
 
   this->bvElement->center = (end - start) * 0.5f;
@@ -104 +107 @@
   this->bvElement->halfLength[1] = (end.y - start.y) * 0.5f;
   this->bvElement->halfLength[2] = (end.z - start.z) * 0.5f;
+
+  this->bvElement->axis[0] = Vector(1,0,0);
+  this->bvElement->axis[1] = Vector(0,1,0);
+  this->bvElement->axis[2] = Vector(0,0,1);
+
+
+  PRINTF(0)("half length %f, %f, %f", this->bvElement->halfLength[0], this->bvElement->halfLength[1], this->bvElement->halfLength[2]);
+  PRINTF(0)("center:\n");
+  this->bvElement->center.debug();
+  this->flag = true;
 }
 
@@ -577 +590 @@
 bool OBBTreeNode::overlapTest(OBB* boxA, OBB* boxB, WorldEntity* nodeA, WorldEntity* nodeB)
 {
+
   //HACK remove this again
   this->owner = nodeA;
@@ -693 +707 @@
 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  */
   if( 1 /*drawMode & DRAW_MODEL || drawMode & DRAW_ALL*/)

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

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

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

@@ -63 +63 @@
   this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
 
-  this->range = 1000.0f;
-  this->sideLength = 10.0f;
+  this->range = 10.0f;
+  this->sideLength = 2.0f;
 
   // new obb tree
   this->obbTree = new OBBTree();
   this->obbTree->createBox(Vector(0.0f, 0.0f, 0.0f), Vector(this->range, this->sideLength, this->sideLength));
+  this->setOBBTree(this->obbTree);
 }
 
@@ -137 +138 @@
 void AimingSystem::draw() const
 {
-//   WorldEntity::draw();
+  WorldEntity::draw();
 
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-
-  /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  Vector tmpRot = this->getAbsDir().getSpacialAxis();
-  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-
-  this->obbTree->drawBV(1, 1);
-
-  glPopMatrix();
+//   glMatrixMode(GL_MODELVIEW);
+//   glPushMatrix();
+//
+//   /* translate */
+//   glTranslatef (this->getAbsCoor ().x,
+//                 this->getAbsCoor ().y,
+//                 this->getAbsCoor ().z);
+//   Vector tmpRot = this->getAbsDir().getSpacialAxis();
+//   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+//
+//   this->obbTree->drawBV(0, 1);
+//
+//   glPopMatrix();
 
 }

branches/presentation/src/world_entities/world_entity.h

@@ -74 +74 @@
 /** @returns a reference to the obb tree of this worldentity */
   inline BVTree* getOBBTree() const { return this->obbTree; };
+  inline void setOBBTree(OBBTree* tree) { if( this->obbTree != NULL) this->obbTree = (BVTree*)tree; }
   void drawBVTree(int depth, int drawMode) const;
   inline AABB* getModelAABB() const { return (this->aabbNode)?this->aabbNode->getAABB():NULL;}