Changeset 6222 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Dec 21, 2005, 1:49:06 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/world_entities/Makefile.am (modified) (5 diffs)
• src/world_entities/camera.cc (modified) (6 diffs)
• src/world_entities/creatures (copied) (copied from branches/christmas_branche/src/world_entities/creatures)
• src/world_entities/creatures/md2_creature.cc (copied) (copied from branches/christmas_branche/src/world_entities/creatures/md2_creature.cc)
• src/world_entities/creatures/md2_creature.h (copied) (copied from branches/christmas_branche/src/world_entities/creatures/md2_creature.h)
• src/world_entities/npcs/npc.cc (modified) (1 diff)
• src/world_entities/npcs/npc_test.cc (modified) (1 diff)
• src/world_entities/npcs/npc_test1.cc (modified) (1 diff)
• src/world_entities/playable.h (modified) (2 diffs)
• src/world_entities/player.cc (modified) (3 diffs)
• src/world_entities/power_ups/laser_power_up.cc (modified) (1 diff)
• src/world_entities/power_ups/param_power_up.cc (modified) (1 diff)
• src/world_entities/power_ups/turret_power_up.cc (modified) (1 diff)
• src/world_entities/power_ups/weapon_power_up.cc (modified) (1 diff)
• src/world_entities/satellite.cc (modified) (1 diff)
• src/world_entities/space_ships/helicopter.cc (modified) (3 diffs)
• src/world_entities/space_ships/helicopter.h (modified) (3 diffs)
• src/world_entities/space_ships/space_ship.cc (modified) (5 diffs)
• src/world_entities/space_ships/space_ship.h (modified) (1 diff)
• src/world_entities/test_entity.cc (modified) (5 diffs)
• src/world_entities/test_entity.h (modified) (2 diffs)
• src/world_entities/weapons/aim.cc (modified) (2 diffs)
• src/world_entities/weapons/bomb.cc (modified) (1 diff)
• src/world_entities/weapons/guided_missile.cc (modified) (1 diff)
• src/world_entities/weapons/laser.cc (modified) (1 diff)
• src/world_entities/weapons/rocket.cc (modified) (1 diff)
• src/world_entities/weapons/test_bullet.cc (modified) (1 diff)
• src/world_entities/weapons/test_gun.cc (modified) (1 diff)
• src/world_entities/weapons/turret.cc (modified) (1 diff)
• src/world_entities/world_entity.cc (modified) (7 diffs)
• src/world_entities/world_entity.h (modified) (3 diffs)

trunk/src/world_entities/Makefile.am

@@ -8 +8 @@
                   camera.cc \
                   playable.cc \
-                              player.cc \
+                  player.cc \
                   npc.cc \
                   npc2.cc \
@@ -18 +18 @@
                   character_attributes.cc \
                   test_entity.cc \
-                              space_ships/space_ship.cc \
+                  space_ships/space_ship.cc \
+                  creatures/md2_creature.cc \
                   weapons/weapon_manager.cc \
                   weapons/weapon.cc \
@@ -27 +28 @@
                   weapons/rocket.cc \
                   weapons/laser.cc \
-                              weapons/ground_turret.cc \
+                  weapons/ground_turret.cc \
                   weapons/crosshair.cc \
-                              weapons/ground_turret.cc \
+                  weapons/ground_turret.cc \
                   power_ups/power_up.cc \
                   power_ups/turret_power_up.cc \
@@ -38 +39 @@
                  camera.h \
                  playable.h \
-                             player.h \
+                 player.h \
                  npc.h \
                  npc2.h \
@@ -49 +50 @@
                  test_entity.h \
                  space_ships/space_ship.h \
+                 creatures/md2_creature.cc \
                  weapons/weapon_manager.h \
                  weapons/weapon.h \

trunk/src/world_entities/camera.cc

@@ -119 +119 @@
     case VIEW_NORMAL:
       this->toFovy = 60.0;
-      this->setParentSoft("TrackNode");
-      this->target->setParentSoft("TrackNode");
+/*      this->setParentSoft("TrackNode");
+      this->target->setParentSoft("TrackNode"); */
       this->setRelCoorSoft(-10, 5, 0);
       this->target->setRelCoorSoft(0,0,0);
