Changeset 2489 for code/branches/presentation/src

Timestamp:

Dec 16, 2008, 8:12:45 PM (16 years ago)

Author:

landauf

Message:

tried to steer the spaceship with the engine.

Location:

code/branches/presentation/src/orxonox/objects

Files:

• items/Engine.cc (modified) (1 diff)
• worldentities/pawns/SpaceShip.cc (modified) (2 diffs)

code/branches/presentation/src/orxonox/objects/items/Engine.cc

@@ -192 +192 @@
         }
 
-        this->ship_->setAcceleration(acceleration);
+        this->ship_->setAcceleration(this->ship_->getOrientation() * acceleration);
 
         this->ship_->setBoost(false);

code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc

@@ -120 +120 @@
         if (this->hasLocalController())
         {
+/*
             this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() * getMass() * this->auxilaryThrust_);
             this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() * getMass() * this->auxilaryThrust_);
@@ -128 +129 @@
             this->physicalBody_->applyCentralForce(physicalBody_->getWorldTransform().getBasis() * this->localLinearAcceleration_);
             this->localLinearAcceleration_.setValue(0, 0, 0);
-
+*/
             if (!this->isInMouseLook())
             {