Changeset 2398 for code/branches

Timestamp:

Dec 10, 2008, 9:20:39 PM (16 years ago)

Author:

polakma

Message:

altfire now available

Location:

code/branches/weapon2

Files:

• bin/def_keybindings.ini (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/weaponSystem/Weapon.cc (modified) (4 diffs)
• src/orxonox/objects/weaponSystem/Weapon.h (modified) (4 diffs)
• src/orxonox/objects/weaponSystem/WeaponPack.cc (modified) (1 diff)
• src/orxonox/objects/weaponSystem/WeaponSet.cc (modified) (1 diff)
• src/orxonox/objects/weaponSystem/WeaponSlot.cc (modified) (2 diffs)
• src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified) (1 diff)
• src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc (modified) (1 diff)
• src/orxonox/objects/weaponSystem/weapons/Fusion.cc (added)
• src/orxonox/objects/weaponSystem/weapons/Fusion.h (added)
• src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (modified) (1 diff)
• src/orxonox/objects/weaponSystem/weapons/LaserGun.h (modified) (1 diff)
• src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/branches/weapon2/bin/def_keybindings.ini

@@ -247 +247 @@
 MouseLeft="fire"
 MouseMiddle=
-MouseRight=
+MouseRight="altfire"
 MouseWheel1Down=
 MouseWheel1Up=

code/branches/weapon2/src/orxonox/CMakeLists.txt

@@ -92 +92 @@
   objects/weaponSystem/Munition.cc
   objects/weaponSystem/weapons/LaserGun.cc
+  objects/weaponSystem/weapons/Fusion.cc
   objects/weaponSystem/munitions/LaserGunMunition.cc
   objects/weaponSystem/projectiles/BillboardProjectile.cc

code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.cc

@@ -45 +45 @@
         this->magazineReadyToShoot_ = true;
         this->parentWeaponSystem_ = 0;
-        this->parentWeaponSlot_ = 0;
+        this->attachedToWeaponSlot_ = 0;
         this->munition_ = 0;
         this->bulletLoadingTime_ = 0;
@@ -61 +61 @@
         SUPER(Weapon, XMLPort, xmlelement, mode);
         XMLPortParam(Weapon, "munitionType", setMunitionType, getMunitionType, xmlelement, mode);
+        XMLPortParam(Weapon, "bulletLoadingTime", setBulletLoadingTime, getBulletLoadingTime, xmlelement, mode);
+        XMLPortParam(Weapon, "magazineLoadingTime", setMagazineLoadingTime, getMagazineLoadingTime, xmlelement, mode);
     }
 
     void Weapon::setWeapon()
     {
-COUT(0) << "LaserGun::setWeapon" << std::endl;
-        this->bulletLoadingTime_ = 0.5;
-        this->magazineLoadingTime_ = 3.0;
-        this->munition_->setMaxMagazines(100);
-        this->munition_->setMaxBullets(6);
         this->munition_->fillBullets();
         this->munition_->fillMagazines();
@@ -165 +162 @@
 
     void Weapon::setMunitionType(std::string munitionType)
-    {   
-COUT(0) << "Weapon::setMunitionType (XMLPort) "<< munitionType << std::endl;
-this->munitionType_ = munitionType; }
+    {   this->munitionType_ = munitionType; }
 
     const std::string Weapon::getMunitionType()
     {   return this->munitionType_;  }
+
+    void Weapon::setBulletLoadingTime(float loadingTime)
+    {   this->bulletLoadingTime_ = loadingTime; }
+
+    const float Weapon::getBulletLoadingTime()
+    {   return this->bulletLoadingTime_;  }
+
+    void Weapon::setMagazineLoadingTime(float loadingTime)
+    {   this->magazineLoadingTime_ = loadingTime; }
+
+    const float Weapon::getMagazineLoadingTime()
+    {   return this->magazineLoadingTime_;  }
+
 
     Munition * Weapon::getAttachedMunition(std::string munitionType)
@@ -179 +187 @@
 return this->munition_; }
 
-
-
-    void Weapon::setBulletLoadingTime(float loadingTime)
-    {   this->bulletLoadingTime_ = loadingTime;   }
-
-    float Weapon::getBulletLoadingTime()
-    {   return this->bulletLoadingTime_;  }
-
-    void Weapon::setMagazineLoadingTime(float loadingTime)
-    {   this->magazineLoadingTime_ = loadingTime;   }
-
-    float Weapon::getMagazineLoadingTime()
-    {   return this->magazineLoadingTime_;  }
-
-
-    Timer<Weapon> * Weapon::getBulletTimer()
-    {   return &this->bulletReloadTimer_;   }
-
-    Timer<Weapon> * Weapon::getMagazineTimer()
-    {   return &this->magazineReloadTimer_;   }
-
     void Weapon::takeBullets() { };
     void Weapon::createProjectile() { };

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

@@ -61 +61 @@
             void bulletReloaded();
             void magazineReloaded();
-            void setBulletLoadingTime(float loadingTime);
-            float getBulletLoadingTime();
-            void setMagazineLoadingTime(float loadingTime);
-            float getMagazineLoadingTime();
-            Timer<Weapon> *getBulletTimer();
-            Timer<Weapon> *getMagazineTimer();
 
             virtual void setMunitionType(std::string munitionType);
             virtual const std::string getMunitionType();
+            virtual void setBulletLoadingTime(float loadingTime);
+            virtual const float getBulletLoadingTime();
+            virtual void setMagazineLoadingTime(float loadingTime);
+            virtual const float getMagazineLoadingTime();
 
             virtual void takeBullets();
@@ -75 +73 @@
             virtual void createProjectile();
 
