Changeset 6443 in orxonox.OLD

Timestamp:

Jan 8, 2006, 5:44:04 PM (18 years ago)

Author:

bensch

Message:

huge pipeline

Location:

trunk/src

Files:

• util/hud.cc (modified) (1 diff)
• util/hud.h (modified) (1 diff)
• world_entities/playable.cc (modified) (1 diff)
• world_entities/playable.h (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/player.h (modified) (1 diff)
• world_entities/space_ships/helicopter.cc (modified) (9 diffs)
• world_entities/space_ships/helicopter.h (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (5 diffs)
• world_entities/space_ships/space_ship.h (modified) (1 diff)

trunk/src/util/hud.cc

@@ -118 +118 @@
 }
 
+void Hud::updateWeaponManager()
+{
+  // hide all the Widgets
+  std::list<GLGuiWidget*>::iterator weaponWidget;
+  for (weaponWidget = this->weaponsWidgets.begin(); weaponWidget != this->weaponsWidgets.end(); weaponWidget++)
+  {
+    (*weaponWidget)->hide();
+  }
+  this->weaponsWidgets.clear();
+
+  // add all that we need again.
+  if (this->weaponManager != NULL)
+    for (unsigned int i = 0; i < this->weaponManager->getSlotCount(); i++)
+  {
+    Weapon* weapon = this->weaponManager->getWeapon(i);
+    if (weapon != NULL)
+    {
+      weapon->getEnergyWidget()->show();
+      this->weaponsWidgets.push_back(weapon->getEnergyWidget());
+    }
+  }
+  this->updateResolution();
+}
 
 void Hud::addWeaponWidget(GLGuiWidget* widget)

trunk/src/util/hud.h

@@ -34 +34 @@
   void removeWeaponWidget(GLGuiWidget* widget);
 
+  void updateWeaponManager();
+
   void tick(float dt);
   void draw() const;

trunk/src/world_entities/playable.cc

@@ -44 +44 @@
 
   }
+}
+
+
+void Playable::addWeapon(Weapon* weapon, int configID, int slotID)
+{
+  this->weaponMan->addWeapon(weapon, configID, slotID);
+
+  if (this->currentPlayer != NULL)
+      this->currentPlayer->weaponConfigChanged();
+}
+
+void Playable::removeWeapon(Weapon* weapon)
+{
+  this->weaponMan->removeWeapon(weapon);
+
+  if (this->currentPlayer != NULL)
+    this->currentPlayer->weaponConfigChanged();
 }
 

trunk/src/world_entities/playable.h

@@ -29 +29 @@
     virtual void leave()=0;
 
-    virtual void addWeapon(Weapon* weapon )  {}//= 0;
-    virtual void removeWeapon(Weapon* weapon) {}//= 0;
+    void addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
+    void removeWeapon(Weapon* weapon);
+
     inline WeaponManager* getWeaponManager() const { return this->weaponMan; };
 

trunk/src/world_entities/player.cc

@@ -81 +81 @@
  }
 
+ void Player::weaponConfigChanged()
+ {
+   this->hud.updateWeaponManager();
+ }
+
  void Player::process(const Event &event)
  {

trunk/src/world_entities/player.h

@@ -31 +31 @@
     inline Playable*  getControllable() { return this->controllable; };
 
+    void              weaponConfigChanged();
     bool              disconnectControllable();
 

trunk/src/world_entities/space_ships/helicopter.cc

@@ -89 +89 @@
   cannon->setName("BFG");
 
-  this->getWeaponManager()->addWeapon(wpLeft, 1, 0);
-  this->getWeaponManager()->addWeapon(wpRight,1 ,1);
-  this->getWeaponManager()->addWeapon(cannon, 0, 6);
-
-  //this->getWeaponManager()->addWeapon(turret, 3, 0);
+  this->addWeapon(wpLeft, 1, 0);
+  this->addWeapon(wpRight,1 ,1);
+  this->addWeapon(cannon, 0, 6);
+
+  //this->addWeapon(turret, 3, 0);
 
   this->getWeaponManager()->changeWeaponConfig(1);
@@ -176 +176 @@
 //   this->getWeaponManager()->setSlotPosition(9, Vector(-2.5, -0.3, 2.0));
 //   this->getWeaponManager()->setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));:
-     
+
   this->getWeaponManager()->getFixedTarget()->setParent(this);
   this->getWeaponManager()->getFixedTarget()->setRelCoor(100000,0,0);
@@ -211 +211 @@
 }
 
