Changeset 2919

Timestamp:

Apr 18, 2009, 6:41:00 PM (16 years ago)

Author:

landauf

Message:

removed some debug output, cleanup in WeaponMode

Location:

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

Files:

• DefaultWeaponmodeLink.cc (modified) (1 diff)
• Munition.cc (modified) (2 diffs)
• Weapon.cc (modified) (1 diff)
• WeaponMode.cc (modified) (2 diffs)
• WeaponMode.h (modified) (1 diff)
• WeaponPack.cc (modified) (1 diff)
• WeaponSet.cc (modified) (1 diff)
• WeaponSlot.cc (modified) (1 diff)
• WeaponSystem.cc (modified) (1 diff)
• weapons/FusionFire.cc (modified) (1 diff)

code/branches/weapons/src/orxonox/objects/weaponSystem/DefaultWeaponmodeLink.cc

@@ -45 +45 @@
         this->firemode_ = WeaponSystem::FIRE_MODE_UNASSIGNED;
         this->weaponmode_ = WeaponSystem::WEAPON_MODE_UNASSIGNED;
-
-COUT(0) << "+DefaultWeaponmodeLink" << std::endl;
     }
 
     DefaultWeaponmodeLink::~DefaultWeaponmodeLink()
     {
-COUT(0) << "~DefaultWeaponmodeLink" << std::endl;
     }
 

code/branches/weapons/src/orxonox/objects/weaponSystem/Munition.cc

@@ -51 +51 @@
 
         this->reloadTime_ = 0;
-
-COUT(0) << "+Munition" << std::endl;
     }
 
@@ -59 +57 @@
         for (std::map<WeaponMode*, Magazine*>::iterator it = this->currentMagazines_.begin(); it != this->currentMagazines_.end(); ++it)
             delete it->second;
-
-COUT(0) << "~Munition" << std::endl;
     }
 

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

@@ -53 +53 @@
         this->reloadTimer_.setTimer(0.0f, false, this, createExecutor(createFunctor(&Weapon::reloaded)));
         this->reloadTimer_.stopTimer();
-
-COUT(0) << "+Weapon" << std::endl;
     }
 
     Weapon::~Weapon()
     {
-COUT(0) << "~Weapon" << std::endl;
-
         if (this->isInitialized())
         {

code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponMode.cc

@@ -63 +63 @@
         this->damage_ = 0;
         this->muzzleOffset_ = Vector3::ZERO;
-
-COUT(0) << "+WeaponMode" << std::endl;
     }
 
     WeaponMode::~WeaponMode()
     {
-COUT(0) << "~WeaponMode" << std::endl;
     }
 
@@ -221 +218 @@
             return WorldEntity::FRONT;
     }