@@ -129 +129 @@
   //    this->target->setRelCoorSoft(Vector(10,0,0));
 
-      if (!strcmp(this->target->getParent()->getName(), "Player"))
-        this->target->setParentSoft("TrackNode");
-      else
-        this->target->setParentSoft("Player");
-      this->getParent()->debugNode(0);
+//       if (!strcmp(this->target->getParent()->getName(), "Player"))
+//         this->target->setParentSoft("TrackNode");
+//       else
+//         this->target->setParentSoft("Player");
+//       this->getParent()->debugNode(0);
 
 //      this->setParent("main-Turret");
@@ -142 +142 @@
     case VIEW_FRONT:
       this->toFovy = 120.0;
-       this->setParentSoft("Player");
-       this->target->setParentSoft("Player");
+/*       this->setParentSoft("Player");
+       this->target->setParentSoft("Player");*/
        this->setRelCoorSoft(4, 0, 0, 5);
        this->target->setRelCoorSoft(Vector(10,0,0), 5);
@@ -150 +150 @@
     case VIEW_LEFT:
       this->toFovy = 90;
-      this->setParentSoft("TrackNode");
-      this->target->setParentSoft("TrackNode");
+/*      this->setParentSoft("TrackNode");
+      this->target->setParentSoft("TrackNode");*/
       this->setRelCoorSoft(0, 1, -10, .5);
       this->target->setRelCoorSoft(0,0,0);
@@ -157 +157 @@
     case VIEW_RIGHT:
       this->toFovy = 90;
-      this->setParentSoft("TrackNode");
-      this->target->setParentSoft("TrackNode");
+/*      this->setParentSoft("TrackNode");
+      this->target->setParentSoft("TrackNode");*/
       this->setRelCoorSoft(Vector(0, 1, 10));
       this->target->setRelCoorSoft(0,0,0);
@@ -164 +164 @@
     case VIEW_TOP:
       this->toFovy= 120;
-      this->setParentSoft("TrackNode");
-      this->target->setParentSoft("TrackNode");
+/*      this->setParentSoft("TrackNode");
+      this->target->setParentSoft("TrackNode");*/
       this->setRelCoorSoft(Vector(30, 50, 0));
       this->target->setRelCoorSoft(35,0,0);

trunk/src/world_entities/npcs/npc.cc

@@ -22 +22 @@
 
 #include "state.h"
-#include "list.h"
 #include "stdlibincl.h"
 #include "power_ups/turret_power_up.h"

trunk/src/world_entities/npcs/npc_test.cc

@@ -23 +23 @@
 #include "shader.h"
 #include "state.h"
-#include "list.h"
 #include "stdlibincl.h"
 #include "debug.h"

trunk/src/world_entities/npcs/npc_test1.cc

@@ -22 +22 @@
 
 #include "state.h"
-#include "list.h"
-#include "stdlibincl.h"
 #include "power_ups/turret_power_up.h"
 #include "power_ups/laser_power_up.h"

trunk/src/world_entities/playable.h

@@ -25 +25 @@
     virtual ~Playable();
 
+    virtual void enter() {};
+    virtual void leave() {};
 
     virtual void addWeapon(Weapon* weapon )  {}//= 0;
@@ -34 +36 @@
 
     virtual void process(const Event &event) = 0;
-    
+
 
 

trunk/src/world_entities/player.cc

@@ -19 +19 @@
 #include "event_handler.h"
 
+
+#include "class_list.h"
+#include "state.h"
+
 using namespace std;
 
@@ -28 +32 @@
 {
   this->init();
+
+  EventHandler::getInstance()->subscribe(this, ES_GAME, SDLK_l);
 }
 
