Changeset 10516 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Jan 30, 2007, 9:17:21 PM (17 years ago)

Author:

patrick

Message:

merged playability back to trunk

Location:

trunk/src/world_entities/weapons

Files:

• acid_launcher.cc (modified) (2 diffs)
• heavy_blaster.cc (modified) (5 diffs)
• heavy_blaster.h (modified) (1 diff)
• light_blaster.cc (modified) (5 diffs)
• light_blaster.h (modified) (1 diff)
• medium_blaster.cc (modified) (4 diffs)
• medium_blaster.h (modified) (1 diff)
• spike_thrower.cc (modified) (2 diffs)
• swarm_launcher.cc (modified) (2 diffs)
• weapon.cc (modified) (1 diff)
• weapon.h (modified) (3 diffs)

trunk/src/world_entities/weapons/acid_launcher.cc

@@ -32 +32 @@
 
 #include "util/loading/factory.h"
+
+#include "elements/glgui_energywidgetvertical.h"
 
 
@@ -122 +124 @@
 void AcidLauncher::tick(float dt)
 {
+  if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
+  {
+    this->energyWidget->setDisplayedImage("textures/gui/gui_acid.png");
+    this->isEnergyWidgetInitialized = true;
+  }
+
   if (!Weapon::tickW(dt))
     return;

trunk/src/world_entities/weapons/heavy_blaster.cc

@@ -10 +10 @@
 
 #include "loading/fast_factory.h"
+
+#include "elements/glgui_energywidgetvertical.h"
 
 CREATE_FACTORY(HeavyBlaster);
@@ -93 +95 @@
 
   this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
+//   this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
   this->setActionSound(WA_RELOAD, "sounds/spawn/alien_generator.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  this->setProjectileTypeC("HBolt");   // FIXME temp project type until the blaste class exist
-//   this->setProjectileTypeC("SpikeBall");   // FIXME temp project type until the blaste class exist
+  this->setProjectileTypeC("HBolt");
   this->prepareProjectiles(5);
 
@@ -104 +105 @@
   this->setSegs(2);
   this->activeBarrel = 0;
-//   this->init2();
 
 
@@ -239 +239 @@
   glPushMatrix();
     glTranslatef (this->objComp[0][0]->getAbsCoor().x, this->objComp[0][0]->getAbsCoor().y, this->objComp[0][0]->getAbsCoor().z);
+    static_cast<StaticModel*>(this->getModel())->draw(2);
+  glPopMatrix();
+
+  glPushMatrix();
+    glTranslatef (this->objComp[1][0]->getAbsCoor().x, this->objComp[1][0]->getAbsCoor().y, this->objComp[1][0]->getAbsCoor().z);
+    static_cast<StaticModel*>(this->getModel())->draw(3);
+  glPopMatrix();
+
+  glPushMatrix();
+    glTranslatef (this->objComp[2][0]->getAbsCoor().x, this->objComp[2][0]->getAbsCoor().y, this->objComp[2][0]->getAbsCoor().z);
     static_cast<StaticModel*>(this->getModel())->draw(1);
-  glPopMatrix();
-
-  glPushMatrix();
-    glTranslatef (this->objComp[1][0]->getAbsCoor().x, this->objComp[1][0]->getAbsCoor().y, this->objComp[1][0]->getAbsCoor().z);
-    static_cast<StaticModel*>(this->getModel())->draw(2);
-  glPopMatrix();
-
-  glPushMatrix();
-    glTranslatef (this->objComp[2][0]->getAbsCoor().x, this->objComp[2][0]->getAbsCoor().y, this->objComp[2][0]->getAbsCoor().z);
-    static_cast<StaticModel*>(this->getModel())->draw(0);
   glPopMatrix();
 
@@ -264 +264 @@
   glPushMatrix();
     glTranslatef (this->objComp[2][1]->getAbsCoor().x, this->objComp[2][1]->getAbsCoor().y, this->objComp[2][1]->getAbsCoor().z);
-    static_cast<StaticModel*>(this->getModel())->draw(3);
-  glPopMatrix();
-
-  glPopMatrix();
-}
+    static_cast<StaticModel*>(this->getModel())->draw(0);
+  glPopMatrix();
+
+  glPopMatrix();
+}
+
+void HeavyBlaster::tick(float dt)
+{
+  if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
+  {
+    this->energyWidget->setDisplayedImage("textures/gui/gui_heavy_bolt.png");
+    this->setEnergyWidgetInitialized(true);
+  }
+}

trunk/src/world_entities/weapons/heavy_blaster.h

@@ -29 +29 @@
     virtual void fire();
 
+    virtual void tick(float dt);
+
     virtual void draw() const;
 

trunk/src/world_entities/weapons/light_blaster.cc

@@ -10 +10 @@
 
 #include "loading/fast_factory.h"
+
+#include "elements/glgui_energywidgetvertical.h"
 
 CREATE_FACTORY(LightBlaster);
@@ -43 +45 @@
    delete [] this->shootAnim;
    delete [] this->objComp;
