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

Timestamp:

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

Author:

rennerc

Message:

less collision hacks

File:

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

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

@@ -24 +24 @@
 #include <cassert>
 #include "debug.h"
+
+#include "obb_tree.h"
 
 #include "effects/wobblegrid.h"
@@ -69 +71 @@
 
   this->grid->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);
 }
 
@@ -125 +131 @@
 
   this->grid->tick(dt);
-
-  for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
-  {
-    if( ((*eIterator)->getOMListNumber() != (this->origList -1))  && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)
-    {
-      (*eIterator)->hit (this->getDamage(),this);
-      this->deactivate();
-    }
-  }
-
 }