Changeset 9965 in orxonox.OLD

Timestamp:

Nov 28, 2006, 11:54:34 PM (17 years ago)

Author:

marcscha

Message:

Modifications to ship, HUD,.. see changelog

Location:

branches/playability

Files:

• ChangeLog (modified) (1 diff)
• src/util/hud.cc (modified) (4 diffs)
• src/util/hud.h (modified) (2 diffs)
• src/world_entities/space_ships/space_ship.cc (modified) (12 diffs)
• src/world_entities/space_ships/space_ship.h (modified) (3 diffs)
• src/world_entities/weapons/weapon.h (modified) (2 diffs)
• src/world_entities/weapons/weapon_manager.cc (modified) (1 diff)
• src/world_entities/weapons/weapon_manager.h (modified) (1 diff)

branches/playability/ChangeLog

@@ +1 @@
+2006-11-28      Marc Schärer <marcscha@ee.ethz.ch>
+        Mapped primary weapon manager back to playable default weapon manager.
+        Addition of secondary weapon manager for special weapon. Currently uses Cannon to show and test this functionality.
+        Implementation of weapon energy regeneration. This needed some little modifications to the HUD class as well but now works :)
+        Addition of the second weapon manager to the HUD manager in util/hud .h .cc for our master of HUD ;-)
+
+
 2006-09-22      Benjamin Grauer <bensch@orxonox.net>
         Complete reimplementation of the ResourceManager.

branches/playability/src/util/hud.cc

@@ -45 +45 @@
   //this->setSize2D(
   this->weaponManager = NULL;
+  this->weaponManagerSecondary = NULL;
   this->energyWidget = NULL;
   this->shieldWidget = NULL;
@@ -118 +119 @@
 {}
 
-void Hud::setWeaponManager(WeaponManager* weaponMan)
+void Hud::setWeaponManager(WeaponManager* weaponMan, WeaponManager* weaponManSec)
 {
   if (this->weaponManager != NULL)
@@ -133 +134 @@
   }
 
+  if (this->weaponManagerSecondary != NULL)
+  {
+    for (unsigned int i = 0; i < this->weaponManagerSecondary->getSlotCount(); i++)
+    {
+      Weapon* weapon = this->weaponManagerSecondary->getWeapon(i);
+      if (weapon != NULL)
+      {
+        weapon->getEnergyWidget()->hide();
+        this->weaponsWidgets.remove(weapon->getEnergyWidget());
+      }
+    }
+  }
+
   this->weaponManager = weaponMan;
+  this->weaponManagerSecondary = weaponManSec;
 
   this->updateWeaponManager();
@@ -164 +179 @@
       }
     }
+
+  if (this->weaponManagerSecondary != NULL)
+    for (unsigned int i = 0; i < this->weaponManagerSecondary->getSlotCount(); i++)
+    {
+      Weapon* weapon = this->weaponManagerSecondary->getWeapon(i);
+      if (weapon != NULL)
+      {
+        //PRINTF(0)("WEAPON %s::%s in Slots\n", weapon->getClassCName(), weapon->getName());
+        weapon->getEnergyWidget()->show();
+        weapon->getEnergyWidget()->setBackgroundColor(Color(.8,.2,.11, 0.1));
+        weapon->getEnergyWidget()->setFrontColor(Color( .2,.5,.7,.6));
+        //      weapon->getEnergyWidget()->frontMaterial().setTransparency(.6);
+        this->weaponsWidgets.push_back(weapon->getEnergyWidget());
+      }
+    }
+
   this->updateResolution();
+
 }
 

branches/playability/src/util/hud.h

@@ -39 +39 @@
   void setShiledWidget(OrxGui::GLGuiWidget* widget);
   void setArmorWidget(OrxGui::GLGuiWidget* widget);
-  void setWeaponManager(WeaponManager* weaponMan);
+  void setWeaponManager(WeaponManager* weaponMan, WeaponManager* weaponManSec = NULL);
 
   void addWeaponWidget(OrxGui::GLGuiWidget* widget);
@@ -68 +68 @@
 
   WeaponManager*           weaponManager;
+  WeaponManager*           weaponManagerSecondary;
 
   std::list<OrxGui::GLGuiWidget*> weaponsWidgets; //!< WeaponWidgets will be displayed one after another

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -84 +84 @@
  */
 SpaceShip::SpaceShip(const std::string& fileName)
-    : primWeaponMan(this),
-    secWeaponMan(this),
+    : secWeaponMan(this),
     supportedPlaymodes(Playable::Full3D || Playable::Horizontal || Playable::Vertical),
     playmode(Playable::Full3D)
@@ -108 +107 @@
 */
 SpaceShip::SpaceShip(const TiXmlElement* root)
-    : primWeaponMan(this),
-    secWeaponMan(this),
+    : secWeaponMan(this),
     supportedPlaymodes(Playable::Full3D || Playable::Horizontal || Playable::Vertical),
     playmode(Playable::Full3D)
