Context Navigation

collision_reaction

Timestamp:

Sep 1, 2006, 8:06:39 PM (18 years ago)

Author:

bensch

Message:

renamed newclassid to classid and newobjectlist to objectlist

Location:

branches/new_class_id/src/lib/collision_reaction

Files:

-                      r9688
+                      r9715
 NewObjectListDefinition(CollisionHandle);
+ObjectListDefinition(CollisionHandle);
 /**
 …
  *  @param classID the classid to look for
  */
 void CollisionHandle::addTarget(const NewClassID& target)
+void CollisionHandle::addTarget(const ClassID& target)
+{
   // make sure there is no dublicate
   std::vector<NewClassID>::iterator it = this->targetList.begin();
+  std::vector<ClassID>::iterator it = this->targetList.begin();
   for( ; it < this->targetList.end(); it++)
     if( (*it) == target)
 …
 bool CollisionHandle::filterCollisionEvent(CollisionEvent* collisionEvent)
+{
   std::vector<NewClassID>::iterator it = this->targetList.begin();
+  std::vector<ClassID>::iterator it = this->targetList.begin();
   for(; it < this->targetList.end(); it++)
+  {
 …
 bool CollisionHandle::filterCollision(Collision* collision)
+{
   std::vector<NewClassID>::iterator it = this->targetList.begin();
+  std::vector<ClassID>::iterator it = this->targetList.begin();
   for(; it < this->targetList.end(); it++)
+  {

-                      r9688
+                      r9715
 class CollisionHandle : public BaseObject
+{
   NewObjectListDeclaration(CollisionHandle);
+  ObjectListDeclaration(CollisionHandle);
   public:
     CollisionHandle(WorldEntity* owner, CREngine::CRType type);
 …
     void reset();
     void addTarget(const NewClassID& target);
+    void addTarget(const ClassID& target);
     Collision* registerCollision(WorldEntity* entityA, WorldEntity* entityB);
     void registerSharedCollision(Collision* collision);
 …
     std::vector<Collision*>       collisionList;           //!< a list full of collisions
     std::vector<NewClassID>          targetList;              //!< a list of target classes for filtering @TODO TAKE SET INSTEAD OF VECTOR 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

r9688	r9715
20	20
21	21
22		~~New~~ObjectListDefinition(CollisionReaction);
	22	ObjectListDefinition(CollisionReaction);
23	23
24	24	/**

r9688	r9715
18	18	class CollisionReaction : public BaseObject
19	19	{
20		~~New~~ObjectListDeclaration(CollisionReaction);
	20	ObjectListDeclaration(CollisionReaction);
21	21	public:
22	22	CollisionReaction();

r9688	r9715
29	29
30	30
31		~~New~~ObjectListDefinition(CREngine);
	31	ObjectListDefinition(CREngine);
32	32	/**
33	33	* standard constructor

r9688	r9715
25	25	class CREngine : public BaseObject
26	26	{
27		~~New~~ObjectListDeclaration(CREngine);
	27	ObjectListDeclaration(CREngine);
28	28
29	29	public:

r9688	r9715
28	28
29	29
30		~~New~~ObjectListDefinition(CRObjectDamage);
	30	ObjectListDefinition(CRObjectDamage);
31	31	/**
32	32	* standard constructor

r9688	r9715
15	15	class CRObjectDamage : public CollisionReaction
16	16	{
17		~~New~~ObjectListDeclaration(CRObjectDamage);
	17	ObjectListDeclaration(CRObjectDamage);
18	18	public:
19	19	CRObjectDamage();

r9688	r9715
35	35
36	36
37		~~New~~ObjectListDefinition(CRPhysicsFullWalk);
	37	ObjectListDefinition(CRPhysicsFullWalk);
38	38	/**
39	39	* standard constructor

r9688	r9715
15	15	class CRPhysicsFullWalk : public CollisionReaction
16	16	{
17		~~New~~ObjectListDeclaration(CRPhysicsFullWalk);
	17	ObjectListDeclaration(CRPhysicsFullWalk);
18	18	public:
19	19	CRPhysicsFullWalk();

r9688	r9715
35	35
36	36
37		~~New~~ObjectListDefinition(CRPhysicsGroundWalk);
	37	ObjectListDefinition(CRPhysicsGroundWalk);
38	38	/**
39	39	* standard constructor

r9688	r9715
15	15	class CRPhysicsGroundWalk : public CollisionReaction
16	16	{
17		~~New~~ObjectListDeclaration(CRPhysicsGroundWalk);
	17	ObjectListDeclaration(CRPhysicsGroundWalk);
18	18	public:
19	19	CRPhysicsGroundWalk();

Note: See TracChangeset for help on using the changeset viewer.