Changeset 10814 for code/branches/fabienHS15/src

Timestamp:

Nov 17, 2015, 10:30:24 PM (9 years ago)

Author:

fvultier

Message:

 

Location:

code/branches/fabienHS15/src

Files:

• modules/overlays/CMakeLists.txt (modified) (1 diff)
• modules/overlays/OverlaysPrereqs.h (modified) (1 diff)
• modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• modules/overlays/hud/HUDRocketFuelBar.cc (added)
• modules/overlays/hud/HUDRocketFuelBar.h (added)
• modules/weapons/WeaponsPrereqs.h (modified) (3 diffs)
• modules/weapons/projectiles/Rocket.cc (modified) (4 diffs)
• modules/weapons/projectiles/Rocket.h (modified) (1 diff)
• modules/weapons/weaponmodes/RocketFire.cc (modified) (4 diffs)
• modules/weapons/weaponmodes/RocketFire.h (modified) (1 diff)
• modules/weapons/weaponmodes/SplitGun.cc (modified) (1 diff)
• orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• orxonox/infos/PlayerInfo.cc (modified) (2 diffs)
• orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)
• orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)

code/branches/fabienHS15/src/modules/overlays/CMakeLists.txt

@@ -16 +16 @@
   LINK_LIBRARIES
     orxonox
+    weapons
   SOURCE_FILES ${OVERLAYS_SRC_FILES}
 )

code/branches/fabienHS15/src/modules/overlays/OverlaysPrereqs.h

@@ -90 +90 @@
     class HUDRadar;
     class HUDSpeedBar;
+    class HUDShieldBar;
     class HUDBoostBar;
+    class HUDRocketFuelBar;
     class HUDTimer;
     class HUDAimAssistant;

code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt

@@ -7 +7 @@
   HUDShieldBar.cc
   HUDHealthBar.cc
+  HUDRocketFuelBar.cc
   HUDTimer.cc
   HUDEnemyHealthBar.cc

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

@@ -69 +69 @@
 {
     class MuzzleFlash;
+    class IceGunFreezer;
+    class RocketController;
 
     // munitions
     class FusionMunition;
     class LaserMunition;
-    class ReplenishingMunition;
     class RocketMunition;
     class GravityBombMuntion;
+    class IceMunition;
+    class LightningMunition;
+    class SplitMunition;
 
     // projectiles
@@ -81 +85 @@
     class LightningGunProjectile;
     class ParticleProjectile;
+    class IceProjectile;
+    class SplitProjectile;
     class Projectile;
+    class BasicProjectile;
     class Rocket;
     class RocketOld;
@@ -91 +98 @@
     class FusionFire;
     class HsW01;
+    class IceGun;
+    class SplitGun;
     class LaserFire;
     class LightningGun;

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

@@ -66 +66 @@
 
         this->localAngularVelocity_ = 0;
-        this->lifetime_ = 100.0f;
+        this->lifetime_ = 20.0f;
 
         if (GameMode::isMaster())
@@ -100 +100 @@
             this->attachCollisionShape(collisionShape);
 
-            this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&BasicProjectile::destroyObject, this)));
-
             // Add sound
             this->defSndWpnEngine_ = new WorldSound(this->getContext());
@@ -114 +112 @@
             this->defSndWpnLaunch_->setVolume(1.0f);
             this->attach(defSndWpnLaunch_);
+
+            this->setHudTemplate("rockethud");
         }
         else
@@ -320 +320 @@
     }
 
+    float Rocket::getFuel() const
+    {
+        return this->destroyTimer_.getRemainingTime();
+    }
+
+    void Rocket::setMaxFuel(float fuel)
+    {
+        this->lifetime_ = fuel;
+        this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&BasicProjectile::destroyObject, this)));
+    }
 }

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

@@ -118 +118 @@
             virtual void fired(unsigned int firemode);
 