@@ -140 +138 @@
 
 
-  this->primWeaponMan.addWeapon( wpLeft, 1, 0);
-  this->primWeaponMan.addWeapon( wpRight, 1, 1);
-  this->secWeaponMan.addWeapon( cannon, 0, 6);
-
-  this->primWeaponMan.changeWeaponConfig(1);
+  this->weaponMan.addWeapon( wpLeft, 0, 0);
+  this->weaponMan.addWeapon( wpRight, 0, 1);
+  this->secWeaponMan.addWeapon( cannon, 0, 0);
+
+  this->weaponMan.changeWeaponConfig(0);
 
   wpRight->requestAction(WA_ACTIVATE);
   wpLeft->requestAction(WA_ACTIVATE);
   cannon->requestAction(WA_ACTIVATE);
+
+  this->curWeaponPrimary    = 0;
+  this->curWeaponSecondary  = 0;
+
+  Playable::weaponConfigChanged();
+
+  weaponEnergyRegen = 10;   // 10 einheiten pro Sekunde
+
   /*
   this->addWeapon(wpLeft, 1, 0);
@@ -159 +165 @@
   this->loadModel("models/ships/hoverglider_mainbody.obj");
 
-  bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = bPrimFire = bSecFire = false;
+  bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = bFire = bSecFire = false;
 
   xMouse = yMouse = 0;
@@ -178 +184 @@
   this->mouseDir = this->getAbsDir();
   this->pitchDir = this->getAbsDir();
+
 
   //   GLGuiButton* button = new GLGuiPushButton();
@@ -205 +212 @@
   registerEvent(EV_MOUSE_MOTION);
 
-  this->primWeaponMan.setSlotCount(6);
-
-  this->primWeaponMan.setSlotPosition(0, Vector(-2.6, .1, -3.0));
-  this->primWeaponMan.setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->primWeaponMan.setSlotPosition(1, Vector(-2.6, .1, 3.0));
-  this->primWeaponMan.setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->primWeaponMan.setSlotPosition(2, Vector(-1.5, .5, -.5));
-  this->primWeaponMan.setSlotDirection(2, Quaternion(-M_PI_4*.5, Vector(1,0,0)));
-
-  this->primWeaponMan.setSlotPosition(3, Vector(-1.5, .5, .5));
-  this->primWeaponMan.setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0)));
-
-  this->primWeaponMan.setSlotPosition(4, Vector(-1.5, -.5, .5));
-  this->primWeaponMan.setSlotDirection(4, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
-
-  this->primWeaponMan.setSlotPosition(5, Vector(-1.5, -.5, -.5));
-  this->primWeaponMan.setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
-  //
-  this->primWeaponMan.setSlotPosition(6, Vector(-1, 0.0, 0));
-  this->primWeaponMan.setSlotCapability(6, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.setSlotCount(6);
+
+  this->weaponMan.setSlotPosition(0, Vector(-2.6, .1, -3.0));
+  this->weaponMan.setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
+  this->weaponMan.setSlotPosition(1, Vector(-2.6, .1, 3.0));
+  this->weaponMan.setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
+  this->weaponMan.setSlotPosition(2, Vector(-1.5, .5, -.5));
+  this->weaponMan.setSlotDirection(2, Quaternion(-M_PI_4*.5, Vector(1,0,0)));
+
+  this->weaponMan.setSlotPosition(3, Vector(-1.5, .5, .5));
+  this->weaponMan.setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0)));
+
+  this->weaponMan.setSlotPosition(4, Vector(-1.5, -.5, .5));
+  this->weaponMan.setSlotDirection(4, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
+
+  this->weaponMan.setSlotPosition(5, Vector(-1.5, -.5, -.5));
+  this->weaponMan.setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
 
   this->secWeaponMan.setSlotCount(6);
 
-  this->secWeaponMan.setSlotPosition(0, Vector(2.6, -0.5, 0));
+  this->secWeaponMan.setSlotPosition(0, Vector(2.6, -2.5, 0));
   this->secWeaponMan.setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
@@ -247 +251 @@
   this->secWeaponMan.setSlotPosition(5, Vector(1.5, -.5, -.5));
   this->secWeaponMan.setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
-  //
-  this->secWeaponMan.setSlotPosition(6, Vector(1, 0.0, 0));
-  this->secWeaponMan.setSlotCapability(6, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
   //
   //   this->getWeaponManager().setSlotPosition(8, Vector(-2.5, -0.3, -2.0));
@@ -257 +259 @@
   //   this->getWeaponManager().setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));:
 
-  this->primWeaponMan.getFixedTarget()->setParent(this);
-  this->primWeaponMan.getFixedTarget()->setRelCoor(100000,0,0);
+  this->weaponMan.getFixedTarget()->setParent(this);
+  this->weaponMan.getFixedTarget()->setRelCoor(100000,0,0);
 
   this->secWeaponMan.getFixedTarget()->setParent(this);
   this->secWeaponMan.getFixedTarget()->setRelCoor(100000,0,0);
 
-  dynamic_cast<Element2D*>(this->primWeaponMan.getFixedTarget())->setVisibility( false);
+  dynamic_cast<Element2D*>(this->weaponMan.getFixedTarget())->setVisibility( false);
 
   this->burstEmitter = new DotEmitter(200, 0.0, .01);
@@ -315 +317 @@
 void SpaceShip::reset()
 {
-  bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
+  bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = bFire = bSecFire = false;
 
   xMouse = yMouse = 0;
@@ -381 +383 @@
 
   // Own Tick Setup, as a different fire routine is used on the weapon manager
-  this->primWeaponMan.tick(time);
+  this->weaponMan.tick(time);
   this->secWeaponMan.tick(time);
 
-  if( this->bPrimFire)
-  {
-    this->primWeaponMan.fire();
+  if( this->bFire)
+  {
+    this->weaponMan.fire();
   }
   if( this->bSecFire)
   {
     this->secWeaponMan.fire();
-    this->bSecFire = !this->bSecFire;
-  }
+    this->bSecFire = !this->bSecFire;   // FIXME This currently is needed to prevent "echo fires" of a second rocket after its cooldown has passed
+  }
+
+  this->weaponRegen(time);
 
   if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == SharedNetworkData::getInstance()->getHostID() )
@@ -572 +576 @@
     this->bSecFire = event.bPressed;
   else if( event.type == KeyMapper::PEV_FIRE1)
-    this->bPrimFire = event.bPressed;
+    this->bFire = event.bPressed;
   else if( event.type == EV_MOUSE_MOTION)
   {
@@ -639 +643 @@
   }
 }
+
+/**
+ * Weapon regeneration
+ * does not use any reactor capacity, as it wouldn't work in a consistent way.
+ */
+void SpaceShip::weaponRegen(float time)
+{
+  float energy  = ( this->reactorOutput * this->weaponEnergyShare + this->weaponEnergyRegen) * time;
+  Weapon* weapon;
+  for( int i=0; i < this->weaponMan.getSlotCount(); i++)
+  {
+    weapon = this->weaponMan.getWeapon(i);
+    if( weapon != NULL && weapon->isActive())
+    {
+      weapon->increaseEnergy( energy);
+      weapon->updateWidgets();
+    }
+
+  }
+  // weaponMan.increaseAmmunition( weapon, energy);
+  
+}

