Changeset 9939 in orxonox.OLD for branches/coll_rect/src/lib/collision_reaction/collision_tube.cc
- Timestamp:
- Nov 20, 2006, 12:53:27 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/coll_rect/src/lib/collision_reaction/collision_tube.cc
r9898 r9939 95 95 const Vector& normal, const Vector& position, bool bInWall) 96 96 { 97 // get last collision 97 98 Collision* collision = this->_collisionList.back(); 98 99 99 100 // check if there is already a collision defined between these objects 100 if( !collision->match(*entity, *groundEntity))101 if( collision != NULL && !collision->match(*entity, *groundEntity)) 101 102 { 103 // get a new collision object 102 104 collision = CREngine::getInstance()->popCollisionObject(); 103 105 collision->collide( entity, groundEntity); … … 117 119 void CollisionTube::handleCollisions() 118 120 { 119 // 121 // for all collisions: 122 std::vector<Collision*>::iterator collisions = this->_collisionList.begin(); 123 for(; collisions < this->_collisionList.end(); collisions++) 124 { 125 126 127 // for all collision events of each collision: 128 Collision::iterator events = (*collisions)->begin(); 129 for(; events < (*collisions)->end(); events++) 130 { 131 132 } 133 } 120 134 } 121 135 122 136 123 /**124 * checks if two objects are125 */126 bool CollisionTube::needCollisionChecking(const WorldEntity& entityA, const WorldEntity& entityB)127 {128 //if( !this->isReactive( entityA, entityB) )129 // return false;130 137 131 //if( entityA->)132 133 }134 138 135 139
Note: See TracChangeset
for help on using the changeset viewer.