@@ -79 +85 @@
  void Player::process(const Event &event)
  {
+   if (event.type == SDLK_l && event.bPressed)
+   {
+     /// FIXME this should be in the ObjectManager
+     const std::list<BaseObject*>* objectList = ClassList::getList(CL_PLAYABLE);
+     if (objectList != NULL)
+     {
+       list<BaseObject*>::const_iterator node;
+       for (node = objectList->begin(); node != objectList->end(); node++)
+         if (this->controllable != (*node) && (dynamic_cast<PNode*>(*node)->getAbsCoor() - this->controllable->getAbsCoor()).len() < 10.0)
+       {
+         this->controllable->leave();
+         this->disconnectControllable();
+         this->setControllable(dynamic_cast<Playable*>(*node));
+         this->controllable->enter();
+         State::getCamera()->setParentSoft(this->controllable);
+         State::getCameraTarget()->setParentSoft(this->controllable);
+
+         break;
+       }
+     }
+   }
+
    if (likely(this->controllable != NULL))
      this->controllable->process(event);

trunk/src/world_entities/power_ups/laser_power_up.cc

@@ -19 +19 @@
 #include "factory.h"
 #include "state.h"
-#include "list.h"
 
 #include "primitive_model.h"

trunk/src/world_entities/power_ups/param_power_up.cc

@@ -19 +19 @@
 #include "factory.h"
 #include "state.h"
-#include "list.h"
 
 #include "primitive_model.h"

trunk/src/world_entities/power_ups/turret_power_up.cc

@@ -19 +19 @@
 #include "factory.h"
 #include "state.h"
-#include "list.h"
 
 #include "primitive_model.h"

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -19 +19 @@
 #include "factory.h"
 #include "state.h"
-#include "list.h"
 
 #include "primitive_model.h"

trunk/src/world_entities/satellite.cc

@@ -21 +21 @@
 
 #include "objModel.h"
-#include "list.h"
 #include "vector.h"
 

trunk/src/world_entities/space_ships/helicopter.cc

@@ -95 +95 @@
 
   this->getWeaponManager()->changeWeaponConfig(1);
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
 }
 
@@ -184 +185 @@
 
 
+
+
+void Helicopter::enter()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+
+
+}
+
+void Helicopter::leave()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+
+
+}
+
+
 /**
  * adds a weapon to the weapon list of the spaceship
@@ -324 +342 @@
          if(this->getAbsDirZ().y > 0.02) this->shiftDir(Quaternion(time/5, Vector(1,0,0)));
    }
-   
+
   if( this->bRight /* > this->getRelCoor().z*2*/)
   {

trunk/src/world_entities/space_ships/helicopter.h

@@ -24 +24 @@
     void loadParams(const TiXmlElement* root);
 
+    virtual void enter();
+    virtual void leave();
+
     void addWeapon(Weapon* weapon );
     void removeWeapon(Weapon* weapon);
@@ -39 +42 @@
 
   private:
-
     void calculateVelocity(float time);
     void weaponAction();
@@ -65 +67 @@
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.
-    
+
     float                 airViscosity;
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -112 +112 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  EventHandler::getInstance()->grabEvents(true);
+//   EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
@@ -177 +177 @@
   this->getWeaponManager()->getFixedTarget()->setRelCoor(100000,0,0);
 
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
 }
 
@@ -188 +189 @@
 }
 
+
+void SpaceShip::enter()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+
+
+}
+
+void SpaceShip::leave()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+
+
+}
 
 /**
@@ -267 +282 @@
   velocity += ((this->getAbsDirX())*travelSpeed-velocity)*airViscosity;
   velocity = (velocity.getNormalized())*travelSpeed;
-  
+
   //orient the spaceship in direction of the mouse
    rotQuat = Quaternion::quatSlerp( this->getAbsDir(),mouseDir,fabsf(time)*3);
-   if (this->getAbsDir().distance(rotQuat) > 0.001)  
+   if (this->getAbsDir().distance(rotQuat) > 0.001)
     this->setAbsDir( rotQuat);
    //this->setAbsDirSoft(mouseDir,5);
-   
+
   // this is the air friction (necessary for a smooth control)
   if(velocity.len() != 0) velocity -= velocity*0.01;
@@ -308 +323 @@
   /* calculate the direction in which the craft is heading  */
 