-
-/*
-    WeaponMode::WeaponMode(BaseObject* creator) : StaticEntity(creator)
-    {
-        RegisterObject(WeaponMode);
-
-        this->bulletReadyToShoot_ = true;
-        this->magazineReadyToShoot_ = true;
-        this->weaponSystem_ = 0;
-        this->weaponPack_ = 0;
-        this->weaponSlot_ = 0;
-        this->bulletLoadingTime_ = 0;
-        this->magazineLoadingTime_ = 0;
-        this->bReloading_ = false;
-        this->bulletAmount_= 0;
-        this->magazineAmount_ = 0;
-        this->munition_ = 0;
-        this->unlimitedMunition_ = false;
-        this->setObjectMode(0x0);
-COUT(0) << "+WeaponMode" << std::endl;
-    }
-
-    WeaponMode::~WeaponMode()
-    {
-COUT(0) << "~WeaponMode" << std::endl;
-        if (this->isInitialized() && this->weaponPack_)
-            this->weaponPack_->removeWeapon(this);
-    }
-
-    void WeaponMode::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(WeaponMode, XMLPort, xmlelement, mode);
-
-        XMLPortParam(WeaponMode, "munitionType", setMunitionType, getMunitionType, xmlelement, mode);
-        XMLPortParam(WeaponMode, "bulletLoadingTime", setBulletLoadingTime, getBulletLoadingTime, xmlelement, mode);
-        XMLPortParam(WeaponMode, "magazineLoadingTime", setMagazineLoadingTime, getMagazineLoadingTime, xmlelement, mode);
-        XMLPortParam(WeaponMode, "bullets", setBulletAmount, getBulletAmount, xmlelement, mode);
-        XMLPortParam(WeaponMode, "magazines", setMagazineAmount, getMagazineAmount, xmlelement, mode);
-        XMLPortParam(WeaponMode, "unlimitedMunition", setUnlimitedMunition, getUnlimitedMunition, xmlelement, mode);
-    }
-
-    void WeaponMode::setWeapon()
-    {
-        this->munition_->fillBullets();
-        this->munition_->fillMagazines();
-    }
-
-    void WeaponMode::setMunition()
-    {
-        this->munition_->setMaxBullets(this->bulletAmount_);
-        this->munition_->setMaxMagazines(this->magazineAmount_);
-    }
-
-    void WeaponMode::fire()
-    {
-        if ( this->bulletReadyToShoot_ && this->magazineReadyToShoot_ && !this->bReloading_)
-        {
-            this->bulletReadyToShoot_ = false;
-            if ( this->unlimitedMunition_== true )
-            {
-                //shoot
-                this->reloadBullet();
-                this->createProjectile();
-            }
-            else
-            {
-                if ( this->munition_->bullets() > 0)
-                {
-                    //shoot and reload
-                    this->takeBullets();
-                    this->reloadBullet();
-                    this->createProjectile();
-                }
-                //if there are no bullets, but magazines
-                else if ( this->munition_->magazines() > 0 && this->munition_->bullets() == 0 )
-                {
-                    //reload magazine
-                    this->takeMagazines();
-                    this->reloadMagazine();
-                }
-                else
-                {
-                    //no magazines
-                }
-            }
-        }
-        else
-        {
-            //weapon not reloaded
-        }
-    }
-
-
-    //weapon reloading
-    void WeaponMode::bulletTimer(float bulletLoadingTime)
-    {
-        this->bReloading_ = true;
-        this->bulletReloadTimer_.setTimer( bulletLoadingTime , false , this , createExecutor(createFunctor(&WeaponMode::bulletReloaded)));
-    }
-    void WeaponMode::magazineTimer(float magazineLoadingTime)
-    {
-        this->bReloading_ = true;
-        this->magazineReloadTimer_.setTimer( magazineLoadingTime , false , this , createExecutor(createFunctor(&WeaponMode::magazineReloaded)));
-    }
-
-    void WeaponMode::bulletReloaded()
-    {
-        this->bReloading_ = false;
-        this->bulletReadyToShoot_ = true;
-    }
-
-    void WeaponMode::magazineReloaded()
-    {
-        this->bReloading_ = false;
-        this->munition_->fillBullets();
-    }
-
-
-
-    void WeaponMode::attachNeededMunition(const std::string& munitionName)
-    {
-        //  if munition type already exists attach it, else create a new one of this type and attach it to the weapon and to the WeaponSystem
-        if (this->weaponSystem_)
-        {
-            //getMunitionType returns 0 if there is no such munitionType
-            Munition* munition = this->weaponSystem_->getMunitionType(munitionName);
-            if ( munition )
-            {
-                this->munition_ = munition;
-                this->setMunition();
-            }
-            else
-            {
-                //create new munition with identifier because there is no such munitionType
-                this->munitionIdentifier_ = ClassByString(munitionName);
-                this->munition_ = this->munitionIdentifier_.fabricate(this);
-                this->weaponSystem_->setNewMunition(munitionName, this->munition_);
-                this->setMunition();
-            }
-        }
-    }
-
-
-    Munition * WeaponMode::getAttachedMunition(const std::string& munitionType)
-    {
-        this->munition_ = this->weaponSystem_->getMunitionType(munitionType);
-        return this->munition_;
-    }
-*/
 }

code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponMode.h

@@ -151 +151 @@
             Timer<WeaponMode> reloadTimer_;
             bool bReloading_;
