Changeset 5458 in orxonox.OLD for trunk/src/world_entities/power_ups

Timestamp:

Oct 30, 2005, 1:52:29 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: a second power-up (lasers)

Location:

trunk/src/world_entities/power_ups

Files:

• laser_power_up.cc (copied) (copied from trunk/src/world_entities/power_ups/turret_power_up.cc) (8 diffs)
• laser_power_up.h (copied) (copied from trunk/src/world_entities/power_ups/turret_power_up.h) (2 diffs)

trunk/src/world_entities/power_ups/laser_power_up.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-#include "turret_power_up.h"
+#include "laser_power_up.h"
 #include "factory.h"
 #include "state.h"
@@ -25 +25 @@
 using namespace std;
 
-CREATE_FACTORY(TurretPowerUp);
+CREATE_FACTORY(LaserPowerUp);
 
-TurretPowerUp::TurretPowerUp ()
+LaserPowerUp::LaserPowerUp ()
 {
   this->init();
 }
 
-TurretPowerUp::TurretPowerUp(const TiXmlElement* root)
+LaserPowerUp::LaserPowerUp(const TiXmlElement* root)
 {
   this->init();
@@ -40 +40 @@
 
 
-TurretPowerUp::~TurretPowerUp ()
+LaserPowerUp::~LaserPowerUp ()
 {
   delete this->sphereModel;
@@ -47 +47 @@
 
 
-void TurretPowerUp::init()
+void LaserPowerUp::init()
 {
-  this->setClassID(CL_TURRET_POWER_UP, "TurretPowerUp");
-  this->loadModelWithScale("models/guns/turret1.obj", 2.0);
+  this->setClassID(CL_LASER_POWER_UP, "LaserPowerUp");
+  this->loadModelWithScale("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(.1, .1, .8);
+  this->sphereMaterial->setDiffuse(.7, .7, .1);
 
   this->rotation = Vector(0,1,0);
@@ -63 +63 @@
 
 
-void TurretPowerUp::loadParams(const TiXmlElement* root)
+void LaserPowerUp::loadParams(const TiXmlElement* root)
 {
   static_cast<PowerUp*>(this)->loadParams(root);
@@ -76 +76 @@
  * Implement behaviour like damage application or other miscellaneous collision stuff in this function
  */
-void TurretPowerUp::collidesWith(WorldEntity* entity, const Vector& location)
+void LaserPowerUp::collidesWith(WorldEntity* entity, const Vector& location)
 {
  // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
@@ -89 +89 @@
  * Handle all stuff that should update with time inside this method (movement, animation, etc.)
 */
-void TurretPowerUp::tick(float dt)
+void LaserPowerUp::tick(float dt)
 {
   this->shiftDir(Quaternion(dt, this->rotation));
@@ -102 +102 @@
  * Just override this function with whatever you want to be drawn.
 */
-void TurretPowerUp::draw()
+void LaserPowerUp::draw()
 {  glMatrixMode(GL_MODELVIEW);
   glPushMatrix();

trunk/src/world_entities/power_ups/laser_power_up.h

@@ -1 +1 @@
 /*!
- * @file turret_power_up.h
+ * @file laser_power_up.h
  * @brief A class representing a PowerUp in the world.
 */
 
-#ifndef _TURRET_POWER_UP_H
-#define _TURRET_POWER_UP_H
+#ifndef _LASER_POWER_UP_H
+#define _LASER_POWER_UP_H
 
 #include "power_up.h"
 
-class TurretPowerUp : public PowerUp {
+class LaserPowerUp : public PowerUp {
 
  public:
-  TurretPowerUp();
-  TurretPowerUp(const TiXmlElement* root);
-  virtual ~TurretPowerUp ();
+  LaserPowerUp();
+  LaserPowerUp(const TiXmlElement* root);
+  virtual ~LaserPowerUp ();
 
-  virtual void TurretPowerUp::collidesWith(WorldEntity* entity, const Vector& location);
+  virtual void LaserPowerUp::collidesWith(WorldEntity* entity, const Vector& location);
   virtual void tick(float dt);
   virtual void draw();
@@ -32 +32 @@
 };
 
-#endif /* _TURRET_POWER_UP_H */
+#endif /* _LASER_POWER_UP_H */