-
-/**
- * adds a weapon to the weapon list of the spaceship
- * @param weapon to add
-*/
-void Helicopter::addWeapon(Weapon* weapon)
-{
-  this->getWeaponManager()->addWeapon(weapon);
-}
-
-
-/**
- *  removes a weapon from the spaceship
- * @param weapon to remove
-*/
-void Helicopter::removeWeapon(Weapon* weapon)
-{
-  this->getWeaponManager()->removeWeapon(weapon);
-}
 
 /**
@@ -267 +248 @@
 */
 void Helicopter::tick (float time)
-{ 
+{
   tailrotorspeed += xMouse/20;
   if (tailrotorspeed >= 0.07) tailrotorspeed = 0.07;
   else if (tailrotorspeed <= -0.07) tailrotorspeed = -0.07;
-  
+
   if (tailrotorspeed > 0.0008) tailrotorspeed -= 0.001;
   else if (tailrotorspeed < -0.0008) tailrotorspeed += 0.001;
   if (tailrotorspeed <= 0.001 && tailrotorspeed >= -0.001) tailrotorspeed = 0;
-  
+
   // spaceship controlled movement
   this->calculateVelocity(time);
@@ -286 +267 @@
   //physics: Gravity
   this->shiftCoor(Vector(0,-1,0));
-  
+
   this->shiftCoor(getAbsDirY()*rotorspeed);
 
@@ -400 +381 @@
     if(rotorspeed >= 1.05) rotorspeed -= 0.05;
   }
-  
+
   if (this->bDescend )
   {
@@ -470 +451 @@
     this->xMouse = event.xRel*mouseSensitivity;
     this->yMouse = event.yRel*mouseSensitivity;
-    
+
     //this->shiftDir(Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
   }
@@ -486 +467 @@
     {
       turret = new Turret();
-      this->getWeaponManager()->addWeapon(turret, 2);
+      this->addWeapon(turret, 2);
       this->getWeaponManager()->changeWeaponConfig(2);
     }
@@ -495 +476 @@
     {
       turret = new AimingTurret();
-      this->getWeaponManager()->addWeapon(turret, 3);
+      this->addWeapon(turret, 3);
 
       this->getWeaponManager()->changeWeaponConfig(3);

trunk/src/world_entities/space_ships/helicopter.h

@@ -26 +26 @@
     virtual void enter();
     virtual void leave();
-
-    void addWeapon(Weapon* weapon );
-    void removeWeapon(Weapon* weapon);
 
     virtual void postSpawn();

trunk/src/world_entities/space_ships/space_ship.cc

@@ -103 +103 @@
   cannon->setName("BFG");
 
-  this->getWeaponManager()->addWeapon(wpLeft, 1, 0);
-  this->getWeaponManager()->addWeapon(wpRight,1 ,1);
-  this->getWeaponManager()->addWeapon(cannon, 0, 6);
-
-  //this->getWeaponManager()->addWeapon(turret, 3, 0);
+  this->addWeapon(wpLeft, 1, 0);
+  this->addWeapon(wpRight,1 ,1);
+  this->addWeapon(cannon, 0, 6);
+
+  //this->addWeapon(turret, 3, 0);
 
   this->getWeaponManager()->changeWeaponConfig(1);
@@ -221 +221 @@
 }
 
-/**
- * adds a weapon to the weapon list of the spaceship
- * @param weapon to add
-*/
-void SpaceShip::addWeapon(Weapon* weapon)
-{
-  this->getWeaponManager()->addWeapon(weapon);
-}
-
-
-/**
- *  removes a weapon from the spaceship
- * @param weapon to remove
-*/
-void SpaceShip::removeWeapon(Weapon* weapon)
-{
-  this->getWeaponManager()->removeWeapon(weapon);
-}
 
 /**
@@ -451 +433 @@
       this->bFire = event.bPressed;
   else if( event.type == KeyMapper::PEV_NEXT_WEAPON && event.bPressed)
+  {
     this->getWeaponManager()->nextWeaponConfig();//if( !event.bPressed) this->bWeaponChange = !this->bWeaponChange;
+  }
   else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
     this->getWeaponManager()->previousWeaponConfig();
@@ -503 +487 @@
     {
       turret = new Turret();
-      this->getWeaponManager()->addWeapon(turret, 2);
+      this->addWeapon(turret, 2);
       this->getWeaponManager()->changeWeaponConfig(2);
     }
@@ -513 +497 @@
       turret = dynamic_cast<Weapon*>(Factory::fabricate(CL_TARGETING_TURRET));
       if (turret != NULL)
-      this->getWeaponManager()->addWeapon(turret, 3);
+      this->addWeapon(turret, 3);
 
       this->getWeaponManager()->changeWeaponConfig(3);

trunk/src/world_entities/space_ships/space_ship.h

@@ -30 +30 @@
     virtual void enter();
     virtual void leave();
-
-    void addWeapon(Weapon* weapon );
-    void removeWeapon(Weapon* weapon);
 
     virtual void postSpawn();