Changeset 6588 in orxonox.OLD for branches

Timestamp:

Jan 18, 2006, 4:41:00 PM (19 years ago)

Author:

manuel

Message:

prepare to merge…

Location:

branches/powerups/src/world_entities

Files:

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

branches/powerups/src/world_entities/playable.cc

@@ -149 +149 @@
     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;
-    }
+    manager->addWeapon(weapon, 2, -1);
+    return true;
   }
   else if(powerUp->isA(CL_PARAM_POWER_UP)) {

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

@@ -28 +28 @@
 
   this->respawnType = RESPAWN_NONE;
+  this->respawnStart = 10;
+  this->model = NULL;
 /*  if(!PowerUp::sphereModel) {*/
 
@@ -58 +60 @@
     if(dynamic_cast<Extendable*>(entity)->pickup(this))
     {
+      this->respawnTime = this->respawnStart;
       this->toList(OM_DEAD_TICK);
+    }
+  }
+}
+
+void PowerUp::tick(float dt) {
+  if(this->getOMListNumber() != OM_COMMON) {
+    this->respawnTime -= dt;
+    if(this->respawnTime <= 0) {
+      this->toList(OM_COMMON);
+      this->respawn();
     }
   }
@@ -65 +78 @@
 void PowerUp::draw() const
 {
+  if(this->model != NULL) {
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glTranslatef (this->getAbsCoor ().x,
+                  this->getAbsCoor ().y,
+                  this->getAbsCoor ().z);
+    Vector tmpRot = this->getAbsDir().getSpacialAxis();
+    glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+    this->model->draw();
+    glPopMatrix();
+  }
   this->sphereMaterial->select();
   WorldEntity::draw();
-  /*glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  Vector tmpRot = this->getAbsDir().getSpacialAxis();
-  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-
-   this->sphereMaterial->select();
-   this->getModel(0)->draw();
-
-  glPopMatrix();*/
 }
 

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

@@ -24 +24 @@
 
   virtual void draw () const;
+  virtual void tick(float dt);
   void setRespawnType(const char* type);
 
@@ -33 +34 @@
   virtual ~PowerUp ();
   virtual void respawn() {};
+  Model* model;
 
 private:
   Material* sphereMaterial;
   PowerUpRespawn respawnType;
+  float respawnTime;
+  float respawnStart;
   static const char* respawnTypes[];
 };

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

@@ -69 +69 @@
     LoadParam(root, "weaponID", this, WeaponPowerUp, setWeaponClass);
   }
+  this->model = this->weapon->getModel(0);
 }
 

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

@@ -45 +45 @@
   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
 
-  this->loadModel("models/guns/turret1.obj");
 }
 
@@ -97 +96 @@
   this->setEmissionPoint(1.684, 0.472, 0);
   //this->getProjectileFactory()->prepare(100);
+  this->loadModel("models/guns/turret1.obj");
+
 }