Changeset 5965 in orxonox.OLD for branches/powerups

Timestamp:

Dec 7, 2005, 3:45:26 PM (19 years ago)

Author:

manuel

Message:

many changes:
created generic weapon_power_up that can contain any kind of weapon
space_ship is now extendable and can pickup weapon_power_ups

Location:

branches/powerups/src

Files:

• Makefile.am (modified) (1 diff)
• defs/class_id.h (modified) (2 diffs)
• lib/sound/sound_engine.cc (modified) (1 diff)
• world_entities/extendable.h (modified) (1 diff)
• world_entities/power_ups/weapon_power_up.cc (copied) (copied from branches/powerups/src/world_entities/power_ups/laser_power_up.cc) (3 diffs)
• world_entities/power_ups/weapon_power_up.h (copied) (copied from branches/powerups/src/world_entities/power_ups/laser_power_up.h) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (3 diffs)
• world_entities/space_ships/space_ship.h (modified) (3 diffs)
• world_entities/weapons/weapon_manager.cc (modified) (1 diff)

branches/powerups/src/Makefile.am

@@ -79 +79 @@
                   world_entities/power_ups/turret_power_up.cc \
                   world_entities/power_ups/laser_power_up.cc \
+                  world_entities/power_ups/weapon_power_up.cc \
                   world_entities/space_ships/space_ship.cc \
                   subprojects/benchmark.cc

branches/powerups/src/defs/class_id.h

@@ -88 +88 @@
   CL_WEAPON                     =    0x00210000,
   CL_POWER_UP                   =    0x00220000,
-  CL_EXTENDABLE                 =    0x00140000,
+  CL_EXTENDABLE                 =    0x00240000,
   // SUPER-Modeling
   CL_TEXTURE                    =    0x00c01000,
@@ -149 +149 @@
   CL_TURRET_POWER_UP            =    0x00000211,
   CL_LASER_POWER_UP             =    0x00000212,
+  CL_WEAPON_POWER_UP            =    0x00000213,
+  CL_SHIELD_POWER_UP            =    0x00000214,
 
   CL_TEST_GUN                   =    0x00000230,

branches/powerups/src/lib/sound/sound_engine.cc

@@ -289 +289 @@
 
   // INITIALIZING THE DEVICE:
-#ifndef AL_VERSION_1_1
-  ALubyte deviceName[] =
-#else
   ALCchar deviceName[] =
-#endif
 #ifdef __WIN32__
       "Direct3D";

branches/powerups/src/world_entities/extendable.h

@@ -7 +7 @@
 #define _EXTENDABLE_H
 
+#include "base_object.h"
+
 // FORWARD DECLARATION
-
+class PowerUp;
 
 
 //! A class for ...
