Changeset 11175 for code/branches

Timestamp:

Apr 28, 2016, 3:09:26 PM (9 years ago)

Author:

sagerj

Message:

overwritten many fire functions now only need to implement timer/charges

Location:

code/branches/sagerjFS16

Files:

• data/defaultConfig/keybindings.ini (modified) (3 diffs)
• src/modules/invader/InvaderEnemyShooter.cc (modified) (1 diff)
• src/modules/invader/InvaderShip.cc (modified) (1 diff)
• src/modules/jump/JumpFigure.cc (modified) (1 diff)
• src/modules/jump/JumpFigure.h (modified) (1 diff)
• src/modules/objects/controllers/TurretController.cc (modified) (1 diff)
• src/modules/towerdefense/TowerDefenseSelecter.cc (modified) (1 diff)
• src/modules/towerdefense/TowerDefenseSelecter.h (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.cc (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.h (modified) (1 diff)
• src/modules/weapons/projectiles/RocketOld.cc (modified) (1 diff)
• src/modules/weapons/projectiles/RocketOld.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/Discharger.cc (modified) (3 diffs)
• src/modules/weapons/weaponmodes/Discharger.h (modified) (1 diff)
• src/orxonox/controllers/AIController.cc (modified) (3 diffs)
• src/orxonox/controllers/ArtificialController.cc (modified) (3 diffs)
• src/orxonox/controllers/ArtificialController.h (modified) (1 diff)
• src/orxonox/controllers/DroneController.cc (modified) (1 diff)
• src/orxonox/controllers/FightingController.cc (modified) (1 diff)
• src/orxonox/controllers/WaypointPatrolController.cc (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponMode.cc (modified) (3 diffs)
• src/orxonox/weaponsystem/WeaponMode.h (modified) (1 diff)
• src/orxonox/worldentities/ControllableEntity.cc (modified) (3 diffs)
• src/orxonox/worldentities/pawns/Spectator.cc (modified) (5 diffs)
• src/orxonox/worldentities/pawns/Spectator.h (modified) (1 diff)

code/branches/sagerjFS16/data/defaultConfig/keybindings.ini

@@ -122 +122 @@
 KeyStop=
 KeySystemRequest="printScreen"
-KeyT= onpress fire 3 | onrelease release 3
+KeyT= onpress push 3 | onrelease release 3
 KeyTab="NewHumanController changeMode"
 KeyU=""
@@ -142 +142 @@
 KeyWebStop=
 KeyX="selectClosest"
-KeyY= onpress fire 4 | onrelease release 4
+KeyY= onpress push 4 | onrelease release 4
 KeyYen=
 KeyZ="selectNext"
@@ -152 +152 @@
 Button6=
 Button7=
-Left= fire 0 | release 0
-Middle= fire 2 | release 2
-Right= fire 1 | release 1
+Left= push 0 | release 0
+Middle= push 2 | release 2
+Right= push 1 | release 1
 Wheel1Down="NewHumanController decelerate"
 Wheel1Up="NewHumanController accelerate"

code/branches/sagerjFS16/src/modules/invader/InvaderEnemyShooter.cc

@@ -71 +71 @@
     void InvaderEnemyShooter::shoot()
     {
-        ControllableEntity::fire(0);
+        ControllableEntity::push(0);
     }
 

code/branches/sagerjFS16/src/modules/invader/InvaderShip.cc

@@ -91 +91 @@
         // shoot!
         if (isFireing)
-            ControllableEntity::fire(0);
+            ControllableEntity::push(0);
 
         // Camera

code/branches/sagerjFS16/src/modules/jump/JumpFigure.cc

@@ -398 +398 @@
     }
 
-    void JumpFigure::fire(unsigned int firemode)
-    {
-
-    }
-
-    void JumpFigure::fired(unsigned int firemode)
+    void JumpFigure::push(unsigned int firemode)
+    {
+
+    }
+
+    void JumpFigure::pushed(unsigned int firemode)
     {
         firePressed_ = true;

code/branches/sagerjFS16/src/modules/jump/JumpFigure.h

@@ -47 +47 @@
             virtual void rotatePitch(const Vector2& value) override;
             virtual void rotateRoll(const Vector2& value) override;
-            void fire(unsigned int firemode);
-            virtual void fired(unsigned int firemode) override;
+            void push(unsigned int firemode);
+            virtual void pushed(unsigned int firemode) override;
             virtual void JumpFromPlatform(JumpPlatform* platform);
             virtual void JumpFromSpring(JumpSpring* spring);

code/branches/sagerjFS16/src/modules/objects/controllers/TurretController.cc

@@ -198 +198 @@
             {
 
-                this->getControllableEntity()->fire(0);
+                this->getControllableEntity()->push(0);
             }
         }

code/branches/sagerjFS16/src/modules/towerdefense/TowerDefenseSelecter.cc

@@ -146 +146 @@
     }
 
-    void TowerDefenseSelecter::fire(unsigned int firemode)
+    void TowerDefenseSelecter::push(unsigned int firemode)
     {
     }
 
-    void TowerDefenseSelecter::fired(unsigned int firemode)
+    void TowerDefenseSelecter::pushed(unsigned int firemode)
     {
         

code/branches/sagerjFS16/src/modules/towerdefense/TowerDefenseSelecter.h

@@ -47 +47 @@
             virtual void rotatePitch(const Vector2& value) override;
             virtual void rotateRoll(const Vector2& value) override;
-            void fire(unsigned int firemode);
-            virtual void fired(unsigned int firemode) override;
+            void push(unsigned int firemode);
+            virtual void pushed(unsigned int firemode) override;
             virtual void boost(bool bBoost) override;
             virtual void setSelectedPosition(TDCoordinate* newPos);

code/branches/sagerjFS16/src/modules/weapons/projectiles/Rocket.cc

@@ -218 +218 @@
         Destroys the Rocket upon pressing "fire".
     */
-    void Rocket::fired(unsigned int firemode)
+    void Rocket::pushed(unsigned int firemode)
     {
         this->destroyObject();

code/branches/sagerjFS16/src/modules/weapons/projectiles/Rocket.h

@@ -116 +116 @@
             virtual void setShooter(Pawn* shooter) override;
 
-            virtual void fired(unsigned int firemode) override;
+            virtual void pushed(unsigned int firemode) override;
 
             /**

code/branches/sagerjFS16/src/modules/weapons/projectiles/RocketOld.cc

@@ -218 +218 @@
         Destroys the RocketOld upon pressing "fire".
     */
-    void RocketOld::fired(unsigned int firemode)
+    void RocketOld::pushed(unsigned int firemode)
     {
         this->destroyObject();

code/branches/sagerjFS16/src/modules/weapons/projectiles/RocketOld.h

@@ -116 +116 @@
             virtual void setShooter(Pawn* shooter) override;
 
-            virtual void fired(unsigned int firemode) override;
+            virtual void pushed(unsigned int firemode) override;
 
         private:

code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc

@@ -54 +54 @@
         this->damage_ = 90.01f;
         this->speed_ = 90.01f;
-        this->chargeable_ = 0;
+        this->chargeable_ = true;
 
         this->setMunitionName("LaserMunition");
@@ -65 +65 @@
     void Discharger::fire()
     {
-        orxout() << "release" << cTime_ << endl;
+        // orxout() << "release" << cTime_ << endl;
         BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
 
@@ -71 +71 @@
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());
-        projectile->setVelocity(this->getMuzzleDirection() * this->speed_ * charges_);
+        projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
 
         projectile->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         projectile->setDamage(this->getDamage() * charges_);
-        projectile->setShieldDamage(this->getShieldDamage() * charges_);
-        projectile->setHealthDamage(this->getHealthDamage() * charges_);
-        this->charges_ = 0;
+        projectile->setShieldDamage(this->getShieldDamage());
+        projectile->setHealthDamage(this->getHealthDamage());
+        //  this->charges_ = 0;
     }
 }

code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h

@@ -58 +58 @@
 
         private:
-            bool chargeable_;       // An indicator that this weapon type is chargeable.
-            float speed_;           // The speed of the fired projectile.
-            float ctime_;           // time the weapon has charged.
-    };
+            //bool chargeable_;     // An indicator that this weapon type is chargeable.
+            int charges_;
+            float speed_;                  // The speed of the fired projectile.
+            float ctime_;                  // time the weapon has charged.
+    }; 
 }
 

