Changeset 9892 in orxonox.OLD for branches/coll_rect/src/world_entities/world_entity.cc

Timestamp:

Oct 14, 2006, 1:25:47 AM (18 years ago)

Author:

patrick

Message:

new interface to collision registers, more transparent. some more functionality

File:

• branches/coll_rect/src/world_entities/world_entity.cc (modified) (8 diffs)

branches/coll_rect/src/world_entities/world_entity.cc

@@ -302 +302 @@
  *  @param target1 a filter target (classID)
  */
-void WorldEntity::subscribeReaction(CoRe::CREngine::CRType type, const ClassID& target1)
+void WorldEntity::subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1)
 {
   this->subscribeReaction(type);
@@ -316 +316 @@
  *  @param target1 a filter target (classID)
  */
-void WorldEntity::subscribeReaction(CoRe::CREngine::CRType type, const ClassID& target1, const ClassID& target2)
+void WorldEntity::subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1, const ClassID& target2)
 {
   this->subscribeReaction(type);
@@ -331 +331 @@
  *  @param target1 a filter target (classID)
  */
-void WorldEntity::subscribeReaction(CoRe::CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3)
+void WorldEntity::subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1, const ClassID& target2, const ClassID& target3)
 {
   this->subscribeReaction(type);
@@ -349 +349 @@
  *  @param ... the targets as classIDs
  */
-void WorldEntity::subscribeReaction(CoRe::CREngine::CRType type)
+void WorldEntity::subscribeReaction(CoRe::CREngine::ReactionType type)
 {
   if( this->collisionHandles[type] != NULL)
@@ -368 +368 @@
  *  @param type the reaction to unsubscribe
  */
-void WorldEntity::unsubscribeReaction(CoRe::CREngine::CRType type)
+void WorldEntity::unsubscribeReaction(CoRe::CREngine::ReactionType type)
 {
   if( this->collisionHandles[type] == NULL)
@@ -395 +395 @@
 {
   for( int i = 0; i < CoRe::CREngine::CR_NUMBER; i++)
-    this->unsubscribeReaction((CoRe::CREngine::CRType)i);
+    this->unsubscribeReaction((CoRe::CREngine::ReactionType)i);
 
   // there are no reactions subscribed from now on
@@ -419 +419 @@
   CoRe::CollisionEvent* c = CoRe::CREngine::getInstance()->popCollisionEventObject();
   assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h
-  c->collide(COLLISION_TYPE_OBB, entityA, entityB, bvA, bvB);
+//  c->collide(COLLISION_TYPE_OBB, entityA, entityB, bvA, bvB);
 
   for( int i = 0; i < CoRe::CREngine::CR_NUMBER; ++i)
@@ -443 +443 @@
   CoRe::CollisionEvent* c = CoRe::CREngine::getInstance()->popCollisionEventObject();
   assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h
-  c->collide(type, entity, groundEntity, normal, position, bInWall);
+//  c->collide(type, entity, groundEntity, normal, position, bInWall);
 
   for( int i = 0; i < CoRe::CREngine::CR_NUMBER; ++i)