Changeset 6547 in orxonox.OLD for trunk

Timestamp:

Jan 18, 2006, 2:12:53 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WeaponManager back to the trunk

Location:

trunk/src/world_entities

Files:

• playable.cc (modified) (2 diffs)
• playable.h (modified) (3 diffs)
• power_ups/param_power_up.cc (modified) (7 diffs)
• power_ups/param_power_up.h (modified) (3 diffs)
• power_ups/power_up.cc (modified) (2 diffs)
• power_ups/weapon_power_up.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (2 diffs)
• space_ships/space_ship.h (modified) (2 diffs)
• weapons/turret.cc (modified) (1 diff)

trunk/src/world_entities/playable.cc

@@ -21 +21 @@
 #include "player.h"
 #include "state.h"
+
+#include "power_ups/weapon_power_up.h"
+#include "power_ups/param_power_up.h"
 
 
@@ -141 +144 @@
 }
 
+bool Playable::pickup(PowerUp* powerUp)
+{
+  if(powerUp->isA(CL_WEAPON_POWER_UP)) {
+    Weapon* weapon = dynamic_cast<WeaponPowerUp*>(powerUp)->getWeapon();
+    WeaponManager* manager = this->getWeaponManager();
+    int slot = manager->getNextFreeSlot(2, weapon->getCapability());
+    if(slot >= 0) {
+      manager->addWeapon(weapon, 2, slot);
+      return true;
+    }
+  }
+  else if(powerUp->isA(CL_PARAM_POWER_UP)) {
+    ParamPowerUp* ppu = dynamic_cast<ParamPowerUp*>(powerUp);
+    switch(ppu->getType()) {
+      case POWERUP_PARAM_HEALTH:
+        this->addEnergy(ppu->getValue());
+        return true;
+      case POWERUP_PARAM_MAX_HEALTH:
+        this->setMaxEnergy(this->getMaxEnergy() + ppu->getValue());
+        return true;
+    }
+  }
+  return false;
+}
+
 /**
  * add an event to the event list of events this Playable can capture

trunk/src/world_entities/playable.h

@@ -8 +8 @@
 
 #include "world_entity.h"
+#include "extendable.h"
 #include "event.h"
 #include <list>
@@ -21 +22 @@
  *
  */
-class Playable : public WorldEntity
+class Playable : public WorldEntity, public Extendable
 {
   public:
@@ -29 +30 @@
     virtual void enter()=0;
     virtual void leave()=0;
+
+    virtual bool pickup(PowerUp* powerUp);
 
     void addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);

trunk/src/world_entities/power_ups/param_power_up.cc

@@ -32 +32 @@
 
 const char* ParamPowerUp::paramTypes[] = {
-  "shield"
+  "shield",
+  "max-shield",
+  "health",
+  "max-health",
 };
 
@@ -77 +80 @@
 }
 
