BGE: New Property sensor evaluation types

This patch adds "Less Than" and "Greater Than" evaluation types to the property sensor.
The Wiki Docs modifications http://wiki.blender.org/index.php/User:Lordloki/Doc:2.6/Manual/Game_Engine/Logic/Sensors/Property
Also, I have attached a screenshot and a blend to check.

Reviewers: dfelinto, moguri

Reviewed By: moguri

Differential Revision: https://developer.blender.org/D476

2 files changed, 37 insertions, 4 deletions

diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.cpp b/source/gameengine/GameLogic/SCA_PropertySensor.cpp
index ad57e529297..6f34f8710c1 100644
--- a/source/gameengine/GameLogic/SCA_PropertySensor.cpp
+++ b/source/gameengine/GameLogic/SCA_PropertySensor.cpp
@@ -133,6 +133,7 @@ bool	SCA_PropertySensor::CheckPropertyCondition()
 	{
 	case KX_PROPSENSOR_NOTEQUAL:
 		reverse = true;
+		/* fall-through */
 	case KX_PROPSENSOR_EQUAL:
 		{
 			CValue* orgprop = GetParent()->FindIdentifier(m_checkpropname);
@@ -150,7 +151,7 @@ bool	SCA_PropertySensor::CheckPropertyCondition()
 				/* Patch: floating point values cant use strings usefully since you can have "0.0" == "0.0000"
 				 * this could be made into a generic Value class function for comparing values with a string.
 				 */
-				if (result==false && dynamic_cast<CFloatValue *>(orgprop) != NULL) {
+				if (result==false && (orgprop->GetValueType() == VALUE_FLOAT_TYPE)) {
 					float f;
 					if (sscanf(m_checkpropval.ReadPtr(), "%f", &f) == 1) {
 						result = (f == ((CFloatValue *)orgprop)->GetFloat());
@@ -198,11 +199,11 @@ bool	SCA_PropertySensor::CheckPropertyCondition()
 				const float max = m_checkpropmaxval.ToFloat();
 				float val;
 
-				if (dynamic_cast<CStringValue *>(orgprop) == NULL) {
-					val = orgprop->GetNumber();
+				if (orgprop->GetValueType() == VALUE_STRING_TYPE){
+					val = orgprop->GetText().ToFloat();
 				}
 				else {
-					val = orgprop->GetText().ToFloat();
+					val = orgprop->GetNumber();
 				}
 
 				result = (min <= val) && (val <= max);
@@ -228,6 +229,36 @@ bool	SCA_PropertySensor::CheckPropertyCondition()
 			//cout << " \nSens:Prop:changed!"; /* need implementation here!!! */
 			break;
 		}
+	case KX_PROPSENSOR_LESSTHAN:
+		reverse = true;
+		/* fall-through */
+	case KX_PROPSENSOR_GREATERTHAN:
+		{
+			CValue* orgprop = GetParent()->FindIdentifier(m_checkpropname);
+			if (!orgprop->IsError())
+			{
+				const float ref = m_checkpropval.ToFloat();
+				float val;
+
+				if (orgprop->GetValueType() == VALUE_STRING_TYPE){
+					val = orgprop->GetText().ToFloat();
+				}
+				else {
+					val = orgprop->GetNumber();
+				}
+
+				if (reverse) {
+					result = val < ref;
+				}
+				else {
+					result = val > ref;
+				}
+
+			}
+			orgprop->Release();
+
+			break;
+		}
 	default:
 		; /* error */
 	}
diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.h b/source/gameengine/GameLogic/SCA_PropertySensor.h
index fee03dcf4c0..f9cfb5fb1d2 100644
--- a/source/gameengine/GameLogic/SCA_PropertySensor.h
+++ b/source/gameengine/GameLogic/SCA_PropertySensor.h
@@ -57,6 +57,8 @@ public:
 		KX_PROPSENSOR_INTERVAL,
 		KX_PROPSENSOR_CHANGED,
 		KX_PROPSENSOR_EXPRESSION,
+		KX_PROPSENSOR_LESSTHAN,
+		KX_PROPSENSOR_GREATERTHAN,
 		KX_PROPSENSOR_MAX
 	};