Changeset 2060 for code/branches

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

Files:

• BillboardProjectile.cc (modified) (1 diff)
• BillboardProjectile.h (modified) (1 diff)
• ParticleProjectile.cc (modified) (2 diffs)
• ParticleProjectile.h (modified) (1 diff)
• Projectile.cc (modified) (3 diffs)
• Projectile.h (modified) (2 diffs)
• SpaceShip.cc (modified) (2 diffs)
• SpaceShip.h (modified) (2 diffs)
• WeaponSystem.cc (modified) (1 diff)
• WeaponSystem.h (modified) (1 diff)
• weaponSystem/Weapon.h (modified) (1 diff)
• weaponSystem/WeaponSet.cc (modified) (2 diffs)
• weaponSystem/WeaponSet.h (modified) (2 diffs)
• weaponSystem/WeaponSlot.cc (modified) (1 diff)
• weaponSystem/weapons/LaserGun.cc (modified) (3 diffs)
• weaponSystem/weapons/LaserGun.h (modified) (2 diffs)

code/branches/weapon/src/orxonox/objects/BillboardProjectile.cc

@@ -38 +38 @@
     CreateFactory(BillboardProjectile);
 
-    BillboardProjectile::BillboardProjectile(SpaceShip* owner) : Projectile(owner)
+    BillboardProjectile::BillboardProjectile(Weapon* owner) : Projectile(owner)
     {
         RegisterObject(BillboardProjectile);

code/branches/weapon/src/orxonox/objects/BillboardProjectile.h

@@ -41 +41 @@
     {
         public:
-            BillboardProjectile(SpaceShip* owner = 0);
+            BillboardProjectile(Weapon* owner = 0);
             virtual ~BillboardProjectile();
 

code/branches/weapon/src/orxonox/objects/ParticleProjectile.cc

@@ -38 +38 @@
     CreateFactory(ParticleProjectile);
 
-    ParticleProjectile::ParticleProjectile(SpaceShip* owner) : BillboardProjectile(owner)
+    ParticleProjectile::ParticleProjectile(Weapon* owner) : BillboardProjectile(owner)
     {
         RegisterObject(ParticleProjectile);
@@ -72 +72 @@
         this->particles_->setEnabled(this->isVisible());
     }
-    
+
     bool ParticleProjectile::create(){
       if(!Projectile::create())

code/branches/weapon/src/orxonox/objects/ParticleProjectile.h

@@ -41 +41 @@
     {
         public:
-            ParticleProjectile(SpaceShip* owner = 0);
+            ParticleProjectile(Weapon* owner = 0);
             virtual ~ParticleProjectile();
             virtual void changedVisibility();
             void setConfigValues();
-            
+
             virtual bool create();
 

code/branches/weapon/src/orxonox/objects/Projectile.cc

@@ -47 +47 @@
     float Projectile::speed_s = 5000;
 
-    Projectile::Projectile(SpaceShip* owner) : owner_(owner)
+    Projectile::Projectile(Weapon* owner) : owner_(owner)
     {
         RegisterObject(Projectile);
@@ -57 +57 @@
         this->setStatic(false);
         this->translate(Vector3(55, 0, 0), Ogre::Node::TS_LOCAL);
-        
+
         if (this->owner_)
         {
@@ -124 +124 @@
         delete this;
     }
-    
+
     bool Projectile::create(){
       return WorldEntity::create();

code/branches/weapon/src/orxonox/objects/Projectile.h

@@ -45 +45 @@
             void destroyObject();
             virtual void tick(float dt);
-            
+
             virtual bool create();
 
@@ -52 +52 @@
 
         protected:
-            Projectile(SpaceShip* owner = 0);
+            Projectile(Weapon* owner = 0);
             SpaceShip* owner_;
 

code/branches/weapon/src/orxonox/objects/SpaceShip.cc

@@ -142 +142 @@
 
         this->radarObject_ = static_cast<WorldEntity*>(this);
+
+        //WeaponSystem
+        weaponSystem_ = new WeaponSystem();
+        WeaponSet * weaponSet1 = new WeaponSet(1);
+        this->weaponSystem_->attachWeaponSet(weaponSet1);
+        this->weaponSystem_->getWeaponSetPointer(0)->getWeaponSlotPointer(0)->setAmmoType(true);
+
     }
 
@@ -474 +481 @@
         if (this->bLMousePressed_ && this->timeToReload_ <= 0)
         {
-
-            BillboardProjectile* projectile = new ParticleProjectile(this);
-            projectile->setColour(this->getProjectileColour());
-            projectile->create();
-            if (projectile->getClassID() == 0)
-            {
-              COUT(3) << "generated projectile with classid 0" <<  std::endl; // TODO: remove this output
-            }
-
-            projectile->setObjectMode(0x3);
+            this->weaponSystem_->fire(0);
             this->timeToReload_ = this->reloadTime_;
         }

code/branches/weapon/src/orxonox/objects/SpaceShip.h

@@ -38 +38 @@
 #include "RadarViewable.h"
 #include "tools/BillboardSet.h"
+
+#include "WeaponSystem.h"
 
 namespace orxonox
@@ -181 +183 @@
             float mouseY_;
 
+            //WeaponSystem
+            WeaponSystem * weaponSystem_;
+
         protected:
             bool myShip_;

code/branches/weapon/src/orxonox/objects/WeaponSystem.cc

@@ -77 +77 @@
     }
 
+    WeaponSet * getWeaponSetPointer(int n)
+    {
+        return this->weaponSets_[n];
+    }
+
     void WeaponSystem::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {

code/branches/weapon/src/orxonox/objects/WeaponSystem.h

@@ -50 +50 @@
             void fire(int n);
             void setActiveWeaponSet(int n);
+            WeaponSet * getWeaponSetPointer(int n);
 
             inline void WeaponSystem::setParentSpaceShip(SpaceShip *parentSpaceShip)

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