Changeset 2060 for code/branches/weapon/src/orxonox/objects/weaponSystem/weapons

Timestamp:

Oct 29, 2008, 4:13:10 PM (16 years ago)

Author:

polakma

Message:

WeaponSystem, Projectile (kompiliert nicht)

Location:

code/branches/weapon/src/orxonox/objects/weaponSystem/weapons

Files:

• LaserGun.cc (modified) (3 diffs)
• LaserGun.h (modified) (2 diffs)

code/branches/weapon/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc

@@ -40 +40 @@
     {
         RegisterObject(LaserGun);
+
+        projectileColor_ = ColourValue(1.0, 1.0, 0.5)
     }
 
@@ -46 +48 @@
     }
 
+    LaserGun::fire()
+    {
+            BillboardProjectile* projectile = new ParticleProjectile(this);
+            projectile->setColour(this->projectileColor_);
+            projectile->create();
+            if (projectile->getClassID() == 0)
+            {
+              COUT(3) << "generated projectile with classid 0" <<  std::endl; // TODO: remove this output
+            }
+
+            projectile->setObjectMode(0x3);
+    }
+
     LaserGun::addMunition()
     {
-        this->munition_ =
+        //this->munition_ = ;
     }
 
@@ -56 +71 @@
     }
 
+    ColorValue LaserGun::getProjectileColor()
+    {
+        return projectileColor_;
+    }
 }

code/branches/weapon/src/orxonox/objects/weaponSystem/weapons/LaserGun.h

@@ -35 +35 @@
 
 #include "LaserGunMunition.h"
+#include "../tools/BillboardSet.h"
 
 namespace orxonox
@@ -46 +47 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-
+            ColourValue LaserGun::getProjectileColour();
 
         private:
+            ColorValue projectileColor_;