-/*
-            virtual void fire();
-            void attachNeededMunition(const std::string& munitionType);
-            Munition * getAttachedMunition(const std::string& munitiontype);
-
-            //reloading
-            void bulletTimer(float bulletLoadingTime);
-            void magazineTimer(float magazineLoadingTime);
-            void bulletReloaded();
-            void magazineReloaded();
-
-            //get and set functions for XMLPort
-            void setMunitionType(const std::string& munitionType)
-                {   this->munitionType_ = munitionType; }
-            std::string& getMunitionType() const
-                {   return this->munitionType_;  }
-
-            void setBulletLoadingTime(float loadingTime)
-                {   this->bulletLoadingTime_ = loadingTime; }
-            float getBulletLoadingTime() const
-                {   return this->bulletLoadingTime_;  }
-
-            void setMagazineLoadingTime(float loadingTime)
-                {   this->magazineLoadingTime_ = loadingTime; }
-            float getMagazineLoadingTime() const
-                {   return this->magazineLoadingTime_;  }
-
-            void setBulletAmount(unsigned int amount)
-                {   this->bulletAmount_ = amount; }
-            unsigned int getBulletAmount() const
-                {   return this->bulletAmount_;  }
-
-            void setMagazineAmount(unsigned int amount)
-                {   this->magazineAmount_ = amount; }
-            unsigned int getMagazineAmount() const
-                {   return this->magazineAmount_;   }
-
-            void setUnlimitedMunition(bool unlimitedMunition)
-                {   this->unlimitedMunition_ = unlimitedMunition;   }
-            bool getUnlimitedMunition() const
-                {   return this->unlimitedMunition_;    }
-
-            //weapon actions
-            //these function are defined in the weapon classes
-            virtual void takeBullets() {}
-            virtual void takeMagazines() {}
-            virtual void createProjectile() {}
-            virtual void reloadBullet() {}
-            virtual void reloadMagazine() {}
-
-            //manually set or reset
-            virtual void setWeapon();
-            virtual void setMunition();
-
-            inline void setWeaponSystem(WeaponSystem *weaponSystem)
-                { this->weaponSystem_ = weaponSystem; };
-            inline WeaponSystem * getWeaponSystem() const
-                { return this->weaponSystem_; };
-
-            inline void setWeaponPack(WeaponPack *weaponPack)
-                { this->weaponPack_ = weaponPack; };
-            inline WeaponPack * getWeaponPack() const
-                { return this->weaponPack_; };
-
-            inline void setWeaponSlot(WeaponSlot * wSlot)
-                { this->weaponSlot_ = wSlot; }
-            inline WeaponSlot * getWeaponSlot() const
-                { return this->weaponSlot_; }
-
-        protected:
-            bool bReloading_;
-            bool bulletReadyToShoot_;
-            bool magazineReadyToShoot_;
-            bool unlimitedMunition_;
-            float bulletLoadingTime_;
-            float magazineLoadingTime_;
-            unsigned int bulletAmount_;
-            unsigned int magazineAmount_;
-            std::string munitionType_;
-
-            WeaponSlot * weaponSlot_;
-            Munition * munition_;
-            WeaponSystem * weaponSystem_;
-            WeaponPack* weaponPack_;
-
-            SubclassIdentifier<Munition> munitionIdentifier_;
-
-            Timer<WeaponMode> bulletReloadTimer_;
-            Timer<WeaponMode> magazineReloadTimer_;
-*/
     };
 }

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

@@ -48 +48 @@
 
         this->weaponSystem_ = 0;
-
-COUT(0) << "+WeaponPack" << std::endl;
     }
 
     WeaponPack::~WeaponPack()
     {
-COUT(0) << "~WeaponPack" << std::endl;
-
         if (this->isInitialized() && this->weaponSystem_)
         {

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

@@ -46 +46 @@
         this->weaponSystem_ = 0;
         this->desiredFiremode_ = WeaponSystem::FIRE_MODE_UNASSIGNED;
-
-COUT(0) << "+WeaponSet" << std::endl;
     }
 
     WeaponSet::~WeaponSet()
     {
-COUT(0) << "~WeaponSet" << std::endl;
-
         if (this->isInitialized() && this->weaponSystem_)
             this->weaponSystem_->removeWeaponSet(this);

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

@@ -48 +48 @@
 
         this->setObjectMode(0x0);
-
-COUT(0) << "+WeaponSlot" << std::endl;
     }
 
     WeaponSlot::~WeaponSlot()
     {
-COUT(0) << "~WeaponSlot" << std::endl;
-
         if (this->isInitialized() && this->weaponSystem_)
             this->weaponSystem_->removeWeaponSlot(this);

code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.cc

@@ -53 +53 @@
 
         this->pawn_ = 0;
-COUT(0) << "+WeaponSystem" << std::endl;
     }
 
     WeaponSystem::~WeaponSystem()
     {
-COUT(0) << "~WeaponSystem" << std::endl;
         if (this->isInitialized())
         {

code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/FusionFire.cc

@@ -60 +60 @@
         projectile->setPosition(this->getMuzzlePosition());
         projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
+        projectile->scale(5);
 
         projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());