Changes in code/branches/rocket [6950:6948]

Location:

code/branches/rocket/src/modules/weapons

Files:

• RocketController.cc (modified) (3 diffs)
• projectiles/SimpleRocket.cc (modified) (2 diffs)
• weaponmodes/SimpleRocketFire.cc (modified) (2 diffs)

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

@@ -82 +82 @@
         void RocketController::setTargetPosition() {
                 //this->targetPosition_=this->target_->getWorldPosition();
-                this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(),this->getControllableEntity()->getVelocity().length() , this->target_->getWorldPosition(), this->target_->getVelocity());
+                this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getPosition(),this->getControllableEntity()->getVelocity().length() , this->target_->getPosition(), this->target_->getVelocity());
         }
         void RocketController::moveToTargetPosition() {
@@ -102 +102 @@
            float dy = target.y-this->getControllableEntity()->getPosition().y;
            COUT(0)<<"\n diff: ";
-           COUT(0)<<target-this->getControllableEntity()->getPosition() << endl;
+           COUT(0)<<target.x-this->getControllableEntity()->getPosition().x;
+           COUT(0)<<" ";
+           COUT(0)<<target.y-this->getControllableEntity()->getPosition().y;
+           COUT(0)<<" ";
+           COUT(0)<<target.z-this->getControllableEntity()->getPosition().z;
            //COUT(0)<<"\n 2D view: ";
           /* COUT(0)<<this->getControllableEntity()->getPosition().x;
@@ -113 +117 @@
         float distance = (target - this->getControllableEntity()->getPosition()).length();
                 //Vector3D diff =target-this->rocket->getPosition();
-                COUT(0) << "viewdirection: "<< coord << endl;
+                //COUT(0)<<coord.x;
                 //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(10);
-//         this->getControllableEntity()->rotatePitch(0);
+                 this->getControllableEntity()->rotateYaw(coord.x*coord.x*coord.x*coord.x);
+            this->getControllableEntity()->rotatePitch(coord.y*coord.y* coord.y*coord.y);
                 //this->getControllableEntity()->rotatePitch(rotation.getPitch().valueRadians());
                 //this->getControllableEntity()->rotateYaw(rotation.getYaw().valueRadians());

code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -81 +81 @@
             this->setCollisionType(Kinematic);
 
-            // TODO: fix the orientation and size of this collision shape to match the rocket
             ConeCollisionShape* collisionShape = new ConeCollisionShape(this);
             collisionShape->setRadius(3);
-            collisionShape->setHeight(5);
+            collisionShape->setHeight(500);
             this->attachCollisionShape(collisionShape);
 
@@ -97 +96 @@
             this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
             this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
-            this->localAngularVelocity_ = 0;
 
             if( this->bDestroy_ )

code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -49 +49 @@
         this->bParallelReload_ = false;
         this->damage_ = 100;
-        this->speed_ = 100;
+        this->speed_ = 1;
 
         this->setMunitionName("LaserMunition");
@@ -64 +64 @@
                 SimpleRocket* rocket = con->getRocket();
                 this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
-//              rocket->setOrientation(this->getMuzzleOrientation());
-        rocket->setOrientation(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getWorldOrientation());
-                Vector3 pos = this->getMuzzlePosition();
+                rocket->setOrientation(this->getMuzzleOrientation());
+                Vector3 pos = this->getMuzzlePosition() + (this->getMuzzleOrientation()* Vector3(-2, -3, -2));
         rocket->setPosition(pos);
-//              rocket->setAcceleration(20*rocket->getOrientation() * WorldEntity::FRONT);
+                rocket->setAcceleration(20*rocket->getOrientation() * WorldEntity::FRONT);
                 rocket->setVelocity(this->getMuzzleDirection()*this->speed_);
                 rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());