Changeset 6282 in orxonox.OLD

Timestamp:

Dec 25, 2005, 4:21:48 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the PowerUps back here

Location:

trunk/src

Files:

• lib/lang/base_object.cc (modified) (1 diff)
• world_entities/extendable.h (modified) (1 diff)
• world_entities/power_ups/power_up.cc (modified) (4 diffs)
• world_entities/power_ups/power_up.h (modified) (1 diff)

trunk/src/lib/lang/base_object.cc

@@ -74 +74 @@
 void BaseObject::setClassID(ClassID classID, const char* className)
 {
-  //  printf("%s(0x%.8X)->%s(0x%.8X)\n", this->className, this->classID, className, classID);
-  assert (!(this->classID & classID));
+  //printf("%s(0x%.8X)->%s(0x%.8X)\n", this->className, this->classID, className, classID);
+  assert (!(this->classID & classID & !CL_MASK_SUBSUPER_CLASS_IDA ));
 
   this->classID |= (long)classID;

trunk/src/world_entities/extendable.h

@@ -17 +17 @@
 class Extendable : virtual public BaseObject {
 
- public:
-//   Extendable();
-//   virtual ~Extendable();
+  public:
+   //   virtual ~Extendable();
    virtual bool pickup(PowerUp* powerUp) { return false; };
 
- private:
+  protected:
+    Extendable() { this->setClassID(CL_EXTENDABLE, "Extendable"); };
+
+  private:
 
 };

trunk/src/world_entities/power_ups/power_up.cc

@@ -23 +23 @@
 using namespace std;
 
-Model* PowerUp::sphereModel = NULL;
-
 PowerUp::PowerUp(float r, float g, float b)
 {
   this->respawnType = RESPAWN_NONE;
-  if(!PowerUp::sphereModel) {
-    PowerUp::sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);
-  }
+/*  if(!PowerUp::sphereModel) {*/
+
+  Model* sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);
+
+  this->setModel(sphereModel);
+  this->buildObbTree( 4);
   this->sphereMaterial = new Material;
   this->sphereMaterial->setTransparency(.1);
@@ -55 +56 @@
     if(dynamic_cast<Extendable*>(entity)->pickup(this))
     {
-      this->setVisibiliy(false);
+      this->toList(OM_DEAD_TICK);
     }
   }
@@ -62 +63 @@
 void PowerUp::draw() const
 {
-  WorldEntity::draw();
-
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
-  float matrix[4][4];
 
   /* translate */
@@ -72 +70 @@
                 this->getAbsCoor ().y,
                 this->getAbsCoor ().z);
-  /* rotate */ // FIXME: devise a new Way to rotate this
-  this->getAbsDir ().matrix (matrix);
-  glMultMatrixf((float*)matrix);
+  Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-  this->sphereMaterial->select();
-  sphereModel->draw();
+   this->sphereMaterial->select();
+   this->getModel(0)->draw();
 
-  glPopMatrix();
+   glPopMatrix();
 }
 

trunk/src/world_entities/power_ups/power_up.h

@@ -31 +31 @@
   virtual void respawn() {};
 
-  static Model* sphereModel;
-
 private:
   Material* sphereMaterial;