Changeset 2969 for code/branches/weapons/src/orxonox/objects/weaponsystem

Timestamp:

May 11, 2009, 3:58:38 PM (16 years ago)

Author:

jsmely

Message:

weapon updated

Location:

code/branches/weapons/src/orxonox/objects/weaponsystem

Files:

• projectiles/BillboardProjectile.cc (modified) (1 diff)
• projectiles/BillboardProjectile.h (modified) (1 diff)
• projectiles/CMakeLists.txt (modified) (1 diff)
• projectiles/LightningGunProjectile.cc (added)
• projectiles/LightningGunProjectile.h (added)
• weaponmodes/CMakeLists.txt (modified) (1 diff)
• weaponmodes/LightningGun.cc (added)
• weaponmodes/LightningGun.h (added)

code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc

@@ -64 +64 @@
         this->billboard_.setColour(colour);
     }
+    
+    void BillboardProjectile::setMaterial(const std::string& material)
+    {
+        this->billboard_.setMaterial(material);
+    }
 
     void BillboardProjectile::changedVisibility()

code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h

@@ -45 +45 @@
 
             virtual void setColour(const ColourValue& colour);
+            virtual void setMaterial(const std::string& material);
             virtual void changedVisibility();
 

code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/CMakeLists.txt

@@ -3 +3 @@
   ParticleProjectile.cc
   Projectile.cc
+  LightningGunProjectile.cc
 )

code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt

@@ -2 +2 @@
   FusionFire.cc
   LaserFire.cc
+  LightningGun.cc
 )