+  Plane plane(Vector(0,1,0), Vector(0,0,0));
+
   if( this->bUp )
    {
      //this->shiftCoor(this->getAbsDirX());
       accel += (this->getAbsDirX())*2;
-      
+
       /* Heli-Steuerung
          accel += (this->getAbsDirX()*2;

trunk/src/world_entities/space_ships/space_ship.h

@@ -26 +26 @@
     void init();
     void loadParams(const TiXmlElement* root);
+
+    virtual void enter();
+    virtual void leave();
 
     void addWeapon(Weapon* weapon );

trunk/src/world_entities/test_entity.cc

@@ -18 +18 @@
 
 
+#include "executor/executor.h"
+#include "factory.h"
+#include "load_param.h"
+
 #include "test_entity.h"
 #include "stdincl.h"
@@ -24 +28 @@
 #include "obb_tree.h"
 #include "state.h"
-#include "list.h"
 
 using namespace std;
 
 
+CREATE_FACTORY(TestEntity, CL_TEST_ENTITY);
+
 
 TestEntity::TestEntity ()
 {
-  this->setClassID(CL_TEST_ENTITY, "TestEntity");
-  // TO SOME LIST!!
+  this->init();
+}
 
-  this->md2Model = new MD2Model("models/droidika.md2", "models/droideka.pcx");
-//   this->md2Model = new MD2Model("models/tris.md2", "models/tris.pcx");
-// this->md2Model = new MD2Model("models/goblin.md2", "maps/goblin.bmp");
 
-/// FIXME
-//  this->obbTree = new OBBTree(4, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
 
-  this->md2Model->setAnim(RUN);
-  this->md2Model->debug();
+TestEntity::TestEntity(const TiXmlElement* root)
+{
+  this->init();
+  if (root != NULL)
+    this->loadParams(root);
+
+  this->init();
 }
 
 
 TestEntity::~TestEntity ()
+{}
+
+
+
+void TestEntity::init()
 {
-  delete this->md2Model;
+  this->setClassID(CL_TEST_ENTITY, "TestEntity");
+  this->toList(OM_COMMON);
+}
+
+/**
+ * loads the Settings of a MD2Creature from an XML-element.
+ * @param root the XML-element to load the MD2Creature's properties from
+ */
+void TestEntity::loadParams(const TiXmlElement* root)
+{
+  static_cast<WorldEntity*>(this)->loadParams(root);
+
+  LoadParam(root, "md2animation", this, TestEntity, setAnim)
+      .describe("sets the animation of the md2 model")
+      .defaultValues(1, 1);
+
 }
 
@@ -55 +80 @@
 void  TestEntity::setAnim(int animationIndex)
 {
-  this->md2Model->setAnim(animationIndex);
+  if( likely(this->getModel(0) != NULL))
+    ((MD2Model*)this->getModel(0))->setAnim(animationIndex);
 }
 
@@ -61 +87 @@
 void TestEntity::tick (float time)
 {
-  this->md2Model->tick(time);
+  if( likely(this->getModel(0) != NULL))
+    ((MD2Model*)this->getModel(0))->tick(time);
+
 }
 
 
 void TestEntity::collidesWith(WorldEntity* entity, const Vector& location)
-{
-  if (entity->isA(CL_PROJECTILE))
-  {
-    PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getName(), entity->getName(), location.x, location.y, location.z);
-  this->setVisibiliy(false);
-  this->toList(OM_DEAD);
-  }
-}
-
-void TestEntity::destroy () {}
-
+{}
 
 
@@ -82 +100 @@
 void TestEntity::draw () const
 {
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  float matrix[4][4];
-
-
-  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-  this->getAbsDir().matrix (matrix);
-  glMultMatrixf((float*)matrix);
-  this->md2Model->draw();
-
-
-  glPopMatrix();
+  this->drawLODsafe();
 }
 

trunk/src/world_entities/test_entity.h

@@ -10 +10 @@
 struct t3DModel;
 class Material;
+class TiXmlElement;
 
 class TestEntity : public WorldEntity, PhysicsInterface
@@ -17 +18 @@
  public:
   TestEntity ();
+  TestEntity(const TiXmlElement* root);
   virtual ~TestEntity ();