-void ParamPowerUp::setValue(int value)
+void ParamPowerUp::setValue(float value)
 {
   this->value = value;
@@ -84 +87 @@
 void ParamPowerUp::setType(const char* type)
 {
-  for(int i = 0; i < PARAM_size; ++i) {
+  for(int i = 0; i < POWERUP_PARAM_size; ++i) {
     if(strcmp(type, paramTypes[i]) == 0) {
       this->type = (EnumParamPowerUpType)i;
@@ -92 +95 @@
 }
 
-void ParamPowerUp::setMaxValue(int value)
+void ParamPowerUp::setMaxValue(float value)
 {
   this->max_value = value;
 }
 
-void ParamPowerUp::setMinValue(int value)
+void ParamPowerUp::setMinValue(float value)
 {
   this->min_value = value;
 }
 
-int ParamPowerUp::getValue()
+float ParamPowerUp::getValue()
 {
   return this->value;
@@ -116 +119 @@
   if(this->min_value != this->max_value)
   {
-    value = this->min_value + (int)(rand() * (this->max_value - this->min_value));
+    this->value = this->min_value + rand() * (this->max_value - this->min_value);
   }
 }
@@ -132 +135 @@
   SYNCHELP_READ_INT( i );
   this->type = (EnumParamPowerUpType)i;
-  SYNCHELP_READ_INT( this->value );
+  SYNCHELP_READ_FLOAT( this->value );
 
   if ( this->value != 0 )
   {
-    SYNCHELP_READ_INT( this->min_value );
-    SYNCHELP_READ_INT( this->max_value );
+    SYNCHELP_READ_FLOAT( this->min_value );
+    SYNCHELP_READ_FLOAT( this->max_value );
     respawn();
   }
@@ -165 +168 @@
     int i = (int)this->type;
     SYNCHELP_WRITE_INT( i );
-    SYNCHELP_WRITE_INT( this->value );
+    SYNCHELP_WRITE_FLOAT( this->value );
 
     if ( this->value != 0 )
     {
-      SYNCHELP_WRITE_INT( this->min_value );
-      SYNCHELP_WRITE_INT( this->max_value );
+      SYNCHELP_WRITE_FLOAT( this->min_value );
+      SYNCHELP_WRITE_FLOAT( this->max_value );
     }
 

trunk/src/world_entities/power_ups/param_power_up.h

@@ -12 +12 @@
 
 typedef enum EnumParamPowerUpType {
-  PARAM_SHIELD,
-  PARAM_size
+  POWERUP_PARAM_SHIELD,
+  POWERUP_PARAM_MAX_SHIELD,
+  POWERUP_PARAM_HEALTH,
+  POWERUP_PARAM_MAX_HEALTH,
+  POWERUP_PARAM_size
 } EnumParamPowerUpType;
 
@@ -23 +26 @@
   virtual ~ParamPowerUp ();
 
-  void setValue(int value);
-  void setMaxValue(int value);
-  void setMinValue(int value);
+  void setValue(float value);
+  void setMaxValue(float value);
+  void setMinValue(float value);
   void setType(const char* type);
   EnumParamPowerUpType getType();
-  int getValue();
+  float getValue();
 
   virtual int writeBytes(const byte* data, int length, int sender);
@@ -43 +46 @@
   static const char* paramTypes[];
   EnumParamPowerUpType type;
-  int value;
-  int max_value;
-  int min_value;
+  float value;
+  float max_value;
+  float min_value;
 };
 

trunk/src/world_entities/power_ups/power_up.cc

@@ -65 +65 @@
 void PowerUp::draw() const
 {
-  glMatrixMode(GL_MODELVIEW);
+  this->sphereMaterial->select();
+  WorldEntity::draw();
+  /*glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
 
-  /* translate */
   glTranslatef (this->getAbsCoor ().x,
                 this->getAbsCoor ().y,
@@ -78 +79 @@
    this->getModel(0)->draw();
 
-   glPopMatrix();
+  glPopMatrix();*/
 }
 

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -50 +50 @@
 void WeaponPowerUp::init()
 {
-  weaponXML = NULL;
-  weapon = NULL;
+  this->setClassID(CL_WEAPON_POWER_UP, "WeaponPowerUp");
+  this->weaponXML = NULL;
+  this->weapon = NULL;
 }
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -123 +123 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  //EventHandler::getInstance()->grabEvents(true);
+  EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
@@ -450 +450 @@
      //this->setAbsDir(mouseDir);
   }
-}
-
-/**
- *
- */
-bool SpaceShip::pickup(PowerUp* powerUp)
-{
-  if(powerUp->isA(CL_WEAPON_POWER_UP)) {
-    Weapon* weapon = dynamic_cast<WeaponPowerUp*>(powerUp)->getWeapon();
-    WeaponManager* manager = this->getWeaponManager();
-    int slot = manager->getNextFreeSlot(0, weapon->getCapability());
-    if(slot >= 0) {
-      manager->addWeapon(weapon, 0, slot);
-      return true;
-    }
-  }
-  else if(powerUp->isA(CL_PARAM_POWER_UP)) {
-    ParamPowerUp* ppu = dynamic_cast<ParamPowerUp*>(powerUp);
-    switch(ppu->getType()) {
-      case PARAM_SHIELD:
-        break;
-    }
-  }
-  return false;
 }
 

trunk/src/world_entities/space_ships/space_ship.h

@@ -15 +15 @@
 class Event;
 
-class SpaceShip : public Playable, public Extendable
+class SpaceShip : public Playable
 {
 
@@ -39 +39 @@
 
     virtual void process(const Event &event);
-    bool pickup(PowerUp* powerUp);
 
     virtual int       writeBytes(const byte* data, int length, int sender);

trunk/src/world_entities/weapons/turret.cc

@@ -54 +54 @@
 {
   this->init();
-  this->loadParams(root);
+  if (root != NULL)
+    this->loadParams(root);
 }