More removal of old haptic related items

This commit is contained in:
Travis Nickles 2019-01-10 19:07:49 -06:00
parent f887f334df
commit 2fe34afe2f

View File

@ -838,7 +838,7 @@ namespace DS4Windows
} }
utcNow = DateTime.UtcNow; // timestamp with UTC in case system time zone changes utcNow = DateTime.UtcNow; // timestamp with UTC in case system time zone changes
resetHapticState();
cState.PacketCounter = pState.PacketCounter + 1; cState.PacketCounter = pState.PacketCounter + 1;
cState.ReportTimeStamp = utcNow; cState.ReportTimeStamp = utcNow;
cState.LX = inputReport[1]; cState.LX = inputReport[1];
@ -1360,18 +1360,6 @@ namespace DS4Windows
testRumble.RumbleMotorsExplicitlyOff = rightLightFastMotor == 0 && leftHeavySlowMotor == 0; testRumble.RumbleMotorsExplicitlyOff = rightLightFastMotor == 0 && leftHeavySlowMotor == 0;
} }
private void setTestRumble()
{
if (testRumble.IsRumbleSet())
{
pushHapticState(ref testRumble);
if (testRumble.RumbleMotorsExplicitlyOff)
testRumble.RumbleMotorsExplicitlyOff = false;
}
}
private void MergeStates() private void MergeStates()
{ {
if (testRumble.IsRumbleSet()) if (testRumble.IsRumbleSet())
@ -1435,26 +1423,6 @@ namespace DS4Windows
return true; return true;
} }
private DS4HapticState[] hapticState = new DS4HapticState[1];
private int hapticStackIndex = 0;
private void resetHapticState()
{
hapticStackIndex = 0;
}
public void pushHapticState(ref DS4HapticState hs)
{
int hapsLen = hapticState.Length;
if (hapticStackIndex == hapsLen)
{
DS4HapticState[] newHaptics = new DS4HapticState[hapsLen + 1];
Array.Copy(hapticState, newHaptics, hapsLen);
hapticState = newHaptics;
}
hapticState[hapticStackIndex++] = hs;
}
private DS4HapticState currentHap = new DS4HapticState(); private DS4HapticState currentHap = new DS4HapticState();
public void SetHapticState(ref DS4HapticState hs) public void SetHapticState(ref DS4HapticState hs)
{ {