-/*
-    for(int j = 0; j < this->getSegs(); j++)
-    {
-      delete this->shootAnim[i][j];
-      delete this->objComp[i][j];
-    }
-    delete this->shootAnim[i];
-    delete this->objComp[i];
-    delete this->emissionPoint[i];
-  }*/
 
-//  this->deconstr();
-      // model will be deleted from WorldEntity-destructor
 }
 
@@ -79 +69 @@
 
   this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
+//   this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
   this->setActionSound(WA_RELOAD, "sounds/spawn/alien_generator.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  //this->setProjectileTypeC("RailProjectile");   // FIXME temp project type until the blaste class exist
-  this->setProjectileTypeC("LBolt");   // Working; FIXME: add textures
-//   this->setProjectileTypeC("Spike");   // Working; FIXME: add textures
+  this->setProjectileTypeC("LBolt");
   this->prepareProjectiles(100);
 
@@ -137 +125 @@
 }
 
-
 void LightBlaster::fire()
 {
@@ -187 +174 @@
     static_cast<StaticModel*>(this->getModel())->draw();
   glPopMatrix();
+
 }
+
+void LightBlaster::tick(float dt)
+{
+  if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
+  {
+    this->energyWidget->setDisplayedImage("textures/gui/gui_light_bolt.png");
+    this->setEnergyWidgetInitialized(true);
+  }
+}

trunk/src/world_entities/weapons/light_blaster.h

@@ -26 +26 @@
     virtual void fire();
 
+    virtual void tick(float dt);
+
     virtual void draw() const;
 

trunk/src/world_entities/weapons/medium_blaster.cc

@@ -10 +10 @@
 
 #include "loading/fast_factory.h"
+
+#include "elements/glgui_energywidgetvertical.h"
 
 //
@@ -138 +140 @@
 }
 
+
 /**
  *  this activates the weapon
@@ -158 +161 @@
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
 
-  static_cast<StaticModel*>(this->getModel())->draw(2);
+  static_cast<StaticModel*>(this->getModel())->draw(0);
 
   glPushMatrix();
@@ -167 +170 @@
   glPushMatrix();
     glTranslatef (this->objComp[0][1]->getAbsCoor().x, this->objComp[0][1]->getAbsCoor().y, this->objComp[0][1]->getAbsCoor().z);
-    static_cast<StaticModel*>(this->getModel())->draw(0);
+    static_cast<StaticModel*>(this->getModel())->draw(2);
   glPopMatrix();
 
   glPopMatrix();
 }
+
+void MediumBlaster::tick(float dt)
+{
+  if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
+  {
+    this->energyWidget->setDisplayedImage("textures/gui/gui_medium_bold.png");
+    this->setEnergyWidgetInitialized(true);
+  }
+}

trunk/src/world_entities/weapons/medium_blaster.h

@@ -26 +26 @@
     virtual void fire();
 
+    virtual void tick(float dt);
+
     virtual void draw() const;
 

trunk/src/world_entities/weapons/spike_thrower.cc

@@ -34 +34 @@
 
 #include "util/loading/factory.h"
+
+#include "elements/glgui_energywidgetvertical.h"
 
 
@@ -125 +127 @@
 void SpikeThrower::tick(float dt)
 {
+  if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
+  {
+    this->energyWidget->setDisplayedImage("textures/gui/gui_spikeball.png");
+    this->isEnergyWidgetInitialized = true;
+  }
+
   if (!Weapon::tickW(dt))
     return;

trunk/src/world_entities/weapons/swarm_launcher.cc

@@ -33 +33 @@
 
 #include "util/loading/factory.h"
+
+#include "elements/glgui_energywidgetvertical.h"
 
 
@@ -141 +143 @@
 
   this->setAbsDirSoft(quat, 5);
+
+  if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
+  {
+    this->energyWidget->setDisplayedImage("textures/gui/gui_swarm_missiles.png");
+    this->setEnergyWidgetInitialized(true);
+  }
 }
 

trunk/src/world_entities/weapons/weapon.cc

@@ -154 +154 @@
 
   this->energyWidget = NULL;
+  isEnergyWidgetInitialized = false;
 
   // set this object to be synchronized over network

trunk/src/world_entities/weapons/weapon.h

@@ -190 +190 @@
     inline int getPreferedSlot() { return this->preferedSlot; }
 
+    inline void setEnergyWidgetInitialized(bool b) {this->isEnergyWidgetInitialized = b;};
+
 
   protected:
@@ -207 +209 @@
 
     void setPreferedSlot(int slot, int side) { this->preferedSlot = slot; this->preferedSide = side; }
+
+    //gui
+    OrxGui::GLGuiEnergyWidgetVertical* energyWidget;
+    bool  isEnergyWidgetInitialized;
 
 
@@ -238 +244 @@
     float                maxCharge;                        //!< The maximal energy to be loaded onto one projectile (this is only availible if chargeable is enabled)
 
-    OrxGui::GLGuiEnergyWidgetVertical* energyWidget;
+    //OrxGui::GLGuiEnergyWidgetVertical* energyWidget;
 
     PNode*               defaultTarget;                    //!< A target for targeting Weapons.