Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Oct 6, 2005, 8:31:23 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: nicer quit-modi
TextEngine is now deleted by GraphicsEngine
trying to fix errors in the Element2D deletion

Location:
trunk/src/world_entities
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/environment.cc

    r5256 r5285  
    3636  this->model = (Model*)ResourceManager::getInstance()->load("models/ships/bolido.obj", OBJ, RP_CAMPAIGN);
    3737
    38   if(this->obbTree == NULL)
    39     this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
     38/*  if(this->obbTree == NULL)
     39    this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());*/
    4040}
    4141
  • trunk/src/world_entities/test_entity.cc

    r5256 r5285  
    3636//   this->md2Model = new MD2Model("models/tris.md2", "models/tris.pcx");
    3737// this->md2Model = new MD2Model("models/goblin.md2", "maps/goblin.bmp");
    38   this->obbTree = new OBBTree(4, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
     38//  this->obbTree = new OBBTree(4, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
    3939
    4040  this->md2Model->setAnim(RUN);
  • trunk/src/world_entities/world_entity.cc

    r5281 r5285  
    9797bool WorldEntity::buildObbTree(unsigned int depth)
    9898{
    99   if (this->obbTree)
    100     delete this->obbTree;
    101 
    102   if (this->model)
    103   {
    104     PRINTF(4)("creating obb tree\n");
    105     this->obbTree = new OBBTree(depth, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
    106     return true;
    107   }
    108   else
    109   {
    110     PRINTF(2)("could not create obb-tree, because no model was loaded yet\n");
    111     this->obbTree = NULL;
    112     return false;
    113   }
     99//   if (this->obbTree)
     100//     delete this->obbTree;
     101//
     102//   if (this->model)
     103//   {
     104//     PRINTF(4)("creating obb tree\n");
     105//     this->obbTree = new OBBTree(depth, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
     106//     return true;
     107//   }
     108//   else
     109//   {
     110//     PRINTF(2)("could not create obb-tree, because no model was loaded yet\n");
     111//     this->obbTree = NULL;
     112//     return false;
     113//  }
    114114}
    115115
Note: See TracChangeset for help on using the changeset viewer.