[Orxonox-commit 1363] r6081 - code/branches/particles2/src/modules/weapons/projectiles

[scheusso at orxonox.net]

Author: scheusso
Date: 2009-11-17 11:58:38 +0100 (Tue, 17 Nov 2009)
New Revision: 6081

Modified:
   code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc
Log:
more improvements


Modified: code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc	2009-11-17 10:54:32 UTC (rev 6080)
+++ code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc	2009-11-17 10:58:38 UTC (rev 6081)
@@ -124,7 +124,7 @@
     {
         SUPER(Rocket, tick, dt);
         
-        this->setAngularVelocity(this->localAngularVelocity_);
+        this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
         this->setVelocity( (this->getOrientation()*WorldEntity::FRONT)*100 );
         this->localAngularVelocity_ = 0;
 //         this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() * getMass() * this->auxilaryThrust_);
@@ -194,7 +194,7 @@
     */
     void Rocket::rotateYaw(const Vector2& value)
     {
-        this->localAngularVelocity_.x = value.x;
+        this->localAngularVelocity_.y = value.x;
     }
 
     /**
@@ -205,7 +205,7 @@
     */
     void Rocket::rotatePitch(const Vector2& value)
     {
-        this->localAngularVelocity_.y = value.x;
+        this->localAngularVelocity_.x = value.x;
     }
 
     /**