Changeset 6412 for code/branches/pickup2/src/modules/weapons

Timestamp:

Dec 25, 2009, 1:18:03 PM (15 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) (2 diffs)
• src/modules/weapons/projectiles/Projectile.cc (modified) (4 diffs)
• src/modules/weapons/projectiles/Rocket.cc (copied) (copied from code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc)
• src/modules/weapons/projectiles/Rocket.h (copied) (copied from code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h)
• 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/branches/pickup2/src/modules/weapons/projectiles/CMakeLists.txt

@@ -4 +4 @@
   Projectile.cc
   LightningGunProjectile.cc
+  Rocket.cc
 )

code/branches/pickup2/src/modules/weapons/projectiles/LightningGunProjectile.cc

@@ -43 +43 @@
         this->maxTextureIndex_ = 8;
         this->textureTimer_.setTimer(0.01f, true, createExecutor(createFunctor(&LightningGunProjectile::changeTexture, this)));
-        
+
         registerVariables();
     }
-    
+
     void LightningGunProjectile::registerVariables()
     {
         registerVariable(this->materialBase_);
     }
-    
+
     void LightningGunProjectile::setMaterial(const std::string& material)
     {
-        this->materialBase_ = material;    
-    
+        this->materialBase_ = material;
+
         BillboardProjectile::setMaterial(material + multi_cast<std::string>(this->textureIndex_));
     }
@@ -64 +64 @@
         if (this->textureIndex_ > this->maxTextureIndex_)
             this->textureIndex_ = 1;
-        
+
         this->setMaterial(this->materialBase_);
     }

code/branches/pickup2/src/modules/weapons/projectiles/Projectile.cc

@@ -48 +48 @@
         this->bDestroy_ = false;
         this->owner_ = 0;
+        this->damage_ = 15;
 
         // Get notification about collisions
@@ -53 +54 @@
         if (GameMode::isMaster())
         {
+            this->setMass(1.0);
             this->enableCollisionCallback();
             this->setCollisionResponse(false);
@@ -71 +73 @@
     void Projectile::setConfigValues()
     {
-        SetConfigValue(damage_, 15.0).description("The damage caused by the projectile");
         SetConfigValue(lifetime_, 4.0).description("The time in seconds a projectile stays alive");
     }
@@ -129 +130 @@
             Pawn* victim = orxonox_cast<Pawn*>(otherObject);
             if (victim)
-                victim->damage(dmg, this->owner_);
+                victim->hit(this->owner_, contactPoint, dmg);
         }
         return false;

code/branches/pickup2/src/modules/weapons/weaponmodes/CMakeLists.txt

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

code/branches/pickup2/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/branches/pickup2/src/modules/weapons/weaponmodes/HsW01.h

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

code/branches/pickup2/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/branches/pickup2/src/modules/weapons/weaponmodes/LightningGun.h

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