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

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/HsW01.cc (modified) (4 diffs)
• src/modules/weapons/weaponmodes/HsW01.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/LightningGun.cc (modified) (3 diffs)
• src/modules/weapons/weaponmodes/LightningGun.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/RocketFire.cc (copied) (copied from code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc)
• src/modules/weapons/weaponmodes/RocketFire.h (copied) (copied from code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.h)

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

@@ -5 +5 @@
   HsW01.cc
   LightningGun.cc
+  RocketFire.cc
 )

code/trunk/src/modules/weapons/weaponmodes/HsW01.cc

@@ -39 +39 @@
 #include "weaponsystem/WeaponPack.h"
 #include "weaponsystem/WeaponSystem.h"
+#include "worldentities/WorldEntity.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -56 +58 @@
         this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&HsW01::shot, this)));
         this->delayTimer_.stopTimer();
+
+        this->setDefaultSound("sounds/Weapon_HsW01.ogg");
+    }
+
+    HsW01::~HsW01()
+    {
     }
 
@@ -103 +111 @@
     void HsW01::shot()
     {
+        assert( this->getWeapon() && this->getWeapon()->getWeaponPack() && this->getWeapon()->getWeaponPack()->getWeaponSystem() && this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn() );
         Projectile* projectile = new Projectile(this);
         Model* model = new Model(projectile);
@@ -110 +119 @@
         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/HsW01.h

@@ -41 +41 @@
         public:
             HsW01(BaseObject* creator);
-            virtual ~HsW01() {}
+            virtual ~HsW01();
 
             virtual void fire();

code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc

@@ -34 +34 @@
 #include "weaponsystem/WeaponPack.h"
 #include "weaponsystem/WeaponSystem.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -48 +49 @@
 
         this->setMunitionName("LaserMunition");
+        this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
     }
 
@@ -59 +61 @@
         projectile->setMaterial("Flares/LightningBall_");
 
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());

code/trunk/src/modules/weapons/weaponmodes/LightningGun.h

@@ -42 +42 @@
 
             virtual void fire();
+
        private:
             float speed_;