code/branches/sagerjFS16/src/orxonox/controllers/AIController.cc

@@ -197 +197 @@
                     if (this->bHasTargetPosition_)
                         this->moveToTargetPosition();
-                    this->doFire();
+                    this->doPush();
                 }
 
@@ -227 +227 @@
                     this->moveToTargetPosition();
 
-                    this->doFire();
+                    this->doPush();
             }
         }
@@ -241 +241 @@
                     if((timeout_< 0)||(!target_))//Check if the timeout is over or target died.
                     {
-                       controllable->fire(0);//kill the rocket
+                       controllable->push(0);//kill the rocket
                        this->setPreviousMode();//get out of rocket mode
                     }

code/branches/sagerjFS16/src/orxonox/controllers/ArtificialController.cc

@@ -132 +132 @@
         @brief DoFire is called when a bot should shoot and decides which weapon is used and whether the bot shoots at all.
     */
-    void ArtificialController::doFire()
+    void ArtificialController::doPush()
     {
         if(!this->bSetupWorked)//setup: find out which weapons are active ! hard coded: laser is "0", lens flare is "1", ...
@@ -144 +144 @@
             if (this->isCloseAtTarget(130) && (firemode = getFiremode("LightningGun")) > -1 )
             {//LENSFLARE: short range weapon
-                this->getControllableEntity()->fire(firemode); //ai uses lens flare if they're close enough to the target
+                this->getControllableEntity()->push(firemode); //ai uses lens flare if they're close enough to the target
             }
             else if( this->isCloseAtTarget(400) && (random < this->botlevel_) && (firemode = getFiremode("RocketFire")) > -1 )
             {//ROCKET: mid range weapon
                 this->mode_ = ROCKET; //Vector-implementation: mode_.push_back(ROCKET);
-                this->getControllableEntity()->fire(firemode); //launch rocket
+                this->getControllableEntity()->push(firemode); //launch rocket
                 if(this->getControllableEntity() && this->target_) //after fire(3) is called, getControllableEntity() refers to the rocket!
                 {
@@ -161 +161 @@
             }
             else if ((firemode = getFiremode("HsW01")) > -1 ) //LASER: default weapon
-                this->getControllableEntity()->fire(firemode);
+                this->getControllableEntity()->push(firemode);
         }
     }