-            inline void setParentWeaponSlot(WeaponSlot *parentWeaponSlot)
-                { this->parentWeaponSlot_=parentWeaponSlot; };
-            inline WeaponSlot * getParentWeaponSlot()
-                { return this->parentWeaponSlot_; };
             inline void setParentWeaponSystem(WeaponSystem *parentWeaponSystem)
                 { this->parentWeaponSystem_=parentWeaponSystem; };
@@ -84 +78 @@
                 { return this->parentWeaponSystem_; };
 
-            //in future by XMLPort
+            inline void setAttachedToWeaponSlot(WeaponSlot * wSlot)
+                { this->attachedToWeaponSlot_ = wSlot; }
+            inline WeaponSlot * getAttachedToWeaponSlot()
+                { return this->attachedToWeaponSlot_; }
+
             virtual void setWeapon();
 
@@ -90 +88 @@
 
         protected:
+            bool bReloading_;
             bool bulletReadyToShoot_;
             bool magazineReadyToShoot_;
             float bulletLoadingTime_;
             float magazineLoadingTime_;
-            bool bReloading_;
-
-            Munition *munition_;
             std::string munitionType_;
 
-            WeaponSlot *parentWeaponSlot_;
-            WeaponSystem *parentWeaponSystem_;
+            WeaponSlot * attachedToWeaponSlot_;
+            Munition * munition_;
+            WeaponSystem * parentWeaponSystem_;
+
             SubclassIdentifier<Munition> munitionIdentifier_;
+
             Timer<Weapon> bulletReloadTimer_;
             Timer<Weapon> magazineReloadTimer_;

code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponPack.cc

@@ -64 +64 @@
         {
 COUT(0) << "WeaponPack::fire (attached from WeaponSet)  from Weapon: "<< i << std::endl;
-            this->weapons_[i]->fire();
+            this->weapons_[i]->getAttachedToWeaponSlot()->fire();
         }
     }

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

@@ -68 +68 @@
             {
                 //at the moment this function only works for one weaponPack in the entire WeaponSystem...
-                if ( this->parentWeaponSystem_->getWeaponSlotPointer(i)->getAttachedWeapon() == 0 ) //if slot not full
+                if ( this->parentWeaponSystem_->getWeaponSlotPointer(i)->getAttachedWeapon() == 0 && this->parentWeaponSystem_->getWeaponSlotPointer(i) != 0) //if slot not full
                 {
+COUT(0) << "WeaponSet::attachWeaponPack attaching Weapon" << std::endl;
                     this->setWeaponSlots_.push_back( this->parentWeaponSystem_->getWeaponSlotPointer(i) );
                     this->parentWeaponSystem_->getWeaponSlotPointer(i)->attachWeapon( wPack->getWeaponPointer(wPackWeapon) );
                     wPackWeapon++;
+                }
+                else
+                {
+                    for (int k=0; k < this->parentWeaponSystem_->getWeaponSlotSize(); k++)
+                    {
+                        if ( this->parentWeaponSystem_->getWeaponSlotPointer(k)->getAttachedWeapon() == 0 )
+                        {
+COUT(0) << "WeaponSet::attachWeaponPack mode 2 k="<< k << std::endl;
+                            this->setWeaponSlots_.push_back( this->parentWeaponSystem_->getWeaponSlotPointer(k) );
+                            this->parentWeaponSystem_->getWeaponSlotPointer(k)->attachWeapon( wPack->getWeaponPointer(wPackWeapon) );
+                            wPackWeapon++;
+                        }
+                    }
                 }
             }

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

@@ -66 +66 @@
     void WeaponSlot::fire()
     {
+        if ( this->attachedWeapon_ )
 COUT(0) << "WeaponSlot::fire" << std::endl;
         this->attachedWeapon_->fire();
@@ -79 +80 @@
     {
         this->attachedWeapon_ = weapon;
+        weapon->setAttachedToWeaponSlot(this);
         this->attach(weapon);
 COUT(0) << "WeaponSlot::attachWeapon position=" << this->getWorldPosition() << std::endl;

code/branches/weapon2/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc

@@ -42 +42 @@
     {
         RegisterObject(LaserGunMunition);
+
+        this->maxBullets_ = 40;
+        this->maxMagazines_ = 100;
     }
 

code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc

@@ -43 +43 @@
         RegisterObject(ParticleProjectile);
 
-        this->particles_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/shot2_small", LODParticle::normal);
+        this->particles_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/shot3_small", LODParticle::normal);
         this->particles_->addToSceneNode(this->getNode());
-        //this->particles_->setKeepParticlesInLocalSpace(true);
+        this->particles_->setKeepParticlesInLocalSpace(0);
 
         this->particles_->getAllEmitters()->setDirection(-WorldEntity::FRONT);

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

@@ -44 +44 @@
     {
         RegisterObject(LaserGun);
-
-        //in future XMLPort
-        this->speed_ = 250;
+        
+        this->speed_ = 1250;
 
     }

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

@@ -47 +47 @@
             LaserGun(BaseObject* creator);
             virtual ~LaserGun();
-            
+
             virtual void takeBullets();
             virtual void takeMagazines();

code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -137 +137 @@
     void Pawn::fire(WeaponMode::Enum fireMode)
     {
-COUT(0) << "Pawn::fire" << std::endl;
+COUT(0) << "Pawn::fire" << fireMode << std::endl;
         if (this->weaponSystem_)
             this->weaponSystem_->fire(fireMode);
@@ -152 +152 @@
     void Pawn::setWeaponSlot(WeaponSlot * wSlot)
     {   
-COUT(0) << "Pawn::setWeaponSlot" << std::endl;
+COUT(0) << "Pawn::setWeaponSlot" << wSlot << std::endl;
         this->attach(wSlot);
         this->weaponSystem_->attachWeaponSlot(wSlot);   }