Changeset 10740 in orxonox.OLD for branches/presentation/src/world_entities/projectiles/plasma_pulse.cc

Timestamp:

Jun 20, 2007, 8:00:41 PM (17 years ago)

Author:

rennerc

Message:

less collision hacks

File:

• branches/presentation/src/world_entities/projectiles/plasma_pulse.cc (modified) (3 diffs)

branches/presentation/src/world_entities/projectiles/plasma_pulse.cc

@@ -25 +25 @@
 #include <cassert>
 #include "debug.h"
+
+#include "obb_tree.h"
 
 
@@ -59 +61 @@
   this->blink->loadBlinkSequence( "66678998766" );
   this->blink->toList(OM_ENVIRON);*/
+  
+  this->obbTree = new OBBTree();
+  this->obbTree->createBox(Vector(0.0f, 0.0f, 0.0f), Vector(1.0f, 1.0f, 1.0f));
+  this->setOBBTree(this->obbTree);
 }
 
@@ -112 +118 @@
 
   this->grid->tick(dt);
-
-  for( ObjectList<ActionboxEnemy>::const_iterator eIterator = ActionboxEnemy::objectList().begin(); eIterator !=ActionboxEnemy::objectList().end(); eIterator++)
-  {
-    if( ((*eIterator)->getOMListNumber() != (this->origList -1))  && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 3)
-    {
-      (*eIterator)->hit (this->getDamage(),this);
-      this->deactivate();
-    }
-  }
-
 }