Changeset 9869 in orxonox.OLD for trunk/src/lib/collision_reaction/collision_handle.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/collision_reaction/collision_handle.h (modified) (3 diffs)

trunk/src/lib/collision_reaction/collision_handle.h

@@ -23 +23 @@
 class CollisionHandle : public BaseObject
 {
-
+  ObjectListDeclaration(CollisionHandle);
   public:
     CollisionHandle(WorldEntity* owner, CREngine::CRType type);
@@ -30 +30 @@
     void reset();
 
-    void addTarget(long target);
+    void addTarget(const ClassID& target);
     Collision* registerCollision(WorldEntity* entityA, WorldEntity* entityB);
     void registerSharedCollision(Collision* collision);
@@ -64 +64 @@
 
     std::vector<Collision*>       collisionList;           //!< a list full of collisions
-    std::vector<long>             targetList;              //!< a list of target classes for filtering
+    /// TODO Take a std::set here!
+    std::vector<ClassID>          targetList;              //!< a list of target classes for filtering @TODO TAKE SET INSTEAD OF VECTOR HERE
 
     CollisionReaction*            collisionReaction;       //!< reference to the collision reaction object