Changeset 10622 for code/trunk/src/modules/weapons/weaponmodes

Timestamp:

Oct 4, 2015, 3:45:56 PM (9 years ago)

Author:

landauf

Message:

merged branch presentationFS15merge back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/FusionFire.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/GravityBombFire.cc (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/GravityBombFire.cc)
• src/modules/weapons/weaponmodes/GravityBombFire.h (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/GravityBombFire.h)
• src/modules/weapons/weaponmodes/LaserFire.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/RocketFireOld.cc (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.cc)
• src/modules/weapons/weaponmodes/RocketFireOld.h (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.h)

code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -6 +6 @@
   LightningGun.cc
   RocketFire.cc
+  RocketFireOld.cc
   SimpleRocketFire.cc
+  GravityBombFire.cc
 )

code/trunk/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/trunk/src/modules/weapons/weaponmodes/FusionFire.cc

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

code/trunk/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());