Changeset 6306 in orxonox.OLD for trunk

Timestamp:

Dec 26, 2005, 2:27:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: cool bars for the rocket-louncher

Location:

trunk/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (4 diffs)
• weapons/turret.cc (modified) (4 diffs)
• weapons/turret.h (modified) (2 diffs)
• weapons/weapon.cc (modified) (1 diff)
• weapons/weapon.h (modified) (1 diff)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -39 +39 @@
 
 
-#include "lib/gui/gl_gui/glgui_bar.h"
-#include "lib/gui/gl_gui/glgui_pushbutton.h"
+// #include "lib/gui/gl_gui/glgui_bar.h"
+// #include "lib/gui/gl_gui/glgui_pushbutton.h"
 
 
@@ -121 +121 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  //EventHandler::getInstance()->grabEvents(true);
+  EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
@@ -135 +135 @@
   this->mouseDir = this->getAbsDir();
 
-  GLGuiButton* button = new GLGuiPushButton();
-   button->show();
-   button->setLabel("orxonox");
-   button->setBindNode(this);
-    GLGuiBar* bar = new GLGuiBar();
-    bar->show();
-    bar->setValue(7.0);
-    bar->setMaximum(10);
-    bar->setSize2D( 20, 100);
-    bar->setAbsCoor2D( 10, 200);
+//   GLGuiButton* button = new GLGuiPushButton();
+//    button->show();
+//    button->setLabel("orxonox");
+//    button->setBindNode(this);
+//     GLGuiBar* bar = new GLGuiBar();
+//     bar->show();
+//     bar->setValue(7.0);
+//     bar->setMaximum(10);
+//     bar->setSize2D( 20, 100);
+//     bar->setAbsCoor2D( 10, 200);
 
   //add events to the eventlist
@@ -490 +490 @@
   Weapon* turret = NULL;
 
-  if ((float)rand()/RAND_MAX < .1)
+  if ((float)rand()/RAND_MAX < .9)
   {
     //if (this->getWeaponManager()->hasFreeSlot(2, WTYPE_TURRET))

trunk/src/world_entities/weapons/turret.cc

@@ -82 +82 @@
 
   this->setStateDuration(WS_SHOOTING, .1);
-  this->setStateDuration(WS_RELOADING, .1);
+  this->setStateDuration(WS_RELOADING, 1.0f);
   this->setStateDuration(WS_ACTIVATING, .4);
   this->setStateDuration(WS_DEACTIVATING, .4);
 
-  this->setMaximumEnergy(10000, 50);
-  this->increaseEnergy(100000);
+  this->setMaximumEnergy(100, 5);
+  this->increaseEnergy(100);
   //this->minCharge = 2;
 
@@ -96 +96 @@
   this->setEmissionPoint(1.684, 0.472, 0);
   //this->getProjectileFactory()->prepare(100);
+
+  this->bar = new GLGuiBar;
+  this->bar->setSize2D( 20, 100);
+  this->bar->setMaximum(this->getEnergyMax());
+  this->bar->setValue(this->getEnergy());
+  this->loadedBar = new GLGuiBar;
+  this->loadedBar->setParent2D(this->bar);
+  this->loadedBar->setRelCoor2D(20,0);
+  this->loadedBar->setSize2D(10,50);
+  this->loadedBar->setMaximum(this->getLoadedEnergyMax());
 }
 
@@ -106 +116 @@
 void Turret::activate()
 {
+  this->bar->show();
+  this->loadedBar->show();
 }
 
 void Turret::deactivate()
 {
+  this->bar->hide();
+  this->loadedBar->hide();
 }
 
@@ -141 +155 @@
   pj->setAbsDir(this->getAbsDir());
   pj->activate();
+
+  this->bar->setValue( this->getEnergy());
+  this->loadedBar->setValue(this->getLoadedEnergy());
 }
 

trunk/src/world_entities/weapons/turret.h

@@ -8 +8 @@
 
 #include "weapon.h"
+
+#include "glgui_bar.h"
 
 class Turret : public Weapon
@@ -28 +30 @@
 
   private:
+    GLGuiBar*    bar;
+    GLGuiBar*    loadedBar;
   };
 

trunk/src/world_entities/weapons/weapon.cc

@@ -438 +438 @@
       this->soundSource->play(this->soundBuffers[WA_SHOOT]);
           // fire
+    this->energyLoaded -= this->minCharge;
     this->fire();
-    this->energyLoaded -= this->minCharge;
           // setting up for the next state
     this->enterState(WS_SHOOTING);

trunk/src/world_entities/weapons/weapon.h

@@ -136 +136 @@
     /** @param energyMax the maximum energy the Weapon can have @param energyLoadedMax the maximum energy in the weapon buffers */
     inline void setMaximumEnergy(float energyMax, float energyLoadedMax) { this->energyMax = energyMax; this->energyLoadedMax = energyLoadedMax; };
+    inline float getLoadedEnergyMax() const { return this->energyLoadedMax; };
+    inline float getEnergyMax() const { return this->energyMax; };
+    inline float getEnergy() const { return this->energy; };
+    inline float getLoadedEnergy() const { return this->energyLoaded; };
 
     void setActionSound(WeaponAction action, const char* soundFile);