Changeset 6080

Timestamp:

Nov 17, 2009, 11:54:32 AM (14 years ago)

Author:

scheusso

Message:

some improvements in steering, but not yet good

File:

• code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc (modified) (4 diffs)

code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc

@@ -111 +111 @@
             
         this->originalControllableEntity_ = this->owner_->getPlayer()->getControllableEntity();
+        this->originalControllableEntity_->setDestroyWhenPlayerLeft( false );
         this->owner_->getPlayer()->startControl(this);
     }
@@ -125 +126 @@
         
         this->setAngularVelocity(this->localAngularVelocity_);
+        this->setVelocity( (this->getOrientation()*WorldEntity::FRONT)*100 );
+        this->localAngularVelocity_ = 0;
+//         this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() * getMass() * this->auxilaryThrust_);
+//         this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() * getMass() * this->auxilaryThrust_);
+//         if (this->localLinearAcceleration_.z() > 0)
+//             this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->auxilaryThrust_);
+//         else
+//             this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->primaryThrust_);
+//         this->physicalBody_->applyCentralForce(physicalBody_->getWorldTransform().getBasis() * this->localLinearAcceleration_);
+//         this->localLinearAcceleration_.setValue(0, 0, 0);
+//     
+//         this->localAngularAcceleration_ *= this->getLocalInertia() * this->rotationThrust_;
+//         this->physicalBody_->applyTorque(physicalBody_->getWorldTransform().getBasis() * this->localAngularAcceleration_);
     }
     
@@ -181 +195 @@
     void Rocket::rotateYaw(const Vector2& value)
     {
-        this->localAngularVelocity_.y = value.x;
+        this->localAngularVelocity_.x = value.x;
     }
 
@@ -192 +206 @@
     void Rocket::rotatePitch(const Vector2& value)
     {
-        this->localAngularVelocity_.x = value.x;
+        this->localAngularVelocity_.y = value.x;
     }