Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Dec 25, 2005, 4:07:53 PM (19 years ago)
Author:
bensch
Message:

trunk: make usage of the Virtual-derivates

Location:
trunk/src/world_entities
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/creatures/md2_creature.cc

    r6253 r6281  
    262262void MD2Creature::draw () const
    263263{
    264   this->drawLODsafe();
    265 
     264  WorldEntity::draw();
    266265//  this->cameraConnNode.debugDraw(0);
    267266}
  • trunk/src/world_entities/space_ships/helicopter.cc

    r6222 r6281  
    404404void Helicopter::draw() const
    405405{
    406   this->drawLODsafe();
     406  WorldEntity::draw();
    407407
    408408  this->getWeaponManager()->draw();
  • trunk/src/world_entities/space_ships/space_ship.cc

    r6243 r6281  
    115115  PRINTF(4)("SPACESHIP INIT\n");
    116116
    117   EventHandler::getInstance()->grabEvents(true);
     117  //EventHandler::getInstance()->grabEvents(true);
    118118
    119119  bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
     
    264264void SpaceShip::draw () const
    265265{
    266   this->drawLODsafe();
    267 
     266  WorldEntity::draw();
    268267  this->getWeaponManager()->draw();
    269268
  • trunk/src/world_entities/test_entity.cc

    r6278 r6281  
    9595
    9696
    97 
    98 void TestEntity::draw () const
    99 {
    100   this->drawLODsafe();
    101 }
    102 
  • trunk/src/world_entities/test_entity.h

    r6278 r6281  
    2828  virtual void tick (float time);
    2929  virtual void collidesWith(WorldEntity* entity, const Vector& location);
    30   virtual void draw () const;
    3130
    3231 private:
  • trunk/src/world_entities/world_entity.cc

    r6222 r6281  
    286286void WorldEntity::draw() const
    287287{
    288   this->drawLODsafe();
    289 }
    290 
    291 
    292 /**
    293  *  this functions draws the model automaticaly in multiple LOD
    294  */
    295 void WorldEntity::drawLODsafe() const
    296 {
    297   if (!unlikely(this->models.empty()))
     288    //PRINTF(0)("(%s::%s)\n", this->getClassName(), this->getName());
     289  //  assert(!unlikely(this->models.empty()));
    298290  {
    299291    glMatrixMode(GL_MODELVIEW);
     
    325317  }
    326318}
     319
    327320
    328321/**
  • trunk/src/world_entities/world_entity.h

    r6222 r6281  
    5656
    5757  virtual void draw () const;
    58   void drawLODsafe() const;
    5958
    6059  virtual void collidesWith (WorldEntity* entity, const Vector& location);
Note: See TracChangeset for help on using the changeset viewer.