+            /**
+            @brief Set the maximum lifetime of the rocket.
+            */
+            virtual void setMaxFuel(float fuel);
+            /**
+            @brief Get the maximum lifetime of the rocket.
+            */
+            inline float getMaxFuel() const
+                { return lifetime_; }
+            virtual float getFuel() const;
+
         private:
             Vector3 localAngularVelocity_; //!< Variable to temporarily store accumulated steering command input.

code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -41 +41 @@
 #include "weaponsystem/WeaponSystem.h"
 #include "worldentities/pawns/Pawn.h"
-
+#include "core/XMLPort.h"
 #include "weapons/projectiles/Rocket.h"
 
@@ -56 +56 @@
         this->damage_ = 0.0f;
         this->speed_ = 500.0f;
+        this->fuel_ = 10.0f;
 
         this->setMunitionName("RocketMunition");
@@ -65 +66 @@
     RocketFire::~RocketFire()
     {
+    }
+
+    /**
+    @brief
+        XMLPort for the RocketFire. You can define the maximum lifetime of the rockets
+    */
+    void RocketFire::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(RocketFire, XMLPort, xmlelement, mode);
+
+        XMLPortParam(RocketFire, "fuel", setFuel, getFuel, xmlelement, mode);
     }
 
@@ -85 +97 @@
         rocket->setShieldDamage(this->getShieldDamage());
         rocket->setHealthDamage(this->getHealthDamage());
+        rocket->setMaxFuel(this->fuel_);
     }
 }

code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.h

@@ -54 +54 @@
             virtual ~RocketFire();
 
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+
             virtual void fire();
+            inline void setFuel(float fuel)
+                { this->fuel_ = fuel; }
+            inline float getFuel() const
+                { return this->fuel_; }
 
         private:
             float speed_; //!< The speed of the Rocket.
+            float fuel_; //!< The maximum lifetime of the rocket
     };
 }

code/branches/fabienHS15/src/modules/weapons/weaponmodes/SplitGun.cc

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"    
+#include "core/XMLPort.h"
 #include "weaponsystem/Weapon.h"
 #include "weaponsystem/WeaponPack.h"

code/branches/fabienHS15/src/orxonox/OrxonoxPrereqs.h

@@ -167 +167 @@
     class DefaultWeaponmodeLink;
     class Munition;
+    class ReplenishingMunition;
     class Weapon;
     class WeaponMode;

code/branches/fabienHS15/src/orxonox/infos/PlayerInfo.cc

@@ -202 +202 @@
 
         this->changedControllableEntity();
+
+         // HACK-ish
+        if(this->isHumanPlayer())
+            entity->createHud();
     }
 
@@ -252 +256 @@
         if( !entity || this->previousControllableEntity_.size() == 0 )
             return;
+
+        entity->destroyHud(); // HACK-ish
 
         this->controllableEntity_->setController(0);

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

@@ -143 +143 @@
         XMLPortObject(Pawn, Munition, "munition", addMunitionXML, getMunitionXML, xmlelement, mode);
 
-        XMLPortParam(Pawn, "reloadrate", setShieldRechargeRate, getShieldRechargeRate, xmlelement, mode).defaultValues(0);
-        XMLPortParam(Pawn, "reloadwaittime", setShieldRechargeWaitTime, getShieldRechargeWaitTime, xmlelement, mode).defaultValues(1.0f);
+        XMLPortParam(Pawn, "shieldrechargerate", setShieldRechargeRate, getShieldRechargeRate, xmlelement, mode).defaultValues(0);
+        XMLPortParam(Pawn, "shieldrechargewaittime", setShieldRechargeWaitTime, getShieldRechargeWaitTime, xmlelement, mode).defaultValues(1.0f);
 
         XMLPortParam(Pawn, "explosionSound",  setExplosionSound,  getExplosionSound,  xmlelement, mode);

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

@@ -46 +46 @@
         or below zero. If it is, the pawn gets killed.
 
-        Pawns can carry pickups and fire weapons. The can also have shields.
+        Pawns can carry pickups and fire weapons. They can also have shields.
 
         Notice that every Pawn is a ControllableEntity.