|
@@ -1,4 +1,4 @@
|
|
-using Microsoft.Xna.Framework;
|
|
|
|
|
|
+using Microsoft.Xna.Framework;
|
|
using Microsoft.Xna.Framework.Input;
|
|
using Microsoft.Xna.Framework.Input;
|
|
|
|
|
|
namespace Apos.Input {
|
|
namespace Apos.Input {
|
|
@@ -35,8 +35,9 @@ namespace Apos.Input {
|
|
|
|
|
|
/// <returns>Returns true when the button was not pressed and is now pressed.</returns>
|
|
/// <returns>Returns true when the button was not pressed and is now pressed.</returns>
|
|
public static bool Pressed(MouseButton button) {
|
|
public static bool Pressed(MouseButton button) {
|
|
- return InputHelper.MouseButtons[button](InputHelper.NewMouse) == ButtonState.Pressed &&
|
|
|
|
- InputHelper.MouseButtons[button](InputHelper.OldMouse) == ButtonState.Released;
|
|
|
|
|
|
+ return
|
|
|
|
+ InputHelper.MouseButtons[button](InputHelper.NewMouse) == ButtonState.Pressed &&
|
|
|
|
+ InputHelper.MouseButtons[button](InputHelper.OldMouse) == ButtonState.Released;
|
|
}
|
|
}
|
|
/// <returns>Returns true when the button is now pressed.</returns>
|
|
/// <returns>Returns true when the button is now pressed.</returns>
|
|
public static bool Held(MouseButton button) {
|
|
public static bool Held(MouseButton button) {
|
|
@@ -44,13 +45,15 @@ namespace Apos.Input {
|
|
}
|
|
}
|
|
/// <returns>Returns true when the button was pressed and is now pressed.</returns>
|
|
/// <returns>Returns true when the button was pressed and is now pressed.</returns>
|
|
public static bool HeldOnly(MouseButton button) {
|
|
public static bool HeldOnly(MouseButton button) {
|
|
- return InputHelper.MouseButtons[button](InputHelper.NewMouse) == ButtonState.Pressed &&
|
|
|
|
- InputHelper.MouseButtons[button](InputHelper.OldMouse) == ButtonState.Pressed;
|
|
|
|
|
|
+ return
|
|
|
|
+ InputHelper.MouseButtons[button](InputHelper.NewMouse) == ButtonState.Pressed &&
|
|
|
|
+ InputHelper.MouseButtons[button](InputHelper.OldMouse) == ButtonState.Pressed;
|
|
}
|
|
}
|
|
/// <returns>Returns true when the button was pressed and is now not pressed.</returns>
|
|
/// <returns>Returns true when the button was pressed and is now not pressed.</returns>
|
|
public static bool Released(MouseButton button) {
|
|
public static bool Released(MouseButton button) {
|
|
- return InputHelper.MouseButtons[button](InputHelper.NewMouse) == ButtonState.Released &&
|
|
|
|
- InputHelper.MouseButtons[button](InputHelper.OldMouse) == ButtonState.Pressed;
|
|
|
|
|
|
+ return
|
|
|
|
+ InputHelper.MouseButtons[button](InputHelper.NewMouse) == ButtonState.Released &&
|
|
|
|
+ InputHelper.MouseButtons[button](InputHelper.OldMouse) == ButtonState.Pressed;
|
|
}
|
|
}
|
|
/// <returns>Returns true when the scroll wheel is scrolled.</returns>
|
|
/// <returns>Returns true when the scroll wheel is scrolled.</returns>
|
|
public static bool Scrolled() => ScrollDelta != 0;
|
|
public static bool Scrolled() => ScrollDelta != 0;
|
|
@@ -63,9 +66,10 @@ namespace Apos.Input {
|
|
public static Point PointerDelta => InputHelper.NewMouse.Position - InputHelper.OldMouse.Position;
|
|
public static Point PointerDelta => InputHelper.NewMouse.Position - InputHelper.OldMouse.Position;
|
|
|
|
|
|
/// <returns>Returns true when the mouse is within the game window and active.</returns>
|
|
/// <returns>Returns true when the mouse is within the game window and active.</returns>
|
|
- public static bool IsMouseValid => InputHelper.IsActive &&
|
|
|
|
- 0 <= InputHelper.NewMouse.X && InputHelper.NewMouse.X <= InputHelper.WindowWidth &&
|
|
|
|
- 0 <= InputHelper.NewMouse.Y && InputHelper.NewMouse.Y <= InputHelper.WindowHeight;
|
|
|
|
|
|
+ public static bool IsMouseValid =>
|
|
|
|
+ InputHelper.IsActive &&
|
|
|
|
+ 0 <= InputHelper.NewMouse.X && InputHelper.NewMouse.X <= InputHelper.WindowWidth &&
|
|
|
|
+ 0 <= InputHelper.NewMouse.Y && InputHelper.NewMouse.Y <= InputHelper.WindowHeight;
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
/// The button that will be checked.
|
|
/// The button that will be checked.
|