[Orxonox-commit 2240] r6956 - in code/branches/rocket2/src/modules/weapons: . projectiles weaponmodes

[scheusso at orxonox.net]

Author: scheusso
Date: 2010-05-21 13:06:59 +0200 (Fri, 21 May 2010)
New Revision: 6956

Modified:
   code/branches/rocket2/src/modules/weapons/RocketController.cc
   code/branches/rocket2/src/modules/weapons/projectiles/SimpleRocket.cc
   code/branches/rocket2/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
Log:
further improvements


Modified: code/branches/rocket2/src/modules/weapons/RocketController.cc
===================================================================
--- code/branches/rocket2/src/modules/weapons/RocketController.cc	2010-05-21 10:53:57 UTC (rev 6955)
+++ code/branches/rocket2/src/modules/weapons/RocketController.cc	2010-05-21 11:06:59 UTC (rev 6956)
@@ -93,7 +93,7 @@
     void RocketController::setTarget(WorldEntity* target)
     {
         this->target_ = target;
-        COUT(0)<<"got target\n";
+        CCOUT(4) << "got target" << endl;
     }
 
     void RocketController::moveToPosition(const Vector3& target)
@@ -117,8 +117,8 @@
         COUT(4) << "viewdirection: "<< coord << endl;
         //COUT(0)<<"  ";
         //COUT(0)<<coord.y;
-        this->getControllableEntity()->rotateYaw(-0.8f*sgn(coord.x)*coord.x*coord.x);
-        this->getControllableEntity()->rotatePitch(0.8f*sgn(coord.y)*coord.y*coord.y);
+        this->getControllableEntity()->rotateYaw(-sgn(coord.x)*coord.x*coord.x);
+        this->getControllableEntity()->rotatePitch(sgn(coord.y)*coord.y*coord.y);
 //         this->getControllableEntity()->rotateYaw(10);
 //         this->getControllableEntity()->rotatePitch(0);
         //this->getControllableEntity()->rotatePitch(rotation.getPitch().valueRadians());

Modified: code/branches/rocket2/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- code/branches/rocket2/src/modules/weapons/projectiles/SimpleRocket.cc	2010-05-21 10:53:57 UTC (rev 6955)
+++ code/branches/rocket2/src/modules/weapons/projectiles/SimpleRocket.cc	2010-05-21 11:06:59 UTC (rev 6956)
@@ -63,8 +63,8 @@
 
         if (GameMode::isMaster())
        {
-           this->setCollisionType(WorldEntity::Kinematic);
-            this->setVelocity(0,0,100);
+            this->setCollisionType(WorldEntity::Kinematic);
+            //this->setVelocity(0,0,100);
 
             Model* model = new Model(this);
             model->setMeshSource("rocket.mesh");

Modified: code/branches/rocket2/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
===================================================================
--- code/branches/rocket2/src/modules/weapons/weaponmodes/SimpleRocketFire.cc	2010-05-21 10:53:57 UTC (rev 6955)
+++ code/branches/rocket2/src/modules/weapons/weaponmodes/SimpleRocketFire.cc	2010-05-21 11:06:59 UTC (rev 6956)
@@ -48,7 +48,7 @@
         this->reloadTime_ = 0.20f;
         this->bParallelReload_ = false;
         this->damage_ = 100;
-        this->speed_ = 100;
+        this->speed_ = 300;
 
         this->setMunitionName("LaserMunition");
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)