-class Extendable : public BaseObject {
+class Extendable : virtual public BaseObject {
 
  public:

branches/powerups/src/world_entities/power_ups/weapon_power_up.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-#include "laser_power_up.h"
+#include "weapon_power_up.h"
 #include "factory.h"
 #include "state.h"
@@ -25 +25 @@
 using namespace std;
 
-CREATE_FACTORY(LaserPowerUp, CL_LASER_POWER_UP);
+CREATE_FACTORY(WeaponPowerUp, CL_WEAPON_POWER_UP);
 
-LaserPowerUp::LaserPowerUp ()
+WeaponPowerUp::WeaponPowerUp ()
 {
   this->init();
 }
 
-LaserPowerUp::LaserPowerUp(const TiXmlElement* root)
+WeaponPowerUp::WeaponPowerUp(const TiXmlElement* root)
 {
   this->init();
-
   this->loadParams(root);
 }
 
 
-LaserPowerUp::~LaserPowerUp ()
+WeaponPowerUp::~WeaponPowerUp ()
 {
-  delete this->sphereModel;
-  delete this->sphereMaterial;
 }
 
 
-void LaserPowerUp::init()
+void WeaponPowerUp::init()
 {
-  this->setClassID(CL_LASER_POWER_UP, "LaserPowerUp");
-  this->loadModel("models/guns/test_gun.obj", 2.0);
-
-  this->sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);
-  this->sphereMaterial = new Material;
-  this->sphereMaterial->setTransparency(.1);
-  this->sphereMaterial->setDiffuse(.7, .7, .1);
-
-  this->rotation = Vector(0,1,0);
-  this->cycle    = (float)rand()/RAND_MAX*M_2_PI;
-  this->shiftDir(Quaternion((float)rand()/RAND_MAX*M_2_PI, this->rotation));
 }
 
 
-void LaserPowerUp::loadParams(const TiXmlElement* root)
+void WeaponPowerUp::loadParams(const TiXmlElement* root)
 {
   static_cast<PowerUp*>(this)->loadParams(root);
@@ -69 +55 @@
 }
 
-
-/**
- * this function is called, when two entities collide
- * @param entity: the world entity with whom it collides
- *
- * Implement behaviour like damage application or other miscellaneous collision stuff in this function
- */
-void LaserPowerUp::collidesWith(WorldEntity* entity, const Vector& location)
+Weapon* WeaponPowerUp::getWeapon()
 {
- // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
- if (entity->isA(CL_PLAYABLE))
-  State::getWorldEntityList()->remove(this);
+  return dynamic_cast<Weapon*>(Factory::getFirst()->fabricate(this->getWeaponID()));
 }
 
-/**
- *  this method is called every frame
- * @param time: the time in seconds that has passed since the last tick
- *
- * Handle all stuff that should update with time inside this method (movement, animation, etc.)
-*/
-void LaserPowerUp::tick(float dt)
+ClassID WeaponPowerUp::getWeaponID()
 {
-  this->shiftDir(Quaternion(dt, this->rotation));
-  this->cycle+=dt;
-
+  return this->weaponID;
 }
 
-/**
- *  the entity is drawn onto the screen with this function
- *
- * This is a central function of an entity: call it to let the entity painted to the screen.
- * Just override this function with whatever you want to be drawn.
-*/
-void LaserPowerUp::draw() const
-{  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y + cos(this->cycle*3.0)*2.0,
-                this->getAbsCoor ().z);
-  /* rotate */
-  Vector tmpRot = this->getAbsDir().getSpacialAxis();
-  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-  this->model->draw();
-
-  this->sphereMaterial->select();
-  this->sphereModel->draw();
-  glPopMatrix();
+long WeaponPowerUp::getCapsNeeded()
+{
+  return this->capsNeeded;
 }
-

branches/powerups/src/world_entities/power_ups/weapon_power_up.h

@@ -1 +1 @@
 /*!
- * @file laser_power_up.h
- * @brief A class representing a PowerUp in the world.
+ * @file weapon_power_up.h
+ * @brief A class representing a PowerUp containing a weapon.
 */
 
-#ifndef _LASER_POWER_UP_H
-#define _LASER_POWER_UP_H
+#ifndef _WEAPON_POWER_UP_H
+#define _WEAPON_POWER_UP_H
 
 #include "power_up.h"
+#include "weapons/weapon.h"
 
 /* FORWARD DEFINITION */
-class Material;
 
-class LaserPowerUp : public PowerUp {
+class WeaponPowerUp : public PowerUp {
 
- public:
-  LaserPowerUp();
-  LaserPowerUp(const TiXmlElement* root);
-  virtual ~LaserPowerUp ();
+public:
+  WeaponPowerUp();
+  WeaponPowerUp(const TiXmlElement* root);
+  virtual ~WeaponPowerUp ();
 
-  virtual void LaserPowerUp::collidesWith(WorldEntity* entity, const Vector& location);
-  virtual void tick(float dt);
-  virtual void draw() const;
+  Weapon* getWeapon();
+  ClassID getWeaponID();
+  long getCapsNeeded();
 
-  private:
-   void init();
-   void loadParams(const TiXmlElement* root);
+private:
+  void init();
+  void loadParams(const TiXmlElement* root);
 
-  private:
-   Vector              rotation;
-   float               cycle;
-
-   Model*              sphereModel;
-   Material*           sphereMaterial;
+private:
+  ClassID weaponID;
+  long capsNeeded;
 };
 
-#endif /* _LASER_POWER_UP_H */
+#endif /* _WEAPON_POWER_UP_H */

branches/powerups/src/world_entities/space_ships/space_ship.cc

@@ -17 +17 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
+#include "space_ship.h"
+
 #include "executor/executor.h"
-#include "space_ship.h"
 
 #include "objModel.h"
@@ -30 +31 @@
 #include "factory.h"
 #include "key_mapper.h"
+
+#include "power_ups/weapon_power_up.h"
 
 using namespace std;
@@ -368 +371 @@
 }
 
+/**
+ *
+ */
+bool SpaceShip::pickup(PowerUp* powerUp)
+{
+  if(powerUp->isA(CL_WEAPON_POWER_UP)) {
+    WeaponPowerUp* wpu = dynamic_cast<WeaponPowerUp*>(powerUp);
+    WeaponManager* manager = this->getWeaponManager();
+    int slot = manager->getNextFreeSlot(0, wpu->getCapsNeeded());
+    if(slot >= 0) {
+      manager->addWeapon(wpu->getWeapon(), 0, slot);
+      return true;
+    }
+  }
+  else if(powerUp->isA(CL_SHIELD_POWER_UP)) {
+
+  }
+  return false;
+}
+
 #include "weapons/aiming_turret.h"
 // FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG

branches/powerups/src/world_entities/space_ships/space_ship.h

@@ -8 +8 @@
 
 #include "playable.h"
+#include "extendable.h"
 
 template<class T> class tList;
@@ -13 +14 @@
 class Event;
 
-class SpaceShip : public Playable
+class SpaceShip : public Playable, public Extendable
 {
 
@@ -37 +38 @@
 
     virtual void process(const Event &event);
+
+    bool pickup(PowerUp* powerUp);
 
 

branches/powerups/src/world_entities/weapons/weapon_manager.cc

@@ -408 +408 @@
 
 /**
- * private gets the next free slot in a certain weaponconfig
+ * gets the next free slot in a certain weaponconfig
  * @param the selected weaponconfig
  */
 int WeaponManager::getNextFreeSlot(int configID, long capability)
 {
-  for( int i = 0; i < this->slotCount; ++i)
-  {
-    if( this->configs[configID][i] == NULL &&
-        (this->currentSlotConfig[i].capability & capability & WTYPE_ALLKINDS) &&
-        (this->currentSlotConfig[i].capability & capability & WTYPE_ALLDIRS))
-      return i;
-  }
+  /*if(configID == -1) {
+    for(int i = 0; i < WM_MAX_CONFIGS; ++i)
+    {
+      int slot = this->getNextFreeSlot(i, capability);
+      if(slot >= 0) return slot;
+    }
+  }
+  else {*/
+    for( int i = 0; i < this->slotCount; ++i)
+    {
+      if( this->configs[configID][i] == NULL &&
+          (this->currentSlotConfig[i].capability & capability & WTYPE_ALLKINDS) &&
+          (this->currentSlotConfig[i].capability & capability & WTYPE_ALLDIRS))
+        return i;
+    }
+  //}
   return -1;
 }