diff -r 9d0d0767a8cf757b5d70e2e056e22af42e0ac7b9 -r 9e5a3854223936e5cc5299737d5ec50a715b2447 axios/Axios_WP7.csproj --- a/axios/Axios_WP7.csproj Sat Jun 02 17:14:16 2012 -0500 +++ b/axios/Axios_WP7.csproj Sun Jun 03 15:39:11 2012 -0500 @@ -169,6 +169,7 @@ + diff -r 9d0d0767a8cf757b5d70e2e056e22af42e0ac7b9 -r 9e5a3854223936e5cc5299737d5ec50a715b2447 axios/Axios_Windows.csproj --- a/axios/Axios_Windows.csproj Sat Jun 02 17:14:16 2012 -0500 +++ b/axios/Axios_Windows.csproj Sun Jun 03 15:39:11 2012 -0500 @@ -212,6 +212,7 @@ + diff -r 9d0d0767a8cf757b5d70e2e056e22af42e0ac7b9 -r 9e5a3854223936e5cc5299737d5ec50a715b2447 axios/Axios_Xbox_360.csproj --- a/axios/Axios_Xbox_360.csproj Sat Jun 02 17:14:16 2012 -0500 +++ b/axios/Axios_Xbox_360.csproj Sun Jun 03 15:39:11 2012 -0500 @@ -162,6 +162,7 @@ + diff -r 9d0d0767a8cf757b5d70e2e056e22af42e0ac7b9 -r 9e5a3854223936e5cc5299737d5ec50a715b2447 axios/Axios_settings.cs --- a/axios/Axios_settings.cs Sat Jun 02 17:14:16 2012 -0500 +++ b/axios/Axios_settings.cs Sun Jun 03 15:39:11 2012 -0500 @@ -97,6 +97,8 @@ * - Upon some testing - developers will need to use #if WINDOWS/#endif tags to make sure they can't use XNACC in WP7/Xbox360 * - Adding axioslog command to output AxiosLog * - Changing variables in CommandConsoleBase to be non-static + * - Adding rotation to DrawableAxiosGameObject + * - Adding InputState extensions to test for input agaisnt Player One * * */ diff -r 9d0d0767a8cf757b5d70e2e056e22af42e0ac7b9 -r 9e5a3854223936e5cc5299737d5ec50a715b2447 axios/Engine/DrawableAxiosGameObject.cs --- a/axios/Engine/DrawableAxiosGameObject.cs Sat Jun 02 17:14:16 2012 -0500 +++ b/axios/Engine/DrawableAxiosGameObject.cs Sun Jun 03 15:39:11 2012 -0500 @@ -16,6 +16,14 @@ protected bool _adjustunits = true; protected bool _relativetocamera = true; + protected float _rotation; + + public float Rotation + { + get { return _rotation; } + set { _rotation = value; } + } + public bool AdjustUnits //if value changed - change position depending on adjusting the units { get { return _adjustunits; } @@ -43,9 +51,9 @@ else gameScreen.ScreenManager.SpriteBatch.Begin(); if (_adjustunits) - gameScreen.ScreenManager.SpriteBatch.Draw(Texture, ConvertUnits.ToDisplayUnits(Position), null, Color.White, 0, Origin, _scale, SpriteEffects.None, 0); + gameScreen.ScreenManager.SpriteBatch.Draw(Texture, ConvertUnits.ToDisplayUnits(Position), null, Color.White, _rotation, Origin, _scale, SpriteEffects.None, 0); else - gameScreen.ScreenManager.SpriteBatch.Draw(Texture, Position, null, Color.White, 0, Origin, _scale, SpriteEffects.None, 0); + gameScreen.ScreenManager.SpriteBatch.Draw(Texture, Position, null, Color.White, _rotation, Origin, _scale, SpriteEffects.None, 0); gameScreen.ScreenManager.SpriteBatch.End(); } diff -r 9d0d0767a8cf757b5d70e2e056e22af42e0ac7b9 -r 9e5a3854223936e5cc5299737d5ec50a715b2447 axios/Engine/Extensions/Contact.cs --- a/axios/Engine/Extensions/Contact.cs Sat Jun 02 17:14:16 2012 -0500 +++ b/axios/Engine/Extensions/Contact.cs Sun Jun 03 15:39:11 2012 -0500 @@ -46,8 +46,6 @@ } - - return direction; } } diff -r 9d0d0767a8cf757b5d70e2e056e22af42e0ac7b9 -r 9e5a3854223936e5cc5299737d5ec50a715b2447 axios/ScreenSystem/InputState.cs --- a/axios/ScreenSystem/InputState.cs Sat Jun 02 17:14:16 2012 -0500 +++ b/axios/ScreenSystem/InputState.cs Sun Jun 03 15:39:11 2012 -0500 @@ -473,7 +473,6 @@ } } - /// /// Helper for checking if a button was pressed during this update. /// The controllingPlayer parameter specifies which player to read input for. @@ -501,7 +500,6 @@ } } - /// /// Helper for checking if a key was newly pressed during this update. The /// controllingPlayer parameter specifies which player to read input for. @@ -552,7 +550,6 @@ } } - /// /// Helper for checking if a button was newly pressed during this update. /// The controllingPlayer parameter specifies which player to read input for.