+
+  void init();
+  void loadParams(const TiXmlElement* root);
 
   void setAnim(int animationIndex);
 
   virtual void tick (float time);
-  virtual void destroy ();
   virtual void collidesWith(WorldEntity* entity, const Vector& location);
   virtual void draw () const;

trunk/src/world_entities/weapons/aim.cc

@@ -21 +21 @@
 #include "graphics_engine.h"
 #include "state.h"
-#include "list.h"
 #include "material.h"
 #include "t_animation.h"
@@ -104 +103 @@
 void Aim::searchTarget(float range)
 {
-  //FIXME//
-/*  tIterator<WorldEntity>* iterator = State::getWorldEntityList()->getIterator();
-  WorldEntity* entity = iterator->firstElement();
-  while (likely(entity != NULL))
+  std::list<WorldEntity*>::iterator entity;
+
+  for (entity = State::getObjectManager()->getObjectList(OM_GROUP_00).begin();
+       entity != State::getObjectManager()->getObjectList(OM_GROUP_00).end();
+       entity ++)
   {
-    if (entity->isA(CL_NPC) && this->source->getAbsCoor().x < entity->getAbsCoor().x && (this->source->getAbsCoor() - entity->getAbsCoor()).len() < range)
+    if (this->source->getAbsCoor().x < (*entity)->getAbsCoor().x && (this->source->getAbsCoor() - (*entity)->getAbsCoor()).len() < range)
     {
-      if (this->getParent() != entity)
+      if (this->getParent() != (*entity))
       {
         this->anim->replay();
-        this->setParentSoft(entity, 5);
+        this->setParentSoft(*entity, 5);
+        return;
       }
-      delete iterator;
-      return;
     }
-    entity = iterator->nextElement();
   }
-
-  delete iterator;*/
 }
 

trunk/src/world_entities/weapons/bomb.cc

@@ -21 +21 @@
 
 #include "fast_factory.h"
-#include "list.h"
+
 
 #include "object_manager.h"

trunk/src/world_entities/weapons/guided_missile.cc

@@ -20 +20 @@
 #include "fast_factory.h"
 
-#include "model.h"
 #include "state.h"
-#include "list.h"
 #include "class_list.h"
 

trunk/src/world_entities/weapons/laser.cc

@@ -21 +21 @@
 
 #include "state.h"
-#include "list.h"
 #include "class_list.h"
 #include "model.h"

trunk/src/world_entities/weapons/rocket.cc

@@ -20 +20 @@
 #include "fast_factory.h"
 
-#include "model.h"
 #include "state.h"
-#include "list.h"
 #include "class_list.h"
 

trunk/src/world_entities/weapons/test_bullet.cc

@@ -20 +20 @@
 #include "fast_factory.h"
 
-#include "model.h"
 #include "state.h"
-#include "list.h"
 #include "class_list.h"
 

trunk/src/world_entities/weapons/test_gun.cc

@@ -29 +29 @@
 #include "factory.h"
 
-#include "vector.h"
-#include "list.h"
 #include "animation3d.h"
 

trunk/src/world_entities/weapons/turret.cc

@@ -23 +23 @@
 
 #include "state.h"
-#include "list.h"
 #include "animation3d.h"
 

trunk/src/world_entities/world_entity.cc

@@ -21 +21 @@
 
 #include "model.h"
+#include "md2Model.h"
 #include "resource_manager.h"
 #include "load_param.h"
-#include "list.h"
 #include "vector.h"
 #include "obb_tree.h"
@@ -84 +84 @@
   // Do the PNode loading stuff
   static_cast<PNode*>(this)->loadParams(root);
+
+  LoadParam(root, "md2texture", this, WorldEntity, loadMD2Texture)
+      .describe("the fileName of the texture, that should be loaded onto this world-entity. (must be relative to the data-dir)")
+      .defaultValues(1, NULL);
 
   // Model Loading
@@ -89 +93 @@
       .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)")
       .defaultValues(3, NULL, 1.0f, 0);
