Skip to content
This repository has been archived by the owner on Oct 30, 2019. It is now read-only.

Commit

Permalink
Merge pull request #183 from khbecker/monogame-sdl2
Browse files Browse the repository at this point in the history
[FNA] Style Cleanup for Input
  • Loading branch information
flibitijibibo committed Mar 31, 2014
2 parents 4e90241 + c55adeb commit d42d412
Show file tree
Hide file tree
Showing 16 changed files with 2,272 additions and 2,042 deletions.
104 changes: 50 additions & 54 deletions MonoGame.Framework/Input/AccelerometerCapabilities.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,72 +9,68 @@

namespace Microsoft.Xna.Framework.Input
{
public struct AccelerometerCapabilities
{
public struct AccelerometerCapabilities
{
#region Public Properties

#region Public Properties

public bool IsConnected
{
get
{
public bool IsConnected
{
get
{
return true;
}
}
}
}

public bool HasXAxis
{
get
{
public bool HasXAxis
{
get
{
return true;
}
}
}
}

public bool HasYAxis
{
get
{
public bool HasYAxis
{
get
{
return true;
}
}
}
}

public bool HasZAxis
{
get
{
public bool HasZAxis
{
get
{
return true;
}
}
}
}

public float MaximumAcceleration
{
get
{
//TODO: What?
public float MaximumAcceleration
{
get
{
// TODO: What?
return 1.0f;
}
}
}
}

public float MinimumAcceleration
{
get
{
//TODO: What?
public float MinimumAcceleration
{
get
{
// TODO: What?
return 0.0f;
}
}
}
}

public float AccelerationResolution
{
get
{
//TODO: What?
public float AccelerationResolution
{
get
{
// TODO: What?
return 1.0f;
}
}

#endregion

}
}
}
#endregion
}
}

78 changes: 38 additions & 40 deletions MonoGame.Framework/Input/AccelerometerState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,44 +12,42 @@
namespace Microsoft.Xna.Framework.Input
{
public struct AccelerometerState
{

#region Public Properties

public Vector3 Acceleration
{
get
{
return _acceleration;
}
internal set
{
_acceleration = value;
}
}

/*
public Matrix GetRotation()
{
throw new NotImplementedException();
}
*/

public bool IsConnected
{
get
{
return true;
}
}

#endregion

#region Private Variables

private Vector3 _acceleration;

#endregion

}
{
#region Public Properties

public Vector3 Acceleration
{
get
{
return acceleration;
}
internal set
{
acceleration = value;
}
}

/*
public Matrix GetRotation()
{
throw new NotImplementedException();
}
*/

public bool IsConnected
{
get
{
return true;
}
}

#endregion

#region Private Variables

private Vector3 acceleration;

#endregion
}
}
11 changes: 5 additions & 6 deletions MonoGame.Framework/Input/ButtonState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@

namespace Microsoft.Xna.Framework.Input
{
public enum ButtonState
{
Released = 0,
Pressed = 1,
}
public enum ButtonState
{
Released = 0,
Pressed = 1,
}
}

Loading

0 comments on commit d42d412

Please sign in to comment.