Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5213 in orxonox.OLD for trunk/src


Ignore:
Timestamp:
Sep 21, 2005, 8:10:11 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: removed the Collision-detection, to be faster with Valgrind.
@patrick: to revert this change do a:
svn merge -r 5213:5212 . .
in the trunk

Location:
trunk/src/world_entities
Files:
3 edited

Legend:

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

    r5143 r5213  
    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

    r5116 r5213  
    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

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