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

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

Files:

• Weapon.h (modified) (1 diff)
• WeaponSet.cc (modified) (2 diffs)
• WeaponSet.h (modified) (2 diffs)
• WeaponSlot.cc (modified) (1 diff)
• weapons/LaserGun.cc (modified) (3 diffs)
• weapons/LaserGun.h (modified) (2 diffs)

code/branches/weapon/src/orxonox/objects/weaponSystem/Weapon.h

@@ -46 +46 @@
 
             void addMunition();
-            void fire();
+            virtual void fire();
 
         private:
-                        int loadingTime;
+            int loadingTime;
             Munition *munition_;
 

code/branches/weapon/src/orxonox/objects/weaponSystem/WeaponSet.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    WeaponSet::WeaponSet()
+    WeaponSet::WeaponSet(int k)
     {
         RegisterObject(WeaponSet);
+
+        for (int i=0;i<k;i++)
+        {
+            this->wSlotNew = new WeaponSlot();
+            attachWeaponSlot(wSlotNew);
+        }
     }
 
@@ -63 +69 @@
     }
 
+    WeaponSlot * getWeaponSlotPointer(int n)
+    {
+        return this->weaponSlots_[n];
+    }
+
+
     void WeaponSet::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {

code/branches/weapon/src/orxonox/objects/weaponSystem/WeaponSet.h

@@ -43 +43 @@
     {
         public:
-            WeaponSet();
+            WeaponSet(int k);
             virtual ~WeaponSet();
 
@@ -50 +50 @@
             void WeaponSet::attachWeaponSlot(WeaponSlot *wSlot);
             void WeaponSet::fire();
+            WeaponSlot * getWeaponSlotPointer(int n);
+
             inline void WeaponSet::setParentWeaponSystem(WeaponSystem *parentWeaponSystem)
                 { parentWeaponSystem_=parentWeaponSystem; }

code/branches/weapon/src/orxonox/objects/weaponSystem/WeaponSlot.cc

@@ -59 +59 @@
     void WeaponSlot::setAmmoType(bool isUnlimited)
     {
-        if (isUnlimited == true)
-            unlimitedAmmo_ = true;
-        else unlimitedAmmo_ = false;
+        unlimitedAmmo_ = isUnlimited;
     }
 

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_;