Changeset 11166

Timestamp:

Apr 14, 2016, 4:02:00 PM (8 years ago)

Author:

sagerj

Message:

today I got pawn'ed

Location:

code/branches/sagerjFS16

Files:

• data/levels/includes/weaponSettingsEscort.oxi (modified) (2 diffs)
• src/modules/weapons/WeaponsPrereqs.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/Discharger.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/Discharger.h (modified) (1 diff)
• src/orxonox/controllers/HumanController.cc (modified) (4 diffs)
• src/orxonox/controllers/NewHumanController.cc (modified) (4 diffs)
• src/orxonox/controllers/NewHumanController.h (modified) (1 diff)
• src/orxonox/weaponsystem/Weapon.cc (modified) (2 diffs)
• src/orxonox/weaponsystem/WeaponMode.cc (modified) (2 diffs)
• src/orxonox/weaponsystem/WeaponMode.h (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponPack.cc (modified) (2 diffs)
• src/orxonox/weaponsystem/WeaponSet.cc (modified) (2 diffs)
• src/orxonox/weaponsystem/WeaponSystem.cc (modified) (2 diffs)
• src/orxonox/worldentities/ControllableEntity.cc (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)

code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi

@@ -1 +1 @@
     <weaponslots>
       <WeaponSlot position="-9.2,2,-13" />
-      <WeaponSlot position=" 9.2,2,-13" />
+
     </weaponslots>
     <weaponsets>
       <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
+
     </weaponsets>
     <weaponpacks>
@@ -11 +11 @@
         <links>
           <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+
         </links>
         <Weapon>
-          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
+          <Discharger mode=0 munitionpershot=1 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
         </Weapon>
-        <Weapon>
-          <HsW01 mode=0 munitionpershot=1 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
-        </Weapon>
+   
       </WeaponPack>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
-        </links>
-      </WeaponPack>
+
     </weaponpacks>
     <munition>

code/branches/sagerjFS16/src/modules/weapons/WeaponsPrereqs.h

@@ -107 +107 @@
     class SimpleRocketFire;
     class GravityBombFire;
+    class Discharger;
 }
 

code/branches/sagerjFS16/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -13 +13 @@
   GravityBombFire.cc
   MineGun.cc
+  Discharger.cc
 )

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

@@ -51 +51 @@
         RegisterObject(Discharger);
 
-        this->reloadTime_ = 0.1f;
-        this->damage_ = 9000.1f*loaded_;
-        this->speed_ = 9000.1f*loaded_;
-
-        this->setMunitionName("dEnergy");
-        this->setFireSound("sounds/Weapon_Discharger.ogg");
-        this->setReloadSound("sounds/Reload_Discharger.ogg", 0.8);
+        this->setMunitionName("LaserMunition");
 
         hudImageString_ = "Orxonox/WSHUD_WM_LaserFire";
     }
 
-    /**
-    @brief
-        Fires the weapon. Creates a projectile and fires it.
-    */
     void Discharger::fire()
     {
-        /*BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
-
-        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
-        projectile->setOrientation(this->getMuzzleOrientation());
-        projectile->setPosition(this->getMuzzlePosition());
-        projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
-
-        projectile->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
-        projectile->setDamage(this->getDamage());
-        projectile->setShieldDamage(this->getShieldDamage());
-        projectile->setHealthDamage(this->getHealthDamage());*/
-        extern unsigned int beginLoad_ = time;
+        orxout() << "fire dis " << endl;
     }
-    void Discharger::release()
+    
+    bool Discharger::fire(float* reloadTime)
     {
-        extern unsigned int endLoad_ = time;
-        extern unsigned int loaded_ = endLoad_ - beginLoad_;
-
+        orxout() << "fire Discharger " << endl;
+        return false;
+    }
+    bool Discharger::release(float* reloadTime)
+    {
+        orxout() << "release Discharger " << endl;
+        return false;
     }
 }

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

@@ -55 +55 @@
 
             virtual void fire() override;
-            virtual void release() override;
+            virtual bool fire(float* reloadTime) override;
+            virtual bool release(float* reloadTime) override;
 
         private:
-            float speed_; //!< The speed of the fired projectile.
-            float loaded_; // The time how long the weapon charged
-            float beginLoad_;
-            float endLoad_;
     };
 }

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

