ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Inline event subscription

This commit is contained in:
YoshiRulz 2019-06-13 13:17:40 +10:00 committed by James Groom
parent 1a4e27fda7
commit 7e244be91a
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.cs
View File

@ -18,9 +18,6 @@ namespace BizHawk.Client.EmuHawk
private int rangeAverageX; //for coordinate transformation when non orthogonal (like PSX for example) private int rangeAverageX; //for coordinate transformation when non orthogonal (like PSX for example)
private int rangeAverageY; private int rangeAverageY;
private EventHandler manualXYValueChangedEventHandler;
private EventHandler polarNumericChangedEventHandler;
#endregion #endregion
public VirtualPadAnalogStick() public VirtualPadAnalogStick()
@ -28,13 +25,10 @@ namespace BizHawk.Client.EmuHawk
InitializeComponent(); InitializeComponent();
AnalogStick.ClearCallback = ClearCallback; AnalogStick.ClearCallback = ClearCallback;
manualXYValueChangedEventHandler = new EventHandler(ManualXY_ValueChanged); ManualX.ValueChanged += ManualXY_ValueChanged;
polarNumericChangedEventHandler = new EventHandler(PolarNumeric_Changed); ManualY.ValueChanged += ManualXY_ValueChanged;
manualR.ValueChanged += PolarNumeric_Changed;
ManualX.ValueChanged += manualXYValueChangedEventHandler; manualTheta.ValueChanged += PolarNumeric_Changed;
ManualY.ValueChanged += manualXYValueChangedEventHandler;
manualR.ValueChanged += polarNumericChangedEventHandler;
manualTheta.ValueChanged += polarNumericChangedEventHandler;
} }
public float[] RangeX = new float[] { -128f, 0.0f, 127f }; public float[] RangeX = new float[] { -128f, 0.0f, 127f };
@ -184,8 +178,8 @@ namespace BizHawk.Client.EmuHawk
private void PolarNumeric_Changed(object sender, EventArgs e) private void PolarNumeric_Changed(object sender, EventArgs e)
{ {
ManualX.ValueChanged -= manualXYValueChangedEventHandler; ManualX.ValueChanged -= ManualXY_ValueChanged;
ManualY.ValueChanged -= manualXYValueChangedEventHandler; ManualY.ValueChanged -= ManualXY_ValueChanged;
ManualX.Value = Math.Ceiling(manualR.Value * (decimal)Math.Cos(Math.PI * (double)manualTheta.Value / 180)).Clamp(-127, 127) + rangeAverageX; ManualX.Value = Math.Ceiling(manualR.Value * (decimal)Math.Cos(Math.PI * (double)manualTheta.Value / 180)).Clamp(-127, 127) + rangeAverageX;
ManualY.Value = Math.Ceiling(manualR.Value * (decimal)Math.Sin(Math.PI * (double)manualTheta.Value / 180)).Clamp(-127, 127) + rangeAverageY; ManualY.Value = Math.Ceiling(manualR.Value * (decimal)Math.Sin(Math.PI * (double)manualTheta.Value / 180)).Clamp(-127, 127) + rangeAverageY;
@ -196,8 +190,8 @@ namespace BizHawk.Client.EmuHawk
AnalogStick.HasValue = true; AnalogStick.HasValue = true;
AnalogStick.Refresh(); AnalogStick.Refresh();
ManualX.ValueChanged += manualXYValueChangedEventHandler; ManualX.ValueChanged += ManualXY_ValueChanged;
ManualY.ValueChanged += manualXYValueChangedEventHandler; ManualY.ValueChanged += ManualXY_ValueChanged;
} }
private void SetAnalogControlFromNumerics() private void SetAnalogControlFromNumerics()
@ -241,14 +235,14 @@ namespace BizHawk.Client.EmuHawk
} }
} }
manualR.ValueChanged -= polarNumericChangedEventHandler; manualR.ValueChanged -= PolarNumeric_Changed;
manualTheta.ValueChanged -= polarNumericChangedEventHandler; manualTheta.ValueChanged -= PolarNumeric_Changed;
manualR.Value = Math.Min(manualR.Value, (decimal)Math.Sqrt(Math.Pow(AnalogStick.X - rangeAverageX, 2) + Math.Pow(AnalogStick.Y - rangeAverageY, 2))); manualR.Value = Math.Min(manualR.Value, (decimal)Math.Sqrt(Math.Pow(AnalogStick.X - rangeAverageX, 2) + Math.Pow(AnalogStick.Y - rangeAverageY, 2)));
manualTheta.Value = (decimal)(Math.Atan2(AnalogStick.Y - rangeAverageY, AnalogStick.X - rangeAverageX) * (180 / Math.PI)); manualTheta.Value = (decimal)(Math.Atan2(AnalogStick.Y - rangeAverageY, AnalogStick.X - rangeAverageX) * (180 / Math.PI));
manualR.ValueChanged += polarNumericChangedEventHandler; manualR.ValueChanged += PolarNumeric_Changed;
manualTheta.ValueChanged += polarNumericChangedEventHandler; manualTheta.ValueChanged += PolarNumeric_Changed;
_programmaticallyUpdatingNumerics = false; _programmaticallyUpdatingNumerics = false;
} }