Changeset 7021 for code/branches/presentation3/src/modules/weapons/RocketController.cc

Timestamp:

May 30, 2010, 3:57:05 PM (14 years ago)

Author:

gnadler

Message:

documentation & formatting commit

File:

• code/branches/presentation3/src/modules/weapons/RocketController.cc (modified) (3 diffs)

code/branches/presentation3/src/modules/weapons/RocketController.cc

@@ -50 +50 @@
         this->rocket_->setController(this);
         this->setControllableEntity(dynamic_cast<ControllableEntity*> (this->rocket_));
-        this->counter_=0;
     }
 
@@ -62 +61 @@
     void RocketController::tick(float dt)
     {
-        counter_++;
 
         if (this->target_ && this->rocket_->hasFuel()) {
@@ -99 +97 @@
         if (!this->getControllableEntity())
             return;
-        Vector2 coord = get2DViewdirection(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
-        float distance = (target - this->getControllableEntity()->getWorldPosition()).length();
+
+        Vector2 coord = get2DViewdirection(this->rocket_->getPosition(), this->rocket_->getOrientation() * WorldEntity::FRONT, this->rocket_->getOrientation() * WorldEntity::UP, target);
+        float distance = (target - this->rocket_->getWorldPosition()).length();
 
 
-        if (distance > 1000&&this->getControllableEntity()->getVelocity().squaredLength()<160000) 
-            this->getControllableEntity()->setAcceleration(this->rocket_->getOrientation()*Vector3(-20,-20,-20));
+        if (distance > 1000 && this->rocket_->getVelocity().squaredLength()<160000) 
+            this->rocket_->setAcceleration(this->rocket_->getOrientation()*Vector3(-20,-20,-20));
         if (distance <1000) this->rocket_->setAcceleration(0,0,0);
-        
-        this->getControllableEntity()->rotateYaw(-sgn(coord.x)*coord.x*coord.x);
-        this->getControllableEntity()->rotatePitch(sgn(coord.y)*coord.y*coord.y);
+
+        this->rocket_->rotateYaw(-sgn(coord.x)*coord.x*coord.x);
+        this->rocket_->rotatePitch(sgn(coord.y)*coord.y*coord.y);
     }