code/branches/sagerjFS16/src/orxonox/controllers/ArtificialController.h

@@ -48 +48 @@
             virtual void changedControllableEntity() override;
 
-            virtual void doFire();
+            virtual void doPush();
             void setBotLevel(float level=1.0f);
             inline float getBotLevel() const

code/branches/sagerjFS16/src/orxonox/controllers/DroneController.cc

@@ -130 +130 @@
                        this->aimAtTarget();
                        if(!this->friendlyFire())
-                           this->getDrone()->fire(0);
+                           this->getDrone()->push(0);
                     }
                }

code/branches/sagerjFS16/src/orxonox/controllers/FightingController.cc

@@ -318 +318 @@
         }
               
-        this->getControllableEntity()->fire(firemode);
+        this->getControllableEntity()->push(firemode);
         
     }

code/branches/sagerjFS16/src/orxonox/controllers/WaypointPatrolController.cc

@@ -69 +69 @@
 
             if (this->getControllableEntity() && this->isCloseAtTarget(this->attackradius_) && this->isLookingAtTarget(math::pi / 20.0f))
-                this->getControllableEntity()->fire(0);
+                this->getControllableEntity()->push(0);
         }
         else

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc

@@ -63 +63 @@
         this->bAutoReload_ = true;
         this->bParallelReload_ = true;
+        this->chargeable_ = false;
 
         this->reloadTimer_.setTimer(0.0f, false, createExecutor(createFunctor(&WeaponMode::reloaded, this)));
