Changeset 6113 in orxonox.OLD for trunk/src

Timestamp:

Dec 14, 2005, 4:44:13 PM (19 years ago)

Author:

bensch

Message:

trunk: copied new power-ups

Location:

trunk/src

Files:

• Makefile.am (modified) (3 diffs)
• defs/class_id.h (modified) (2 diffs)
• world_entities/extendable.h (copied) (copied from branches/powerups/src/world_entities/extendable.h)
• world_entities/power_ups/laser_power_up.cc (modified) (1 diff)
• world_entities/power_ups/param_power_up.cc (added)
• world_entities/power_ups/param_power_up.h (added)
• world_entities/power_ups/power_up.cc (modified) (2 diffs)
• world_entities/power_ups/power_up.h (modified) (1 diff)
• world_entities/power_ups/turret_power_up.cc (modified) (1 diff)
• world_entities/power_ups/weapon_power_up.cc (added)
• world_entities/power_ups/weapon_power_up.h (added)

trunk/src/Makefile.am

@@ -81 +81 @@
                   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/power_ups/param_power_up.cc \
                   world_entities/space_ships/space_ship.cc \
                   world_entities/space_ships/helicopter.cc \
@@ -94 +96 @@
                  world_entities/world_entity.h \
                  world_entities/camera.h \
+                 world_entities/extendable.h \
                  world_entities/playable.h \
                  world_entities/player.h \
@@ -123 +126 @@
                  world_entities/power_ups/turret_power_up.h \
                  world_entities/power_ups/laser_power_up.h \
+                 world_entities/power_ups/param_power_up.h \
+                 world_entities/power_ups/weapon_power_up.h \
                  world_entities/space_ships/space_ship.h \
                  world_entities/space_ships/helicopter.h \

trunk/src/defs/class_id.h

@@ -87 +87 @@
   CL_WEAPON                     =    0x00210000,
   CL_POWER_UP                   =    0x00220000,
+  CL_EXTENDABLE                  =    0x00220000,
 
   // SUPER-Modeling
@@ -149 +150 @@
   CL_TURRET_POWER_UP            =    0x00000211,
   CL_LASER_POWER_UP             =    0x00000212,
+  CL_WEAPON_POWER_UP            =    0x00000213,
+  CL_PARAM_POWER_UP             =    0x00000214,
 
   CL_TEST_GUN                   =    0x00000230,

trunk/src/world_entities/power_ups/laser_power_up.cc

@@ -27 +27 @@
 CREATE_FACTORY(LaserPowerUp, CL_LASER_POWER_UP);
 
-LaserPowerUp::LaserPowerUp ()
+LaserPowerUp::LaserPowerUp () : PowerUp(0.0, 1.0, 0.0)
 {
   this->init();
 }
 
-LaserPowerUp::LaserPowerUp(const TiXmlElement* root)
+LaserPowerUp::LaserPowerUp(const TiXmlElement* root) : PowerUp(0.0, 1.0, 0.0)
 {
   this->init();

trunk/src/world_entities/power_ups/power_up.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: Benjamin Grauer
+   main-programmer: Manuel Leuenberger
    co-programmer: ...
 */
@@ -18 +18 @@
 
 #include "power_up.h"
-
+#include "extendable.h"
+#include "primitive_model.h"
 
 using namespace std;
 
+Model* PowerUp::sphereModel = NULL;
 
+PowerUp::PowerUp(float r, float g, float b)
+{
+  if(!PowerUp::sphereModel) {
+    PowerUp::sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);
+  }
+  this->sphereMaterial = new Material;
+  this->sphereMaterial->setTransparency(.1);
+  this->sphereMaterial->setDiffuse(r, g, b);
+}
 
-PowerUp::PowerUp ()
+PowerUp::~PowerUp ()
 {
-  this->setClassID(CL_POWER_UP, "PowerUp");
-
+  delete this->sphereMaterial;
 }
 
 
-
-PowerUp::~PowerUp () {}
+void PowerUp::loadParams(const TiXmlElement* root)
+{
+  static_cast<WorldEntity*>(this)->loadParams(root);
+}
 
 
-void PowerUp::loadParam(const TiXmlElement* root)
+void PowerUp::collidesWith (WorldEntity* entity, const Vector& location)
 {
-  static_cast<WorldEntity*>(this)->loadParams(root);
-
+ if(entity->isA(CL_EXTENDABLE))
+  {
+    if(dynamic_cast<Extendable*>(entity)->pickup(this))
+    {
+      this->setVisibiliy(false);
+    }
+  }
 }
 
+void PowerUp::draw() const
+{
+  WorldEntity::draw();
+
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+  float matrix[4][4];
+
+  /* translate */
+  glTranslatef (this->getAbsCoor ().x,
+                this->getAbsCoor ().y,
+                this->getAbsCoor ().z);
+  /* rotate */ // FIXME: devise a new Way to rotate this
+  this->getAbsDir ().matrix (matrix);
+  glMultMatrixf((float*)matrix);
+
+  this->sphereMaterial->select();
+  sphereModel->draw();
+
+  glPopMatrix();
+}
+
+const char* PowerUp::respawnTypes[] = {
+  "none",
+  "time"
+};
+
+void PowerUp::setRespawnType(const char* type)
+{
+  for(int i = 0; i < RESPAWN_size; ++i) {
+    if(strcmp(type, respawnTypes[i]) == 0) {
+      this->respawnType = (PowerUpRespawn)i;
+      break;
+    }
+  }
+}
+

trunk/src/world_entities/power_ups/power_up.h

@@ -9 +9 @@
 #include "world_entity.h"
 
+class Material;
+
+typedef enum PowerUpRespawn {
+  RESPAWN_NONE,
+  RESPAWN_TIME,
+  RESPAWN_size
+} PowerUpRespawn;
+
 class PowerUp : public WorldEntity {
 
- public:
-  PowerUp ();
+public:
+  void loadParams(const TiXmlElement* root);
+  void collidesWith (WorldEntity* entity, const Vector& location);
+
+  virtual void draw () const;
+  void setRespawnType(const char* type);
+
+protected:
+  PowerUp(float r, float g, float b);
   virtual ~PowerUp ();
-  void loadParam(const TiXmlElement* root);
+  virtual void respawn() {};
+
+  static Model* sphereModel;
+
+private:
+  Material* sphereMaterial;
+  PowerUpRespawn respawnType;
+  static const char* respawnTypes[];
 };
 

trunk/src/world_entities/power_ups/turret_power_up.cc

@@ -27 +27 @@
 CREATE_FACTORY(TurretPowerUp, CL_TURRET_POWER_UP);
 
-TurretPowerUp::TurretPowerUp ()
+TurretPowerUp::TurretPowerUp () : PowerUp(0.0, 1.0, 0.0)
 {
   this->init();
 }
 
-TurretPowerUp::TurretPowerUp(const TiXmlElement* root)
+TurretPowerUp::TurretPowerUp(const TiXmlElement* root) : PowerUp(0.0, 1.0, 0.0)
 {
   this->init();