Changeset 6760 in orxonox.OLD for trunk/src/world_entities/weapons/aim.cc

Timestamp:

Jan 26, 2006, 2:44:57 AM (20 years ago)

Author:

bensch

Message:

merged the SpaceShipControl branche back here.

File:

• trunk/src/world_entities/weapons/aim.cc (modified) (4 diffs)

trunk/src/world_entities/weapons/aim.cc

@@ -82 +82 @@
   this->anim->addKeyFrame(50, .01, ANIM_LINEAR);
 
+
 /*  this->text = new Text();
   this->text->setLayer(this->getLayer());
@@ -114 +115 @@
     diffVec = ( (*entity)->getAbsCoor() - this->source->getAbsCoor() );
 
-    if ( diffVec.len() < range  &&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) < angle)
+    if ( diffVec.len() < range &&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) )  < angle)
     {
       //if (this->getParent() != (*entity))
@@ -168 +169 @@
   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->getParent() == PNode::getNullParent() || 
-      diffVec.len() > range  || 
-      ( acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) > angle))
+   if(this->getParent() == PNode::getNullParent() ||
+      diffVec.len() > range  ||
+     ( acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) > angle))
     {
+     this->setParentSoft(PNode::getNullParent(),5);
      this->searchTarget();
     }
@@ -195 +197 @@
 //                &objY,
 //                &objZ );
-//
+//aa
 //   this->setAbsCoor(objX, objY, objZ);
 }