@@ -120 +121 @@
     bool WeaponMode::fire(float* reloadTime)
     {
+        orxout() << "--- " << endl;
         (*reloadTime) = this->reloadTime_;
         // Fireing is only possible if this weapon mode is not reloading and there is enough munition
@@ -170 +172 @@
     bool WeaponMode::push(float* reloadTime)
     {
+        orxout() << "push " << chargeable_ << endl;
         if( this->chargeable_)
         {
             // setting up a timer for knowing how long the weapon was charged 
             // and passes the value to this->cTime_
+            orxout() << "if " << endl;
+            return false;
         } else {
+            orxout() << "else " << endl;
             return fire(reloadTime);
         }
-        
     }
 
     bool WeaponMode::release(float* reloadTime)
     {
+        orxout() << "release " << endl;
         if( this->chargeable_)
-        {
+        { 
+            orxout() << "if " << endl;
             return fire(reloadTime);
+        }else{
+            orxout() << "else " << endl;
+            return false;
         }
     }

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h

@@ -174 +174 @@
             bool bAutoReload_; // If true, the weapon reloads the magazine automatically.
             bool bParallelReload_; // If true, the weapon reloads in parallel to the magazine reloading.
+            bool chargeable_; // If true, the weapon fires at release instead at push(where he charges up)
 
             float damage_;

code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc

@@ -49 +49 @@
     RegisterClass(ControllableEntity);
 
-    registerMemberNetworkFunction( ControllableEntity, fire );
+    registerMemberNetworkFunction( ControllableEntity, push );
     registerMemberNetworkFunction( ControllableEntity, setTargetInternal );
 
@@ -307 +307 @@
         else
         {
-            callMemberNetworkFunction(&ControllableEntity::fire, this->getObjectID(), 0, firemode);
+            callMemberNetworkFunction(&ControllableEntity::push, this->getObjectID(), 0, firemode);
         }
     }
@@ -319 +319 @@
         else
         {
-            callMemberNetworkFunction(&ControllableEntity::fire, this->getObjectID(), 0, firemode);
+            callMemberNetworkFunction(&ControllableEntity::release, this->getObjectID(), 0, firemode);
         }
     }

code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Spectator.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    extern const std::string __CC_fire_name;
+    extern const std::string __CC_push_name;
     extern const std::string __CC_suicide_name;
 
@@ -162 +162 @@
 
         // change keybind mode of fire command to OnPress to avoid firing after respawn
-        ModifyConsoleCommand(__CC_fire_name).keybindMode(KeybindMode::OnPress);
+        ModifyConsoleCommand(__CC_push_name).keybindMode(KeybindMode::OnPress);
 
         // disable suicide
@@ -177 +177 @@
         // change fire command to a helper function and change keybind mode to OnPress
         // as soon as the player releases and presses the button again, the helper function will be called which changes the keybind mode back to OnHold
-        ModifyConsoleCommand(__CC_fire_name).pushFunction(&Spectator::resetFireCommand).keybindMode(KeybindMode::OnPress);
+        ModifyConsoleCommand(__CC_push_name).pushFunction(&Spectator::resetFireCommand).keybindMode(KeybindMode::OnPress);
 
         // enable suicide
@@ -188 +188 @@
     void Spectator::resetFireCommand(unsigned int firemode)
     {
-        ModifyConsoleCommand(__CC_fire_name).popFunction().keybindMode(KeybindMode::OnHold); // pop this helper function and change keybind mode
-
-        CommandExecutor::execute(__CC_fire_name + " " + multi_cast<std::string>(firemode)); // call the fire command again, this time with the real function
+        ModifyConsoleCommand(__CC_push_name).popFunction().keybindMode(KeybindMode::OnHold); // pop this helper function and change keybind mode
+
+        CommandExecutor::execute(__CC_push_name + " " + multi_cast<std::string>(firemode)); // call the fire command again, this time with the real function
     }
 
@@ -229 +229 @@
     }
 
-    void Spectator::fired(unsigned int firemode)
+    void Spectator::pushed(unsigned int firemode)
     {
         if (this->getPlayer())

code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Spectator.h

@@ -54 +54 @@
             virtual void rotateRoll(const Vector2& value);
 
-            virtual void fired(unsigned int firemode);
+            virtual void pushed(unsigned int firemode);
             virtual void greet();
             virtual void mouseLook() {}