Changeset 6606 in orxonox.OLD for branches/spaceshipcontrol/src/world_entities/weapons/aim.cc

Timestamp:

Jan 18, 2006, 7:32:59 PM (18 years ago)

Author:

snellen

Message:

aim.cc, targeting_turret.cc and aiming turret.cc updated

File:

• branches/spaceshipcontrol/src/world_entities/weapons/aim.cc (modified) (3 diffs)

branches/spaceshipcontrol/src/world_entities/weapons/aim.cc

@@ -101 +101 @@
 }
 
-void Aim::searchTarget(float range)
+void Aim::searchTarget(float range, float angle)
 {
   std::list<WorldEntity*>::iterator entity;
-
+  Vector diffVec(0.0, 0.0, 0.0);
+  diffVec = ( this->getAbsCoor() - this->source->getAbsCoor() );
+
+//only look for target if the aim hasn`t locked a target yet or if the actual target is out of range 
+  if( this == PNode::getNullParent() || diffVec.len() > range  || ( acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) > angle && (this->source->getAbsDirX()).dot(diffVec) > 0))
   for (entity = State::getObjectManager()->getObjectList(OM_GROUP_00).begin();
        entity != State::getObjectManager()->getObjectList(OM_GROUP_00).end();
        entity ++)
   {
-    if (this->source->getAbsCoor().x < (*entity)->getAbsCoor().x && (this->source->getAbsCoor() - (*entity)->getAbsCoor()).len() < range)
+    diffVec = ( (*entity)->getAbsCoor() - this->source->getAbsCoor() );
+
+    if ( diffVec.len() < range  &&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) < angle && (this->source->getAbsDirX()).dot(diffVec) > 0)
     {
       if (this->getParent() != (*entity))
@@ -119 +125 @@
     }
   }
+//if no target found:
+  this->setParent(PNode::getNullParent());
 }
 
@@ -155 +163 @@
 
 
-  if (this->source->getAbsCoor().x > this->getAbsCoor().x )
-    this->searchTarget(1000);
+//  if (this->source->getAbsCoor().x > this->getAbsCoor().x )
+//    this->searchTarget(1000,M_PI_2);
 //   float z = 0.0f;
 //   glReadPixels ((int)this->getAbsCoor2D().x,