Changeset 10010 in orxonox.OLD for branches/coll_rect.merge/src/lib/collision_reaction/collision_reaction.h

Timestamp:

Dec 4, 2006, 4:39:45 PM (17 years ago)

Author:

patrick

Message:

merged the temp branch

File:

• branches/coll_rect.merge/src/lib/collision_reaction/collision_reaction.h (modified) (3 diffs)

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

@@ -9 +9 @@
 #include "base_object.h"
 
-
-
-class Collision;
 class WorldEntity;
 
+namespace CoRe
+{
 
-//! A class representing a simple collision
-class CollisionReaction : public BaseObject
-{
-  ObjectListDeclaration(CollisionReaction);
+  class Collision;
+
+  //! A class representing a simple collision
+  class CollisionReaction : public BaseObject
+  {
+    ObjectListDeclaration(CollisionReaction);
   public:
     CollisionReaction();
@@ -25 +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; }
@@ -32 +31 @@
   private:
     bool                    bContinuousPoll;       //!< if true the collision rection function is also called, if there was no collision
-};
+  };
 
+}
 #endif /* _COLLISION_REACTION_H */