Changeset 184
- Timestamp:
- 02/27/2010 06:25:35 PM (2 years ago)
- Files:
-
- trunk/include/waterworld/sim2/Animat.h (modified) (2 diffs)
- trunk/src/waterworld/sim2/Animat.cpp (modified) (1 diff)
- trunk/src/waterworld/sim2/World.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/include/waterworld/sim2/Animat.h
r183 r184 59 59 */ 60 60 void (*collision)(); 61 62 /** 63 * On/Off collision detection for this body/animat 64 */ 65 bool cde; //CollisiondDetectionEnabled 61 66 public: 62 67 /** … … 69 74 */ 70 75 void* getCollisionFunction(); 76 77 /** 78 * \Set on/of collision detectcion 79 */ 80 void setCollisionEnabled(bool); 81 82 /** 83 * \Get on/of collision detect 84 */ 85 bool isCollisionEnabled(); 71 86 72 87 /** trunk/src/waterworld/sim2/Animat.cpp
r183 r184 53 53 void* Animat::getCollisionFunction() 54 54 { 55 return (void*) collision; 55 return (void*)collision; 56 } 57 58 void Animat::setCollisionEnabled(bool e) 59 { 60 cde = e; 61 } 62 63 bool Animat::isCollisionEnabled() 64 { 65 return cde; 56 66 } 57 67 trunk/src/waterworld/sim2/World.cpp
r182 r184 59 59 { 60 60 (*i)->update(this, dt); 61 palContact contact; 62 pcd->GetContacts((palBodyBase *)(*i)->getPhysicalBody()->getBody(),contact); 61 62 if((*i)->isCollisionEnabled()) 63 { 64 palContact contact; 65 pcd->GetContacts((palBodyBase *)(*i)->getPhysicalBody()->getBody(),contact); 66 } 63 67 } 64 68 palPhysics *tmp = getPhysics();
