diff --git a/Assets/SInput/Scripts/CommonGamepadBindings.cs b/Assets/SInput/Scripts/CommonGamepadBindings.cs index cdc24b5..8c03201 100644 --- a/Assets/SInput/Scripts/CommonGamepadBindings.cs +++ b/Assets/SInput/Scripts/CommonGamepadBindings.cs @@ -91,7 +91,7 @@ public static void ReloadCommonMaps() { //check for partial name matches with this gamepad slot for (int i = 0; i < commonMappings.Count; i++) { for (int k = 0; k < commonMappings[i].partialNames.Count; k++) { - if (!mappingMatch && gamepads[g].Contains(commonMappings[i].partialNames[k])) { + if (!mappingMatch && gamepads[g].Contains(commonMappings[i].partialNames[k].ToUpper())) { mappingMatch = true; mappingSlots[i].slots.Add(g); } @@ -187,4 +187,4 @@ public static List GetApplicableMaps(CommonGamepadInputs commonInpu } } -} \ No newline at end of file +} diff --git a/Assets/SInput/Scripts/Control.cs b/Assets/SInput/Scripts/Control.cs index 1d4dd9d..933e660 100644 --- a/Assets/SInput/Scripts/Control.cs +++ b/Assets/SInput/Scripts/Control.cs @@ -155,8 +155,8 @@ void UpdateControlState(int i, InputDeviceSlot slot) { controlStates[i].repeatPressed = false; if (controlStates[i].pressed) controlStates[i].repeatPressed = true;//repeat press returns true on first frame down if (controlStates[i].held) { - controlStates[i].holdTime += Time.deltaTime; - controlStates[i].repeatTime -= Time.deltaTime; + controlStates[i].holdTime += Time.unscaledDeltaTime; + controlStates[i].repeatTime -= Time.unscaledDeltaTime; if (controlStates[i].holdTime>Sinput.buttonRepeatWait && controlStates[i].repeatTime < 0f) { controlStates[i].repeatTime = Sinput.buttonRepeat; controlStates[i].repeatPressed = true; @@ -225,8 +225,8 @@ void UpdateAnyControlState() { controlStates[0].repeatPressed = false; if (controlStates[0].pressed) controlStates[0].repeatPressed = true;//repeat press returns true on first frame down if (controlStates[0].held) { - controlStates[0].holdTime += Time.deltaTime; - controlStates[0].repeatTime -= Time.deltaTime; + controlStates[0].holdTime += Time.unscaledDeltaTime; + controlStates[0].repeatTime -= Time.unscaledDeltaTime; if (controlStates[0].holdTime > Sinput.buttonRepeatWait && controlStates[0].repeatTime < 0f) { controlStates[0].repeatTime = Sinput.buttonRepeat; controlStates[0].repeatPressed = true; diff --git a/Assets/SInput/Scripts/SInput.cs b/Assets/SInput/Scripts/SInput.cs index e304ace..61a45b0 100644 --- a/Assets/SInput/Scripts/SInput.cs +++ b/Assets/SInput/Scripts/SInput.cs @@ -250,7 +250,7 @@ public static void SinputUpdate() { //count down till we can stop zeroing inputs for (int i = 0; i < _totalPossibleDeviceSlots; i++) { if (zeroInputs[i]) { - zeroInputWaits[i] -= Time.deltaTime; + zeroInputWaits[i] -= Time.unscaledDeltaTime; if (zeroInputWaits[i] <= 0f) zeroInputs[i] = false; } } diff --git a/Assets/SInput/Scripts/SmartControl.cs b/Assets/SInput/Scripts/SmartControl.cs index becfa8a..9e78e25 100644 --- a/Assets/SInput/Scripts/SmartControl.cs +++ b/Assets/SInput/Scripts/SmartControl.cs @@ -91,11 +91,11 @@ public void Update(){ if (gravity > 0f) { if (rawValues[slot] == 0f || (rawValues[slot] < controlValues[slot] && controlValues[slot] > 0f) || (rawValues[slot] > controlValues[slot] && controlValues[slot] < 0f)) { if (controlValues[slot] > 0f) { - controlValues[slot] -= gravity * Time.deltaTime; + controlValues[slot] -= gravity * Time.unscaledDeltaTime; if (controlValues[slot] < 0f) controlValues[slot] = 0f; if (controlValues[slot] < rawValues[slot]) controlValues[slot] = rawValues[slot]; } else if (controlValues[slot] < 0f) { - controlValues[slot] += gravity * Time.deltaTime; + controlValues[slot] += gravity * Time.unscaledDeltaTime; if (controlValues[slot] > 0f) controlValues[slot] = 0f; if (controlValues[slot] > rawValues[slot]) controlValues[slot] = rawValues[slot]; } @@ -111,13 +111,13 @@ public void Update(){ //move value towards target value if (rawValues[slot] < 0f) { if (controlValues[slot] > rawValues[slot]) { - controlValues[slot] -= speed * Time.deltaTime; + controlValues[slot] -= speed * Time.unscaledDeltaTime; if (controlValues[slot] < rawValues[slot]) controlValues[slot] = rawValues[slot]; } } if (rawValues[slot] > 0f) { if (controlValues[slot] < rawValues[slot]) { - controlValues[slot] += speed * Time.deltaTime; + controlValues[slot] += speed * Time.unscaledDeltaTime; if (controlValues[slot] > rawValues[slot]) controlValues[slot] = rawValues[slot]; } }