Changeset 10494 for code/branches/clangenb/src

Timestamp:

May 27, 2015, 9:18:06 AM (9 years ago)

Author:

clangenb

Message:

branch added

Location:

code/branches/clangenb/src/modules/weapons

Files:

• projectiles/Rocket.cc (modified) (1 diff)
• weaponmodes/EnergyDrink.cc (modified) (1 diff)
• weaponmodes/FusionFire.cc (modified) (1 diff)
• weaponmodes/LaserFire.cc (modified) (1 diff)

code/branches/clangenb/src/modules/weapons/projectiles/Rocket.cc

@@ -74 +74 @@
             // Create rocket model
             Model* model = new Model(this->getContext());
-            model->setMeshSource("rocket.mesh");
+            model->setMeshSource("can.mesh");
             model->scale(0.7f);
             this->attach(model);

code/branches/clangenb/src/modules/weapons/weaponmodes/EnergyDrink.cc

@@ -108 +108 @@
         model->setScale(5);
 
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());

code/branches/clangenb/src/modules/weapons/weaponmodes/FusionFire.cc

@@ -67 +67 @@
     {
         BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
-
+        
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());

code/branches/clangenb/src/modules/weapons/weaponmodes/LaserFire.cc

@@ -66 +66 @@
         ParticleProjectile* projectile = new ParticleProjectile(this->getContext());
 
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());