Changeset 10516 in orxonox.OLD

Timestamp:

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

Author:

patrick

Message:

merged playability back to trunk

Location:

trunk/src

Files:

• util/hud.cc (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (1 diff)
• world_entities/elements/glgui_energywidgetvertical.cc (modified) (1 diff)
• world_entities/elements/glgui_radar.cc (modified) (1 diff)
• world_entities/particles/particle_system.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/space_ships/human_scout.cc (copied) (copied from branches/playability/src/world_entities/space_ships/human_scout.cc)
• world_entities/space_ships/human_scout.h (copied) (copied from branches/playability/src/world_entities/space_ships/human_scout.h)
• world_entities/space_ships/space_ship.cc (modified) (7 diffs)
• world_entities/space_ships/space_ship.h (modified) (1 diff)
• world_entities/weapons/acid_launcher.cc (modified) (2 diffs)
• world_entities/weapons/heavy_blaster.cc (modified) (5 diffs)
• world_entities/weapons/heavy_blaster.h (modified) (1 diff)
• world_entities/weapons/light_blaster.cc (modified) (5 diffs)
• world_entities/weapons/light_blaster.h (modified) (1 diff)
• world_entities/weapons/medium_blaster.cc (modified) (4 diffs)
• world_entities/weapons/medium_blaster.h (modified) (1 diff)
• world_entities/weapons/spike_thrower.cc (modified) (2 diffs)
• world_entities/weapons/swarm_launcher.cc (modified) (2 diffs)
• world_entities/weapons/weapon.cc (modified) (1 diff)
• world_entities/weapons/weapon.h (modified) (3 diffs)

trunk/src/util/hud.cc

@@ -515 +515 @@
     pos.x -= ySize;
     //PRINTF(0)("secweaponwidget y-size: %f/n", (*weaponWidget)->getSizeY2D());
-    (*weaponWidget)->setAbsCoor2D(pos.x + this->rightRect->getAbsCoor2D().x, pos.y);
+    (*weaponWidget)->setAbsCoor2D(pos.x, pos.y);//+this->rightRect->getAbsCoor2D().x, pos.y);
     (*weaponWidget)->show();
     //printf("update thing %s::%s\n", (*weaponWidget)->getClassCName(), (*weaponWidget)->getName());

trunk/src/world_entities/WorldEntities.am

@@ -34 +34 @@
                 \
                 world_entities/questGUI/quest_gui.cc \
-                world_entities/questGUI/quest.cc \
+                world_entities/questGUI/quest.cc \
                 \
                 world_entities/weapons/weapon_slot.cc \

trunk/src/world_entities/elements/glgui_energywidgetvertical.cc

@@ -64 +64 @@
     this->_image->setWidgetSize(30,30);
     this->_image->setForegroundColor(Color(1,1,1,0.6));
+    this->_image->setBackgroundTexture(Texture());
     this->_image->setBackgroundColor(Color(1,1,1,0));
-    this->_image->setBackgroundTexture(Texture());
     this->_image->loadImageFromFile("textures/evil-flower.png");
     //this->_image.setRelCoor2D(borderLeft(), borderTop() + this->_bar.getSizeX2D());

trunk/src/world_entities/elements/glgui_radar.cc

@@ -41 +41 @@
   {
     this->setBackgroundTexture("textures/gui/gui_radar.png");
+    this->setBackgroundColor(Color(1.0,1.0,1.0,0.5));
 
     this->_updateInterval = .01f;

trunk/src/world_entities/particles/particle_system.cc

@@ -136 +136 @@
       if (emitter->isA(ParticleEmitter::staticClassID()))
       {
-        // init the emitertter with the coordinates of the system
-        dynamic_cast<ParticleEmitter*>(emitter)->setAbsCoor(this->getAbsCoor());
         this->addEmitter(dynamic_cast<ParticleEmitter*>(emitter));
       }

trunk/src/world_entities/player.cc

@@ -100 +100 @@
   //this->_hud.updateWeaponManager();
 
-  if (dynamic_cast<SpaceShip*>(this->playable) != 0)
-      this->_hud.setWeaponManager(&this->playable->getWeaponManager(), &dynamic_cast<SpaceShip*>(this->playable)->getWeaponManagerSecondary());
-    else
-      this->_hud.setWeaponManager(&this->playable->getWeaponManager());
+  if (dynamic_cast<SpaceShip*>(this->playable) != NULL)
+    this->_hud.setWeaponManager(&this->playable->getWeaponManager(), &dynamic_cast<SpaceShip*>(this->playable)->getWeaponManagerSecondary());
+  else
+    this->_hud.setWeaponManager(&this->playable->getWeaponManager());
 }
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -174 +174 @@
   Weapon* cannon = new SwarmLauncher();
   cannon->setName( "SwarmLauncher");
-
+/*
   Weapon* spike = new SpikeThrower();
   spike->setName( "SpikeThrower" );
@@ -183 +183 @@
 
   Weapon* acid1 = new AcidLauncher();
-  acid1->setName( "AcidSplasher" );
+  acid1->setName( "AcidSplasher" );*/
 
 
@@ -194 +194 @@
   this->weaponMan.addWeapon( wpLeft3, 2, 4);
   this->weaponMan.addWeapon( wpRight3, 2, 5);
-/*
+
   this->weaponMan.addWeapon( wpLeft1, 3, 0);
   this->weaponMan.addWeapon( wpRight1, 3, 1);
@@ -203 +203 @@
   this->weaponMan.addWeapon( wpLeft3, 3, 4);
   this->weaponMan.addWeapon( wpRight3, 3, 5);
-*/
-
-  this->weaponMan.addWeapon( acid0, 3, 0);
-  this->weaponMan.addWeapon( acid1, 3, 1);
+
+
+//   this->weaponMan.addWeapon( acid0, 3, 0);
+//   this->weaponMan.addWeapon( acid1, 3, 1);
 
 
   this->secWeaponMan.addWeapon( cannon, 0, 2);
-  this->secWeaponMan.addWeapon( spike, 1, 3);
+//   this->secWeaponMan.addWeapon( spike, 1, 3);
 //   this->secWeaponMan.addWeapon( acid0, 2, 2);
 //   this->secWeaponMan.addWeapon( acid1, 2, 3);
 
 
-  this->weaponMan.changeWeaponConfig(3);
-  this->secWeaponMan.changeWeaponConfig(1);
+  this->weaponMan.changeWeaponConfig(0);
+  this->secWeaponMan.changeWeaponConfig(0);
+
 
   curWeaponPrimary    = 0;
-  curWeaponSecondary  = 1;
+  curWeaponSecondary  = 0;
 
   Playable::weaponConfigChanged();
@@ -226 +227 @@
 
   weaponEnergyRegen = 10;       // 10 einheiten pro Sekunde
-  engineSpeedBase   = 5;
+  engineSpeedBase   = 15;
   shieldRegen       = 2;
 
@@ -246 +247 @@
 
 
-/*  this->loadModel("models/ships/mantawing.obj");*/
+ this->loadModel("models/spaceships/human_spaceship_fighter.obj", .25);
   //this->setVisibiliy(false);
 
@@ -1087 +1088 @@
 void SpaceShip::previousWeaponConfig()
 {
+  /*
   this->curWeaponPrimary    = (this->curWeaponPrimary + 1) % 3;
   this->weaponMan.changeWeaponConfig(this->curWeaponPrimary);
+  */
+  this->weaponMan.previousWeaponConfig();
   Playable::weaponConfigChanged();
 }

trunk/src/world_entities/space_ships/space_ship.h

@@ -82 +82 @@
     void setPlaymodeXML(const std::string& playmode); //recieves the playmode from a string (useful for script implementation)
     void setActionWidthPercentage(int i);
+    void setTravelSpeed(float f);
     void updateTravelDistance();
     virtual void movement (float dt);

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.