Changeset 3053 for code/trunk/src/orxonox/objects/weaponsystem

Timestamp:

May 25, 2009, 4:19:14 AM (16 years ago)

Author:

landauf

Message:

merged weapons branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/weaponsystem (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem)
• src/orxonox/objects/weaponsystem/CMakeLists.txt (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/CMakeLists.txt)
• src/orxonox/objects/weaponsystem/DefaultWeaponmodeLink.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/DefaultWeaponmodeLink.cc)
• src/orxonox/objects/weaponsystem/DefaultWeaponmodeLink.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/DefaultWeaponmodeLink.h)
• src/orxonox/objects/weaponsystem/Munition.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/Munition.cc) (1 diff)
• src/orxonox/objects/weaponsystem/Munition.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/Munition.h)
• src/orxonox/objects/weaponsystem/MuzzleFlash.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/MuzzleFlash.cc) (1 prop)
• src/orxonox/objects/weaponsystem/MuzzleFlash.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/MuzzleFlash.h) (1 prop)
• src/orxonox/objects/weaponsystem/Weapon.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/Weapon.cc)
• src/orxonox/objects/weaponsystem/Weapon.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/Weapon.h)
• src/orxonox/objects/weaponsystem/WeaponMode.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/WeaponMode.cc)
• src/orxonox/objects/weaponsystem/WeaponMode.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/WeaponMode.h)
• src/orxonox/objects/weaponsystem/WeaponPack.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/WeaponPack.cc)
• src/orxonox/objects/weaponsystem/WeaponPack.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/WeaponPack.h)
• src/orxonox/objects/weaponsystem/WeaponSet.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/WeaponSet.cc)
• src/orxonox/objects/weaponsystem/WeaponSet.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/WeaponSet.h)
• src/orxonox/objects/weaponsystem/WeaponSlot.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/WeaponSlot.cc)
• src/orxonox/objects/weaponsystem/WeaponSlot.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/WeaponSlot.h)
• src/orxonox/objects/weaponsystem/WeaponSystem.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/WeaponSystem.cc) (1 prop)
• src/orxonox/objects/weaponsystem/WeaponSystem.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/WeaponSystem.h) (1 prop)
• src/orxonox/objects/weaponsystem/munitions (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/munitions)
• src/orxonox/objects/weaponsystem/munitions/CMakeLists.txt (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/munitions/CMakeLists.txt)
• src/orxonox/objects/weaponsystem/munitions/FusionMunition.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/munitions/FusionMunition.cc)
• src/orxonox/objects/weaponsystem/munitions/FusionMunition.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h)
• src/orxonox/objects/weaponsystem/munitions/LaserMunition.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/munitions/LaserMunition.cc)
• src/orxonox/objects/weaponsystem/munitions/LaserMunition.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/munitions/LaserMunition.h)
• src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.cc)
• src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h)
• src/orxonox/objects/weaponsystem/projectiles (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles)
• src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc)
• src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h)
• src/orxonox/objects/weaponsystem/projectiles/CMakeLists.txt (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/CMakeLists.txt)
• src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc) (1 prop)
• src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h) (1 prop)
• src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.cc)
• src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h)
• src/orxonox/objects/weaponsystem/projectiles/Projectile.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc)
• src/orxonox/objects/weaponsystem/projectiles/Projectile.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/Projectile.h)
• src/orxonox/objects/weaponsystem/weaponmodes (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes)
• src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt)
• src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc) (2 diffs, 1 prop)
• src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h) (1 prop)
• src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc) (1 prop)
• src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h) (1 prop)
• src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc) (2 diffs, 1 prop)
• src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h) (1 prop)
• src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc) (1 prop)
• src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h) (1 prop)
• src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.cc) (2 diffs, 1 prop)
• src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.h) (1 prop)

code/trunk/src/orxonox/objects/weaponsystem/Munition.cc

@@ -404 +404 @@
             return (this->magazines_ >= amount);
         }
+
+        return false;
     }
 

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc

@@ -52 +52 @@
         this->speed_ = 2500;
         this->delay_ = 0;
-        this->setMunitionName("EnergyDrink");
+        this->setMunitionName("FusionMunition");
 
         this->delayTimer_.setTimer(1.0f, false, this, createExecutor(createFunctor(&EnergyDrink::shot)));
@@ -104 +104 @@
     {
         Projectile* projectile = new Projectile(this);
-        Model* model = new Model(projectile);
-        model->setMeshSource("can.mesh");
-        model->setCastShadows(false);
-        projectile->attach(model);
-        model->setScale(5);
+        Model* model = new Model(projectile);
+        model->setMeshSource("can.mesh");
+        model->setCastShadows(false);
+        projectile->attach(model);
+        model->setScale(5);
 
         projectile->setOrientation(this->getMuzzleOrientation());

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc

@@ -52 +52 @@
         this->speed_ = 2500;
         this->delay_ = 0;
-        this->setMunitionName("HsW01");
+        this->setMunitionName("LaserMunition");
 
         this->delayTimer_.setTimer(1.0f, false, this, createExecutor(createFunctor(&HsW01::shot)));
@@ -104 +104 @@
     {
         Projectile* projectile = new Projectile(this);
-        Model* model = new Model(projectile);
-        model->setMeshSource("laserbeam.mesh");
-        model->setCastShadows(false);
-        projectile->attach(model);
-        model->setScale(5);
+        Model* model = new Model(projectile);
+        model->setMeshSource("laserbeam.mesh");
+        model->setCastShadows(false);
+        projectile->attach(model);
+        model->setScale(5);
 
         projectile->setOrientation(this->getMuzzleOrientation());

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.cc

@@ -53 +53 @@
         this->damage_ = 100;
         this->speed_ = 150;
-        
+
         this->setMunitionName("LaserMunition");
     }
-    
+
     LightningGun::~LightningGun()
     {
@@ -65 +65 @@
         LightningGunProjectile* projectile = new LightningGunProjectile(this);
         projectile->setMaterial("Flares/LightningBall_");
-        
+
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());