Changeset 6827

Timestamp:

May 3, 2010, 11:20:00 AM (14 years ago)

Author:

scheusso

Message:

rocket does spawn and is visible now
however speed and scaling not yet correct

Location:

code/branches/rocket/src/modules/weapons

Files:

• projectiles/SimpleRocket.cc (modified) (1 diff)
• weaponmodes/SimpleRocketFire.cc (modified) (1 diff)

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

@@ -76 +76 @@
 
             Model* model = new Model(this);
-            model->setMeshSource("Rocket.mesh");
+            model->setMeshSource("rocket.mesh");
             //model->scale(0.7f);
             this->attach(model);

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

@@ -61 +61 @@
     void SimpleRocketFire::fire()
     {
-        //SimpleRocket* rocket = new SimpleRocket(this);
-                RocketController* con = new RocketController(this);
+        SimpleRocket* rocket = new SimpleRocket(this);
+        RocketController* con = new RocketController(this);
 
 
         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
-        con->getControllableEntity()->setOrientation(this->getMuzzleOrientation());
-        con->getControllableEntity()->setPosition(this->getMuzzlePosition());
-        /* rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
-        rocket->scale(2);
+        rocket->setOrientation(this->getMuzzleOrientation());
+        rocket->setPosition(this->getMuzzlePosition());
+        rocket->scale(10);
+        rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
+        rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+        rocket->setDamage(this->getDamage());
+        //rocket->scale(2);
 
-        rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
-        rocket->setDamage(this->getDamage());*/
     }
 }