New Pulse option for the collision sensor (off by default wont change existing logic)

Previously only the first collision would trigger an event (no collisions a negative event ofcourse)

With the Pulse option enabled, any change to the set of colliding objects will trigger an event.

Added this because there was no way to count how many sheep were on a platform in YoFrankie without running a script periodically.

Changes in collision are detected by comparing the number of objects colliding with the last event, as well as a hash made from the object pointers.

Also changed the touch sensors internal list of colliding objects to only contain objects that match the property or material.

- pulse isnt a great name, could change this.

1 files changed, 5 insertions, 3 deletions

diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp
index 13b7f43195d..c9b51807767 100644
--- a/source/gameengine/Converter/KX_ConvertSensors.cpp
+++ b/source/gameengine/Converter/KX_ConvertSensors.cpp
@@ -306,12 +306,12 @@ void BL_ConvertSensors(struct Object* blenderobject,
 				{
 					// collision sensor can sense both materials and properties. 
 					
-					bool bFindMaterial = false;
+					bool bFindMaterial = false, bTouchPulse = false;
 					
 					bCollisionSensor* blendertouchsensor = (bCollisionSensor*)sens->data;
 					
-					bFindMaterial = (blendertouchsensor->mode 
-						& SENS_COLLISION_MATERIAL);
+					bFindMaterial = (blendertouchsensor->mode & SENS_COLLISION_MATERIAL);
+					bTouchPulse = (blendertouchsensor->mode & SENS_COLLISION_PULSE);
 					
 					
 					STR_String touchPropOrMatName = ( bFindMaterial ? 
@@ -324,6 +324,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
 						gamesensor = new KX_TouchSensor(eventmgr,
 							gameobj,
 							bFindMaterial,
+							bTouchPulse,
 							touchPropOrMatName);
 					}
 					
@@ -349,6 +350,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
 						gamesensor = new KX_TouchSensor(eventmgr,
 							gameobj,
 							bFindMaterial,
+							false,
 							touchpropertyname);
 					}
 				}