Changeset 1566 for code/trunk/src/orxonox/objects

Timestamp:

Jun 8, 2008, 5:04:18 PM (17 years ago)

Author:

landauf

Message:

• added a prediction-crosshair to the navigation focus
• fixed a bug in SpaceShipAI's target movement prediction - bots are more accurate now

File:

• code/trunk/src/orxonox/objects/SpaceShipAI.cc (modified) (2 diffs)

code/trunk/src/orxonox/objects/SpaceShipAI.cc

@@ -238 +238 @@
         this->setMovePitch(0.8 * sgn(coord.y));
 
-        if ((this->targetPosition_ - this->getPosition()).length() > 300)
+        if ((this->targetPosition_ - this->getPosition()).length() > 500)
             this->setMoveLongitudinal(0.8);
 
@@ -287 +287 @@
             return;
 
-        Vector3 enemymovement = this->target_->getVelocity();
-        Vector3 distance_normalised = this->target_->getPosition() - this->getPosition();
-        distance_normalised.normalise();
-
-        float scalarprod = enemymovement.dotProduct(distance_normalised);
-        float aimoffset = scalarprod*scalarprod + Projectile::getSpeed() * Projectile::getSpeed() - this->target_->getVelocity().squaredLength();
-
-        if (aimoffset < 0)
-        {
-            this->bHasTargetPosition_ = false;
-            return;
-        }
-        aimoffset = -scalarprod + sqrt(aimoffset);
-        this->targetPosition_ = this->getPosition() + enemymovement + distance_normalised * aimoffset;
-        this->bHasTargetPosition_ = true;
+        this->targetPosition_ = getPredictedPosition(this->getPosition(), Projectile::getSpeed(), this->target_->getPosition(), this->target_->getOrientation() * this->target_->getVelocity());
+        this->bHasTargetPosition_ = (this->targetPosition_ != Vector3::ZERO);
     }