branches/playability/src/world_entities/space_ships/space_ship.h

@@ -48 +48 @@
     virtual void process(const Event &event);
 
+    inline WeaponManager getWeaponManagerSecondary() { return this->secWeaponMan; };
+
     //Functions for GUI
     inline float getShieldCur() { return this->shieldCur; };        //!< returns current shield value
@@ -68 +70 @@
     void regen(float time);  //!< handler for shield and electronic regeneration
 
-    WeaponManager         primWeaponMan;      //!< the primary weapon manager: managing a list of energy weapons to wepaon-slot mapping
+    void weaponRegen(float time);   //!< weapon energy regeneration
+
+    //WeaponManager         weaponMan;      //!< the primary weapon manager: managing a list of energy weapons to wepaon-slot mapping
     WeaponManager         secWeaponMan;       //!< the secondary weapon manager: managing a list of special weapons to weapon-slot mapping
     short                 supportedPlaymodes; //!< What Playmodes are Supported in this Playable.
     Playable::Playmode    playmode;           //!< The current playmode.
-    bool                  bPrimFire;
     bool                  bSecFire;
 
@@ -98 +101 @@
     int         weaponEnergyUsed;
     float       weaponEnergyShare;
+    float       weaponEnergyRegen;
     int         weaponSpecialSlot;  //!< number of special weapon slots
     int         weaponSpecialUsed;
 
-    int         reactorOutput;      //!< reactor output
-    int         reactorCapacity;    //!< reactor capacity
-
+    float       reactorOutput;      //!< reactor output 
+    float       reactorCapacity;    //!< reactor capacity
 
     int         curWeaponPrimary;   //!< current primary weapon config 

branches/playability/src/world_entities/weapons/weapon.h

@@ -169 +169 @@
     bool check() const;
     void debug() const;
+
+    void updateWidgets();
 
   protected:
@@ -200 +202 @@
     inline void enterState(WeaponState state);
 
-    void updateWidgets();
+    
 
   private:

branches/playability/src/world_entities/weapons/weapon_manager.cc

@@ -317 +317 @@
 
 /**
- * @brief does the same as the funtion inclreaseAmmunition, added four your convenience
+ * @brief does the same as the funtion increaseAmmunition, added four your convenience
  * @param weapon, the Weapon to read the ammo-info about.
  * @param ammo how much ammo to add.
  */
-float WeaponManager::inclreaseAmmunition(const Weapon* weapon, float ammo)
+float WeaponManager::increaseAmmunition(const Weapon* weapon, float ammo)
 {
   assert (weapon != NULL);

branches/playability/src/world_entities/weapons/weapon_manager.h

@@ -91 +91 @@
 
     float increaseAmmunition(const ClassID& projectileType, float ammo);
-    float inclreaseAmmunition(const Weapon* weapon, float ammo);
+    float increaseAmmunition(const Weapon* weapon, float ammo);
 
     /** @returns a fixed target namely the Crosshair's 3D position */