mirror of
https://github.com/RHeavenStudio/HeavenStudio.git
synced 2025-06-13 00:47:36 +02:00
Alternate Control Styles Support (#554)
* add mouse controller * support different control styles in options deprecate old input check methods * fully functional input actions system * btsds InputAction * blue bear InputAction * more games fix bugs with some input related systems * coin toss re-toss * cheer readers touch * dog ninja touch * multiple games * last of the easy games' touch * more specialized games * specialized games 2 * finish ktb games * remove legacy settings disclaimer * "only" two games left * karate man touch * rockers touch still needs fixes and bad judge strum * DSGuy flicking animation * playstyle chart property * improve performance of minigame preloading * improve look of cursor make assetbundles use chunk-based compression refactor assetbundle loading methods a bit * prime conductor stream playback to stabilize seeking operations * fix air rally swing on pad release * use virtual mouse pointer * add UniTask * make BeatAction use UniTask * implement UniTask to replace some coroutines * add touch style UI elements and effects games now support the ability to define two cursor colours if they need split screen touch inputs * update plugins and buildscript * implement thresholded pointer position clipping * fix clamping * instant show / hide fix discord game SDK crashes
This commit is contained in:
minenice55
@ -9,12 +9,15 @@ using HeavenStudio.InputSystem;
|
||||
|
||||
using static JSL;
|
||||
using HeavenStudio.Games;
|
||||
using System.Diagnostics.Contracts;
|
||||
|
||||
namespace HeavenStudio.InputSystem
|
||||
{
|
||||
public class LoadOrder : Attribute {
|
||||
public class LoadOrder : Attribute
|
||||
{
|
||||
public int Order { get; set; }
|
||||
public LoadOrder(int order) {
|
||||
public LoadOrder(int order)
|
||||
{
|
||||
Order = order;
|
||||
}
|
||||
}
|
||||
@ -24,14 +27,33 @@ namespace HeavenStudio
|
||||
{
|
||||
public class PlayerInput
|
||||
{
|
||||
public class InputAction
|
||||
{
|
||||
public delegate bool ActionQuery(out double dt);
|
||||
|
||||
public string name;
|
||||
public int[] inputLockCategory;
|
||||
public ActionQuery padAction, touchAction, batonAction;
|
||||
|
||||
public InputAction(string name, int[] inputLockCategory, ActionQuery pad, ActionQuery touch, ActionQuery baton)
|
||||
{
|
||||
this.name = name;
|
||||
this.inputLockCategory = inputLockCategory;
|
||||
padAction = pad;
|
||||
touchAction = touch;
|
||||
batonAction = baton;
|
||||
}
|
||||
}
|
||||
|
||||
//Clockwise
|
||||
public const int UP = 0;
|
||||
public const int RIGHT = 1;
|
||||
public const int DOWN = 2;
|
||||
public const int LEFT = 3;
|
||||
|
||||
|
||||
public static InputController.ControlStyles CurrentControlStyle = InputController.ControlStyles.Pad;
|
||||
|
||||
static List<InputController> inputDevices;
|
||||
static InputController.ControlStyles currentControlStyle = InputController.ControlStyles.Pad;
|
||||
|
||||
public delegate InputController[] InputControllerInitializer();
|
||||
|
||||
@ -42,14 +64,15 @@ namespace HeavenStudio
|
||||
public static List<InputControllerRefresh> PlayerInputRefresh;
|
||||
|
||||
static List<InputControllerInitializer> loadRunners;
|
||||
static void BuildLoadRunnerList() {
|
||||
static void BuildLoadRunnerList()
|
||||
{
|
||||
PlayerInputRefresh = new();
|
||||
loadRunners = System.Reflection.Assembly.GetExecutingAssembly()
|
||||
.GetTypes()
|
||||
.Where(x => x.Namespace == "HeavenStudio.InputSystem.Loaders" && x.GetMethod("Initialize", BindingFlags.Public | BindingFlags.Static) != null)
|
||||
.Select(t => (InputControllerInitializer) Delegate.CreateDelegate(
|
||||
typeof(InputControllerInitializer),
|
||||
null,
|
||||
.Select(t => (InputControllerInitializer)Delegate.CreateDelegate(
|
||||
typeof(InputControllerInitializer),
|
||||
null,
|
||||
t.GetMethod("Initialize", BindingFlags.Public | BindingFlags.Static),
|
||||
false
|
||||
))
|
||||
@ -63,44 +86,49 @@ namespace HeavenStudio
|
||||
inputDevices = new List<InputController>();
|
||||
|
||||
BuildLoadRunnerList();
|
||||
foreach (InputControllerInitializer runner in loadRunners) {
|
||||
foreach (InputControllerInitializer runner in loadRunners)
|
||||
{
|
||||
InputController[] controllers = runner();
|
||||
if (controllers != null) {
|
||||
if (controllers != null)
|
||||
{
|
||||
inputDevices.AddRange(controllers);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return inputDevices.Count;
|
||||
}
|
||||
|
||||
public static int RefreshInputControllers()
|
||||
{
|
||||
inputDevices = new List<InputController>();
|
||||
if (PlayerInputRefresh != null) {
|
||||
foreach (InputControllerRefresh runner in PlayerInputRefresh) {
|
||||
if (PlayerInputRefresh != null)
|
||||
{
|
||||
foreach (InputControllerRefresh runner in PlayerInputRefresh)
|
||||
{
|
||||
InputController[] controllers = runner();
|
||||
if (controllers != null) {
|
||||
if (controllers != null)
|
||||
{
|
||||
inputDevices.AddRange(controllers);
|
||||
}
|
||||
}
|
||||
}
|
||||
return inputDevices.Count;
|
||||
}
|
||||
|
||||
|
||||
public static int GetNumControllersConnected()
|
||||
{
|
||||
return inputDevices.Count;
|
||||
}
|
||||
|
||||
|
||||
public static List<InputController> GetInputControllers()
|
||||
{
|
||||
return inputDevices;
|
||||
}
|
||||
|
||||
|
||||
public static InputController GetInputController(int player)
|
||||
{
|
||||
// Needed so Keyboard works on MacOS and Linux
|
||||
#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX
|
||||
#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX
|
||||
inputDevices = new List<InputController>();
|
||||
if(inputDevices.Count < 1)
|
||||
{
|
||||
@ -109,7 +137,7 @@ namespace HeavenStudio
|
||||
keyboard.InitializeController();
|
||||
inputDevices.Add(keyboard);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
//select input controller that has player field set to player
|
||||
//this will return the first controller that has that player number in the case of controller pairs (eg. Joy-Cons)
|
||||
//so such controllers should have a reference to the other controller in the pair
|
||||
@ -122,17 +150,17 @@ namespace HeavenStudio
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public static int GetInputControllerId(int player)
|
||||
{
|
||||
//select input controller id that has player field set to player
|
||||
//this will return the first controller that has that player number in the case of controller pairs (eg. Joy-Cons)
|
||||
//so such controllers should have a reference to the other controller in the pair
|
||||
//controller IDs are determined by connection order (the Keyboard is always first)
|
||||
|
||||
|
||||
|
||||
|
||||
// Needed so Keyboard works on MacOS and Linux
|
||||
#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX
|
||||
#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX
|
||||
inputDevices = new List<InputController>();
|
||||
if(inputDevices.Count < 1)
|
||||
{
|
||||
@ -141,7 +169,7 @@ namespace HeavenStudio
|
||||
keyboard.InitializeController();
|
||||
inputDevices.Add(keyboard);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
for (int i = 0; i < inputDevices.Count; i++)
|
||||
{
|
||||
if (inputDevices[i].GetPlayer() == player)
|
||||
@ -151,11 +179,11 @@ namespace HeavenStudio
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
public static void UpdateInputControllers()
|
||||
{
|
||||
// Needed so Keyboard works on MacOS and Linux
|
||||
#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX
|
||||
#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX
|
||||
inputDevices = new List<InputController>();
|
||||
if(inputDevices.Count < 1)
|
||||
{
|
||||
@ -164,18 +192,18 @@ namespace HeavenStudio
|
||||
keyboard.InitializeController();
|
||||
inputDevices.Add(keyboard);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
foreach (InputController i in inputDevices)
|
||||
{
|
||||
i.UpdateState();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static void CleanUp()
|
||||
{
|
||||
PlayerInputCleanUp?.Invoke();
|
||||
}
|
||||
|
||||
|
||||
// The autoplay isn't activated AND
|
||||
// The song is actually playing AND
|
||||
// The GameManager allows you to Input
|
||||
@ -183,92 +211,267 @@ namespace HeavenStudio
|
||||
{
|
||||
return !GameManager.instance.autoplay && Conductor.instance.isPlaying && GameManager.instance.canInput;
|
||||
}
|
||||
|
||||
|
||||
/*--------------------*/
|
||||
/* MAIN INPUT METHODS */
|
||||
/*--------------------*/
|
||||
|
||||
public static bool GetIsAction(string action)
|
||||
public static bool GetIsAction(InputAction action, out double dt)
|
||||
{
|
||||
dt = 0;
|
||||
switch (CurrentControlStyle)
|
||||
{
|
||||
case InputController.ControlStyles.Pad:
|
||||
return action.padAction(out dt);
|
||||
case InputController.ControlStyles.Touch:
|
||||
return action.touchAction(out dt);
|
||||
case InputController.ControlStyles.Baton:
|
||||
return action.batonAction(out dt);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// BUTTONS
|
||||
//TODO: refactor for controller and custom binds, currently uses temporary button checks
|
||||
|
||||
public static bool Pressed(bool includeDPad = false)
|
||||
|
||||
public static bool GetIsAction(InputAction action)
|
||||
{
|
||||
bool keyDown = GetInputController(1).GetActionDown((int) InputController.ActionsPad.East, out _) || (includeDPad && GetAnyDirectionDown());
|
||||
return keyDown && !GameManager.instance.autoplay && Conductor.instance.isPlaying && GameManager.instance.canInput;
|
||||
switch (CurrentControlStyle)
|
||||
{
|
||||
case InputController.ControlStyles.Pad:
|
||||
return action.padAction(out _);
|
||||
case InputController.ControlStyles.Touch:
|
||||
return action.touchAction(out _);
|
||||
case InputController.ControlStyles.Baton:
|
||||
return action.batonAction(out _);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static bool Pressed(out double dt, bool includeDPad = false)
|
||||
public static bool GetPadDown(InputController.ActionsPad ac, out double dt)
|
||||
{
|
||||
bool keyDown = GetInputController(1).GetActionDown((int) InputController.ActionsPad.East, out dt) || (includeDPad && GetAnyDirectionDown());
|
||||
return keyDown && !GameManager.instance.autoplay && Conductor.instance.isPlaying && GameManager.instance.canInput;
|
||||
}
|
||||
|
||||
public static bool PressedUp(bool includeDPad = false)
|
||||
{
|
||||
bool keyUp = GetInputController(1).GetActionUp((int) InputController.ActionsPad.East, out _) || (includeDPad && GetAnyDirectionUp());
|
||||
return keyUp && !GameManager.instance.autoplay && Conductor.instance.isPlaying && GameManager.instance.canInput;
|
||||
}
|
||||
|
||||
public static bool PressedUp(out double dt, bool includeDPad = false)
|
||||
{
|
||||
bool keyUp = GetInputController(1).GetActionUp((int) InputController.ActionsPad.East, out dt) || (includeDPad && GetAnyDirectionUp());
|
||||
return keyUp && !GameManager.instance.autoplay && Conductor.instance.isPlaying && GameManager.instance.canInput;
|
||||
}
|
||||
|
||||
public static bool Pressing(bool includeDPad = false)
|
||||
{
|
||||
bool pressing = GetInputController(1).GetAction((int) InputController.ActionsPad.East) || (includeDPad && GetAnyDirection());
|
||||
return pressing && !GameManager.instance.autoplay && Conductor.instance.isPlaying && GameManager.instance.canInput;
|
||||
}
|
||||
|
||||
|
||||
public static bool AltPressed()
|
||||
{
|
||||
bool down = GetInputController(1).GetActionDown((int) InputController.ActionsPad.South, out _);
|
||||
return down && PlayerHasControl();
|
||||
bool a = GetInputController(1).GetActionDown(InputController.ControlStyles.Pad, (int)ac, out dt);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool AltPressed(out double dt)
|
||||
public static bool GetPadDown(InputController.ActionsPad ac)
|
||||
{
|
||||
bool down = GetInputController(1).GetActionDown((int) InputController.ActionsPad.South, out dt);
|
||||
return down && PlayerHasControl();
|
||||
bool a = GetInputController(1).GetActionDown(InputController.ControlStyles.Pad, (int)ac, out _);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool AltPressedUp()
|
||||
|
||||
public static bool GetPadUp(InputController.ActionsPad ac, out double dt)
|
||||
{
|
||||
bool up = GetInputController(1).GetActionUp((int) InputController.ActionsPad.South, out _);
|
||||
return up && PlayerHasControl();
|
||||
bool a = GetInputController(1).GetActionUp(InputController.ControlStyles.Pad, (int)ac, out dt);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool AltPressedUp(out double dt)
|
||||
|
||||
public static bool GetPadUp(InputController.ActionsPad ac)
|
||||
{
|
||||
bool up = GetInputController(1).GetActionUp((int) InputController.ActionsPad.South, out dt);
|
||||
return up && PlayerHasControl();
|
||||
bool a = GetInputController(1).GetActionUp(InputController.ControlStyles.Pad, (int)ac, out _);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool AltPressing()
|
||||
|
||||
public static bool GetPad(InputController.ActionsPad ac)
|
||||
{
|
||||
bool pressing = GetInputController(1).GetAction((int) InputController.ActionsPad.South);
|
||||
bool a = GetInputController(1).GetAction(InputController.ControlStyles.Pad, (int)ac);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetBatonDown(InputController.ActionsBaton ac, out double dt)
|
||||
{
|
||||
bool a = GetInputController(1).GetActionDown(InputController.ControlStyles.Baton, (int)ac, out dt);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetBatonDown(InputController.ActionsBaton ac)
|
||||
{
|
||||
bool a = GetInputController(1).GetActionDown(InputController.ControlStyles.Baton, (int)ac, out _);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetBatonUp(InputController.ActionsBaton ac, out double dt)
|
||||
{
|
||||
bool a = GetInputController(1).GetActionUp(InputController.ControlStyles.Baton, (int)ac, out dt);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetBatonUp(InputController.ActionsBaton ac)
|
||||
{
|
||||
bool a = GetInputController(1).GetActionUp(InputController.ControlStyles.Baton, (int)ac, out _);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetBaton(InputController.ActionsBaton ac)
|
||||
{
|
||||
bool a = GetInputController(1).GetAction(InputController.ControlStyles.Baton, (int)ac);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetSqueeze()
|
||||
{
|
||||
bool a = GetInputController(1).GetSqueeze();
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetSqueezeDown()
|
||||
{
|
||||
bool a = GetInputController(1).GetSqueezeDown(out _);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetSqueezeDown(out double dt)
|
||||
{
|
||||
bool a = GetInputController(1).GetSqueezeDown(out dt);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetSqueezeUp()
|
||||
{
|
||||
bool a = GetInputController(1).GetSqueezeUp(out _);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetSqueezeUp(out double dt)
|
||||
{
|
||||
bool a = GetInputController(1).GetSqueezeUp(out dt);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetTouchDown(InputController.ActionsTouch ac, out double dt)
|
||||
{
|
||||
bool a = GetInputController(1).GetActionDown(InputController.ControlStyles.Touch, (int)ac, out dt);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetTouchDown(InputController.ActionsTouch ac)
|
||||
{
|
||||
bool a = GetInputController(1).GetActionDown(InputController.ControlStyles.Touch, (int)ac, out _);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetTouchUp(InputController.ActionsTouch ac, out double dt)
|
||||
{
|
||||
bool a = GetInputController(1).GetActionUp(InputController.ControlStyles.Touch, (int)ac, out dt);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetTouchUp(InputController.ActionsTouch ac)
|
||||
{
|
||||
bool a = GetInputController(1).GetActionUp(InputController.ControlStyles.Touch, (int)ac, out _);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetTouch(InputController.ActionsTouch ac)
|
||||
{
|
||||
bool a = GetInputController(1).GetAction(InputController.ControlStyles.Touch, (int)ac);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetSlide()
|
||||
{
|
||||
bool a = GetInputController(1).GetSlide(out _);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetSlide(out double dt)
|
||||
{
|
||||
bool a = GetInputController(1).GetSlide(out dt);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetFlick()
|
||||
{
|
||||
bool a = GetInputController(1).GetFlick(out _);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
public static bool GetFlick(out double dt)
|
||||
{
|
||||
bool a = GetInputController(1).GetFlick(out dt);
|
||||
return a && PlayerHasControl();
|
||||
}
|
||||
|
||||
#region Deprecated Input Methods
|
||||
[Obsolete("Use GetPadDown instead")]
|
||||
public static bool Pressed()
|
||||
{
|
||||
bool keyDown = GetInputController(1).GetActionDown(InputController.ControlStyles.Pad, (int)InputController.ActionsPad.East, out _);
|
||||
return keyDown && PlayerHasControl();
|
||||
}
|
||||
|
||||
[Obsolete("Use GetPadDown instead")]
|
||||
public static bool Pressed(out double dt)
|
||||
{
|
||||
bool keyDown = GetInputController(1).GetActionDown(InputController.ControlStyles.Pad, (int)InputController.ActionsPad.East, out dt);
|
||||
return keyDown && PlayerHasControl();
|
||||
}
|
||||
|
||||
[Obsolete("Use GetPadUp instead")]
|
||||
public static bool PressedUp()
|
||||
{
|
||||
bool keyUp = GetInputController(1).GetActionUp(InputController.ControlStyles.Pad, (int)InputController.ActionsPad.East, out _);
|
||||
return keyUp && PlayerHasControl();
|
||||
}
|
||||
|
||||
[Obsolete("Use GetPadUp instead")]
|
||||
public static bool PressedUp(out double dt)
|
||||
{
|
||||
bool keyUp = GetInputController(1).GetActionUp(InputController.ControlStyles.Pad, (int)InputController.ActionsPad.East, out dt);
|
||||
return keyUp && PlayerHasControl();
|
||||
}
|
||||
|
||||
[Obsolete("Use GetPad instead")]
|
||||
public static bool Pressing()
|
||||
{
|
||||
bool pressing = GetInputController(1).GetAction(InputController.ControlStyles.Pad, (int)InputController.ActionsPad.East);
|
||||
return pressing && PlayerHasControl();
|
||||
}
|
||||
|
||||
//Directions
|
||||
|
||||
|
||||
[Obsolete("Use GetPadDown instead")]
|
||||
public static bool AltPressed()
|
||||
{
|
||||
bool down = GetInputController(1).GetActionDown(InputController.ControlStyles.Pad, (int)InputController.ActionsPad.South, out _);
|
||||
return down && PlayerHasControl();
|
||||
}
|
||||
|
||||
[Obsolete("Use GetPadDown instead")]
|
||||
public static bool AltPressed(out double dt)
|
||||
{
|
||||
bool down = GetInputController(1).GetActionDown(InputController.ControlStyles.Pad, (int)InputController.ActionsPad.South, out dt);
|
||||
return down && PlayerHasControl();
|
||||
}
|
||||
|
||||
[Obsolete("Use GetPadUp instead")]
|
||||
public static bool AltPressedUp()
|
||||
{
|
||||
bool up = GetInputController(1).GetActionUp(InputController.ControlStyles.Pad, (int)InputController.ActionsPad.South, out _);
|
||||
return up && PlayerHasControl();
|
||||
}
|
||||
|
||||
[Obsolete("Use GetPadUp instead")]
|
||||
public static bool AltPressedUp(out double dt)
|
||||
{
|
||||
bool up = GetInputController(1).GetActionUp(InputController.ControlStyles.Pad, (int)InputController.ActionsPad.South, out dt);
|
||||
return up && PlayerHasControl();
|
||||
}
|
||||
|
||||
[Obsolete("Use GetPad instead")]
|
||||
public static bool AltPressing()
|
||||
{
|
||||
bool pressing = GetInputController(1).GetAction(InputController.ControlStyles.Pad, (int)InputController.ActionsPad.South);
|
||||
return pressing && PlayerHasControl();
|
||||
}
|
||||
|
||||
[Obsolete("Use GetPadDown instead")]
|
||||
public static bool GetAnyDirectionDown()
|
||||
{
|
||||
InputController c = GetInputController(1);
|
||||
return (c.GetHatDirectionDown((InputController.InputDirection) UP, out _)
|
||||
|| c.GetHatDirectionDown((InputController.InputDirection) DOWN, out _)
|
||||
|| c.GetHatDirectionDown((InputController.InputDirection) LEFT, out _)
|
||||
|| c.GetHatDirectionDown((InputController.InputDirection) RIGHT, out _)
|
||||
return (c.GetHatDirectionDown((InputController.InputDirection)UP, out _)
|
||||
|| c.GetHatDirectionDown((InputController.InputDirection)DOWN, out _)
|
||||
|| c.GetHatDirectionDown((InputController.InputDirection)LEFT, out _)
|
||||
|| c.GetHatDirectionDown((InputController.InputDirection)RIGHT, out _)
|
||||
) && PlayerHasControl();
|
||||
}
|
||||
|
||||
[Obsolete("Use GetPadDown instead")]
|
||||
public static bool GetAnyDirectionDown(out double dt)
|
||||
{
|
||||
InputController c = GetInputController(1);
|
||||
@ -280,17 +483,19 @@ namespace HeavenStudio
|
||||
dt = Math.Max(Math.Max(Math.Max(d1, d2), d3), d4);
|
||||
return r;
|
||||
}
|
||||
|
||||
|
||||
[Obsolete("Use GetPadUp instead")]
|
||||
public static bool GetAnyDirectionUp()
|
||||
{
|
||||
InputController c = GetInputController(1);
|
||||
return (c.GetHatDirectionUp((InputController.InputDirection) UP, out _)
|
||||
|| c.GetHatDirectionUp((InputController.InputDirection) DOWN, out _)
|
||||
|| c.GetHatDirectionUp((InputController.InputDirection) LEFT, out _)
|
||||
|| c.GetHatDirectionUp((InputController.InputDirection) RIGHT, out _)
|
||||
) && PlayerHasControl();
|
||||
return (c.GetHatDirectionUp((InputController.InputDirection)UP, out _)
|
||||
|| c.GetHatDirectionUp((InputController.InputDirection)DOWN, out _)
|
||||
|| c.GetHatDirectionUp((InputController.InputDirection)LEFT, out _)
|
||||
|| c.GetHatDirectionUp((InputController.InputDirection)RIGHT, out _)
|
||||
) && PlayerHasControl();
|
||||
}
|
||||
|
||||
[Obsolete("Use GetPadUp instead")]
|
||||
public static bool GetAnyDirectionUp(out double dt)
|
||||
{
|
||||
InputController c = GetInputController(1);
|
||||
@ -302,40 +507,47 @@ namespace HeavenStudio
|
||||
dt = Math.Max(Math.Max(Math.Max(d1, d2), d3), d4);
|
||||
return r;
|
||||
}
|
||||
|
||||
|
||||
[Obsolete("Use GetPad instead")]
|
||||
public static bool GetAnyDirection()
|
||||
{
|
||||
InputController c = GetInputController(1);
|
||||
return (c.GetHatDirection((InputController.InputDirection) UP)
|
||||
|| c.GetHatDirection((InputController.InputDirection) DOWN)
|
||||
|| c.GetHatDirection((InputController.InputDirection) LEFT)
|
||||
|| c.GetHatDirection((InputController.InputDirection) RIGHT)
|
||||
return (c.GetHatDirection((InputController.InputDirection)UP)
|
||||
|| c.GetHatDirection((InputController.InputDirection)DOWN)
|
||||
|| c.GetHatDirection((InputController.InputDirection)LEFT)
|
||||
|| c.GetHatDirection((InputController.InputDirection)RIGHT)
|
||||
) && PlayerHasControl();
|
||||
}
|
||||
|
||||
|
||||
[Obsolete("Use GetPad instead")]
|
||||
public static bool GetSpecificDirection(int direction)
|
||||
{
|
||||
return GetInputController(1).GetHatDirection((InputController.InputDirection) direction) && PlayerHasControl();
|
||||
return GetInputController(1).GetHatDirection((InputController.InputDirection)direction) && PlayerHasControl();
|
||||
}
|
||||
|
||||
|
||||
[Obsolete("Use GetPadDown instead")]
|
||||
public static bool GetSpecificDirectionDown(int direction)
|
||||
{
|
||||
return GetInputController(1).GetHatDirectionDown((InputController.InputDirection) direction, out _) && PlayerHasControl();
|
||||
return GetInputController(1).GetHatDirectionDown((InputController.InputDirection)direction, out _) && PlayerHasControl();
|
||||
}
|
||||
|
||||
|
||||
[Obsolete("Use GetPadUp instead")]
|
||||
public static bool GetSpecificDirectionUp(int direction)
|
||||
{
|
||||
return GetInputController(1).GetHatDirectionUp((InputController.InputDirection) direction, out _) && PlayerHasControl();
|
||||
return GetInputController(1).GetHatDirectionUp((InputController.InputDirection)direction, out _) && PlayerHasControl();
|
||||
}
|
||||
|
||||
|
||||
[Obsolete("Use GetPadDown instead")]
|
||||
public static bool GetSpecificDirectionDown(int direction, out double dt)
|
||||
{
|
||||
return GetInputController(1).GetHatDirectionDown((InputController.InputDirection) direction, out dt) && PlayerHasControl();
|
||||
return GetInputController(1).GetHatDirectionDown((InputController.InputDirection)direction, out dt) && PlayerHasControl();
|
||||
}
|
||||
|
||||
|
||||
[Obsolete("Use GetPadUp instead")]
|
||||
public static bool GetSpecificDirectionUp(int direction, out double dt)
|
||||
{
|
||||
return GetInputController(1).GetHatDirectionUp((InputController.InputDirection) direction, out dt) && PlayerHasControl();
|
||||
return GetInputController(1).GetHatDirectionUp((InputController.InputDirection)direction, out dt) && PlayerHasControl();
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user