Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9008 in orxonox.OLD for trunk/src/story_entities


Ignore:
Timestamp:
Jul 2, 2006, 2:22:19 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the network bak to the trunk
merged with command:
svn merge -r8804:HEAD ​https://svn.orxonox.net/orxonox/branches/multi_player_map .

conflicts all resolved in favour of the branche

Location:
trunk/src/story_entities
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/story_entities/multi_player_world.cc

    r8894 r9008  
    9393void MultiPlayerWorld::collisionDetection()
    9494{
     95  //CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS), this->dataTank->objectManager->getObjectList(OM_PLAYERS));
     96
     97  PRINTF(5)("\n-----------------------------------------\nchecking OM_PLAYERS vs OM_PLAYERS_PROJ\n\n");
     98  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ),
     99  this->dataTank->objectManager->getObjectList(OM_PLAYERS));
     100  PRINTF(5)("\n-----------------------------------------\nchecking OM_PLAYERS vs OM_GROUP_01_PROJ\n\n");
    95101  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
    96     this->dataTank->objectManager->getObjectList(OM_PLAYERS));
     102    this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
     103  PRINTF(5)("\n-----------------------------------------\nchecking OM_PLAYERS vs OM_GROUP_01_PROJ\n\n");
    97104  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
     105    this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
     106  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
     107    this->dataTank->objectManager->getObjectList(OM_GROUP_00));
     108  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
     109    this->dataTank->objectManager->getObjectList(OM_GROUP_01));
     110
     111
     112
     113  PRINTF(5)("\n-----------------------------------------\nchecking OM_GROUP_00 vs OM_GROUP_01_PROJ\n\n");
     114  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
     115    this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
     116  PRINTF(5)("\n-----------------------------------------\nchecking OM_GROUP_00 vs OM_GROUP_01\n\n");
     117  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
     118    this->dataTank->objectManager->getObjectList(OM_GROUP_01));
     119  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
    98120    this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
    99121
    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 
    105   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
    106     this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
     122  PRINTF(5)("\n-----------------------------------------\nchecking OM_GROUP_01 vs OM_GROUP_00_PROJ\n\n");
    107123  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
    108124    this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
    109   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
    110     this->dataTank->objectManager->getObjectList(OM_GROUP_01));
    111 
    112   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
    113     this->dataTank->objectManager->getObjectList(OM_COMMON));
    114125  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
    115     this->dataTank->objectManager->getObjectList(OM_COMMON));
    116 
     126    this->dataTank->objectManager->getObjectList(OM_GROUP_00));
     127  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
     128    this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
    117129}
    118130

  • trunk/src/story_entities/multi_player_world_data.cc

    r8717 r9008  
    233233  this->tickLists.push_back(OM_ENVIRON);
    234234  this->tickLists.push_back(OM_COMMON);
     235  this->tickLists.push_back(OM_PLAYERS);
     236  this->tickLists.push_back(OM_PLAYERS_PROJ);
    235237  this->tickLists.push_back(OM_GROUP_00);
    236238  this->tickLists.push_back(OM_GROUP_00_PROJ);
    … …  
    241243  this->drawLists.push_back(OM_ENVIRON);
    242244  this->drawLists.push_back(OM_COMMON);
     245  this->drawLists.push_back(OM_PLAYERS);
     246  this->drawLists.push_back(OM_PLAYERS_PROJ);
    243247  this->drawLists.push_back(OM_GROUP_00);
    244248  this->drawLists.push_back(OM_GROUP_00_PROJ);
Note: See TracChangeset for help on using the changeset viewer.