Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8834 in orxonox.OLD for branches/single_player_map


Ignore:
Timestamp:
Jun 27, 2006, 4:39:15 PM (18 years ago)
Author:
patrick
Message:

collision reaction rebwork

Location:
branches/single_player_map/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/single_player_map/src/lib/collision_reaction/cr_physics_ground_walk.cc

    r8829 r8834  
    6969  AABB* box = collision->getEntityB()->getModelAABB();
    7070
     71  if( box != NULL)
     72  {
    7173
     74    Vector collPos =  collision->getEntityB()->getAbsCoor()  + box->center - ce->getCollisionPosition();
     75    PRINTF(0)("height: %f          , model height: %f\n", collPos.y, box->halfLength[1]);
     76
     77  }
     78
     79#if 0
    7280  if( box != NULL)
    7381    height = ( ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor() )*(-1.0f) ;
     
    126134
    127135  }// if(box!= NULL)
    128 
     136#endif
    129137  /*
    130138  PRINTF(0)("Collision with Ground: \n");
  • branches/single_player_map/src/story_entities/multi_player_world.cc

    r8717 r8834  
    9898    this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
    9999
     100  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
     101  this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
     102  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
     103  this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
     104
    100105  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
    101106    this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
  • branches/single_player_map/src/world_entities/world_entity.cc

    r8778 r8834  
    193193        PRINTF(1)("OBJ-File %s not found.\n", fileName.c_str());
    194194
    195       if( modelNumber == 0)
     195      if( modelNumber == 0 && !this->isA(CL_WEAPON))
    196196        this->buildObbTree(obbTreeDepth);
    197197    }
Note: See TracChangeset for help on using the changeset viewer.