-
-}
+}
+
 
 /**
@@ -103 +107 @@
   if (fileName != NULL)
   {
-    // search for the special character # in the LoadParam
+   // search for the special character # in the LoadParam
     if (strchr(fileName, '#') != NULL)
+    {
+      PRINTF(4)("Found # in %s... searching for LOD's\n", fileName);
+      char* lodFile = new char[strlen(fileName)+1];
+      strcpy(lodFile, fileName);
+      char* depth = strchr(lodFile, '#');
+      for (unsigned int i = 0; i < 5; i++)
       {
-        PRINTF(4)("Found # in %s... searching for LOD's\n", fileName);
-        char* lodFile = new char[strlen(fileName)+1];
-        strcpy(lodFile, fileName);
-        char* depth = strchr(lodFile, '#');
-        for (unsigned int i = 0; i < 5; i++)
-          {
-            *depth = 48+(int)i;
-            printf("-------%s\n", lodFile);
-            if (ResourceManager::isInDataDir(lodFile))
-              this->loadModel(lodFile, scaling, i);
-          }
-        return;
+        *depth = 48+(int)i;
+        printf("-------%s\n", lodFile);
+        if (ResourceManager::isInDataDir(lodFile))
+          this->loadModel(lodFile, scaling, i);
       }
-
-    PRINTF(4)("fetching %s\n", fileName);
-    if (scaling == 1.0)
-      this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN), modelNumber);
-    else
-      this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, &scaling), modelNumber);
-    if (modelNumber == 0)
-    this->buildObbTree(4);
+      return;
+    }
+
+    if(strstr(fileName, ".obj"))
+    {
+      PRINTF(4)("fetching OBJ file: %s\n", fileName);
+      if (scaling == 1.0)
+        this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN), modelNumber);
+      else
+        this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, &scaling), modelNumber);
+
+      if( modelNumber == 0)
+        this->buildObbTree(4);
+    }
+    else if(strstr(fileName, ".md2"))
+    {
+      PRINTF(4)("fetching MD2 file: %s\n", fileName);
+      Model* m = new MD2Model(fileName, this->md2TextureFileName);
+        //this->setModel((Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN), 0);
+      this->setModel(m, 0);
+    }
   }
   else
@@ -145 +160 @@
   {
     Resource* resource = ResourceManager::getInstance()->locateResourceByPointer(this->models[modelNumber]);
-    if (resource != NULL)
-      ResourceManager::getInstance()->unload(resource, RP_LEVEL);
-    else
-      delete this->models[modelNumber];
-  }
+//     if (resource != NULL)
+    ResourceManager::getInstance()->unload(resource, RP_LEVEL);
+  }
+  else
+    delete this->models[modelNumber];
+
   this->models[modelNumber] = model;
+
 
 //   if (this->model != NULL)
@@ -272 +289 @@
 }
 
+
+/**
+ *  this functions draws the model automaticaly in multiple LOD
+ */
 void WorldEntity::drawLODsafe() const
 {
-  if (!this->models.empty())
+  if (!unlikely(this->models.empty()))
   {
     glMatrixMode(GL_MODELVIEW);
@@ -291 +312 @@
     if (cameraDistance > 30 && this->models.size() >= 3 && this->models[2] != NULL)
     {
-       this->models[2]->draw();
+      this->models[2]->draw();
     }
     else if (cameraDistance > 10 && this->models.size() >= 2 && this->models[1] != NULL)

trunk/src/world_entities/world_entity.h

@@ -37 +37 @@
   Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
 
+  inline void loadMD2Texture(const char* fileName) { this->md2TextureFileName = fileName; }
+
   bool buildObbTree(unsigned int depth);
   /** @returns a reference to the obb tree of this worldentity */
@@ -72 +74 @@
   /** @returns a Reference to the Iterator */
   std::list<WorldEntity*>::iterator& getEntityIterator() { return this->objectListIterator; }
+
+
  protected:
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
@@ -77 +81 @@
  private:
   std::vector<Model*>     models;             //!< The model that should be loaded for this entity.
+  const char*             md2TextureFileName; //!< the file name of the md2 model texture, only if this
   BVTree*                 obbTree;            //!< this is the obb tree reference needed for collision detection