Changeset 9982 in orxonox.OLD

Timestamp:

Dec 2, 2006, 3:37:31 PM (17 years ago)

Author:

patrick

Message:

collision reaction classes adapted to new structure

Location:

branches/coll_rect/src/lib/collision_reaction

Files:

• collision_reaction.h (modified) (1 diff)
• cr_object_damage.h (modified) (1 diff)
• cr_physics_full_walk.cc (modified) (2 diffs)
• cr_physics_full_walk.h (modified) (1 diff)
• cr_physics_ground_walk.cc (modified) (1 diff)
• cr_physics_ground_walk.h (modified) (1 diff)

branches/coll_rect/src/lib/collision_reaction/collision_reaction.h

@@ -26 +26 @@
     virtual void reactToCollision(Collision* collision) = 0;
 
-    virtual void update(WorldEntity* owner) {}
-
     /** use this to do some collision offline calculations, only called for bContinuousPoll == true */
     inline bool isContinuousPoll() const { return this->bContinuousPoll; }

branches/coll_rect/src/lib/collision_reaction/cr_object_damage.h

@@ -26 +26 @@
     virtual void reactToCollision(Collision* collision);
 
-  private:
-
   };
 }

branches/coll_rect/src/lib/collision_reaction/cr_physics_full_walk.cc

@@ -209 +209 @@
     }
     //PRINTF(0)("collision distances: x: %f, y: %f, z: %f\n", front, height, side);
-
-
-
-
-
-
-
   }
 
@@ -221 +214 @@
 
 
-  /**
-   * use this to do some collision offline calculations, only called for bContinuousPoll == true
-   */
-  void CRPhysicsFullWalk::update(WorldEntity* owner)
-  {}
 }

branches/coll_rect/src/lib/collision_reaction/cr_physics_full_walk.h

@@ -23 +23 @@
 
     virtual void reactToCollision(Collision* collision);
-
-    virtual void update(WorldEntity* entity);
-
-
-  private:
-    float        downspeed;
   };
 }

branches/coll_rect/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -127 +127 @@
 
 
-
-  /**
-   * use this to do some collision offline calculations, only called for bContinuousPoll == true
-   */
-  void CRPhysicsGroundWalk::update(WorldEntity* owner)
-  {}
-
 }

branches/coll_rect/src/lib/collision_reaction/cr_physics_ground_walk.h

@@ -24 +24 @@
     virtual void reactToCollision(Collision* collision);
 
-    virtual void update(WorldEntity* entity);
-
-
-  private:
-    float        downspeed;
   };