Changeset 9172 in orxonox.OLD

Timestamp:

Jul 4, 2006, 9:45:39 PM (18 years ago)

Author:

patrick

Message:

less debug more boxes creation obb

Location:

branches/presentation/src

Files:

• lib/collision_detection/obb_tree.cc (modified) (2 diffs)
• lib/collision_detection/obb_tree.h (modified) (2 diffs)
• lib/collision_detection/obb_tree_node.cc (modified) (2 diffs)
• lib/collision_detection/obb_tree_node.h (modified) (1 diff)
• world_entities/creatures/fps_player.cc (modified) (2 diffs)
• world_entities/weapons/aiming_system.cc (modified) (6 diffs)
• world_entities/weapons/aiming_system.h (modified) (3 diffs)

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

@@ -41 +41 @@
 
 
+/**
+ *  standard constructor
+ */
+OBBTree::OBBTree()
+  : BVTree()
+{}
+
 
 void OBBTree::init()
@@ -78 +85 @@
 
   this->rootNode->spawnBVTree(modelInf, triangleIndexes, modelInf.numTriangles);
+}
+
+
+void OBBTree::createBox(Vector start, Vector end)
+{
+  this->rootNode = new OBBTreeNode(*this, NULL, 11);
+
+  this->rootNode->createBox(start, end);
 }
 

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

@@ -23 +23 @@
   public:
     OBBTree(int depth, const modelInfo* modInfo, WorldEntity* entity);
+    OBBTree();
     virtual ~OBBTree();
     void init();
@@ -28 +29 @@
     virtual void spawnBVTree(const modelInfo& modelInf);
     virtual void flushTree();
+
+    void createBox(Vector start, Vector end);
 
     virtual void collideWith(WorldEntity* entity1, WorldEntity* entity2);

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

@@ -90 +90 @@
     delete this->bvElement;
 }
+
+
+
+void OBBTreeNode::createBox(Vector start, Vector end)
+{
+
+  this->bvElement = new OBB();
+  this->nodeLeft = NULL;
+  this->nodeRight = NULL;
+
+  this->bvElement->center = (end - start) * 0.5f;
+  this->bvElement->halfLength[0] = (end.x - start.x) * 0.5f;
+  this->bvElement->halfLength[1] = (end.y - start.y) * 0.5f;
+  this->bvElement->halfLength[2] = (end.z - start.z) * 0.5f;
+}
+
 
 
@@ -682 +698 @@
     if( depth == 0/*!(drawMode & DRAW_SINGLE && depth != 0)*/)
     {
-      if( 1 /*drawMode & DRAW_POINTS*/)
+      if( 0 /*drawMode & DRAW_POINTS*/)
       {
         glBegin(GL_POINTS);

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

@@ -31 +31 @@
 
     virtual void spawnBVTree(const modelInfo& modelInf, const int* triangleIndexes, int length);
+    void createBox(Vector start, Vector end);
 
     virtual void collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB);

branches/presentation/src/world_entities/creatures/fps_player.cc

@@ -243 +243 @@
       this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * f, 0.0));
 
-      this->aimingSystem->toList(/*OM_LIST(this->getOMListNumber() + 1)*/ OM_GROUP_00);
+      this->aimingSystem->toList(/*OM_LIST(this->getOMListNumber() + 1)*/ OM_COMMON);
     }
   }
@@ -399 +399 @@
 
   this->setOnGround(false);
-
+  this->aimingSystem->flushList();
 }
 

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

@@ -1 @@
-/*
+  /*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -36 +36 @@
 AimingSystem::AimingSystem (WorldEntity* entity)
 {
+  this->owner = entity;
+
   this->init();
 }
@@ -55 +57 @@
   this->setName("AimingSystem");
 
-  this->loadModel("models/guns/targeting_system_body.obj");
+  //this->loadModel("models/guns/targeting_system_body2.obj");
+//   this->loadModel("models/ships/fighter.obj");
 
   // registering default reactions:
   this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
+
+  this->range = 1000.0f;
+  this->sideLength = 10.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));
 }
 
@@ -69 +79 @@
 WorldEntity* AimingSystem::getNearestTarget()
 {
+
+//   PRINTF(0)("size: %i\n", this->selectionList.size());
+
+
   if( this->selectionList.size() == 0)
     return NULL;
-  else if( this->selectionList.size() == 1)
-    return this->selectionList.back();
+
 
   WorldEntity* nearestEntity     = NULL;
@@ -91 +104 @@
   if( nearestEntity != this->owner)
     return nearestEntity;
-  else return NULL;
+  else
+    return NULL;
 }
 
@@ -123 +137 @@
 void AimingSystem::draw() const
 {
-  WorldEntity::draw();
+//   WorldEntity::draw();
 
-  if( this->getOBBTree () != NULL)
-    this->getOBBTree()->drawBV(0, 1);
+  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();
+
 }

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

@@ -16 +16 @@
 class BVTree;
 class Model;
+class OBBTree;
 
 
@@ -28 +29 @@
 
   WorldEntity* getNearestTarget();
+  void flushList() { this->selectionList.clear(); }
 
   void setRange(float range){this->range = range;};
@@ -39 +41 @@
  private:
    float                       range;                //!<
+   float                       sideLength;
    std::vector<WorldEntity*>   selectionList;        //!< the selections
 
    WorldEntity*                owner;                //!< the owner of the targeting system
 
+   OBBTree*                    obbTree;
+
 };