@@ -159 +159 @@
     void HumanController::fire(unsigned int firemode)
     {
+        orxout() << "fire hc " << firemode << endl;
         if (HumanController::localController_s)
             HumanController::localController_s->doFire(firemode);
@@ -165 +166 @@
     void HumanController::doFire(unsigned int firemode)
     {
+        orxout() << "do fire hc " << firemode << endl;
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
         {
@@ -178 +180 @@
     void HumanController::release(unsigned int firemode)
     {
-        orxout() << "HumanController " << firemode << endl;
+        orxout() << "release hc " << firemode << endl;
         if (HumanController::localController_s)
             HumanController::localController_s->doRelease(firemode);
@@ -185 +187 @@
     void HumanController::doRelease(unsigned int firemode)
     {
+        orxout() << "do release hc " << firemode << endl;
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
         {

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

@@ -54 +54 @@
     SetConsoleCommand("NewHumanController", "accelerate", &NewHumanController::accelerate).keybindMode(KeybindMode::OnPress);
     SetConsoleCommand("NewHumanController", "decelerate", &NewHumanController::decelerate).keybindMode(KeybindMode::OnPress);
-    //SetConsoleCommand("NewHumanController", "release",    &NewHumanController::release   ).keybindMode(KeybindMode::OnRelease).addShortcut();
 
     RegisterUnloadableClass(NewHumanController);
@@ -286 +285 @@
         if (firemode == 1 && this->controlMode_ == 1)
         {
+            orxout() << "do fire nhc if " << firemode << endl;
             //unlocked steering, steer on right mouse click
             HumanController::yaw(Vector2(this->currentYaw_, 0));
@@ -291 +291 @@
         }
         else
+        {
+            orxout() << "do fire nhc else " << firemode << endl;
             HumanController::doFire(firemode); //call for formationflight
-    }
-
-    /*void NewHumanController::release(unsigned int firemode)
-    {
-        if (NewHumanController::localController_s)
-            NewHumanController::localController_s->doRelease(firemode);
-        orxout() << "Trigger " << firemode << endl;
-    }
-
-    /void NewHumanController::doRelease(unsigned int firemode)
-    {
-        // this->firemode_ = -1; (outdated code from unfire)
-        // hideArrows();
+        }
+    }
+
+    void NewHumanController::doRelease(unsigned int firemode)
+    {
+        orxout() << "do release nhc" << firemode << endl;
         if (!this->controllableEntity_)
             return;
@@ -311 +306 @@
 
         HumanController::doRelease(firemode); //call for formationflight
-    }*/
+    }
 
     void NewHumanController::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage)

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

@@ -55 +55 @@
 
             virtual void doFire(unsigned int firemode) override;
-            /*virtual void release(unsigned int firemode);
-            virtual void doRelease(unsigned int firemode);*/
+            virtual void doRelease(unsigned int firemode) override;
 
             virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) override;

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

@@ -114 +114 @@
         // Note: The reloading of each WeaponMode is internally handled by each A, B and C.
         //       The reloading of the weapon is only performed to avoid firing with different modes at the same time.
+        orxout() << "fire weapon " << mode << endl;
         if (this->bReloading_ && this->reloadingWeaponmode_ != mode)
             return;
@@ -135 +136 @@
 
     void Weapon::release(unsigned int mode)
-    {orxout() << "release weapon " << mode << endl;}
+    {
+        orxout() << "release weapon " << mode << endl;
+        if (this->bReloading_ && this->reloadingWeaponmode_ != mode)
+            return;
+
+        std::multimap<unsigned int, WeaponMode*>::iterator start = this->weaponmodes_.lower_bound(mode);
+        std::multimap<unsigned int, WeaponMode*>::iterator end   = this->weaponmodes_.upper_bound(mode);
+
+        for (std::multimap<unsigned int, WeaponMode*>::iterator it = start; it != end; ++it)
+        {
+            float reloading_time = 0;
+            if (it->second->release(&reloading_time))
+            {
+                this->bReloading_ = true;
+                this->reloadingWeaponmode_ = mode;
+
+                this->reloadTimer_.setInterval(reloading_time);
+                this->reloadTimer_.startTimer();
+            }
+        }
+    }
 
     /**

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

@@ -121 +121 @@
     {
         (*reloadTime) = this->reloadTime_;
-        
+        orxout() << "fire wm " << reloadTime << endl;
         // Fireing is only possible if this weapon mode is not reloading and there is enough munition
         if (!this->bReloading_ && this->munition_ && this->munition_->takeMunition(this->munitionPerShot_, this))
@@ -169 +169 @@
     }
 
-    void WeaponMode::release(float* reloadTime)
-    {orxout() << "release wmode " << reloadTime << endl;}
+    bool WeaponMode::release(float* reloadTime)
+    {
+        orxout() << "release wm " << reloadTime << endl;
+        return false;
+    }
 
     bool WeaponMode::reload()

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

@@ -58 +58 @@
 
             virtual bool fire(float* reloadTime);
-            virtual void release(float* reloadTime);
+            virtual bool release(float* reloadTime);
             bool reload();
 

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

@@ -76 +76 @@
     void WeaponPack::fire(unsigned int weaponmode)
     {
+        orxout() << "fire wp " << weaponmode << endl;
         for (Weapon* weapon : this->weapons_)
             weapon->fire(weaponmode);
@@ -82 +83 @@
     void WeaponPack::release(unsigned int weaponmode)
     {
+        orxout() << "release wp " << weaponmode << endl;
         for (Weapon* weapon : this->weapons_)
             weapon->release(weaponmode);
-        orxout() << "release wpack " << weaponmode << endl;
     }
 

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

@@ -63 +63 @@
     {
         // Fire all WeaponPacks with their defined weaponmode
+        orxout() << "fire wset " << endl;
         for (const auto& mapEntry : this->weaponpacks_)
             if (mapEntry.second != WeaponSystem::WEAPON_MODE_UNASSIGNED)
@@ -70 +71 @@
     void WeaponSet::release()
     {
-        
         // Fire all WeaponPacks with their defined weaponmode
+        orxout() << "release wset " << endl;
         for (const auto& mapEntry : this->weaponpacks_)
             if (mapEntry.second != WeaponSystem::WEAPON_MODE_UNASSIGNED)
                 mapEntry.first->release(mapEntry.second);
-        orxout() << "release wset " << endl;
-        
     }
 

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

@@ -289 +289 @@
     void WeaponSystem::fire(unsigned int firemode)
     {
+        orxout() << "fire wsys " << firemode << endl;
         std::map<unsigned int, WeaponSet *>::iterator it = this->weaponSets_.find(firemode);
         if (it != this->weaponSets_.end() && it->second)
@@ -296 +297 @@
     void WeaponSystem::release(unsigned int firemode)
     {
+        orxout() << "release wsys " << firemode << endl;
         std::map<unsigned int, WeaponSet *>::iterator it = this->weaponSets_.find(firemode);
         if (it != this->weaponSets_.end() && it->second)
             it->second->release();
-        orxout() << "release wsys " << firemode << endl;
     }
 

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

@@ -303 +303 @@
         if(GameMode::isMaster())
         {
-            orxout() << "f CE IF " << firemode << endl;
+            orxout() << "fire ce if " << firemode << endl;
             this->fired(firemode);
         }
         else
         {
-            orxout() << "f CE EL " << firemode << endl;
+            orxout() << "fire ce else " << firemode << endl;
             callMemberNetworkFunction(&ControllableEntity::fire, this->getObjectID(), 0, firemode);
         }
@@ -317 +317 @@
         if(GameMode::isMaster())
         {
-            orxout() << "r CE IF " << firemode << endl;
+            orxout() << "release ce if " << firemode << endl;
             this->released(firemode);
         }
         else
         {
-            orxout() << "r CE EL " << firemode << endl;
+            orxout() << "release ce else " << firemode << endl;
             callMemberNetworkFunction(&ControllableEntity::fire, this->getObjectID(), 0, firemode);
         }

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

@@ -430 +430 @@
     void Pawn::fired(unsigned int firemode)
     {
+        orxout() << "fired pawn " << firemode << endl;
         if (this->weaponSystem_)
             this->weaponSystem_->fire(firemode);
+    }
+
+    void Pawn::released(unsigned int firemode)
+    {
+        orxout() << "released pawn " << firemode << endl;
+        if (this->weaponSystem_)
+            this->weaponSystem_->release(firemode);
     }
 

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

@@ -158 +158 @@
 
             virtual void fired(unsigned int firemode) override;
+            virtual void released(unsigned int firemode) override;
             virtual void postSpawn();