Changeset 6281 in orxonox.OLD

Timestamp:

Dec 25, 2005, 4:07:53 PM (18 years ago)

Author:

bensch

Message:

trunk: make usage of the Virtual-derivates

Location:

trunk/src

Files:

• lib/lang/base_object.cc (modified) (1 diff)
• world_entities/creatures/md2_creature.cc (modified) (1 diff)
• world_entities/space_ships/helicopter.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)
• world_entities/test_entity.cc (modified) (1 diff)
• world_entities/test_entity.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (2 diffs)
• world_entities/world_entity.h (modified) (1 diff)

trunk/src/lib/lang/base_object.cc

@@ -100 +100 @@
 }
 
+
 /**
  * @brief queries for the ClassID of the Leaf Class (the last made class of this type

trunk/src/world_entities/creatures/md2_creature.cc

@@ -262 +262 @@
 void MD2Creature::draw () const
 {
-  this->drawLODsafe();
-
+  WorldEntity::draw();
 //  this->cameraConnNode.debugDraw(0);
 }

trunk/src/world_entities/space_ships/helicopter.cc

@@ -404 +404 @@
 void Helicopter::draw() const
 {
-  this->drawLODsafe();
+  WorldEntity::draw();
 
   this->getWeaponManager()->draw();

trunk/src/world_entities/space_ships/space_ship.cc

@@ -115 +115 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  EventHandler::getInstance()->grabEvents(true);
+  //EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
@@ -264 +264 @@
 void SpaceShip::draw () const
 {
-  this->drawLODsafe();
-
+  WorldEntity::draw();
   this->getWeaponManager()->draw();
 

trunk/src/world_entities/test_entity.cc

@@ -95 +95 @@
 
 
-
-void TestEntity::draw () const
-{
-  this->drawLODsafe();
-}
-

trunk/src/world_entities/test_entity.h

@@ -28 +28 @@
   virtual void tick (float time);
   virtual void collidesWith(WorldEntity* entity, const Vector& location);
-  virtual void draw () const;
 
  private:

trunk/src/world_entities/world_entity.cc

@@ -286 +286 @@
 void WorldEntity::draw() const
 {
-  this->drawLODsafe();
-}
-
-
-/**
- *  this functions draws the model automaticaly in multiple LOD
- */
-void WorldEntity::drawLODsafe() const
-{
-  if (!unlikely(this->models.empty()))
+    //PRINTF(0)("(%s::%s)\n", this->getClassName(), this->getName());
+  //  assert(!unlikely(this->models.empty()));
   {
     glMatrixMode(GL_MODELVIEW);
@@ -325 +317 @@
   }
 }
+
 
 /**

trunk/src/world_entities/world_entity.h

@@ -56 +56 @@
 
   virtual void draw () const;
-  void drawLODsafe() const;
 
   virtual void collidesWith (WorldEntity* entity, const Vector& location);