From 777fbeda45d6e439c20e013d241c32ba7618ae3c Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Tue, 10 Mar 2015 02:55:55 +0000
Subject: [PATCH] extract NormalizeFloats in controller logic so it can be done
 at the right time, if anyone can figure out what the right time is

---
 BizHawk.Client.Common/ControllerBinding.cs | 59 ++++++++++++++--------
 1 file changed, 38 insertions(+), 21 deletions(-)

diff --git a/BizHawk.Client.Common/ControllerBinding.cs b/BizHawk.Client.Common/ControllerBinding.cs
index d024b62bd9..8ad3e5c3a3 100644
--- a/BizHawk.Client.Common/ControllerBinding.cs
+++ b/BizHawk.Client.Common/ControllerBinding.cs
@@ -64,29 +64,11 @@ namespace BizHawk.Client.Common
 			return _bindings.SelectMany(kvp => kvp.Value).Any(boundButton => boundButton == button);
 		}
 
-		/// <summary>
-		/// uses the bindings to latch our own logical button state from the source controller's button state (which are assumed to be the physical side of the binding).
-		/// this will clobber any existing data (use OR_* or other functions to layer in additional input sources)
-		/// </summary>
-		public void LatchFromPhysical(IController controller)
+		public void NormalizeFloats(IController controller)
 		{
-			_buttons.Clear();
-			
-			foreach (var kvp in _bindings)
-			{
-				_buttons[kvp.Key] = false;
-				foreach (var bound_button in kvp.Value)
-				{
-					if (controller[bound_button])
-					{
-						_buttons[kvp.Key] = true;
-					}
-				}
-			}
-
 			foreach (var kvp in _floatBinds)
 			{
-				var input = controller.GetFloat(kvp.Value.Value);
+				var input = _floatButtons[kvp.Key];
 				string outkey = kvp.Key;
 				float multiplier = kvp.Value.Mult;
 				float deadzone = kvp.Value.Deadzone;
@@ -112,7 +94,8 @@ namespace BizHawk.Client.Common
 						}
 					}
 
-					var output = (input * multiplier + 10000.0f) * (range.Max - range.Min) / 20000.0f + range.Min;
+					//zero 09-mar-2015 - not sure if adding + 1 here is correct.. but... maybe?
+					var output = (input * multiplier + 10000.0f) * (range.Max - range.Min + 1) / 20000.0f + range.Min;
 
 					float lbound = Math.Min(range.Min, range.Max);
 					float ubound = Math.Max(range.Min, range.Max);
@@ -132,6 +115,40 @@ namespace BizHawk.Client.Common
 			}
 		}
 
+		/// <summary>
+		/// uses the bindings to latch our own logical button state from the source controller's button state (which are assumed to be the physical side of the binding).
+		/// this will clobber any existing data (use OR_* or other functions to layer in additional input sources)
+		/// </summary>
+		public void LatchFromPhysical(IController controller)
+		{
+			_buttons.Clear();
+			
+			foreach (var kvp in _bindings)
+			{
+				_buttons[kvp.Key] = false;
+				foreach (var bound_button in kvp.Value)
+				{
+					if (controller[bound_button])
+					{
+						_buttons[kvp.Key] = true;
+					}
+				}
+			}
+
+			foreach (var kvp in _floatBinds)
+			{
+				var input = controller.GetFloat(kvp.Value.Value);
+				string outkey = kvp.Key;
+				if (_floatRanges.ContainsKey(outkey))
+				{
+					_floatButtons[outkey] = input;
+				}
+			}
+
+			//it's not sure where this should happen, so for backwards compatibility.. do it every time
+			NormalizeFloats(controller);
+		}
+
 		public void ApplyAxisConstraints(string constraintClass)
 		{
 			_type.ApplyAxisConstraints(constraintClass,_floatButtons);