diff --git a/axios.suo b/axios.suo index 395536d..3ec3f27 100644 Binary files a/axios.suo and b/axios.suo differ diff --git a/axios/Axios_settings.cs b/axios/Axios_settings.cs index c7c5955..3ccc6c6 100644 --- a/axios/Axios_settings.cs +++ b/axios/Axios_settings.cs @@ -51,23 +51,18 @@ * 1.0.1.1 - 3/22/2012 * - Fixing UI collision with mouse pointer * - Adding AxiosRectangle and AxiosPoint classes + * - Adding properties in DrawableAxiosGameObject to turn on/off the following: + * - AdjustUnits + * - RelativeToCamera + * - Cleaning and sorting using statements + * * * */ -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Audio; -using Microsoft.Xna.Framework.Content; -using Microsoft.Xna.Framework.GamerServices; -using Microsoft.Xna.Framework.Graphics; -using Microsoft.Xna.Framework.Input; -using Microsoft.Xna.Framework.Media; using System.Reflection; -using Axios.Engine.Extenions; using Axios.Engine.Log; +using Microsoft.Xna.Framework; namespace Axios { diff --git a/axios/Engine/AxiosBreakableGameObject.cs b/axios/Engine/AxiosBreakableGameObject.cs index 25ca675..aecca68 100644 --- a/axios/Engine/AxiosBreakableGameObject.cs +++ b/axios/Engine/AxiosBreakableGameObject.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -using FarseerPhysics.Dynamics; +using System.Collections.Generic; using Axios.Engine.Interfaces; diff --git a/axios/Engine/AxiosEvents.cs b/axios/Engine/AxiosEvents.cs index a8d9902..c56de03 100644 --- a/axios/Engine/AxiosEvents.cs +++ b/axios/Engine/AxiosEvents.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using FarseerPhysics.SamplesFramework; namespace Axios.Engine diff --git a/axios/Engine/AxiosGameObject.cs b/axios/Engine/AxiosGameObject.cs index bb387af..3a0c65d 100644 --- a/axios/Engine/AxiosGameObject.cs +++ b/axios/Engine/AxiosGameObject.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Axios.Engine.Interfaces; +using Axios.Engine.Interfaces; +using FarseerPhysics.Dynamics; using FarseerPhysics.SamplesFramework; using Microsoft.Xna.Framework; -using FarseerPhysics.Dynamics; namespace Axios.Engine { diff --git a/axios/Engine/AxiosGameScreen.cs b/axios/Engine/AxiosGameScreen.cs index 223f7ca..ece11f8 100644 --- a/axios/Engine/AxiosGameScreen.cs +++ b/axios/Engine/AxiosGameScreen.cs @@ -1,26 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Audio; -using Microsoft.Xna.Framework.Content; -using Microsoft.Xna.Framework.GamerServices; -using Microsoft.Xna.Framework.Graphics; -using Microsoft.Xna.Framework.Input; -using Microsoft.Xna.Framework.Media; -using FarseerPhysics.Dynamics; -using FarseerPhysics.Dynamics.Joints; -using FarseerPhysics.Dynamics.Contacts; -using FarseerPhysics.Factories; -using FarseerPhysics.Common; -using FarseerPhysics.SamplesFramework; using Axios.Engine.Interfaces; -using Axios.Engine.UI; using Axios.Engine.Log; -using Axios.Engine.File; -using System.IO; using Axios.Engine.Structures; +using Axios.Engine.UI; +using FarseerPhysics.Dynamics; +using FarseerPhysics.SamplesFramework; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; namespace Axios.Engine { diff --git a/axios/Engine/AxiosTimer.cs b/axios/Engine/AxiosTimer.cs index 7463787..0af822d 100644 --- a/axios/Engine/AxiosTimer.cs +++ b/axios/Engine/AxiosTimer.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Axios.Engine.Interfaces; using Microsoft.Xna.Framework; diff --git a/axios/Engine/Data/AxiosCSV.cs b/axios/Engine/Data/AxiosCSV.cs index 4a1758f..fb9716b 100644 --- a/axios/Engine/Data/AxiosCSV.cs +++ b/axios/Engine/Data/AxiosCSV.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + using Axios.Engine.File; namespace Axios.Engine.Data diff --git a/axios/Engine/DrawableAxiosGameObject.cs b/axios/Engine/DrawableAxiosGameObject.cs index 130cde0..c2c7e31 100644 --- a/axios/Engine/DrawableAxiosGameObject.cs +++ b/axios/Engine/DrawableAxiosGameObject.cs @@ -1,13 +1,8 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - +using Axios.Engine.Interfaces; +using FarseerPhysics.SamplesFramework; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using FarseerPhysics.Dynamics; -using FarseerPhysics.SamplesFramework; -using Axios.Engine.Interfaces; namespace Axios.Engine { @@ -15,12 +10,23 @@ namespace Axios.Engine { protected int _draworder; protected Texture2D Texture; - //protected float _scale = 1f; - public Vector2 Position = new Vector2(); + public Vector2 Position = new Vector2(); //set this to a property and adjust if adjustunits is true public Vector2 Origin = new Vector2(); - protected Boolean _adjustunits = true; - protected Boolean _relativetocamera = true; + protected bool _adjustunits = true; + protected bool _relativetocamera = true; + + public bool AdjustUnits //if value changed - change position depending on adjusting the units + { + get { return _adjustunits; } + set { _adjustunits = value; } + } + + public bool RelativeToCamera + { + get { return _relativetocamera; } + set { _relativetocamera = value; } + } public override void LoadContent(AxiosGameScreen gameScreen) { @@ -29,17 +35,9 @@ namespace Axios.Engine } - /*public float Scale - { - get { return _scale; } - set { _scale = value; } - }*/ - public virtual void Draw(AxiosGameScreen gameScreen, GameTime gameTime) { -/*#if DEBUG - System.Diagnostics.Debugger.Break(); -#endif*/ + if (_relativetocamera) gameScreen.ScreenManager.SpriteBatch.Begin(0, null, null, null, null, null, gameScreen.Camera.View); else diff --git a/axios/Engine/Extensions/String.cs b/axios/Engine/Extensions/String.cs index ccd9c71..3aab7cc 100644 --- a/axios/Engine/Extensions/String.cs +++ b/axios/Engine/Extensions/String.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace Axios.Engine.Extenions { public static class AxiosExtensions_String diff --git a/axios/Engine/Extensions/Texture2D.cs b/axios/Engine/Extensions/Texture2D.cs index 967b574..45a6ca3 100644 --- a/axios/Engine/Extensions/Texture2D.cs +++ b/axios/Engine/Extensions/Texture2D.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -using Microsoft.Xna.Framework.Graphics; + using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; namespace Axios.Engine.Extenions diff --git a/axios/Engine/File/AxiosFile.cs b/axios/Engine/File/AxiosFile.cs index 40aef9d..b8e8a83 100644 --- a/axios/Engine/File/AxiosFile.cs +++ b/axios/Engine/File/AxiosFile.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.IO; using Axios.Engine.Interfaces; diff --git a/axios/Engine/File/AxiosIsolatedFile.cs b/axios/Engine/File/AxiosIsolatedFile.cs index 2d304a0..02fbec1 100644 --- a/axios/Engine/File/AxiosIsolatedFile.cs +++ b/axios/Engine/File/AxiosIsolatedFile.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.IO; using System.IO.IsolatedStorage; -using System.IO; - using Axios.Engine.Interfaces; namespace Axios.Engine.File diff --git a/axios/Engine/File/AxiosRegularFile.cs b/axios/Engine/File/AxiosRegularFile.cs index f860204..295f769 100644 --- a/axios/Engine/File/AxiosRegularFile.cs +++ b/axios/Engine/File/AxiosRegularFile.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.IO; +using System.IO; using Axios.Engine.Interfaces; diff --git a/axios/Engine/File/AxiosTitleFile.cs b/axios/Engine/File/AxiosTitleFile.cs index 3f24cc8..576dd0c 100644 --- a/axios/Engine/File/AxiosTitleFile.cs +++ b/axios/Engine/File/AxiosTitleFile.cs @@ -1,11 +1,7 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.IO; -using Microsoft.Xna.Framework; -using Axios.Engine.File; using Axios.Engine.Interfaces; +using Microsoft.Xna.Framework; namespace Axios.Engine.File { diff --git a/axios/Engine/Interfaces/IAxiosFile.cs b/axios/Engine/Interfaces/IAxiosFile.cs index 7e0b669..e7ba5d9 100644 --- a/axios/Engine/Interfaces/IAxiosFile.cs +++ b/axios/Engine/Interfaces/IAxiosFile.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.IO; +using System.IO; namespace Axios.Engine.Interfaces { diff --git a/axios/Engine/Interfaces/IAxiosGameObject.cs b/axios/Engine/Interfaces/IAxiosGameObject.cs index 3af34d3..69ae2cb 100644 --- a/axios/Engine/Interfaces/IAxiosGameObject.cs +++ b/axios/Engine/Interfaces/IAxiosGameObject.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using FarseerPhysics.SamplesFramework; using Microsoft.Xna.Framework; -using FarseerPhysics.SamplesFramework; namespace Axios.Engine.Interfaces diff --git a/axios/Engine/Interfaces/IDrawableAxiosGameObject.cs b/axios/Engine/Interfaces/IDrawableAxiosGameObject.cs index dd558aa..0f90df6 100644 --- a/axios/Engine/Interfaces/IDrawableAxiosGameObject.cs +++ b/axios/Engine/Interfaces/IDrawableAxiosGameObject.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework; namespace Axios.Engine.Interfaces { diff --git a/axios/Engine/Log/AxiosLog.cs b/axios/Engine/Log/AxiosLog.cs index d32751f..e8d3bc2 100644 --- a/axios/Engine/Log/AxiosLog.cs +++ b/axios/Engine/Log/AxiosLog.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using Axios.Engine; namespace Axios.Engine.Log { diff --git a/axios/Engine/SimpleAxiosGameObject.cs b/axios/Engine/SimpleAxiosGameObject.cs index 9e1f88c..524da16 100644 --- a/axios/Engine/SimpleAxiosGameObject.cs +++ b/axios/Engine/SimpleAxiosGameObject.cs @@ -1,12 +1,8 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using Axios.Engine.Log; using FarseerPhysics.Dynamics; using Microsoft.Xna.Framework; -using Axios.Engine.Log; - namespace Axios.Engine { public abstract class SimpleAxiosGameObject : AxiosGameObject diff --git a/axios/Engine/SimpleDrawableAxiosGameObject.cs b/axios/Engine/SimpleDrawableAxiosGameObject.cs index 518edd2..887ce7c 100644 --- a/axios/Engine/SimpleDrawableAxiosGameObject.cs +++ b/axios/Engine/SimpleDrawableAxiosGameObject.cs @@ -1,16 +1,14 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; +using Axios.Engine.Interfaces; +using FarseerPhysics.Common; +using FarseerPhysics.Common.Decomposition; +using FarseerPhysics.Common.PolygonManipulation; +using FarseerPhysics.Dynamics; +using FarseerPhysics.Factories; +using FarseerPhysics.SamplesFramework; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using FarseerPhysics.Dynamics; -using FarseerPhysics.SamplesFramework; -using Axios.Engine.Interfaces; -using FarseerPhysics.Common.Decomposition; -using FarseerPhysics.Common; -using FarseerPhysics.Factories; -using FarseerPhysics.Common.PolygonManipulation; namespace Axios.Engine { diff --git a/axios/Engine/Singleton.cs b/axios/Engine/Singleton.cs index 51ce2d2..447c4bf 100644 --- a/axios/Engine/Singleton.cs +++ b/axios/Engine/Singleton.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Axios.Engine { diff --git a/axios/Engine/Structures/AxiosPoint.cs b/axios/Engine/Structures/AxiosPoint.cs index f0dc5a4..57a0686 100644 --- a/axios/Engine/Structures/AxiosPoint.cs +++ b/axios/Engine/Structures/AxiosPoint.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace Axios.Engine.Structures { public class AxiosPoint diff --git a/axios/Engine/Structures/AxiosRectangle.cs b/axios/Engine/Structures/AxiosRectangle.cs index c97fce8..8baf9f5 100644 --- a/axios/Engine/Structures/AxiosRectangle.cs +++ b/axios/Engine/Structures/AxiosRectangle.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Axios.Engine.Structures { diff --git a/axios/Engine/UI/AxiosButton.cs b/axios/Engine/UI/AxiosButton.cs index 5faf6ec..ac04d16 100644 --- a/axios/Engine/UI/AxiosButton.cs +++ b/axios/Engine/UI/AxiosButton.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -using Microsoft.Xna.Framework.Graphics; + using FarseerPhysics.SamplesFramework; -using FarseerPhysics.Factories; -using FarseerPhysics.Dynamics; +using Microsoft.Xna.Framework.Graphics; namespace Axios.Engine.UI { diff --git a/axios/Engine/UI/AxiosUIObject.cs b/axios/Engine/UI/AxiosUIObject.cs index f874a46..9cda7ef 100644 --- a/axios/Engine/UI/AxiosUIObject.cs +++ b/axios/Engine/UI/AxiosUIObject.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Axios.Engine; namespace Axios.Engine.UI {