Changeset 6834 for code/branches/rocket/src/modules/weapons/weaponmodes

Timestamp:

May 3, 2010, 1:40:16 PM (15 years ago)

Author:

gnadler

Message:

Success:
Now rocket spawns somewhere around the ship and the orientation is more or less correct. The controller does nothing but change some pitch/roll (to be sure it does something).
I modified the rocketfire particle to produce rocketfire2.particle which is slightly smaller and matches the smaller rocket.

File:

• code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) (2 diffs)

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

@@ -45 +45 @@
     {
         RegisterObject(SimpleRocketFire);
+                
 
       /*  this->reloadTime_ = 0.20f;
@@ -61 +62 @@
     void SimpleRocketFire::fire()
     {
-        SimpleRocket* rocket = new SimpleRocket(this);
-        RocketController* con = new RocketController(this);
+        //SimpleRocket* rocket = new SimpleRocket(this);
+                RocketController* con = new RocketController(this);
+                SimpleRocket* rocket = con->getRocket();
+                this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
+                rocket->setOrientation(this->getMuzzleOrientation());
+        rocket->setPosition(this->getMuzzlePosition());
+                rocket->setVelocity(this->getMuzzleDirection() * rocket->getVelocity());
+                rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+                //con->getRocket()->setPosition(this->getMuzzlePosition());
+        //con->setControllableEntity(dynamic_cast<ControllableEntity*>(rocket));
+        //con->getControllableEntity()->setPosition(this->getMuzzlePosition());
 
-
-        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
+        /* this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         rocket->setOrientation(this->getMuzzleOrientation());
         rocket->setPosition(this->getMuzzlePosition());
-        rocket->scale(10);
+                rocket->scale(10);
         rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
         rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
-        rocket->setDamage(this->getDamage());
-        //rocket->scale(2);
-
+        rocket->setDamage(this->getDamage()); 
+        rocket->scale(2);
+                */
     }
 }