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

Timestamp:

Jan 19, 2006, 8:01:08 AM (18 years ago)

Author:

snellen

Message:

aim.cc updated

File:

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

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

@@ -73 +73 @@
   this->source = NULL;
 
+  this->range = 0;
+  this->angle = 0;
   this->anim = new tAnimation<Aim>(this, &Aim::setSize);
   this->anim->setInfinity(ANIM_INF_CONSTANT);
@@ -101 +103 @@
 }
 
-void Aim::searchTarget(float range, float angle)
+void Aim::searchTarget()
 {
   std::list<WorldEntity*>::iterator entity;
@@ -107 +109 @@
   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))
+//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))
   for (entity = State::getObjectManager()->getObjectList(OM_GROUP_00).begin();
        entity != State::getObjectManager()->getObjectList(OM_GROUP_00).end();
@@ -115 +117 @@
     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 ( diffVec.len() < range  &&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) < angle)
     {
       if (this->getParent() != (*entity))
@@ -130 +132 @@
 
 
-
 /**
  * @brief sets the size of the Aim.
@@ -164 +165 @@
 
 //  if (this->source->getAbsCoor().x > this->getAbsCoor().x )
-//    this->searchTarget(1000,M_PI_2);
+     this->searchTarget();
 //   float z = 0.0f;
 //   glReadPixels ((int)this->getAbsCoor2D().x,