Changeset 8341 in orxonox.OLD for branches/bsp_model/src/lib
- Timestamp:
- Jun 13, 2006, 12:00:01 PM (18 years ago)
- Location:
- branches/bsp_model/src/lib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/bsp_model/src/lib/collision_reaction/collision_handle.cc
r8337 r8341 227 227 { 228 228 if( collisionEvent->getEntityA() == this->owner) { 229 if( collisionEvent->getEntityB()->isA((ClassID)(*it))) 229 if( collisionEvent->getEntityB()->isA((ClassID)(*it))) { 230 PRINTF(0)("I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(), 231 collisionEvent->getEntityB()->getClassName(), *it); 230 232 return true; } 233 } 231 234 else { 232 if( collisionEvent->getEntityA()->isA((ClassID)(*it))) 233 return true; } 235 if( collisionEvent->getEntityA()->isA((ClassID)(*it))) { 236 PRINTF(0)("I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(), 237 collisionEvent->getEntityA()->getClassName(), *it); 238 return true; } 239 } 234 240 } 235 241 -
branches/bsp_model/src/lib/collision_reaction/cr_physics_ground_walk.cc
r8338 r8341 63 63 // collision->getEntityB()->getAbsCoor().debug(); 64 64 65 collision->getEntityB()->setVelocity(Vector()); 66 collision->getEntityB()->setAbsCoor(this->lastPositions[5]); 65 PRINTF(0)("Collision with Ground: \n"); 66 collision->getEntityB()->getAbsCoor().debug(); 67 68 //collision->getEntityB()->setVelocity(Vector()); 69 //collision->getEntityB()->setAbsCoor(this->lastPositions[5]); 67 70 } 68 71 -
branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc
r8336 r8341 940 940 // Return the normal here: Normal's stored in this->collPlane; 941 941 if(collision ) { 942 PRINTF(0)("We got a collision!! Are you sure: outputFraction = %f\n", this->outputFraction);942 // PRINTF(0)("We got a collision!! Are you sure: outputFraction = %f\n", this->outputFraction); 943 943 worldEntity->registerCollision(this->parent, worldEntity, Vector(this->collPlane->x, this->collPlane->y, this->collPlane->z), out); 944 944 }
Note: See TracChangeset
for help on using the changeset viewer.