From 7d3c8a9f391a7da32a05edb590792a8f04d12783 Mon Sep 17 00:00:00 2001
From: "nathan@daedalus" <nathan@daedalus>
Date: Sat, 24 Mar 2012 18:06:51 -0500
Subject: [PATCH] + * - Adding properties in DrawableAxiosGameObject to turn
 on/off the following: + *   - AdjustUnits + *   - RelativeToCamera + * -
 Cleaning and sorting using statements

---
 axios.suo                                     | Bin 116224 -> 116224 bytes
 axios/Axios_settings.cs                       |  17 +++-----
 axios/Engine/AxiosBreakableGameObject.cs      |   7 +---
 axios/Engine/AxiosEvents.cs                   |   3 --
 axios/Engine/AxiosGameObject.cs               |   8 +---
 axios/Engine/AxiosGameScreen.cs               |  22 +++-------
 axios/Engine/AxiosTimer.cs                    |   3 --
 axios/Engine/Data/AxiosCSV.cs                 |   6 +--
 axios/Engine/DrawableAxiosGameObject.cs       |  38 +++++++++---------
 axios/Engine/Extensions/String.cs             |   6 +--
 axios/Engine/Extensions/Texture2D.cs          |   8 +---
 axios/Engine/File/AxiosFile.cs                |   3 --
 axios/Engine/File/AxiosIsolatedFile.cs        |   7 +---
 axios/Engine/File/AxiosRegularFile.cs         |   6 +--
 axios/Engine/File/AxiosTitleFile.cs           |   6 +--
 axios/Engine/Interfaces/IAxiosFile.cs         |   6 +--
 axios/Engine/Interfaces/IAxiosGameObject.cs   |   6 +--
 .../Interfaces/IDrawableAxiosGameObject.cs    |   6 +--
 axios/Engine/Log/AxiosLog.cs                  |   3 --
 axios/Engine/SimpleAxiosGameObject.cs         |   6 +--
 axios/Engine/SimpleDrawableAxiosGameObject.cs |  16 ++++----
 axios/Engine/Singleton.cs                     |   3 --
 axios/Engine/Structures/AxiosPoint.cs         |   6 +--
 axios/Engine/Structures/AxiosRectangle.cs     |   3 --
 axios/Engine/UI/AxiosButton.cs                |  10 +----
 axios/Engine/UI/AxiosUIObject.cs              |   5 ---
 26 files changed, 53 insertions(+), 157 deletions(-)

diff --git a/axios.suo b/axios.suo
index 395536d40467a04e67e16d99e02fbde066439cb3..3ec3f27bb0fad7d405e36eb529676a84456a3f7a 100644
GIT binary patch
delta 3369
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

delta 991
zcmZuwS!h#H5WSPWW;3k`l1C!JhANtBv{l5d5L2m8ms;Zjf?%UYa3cvC+#>k!M}<I}
zUhVkN)~#T*wAh9wO${|sL=>gfuYRcHPf-z<3hIY(-h0%DIB;OzIWzapJ<OA0Iw_`W
z^@3)gu0kXHDijKdfX1LHYi<d;wa=i0F($barvy()Jm5@B=ssvPix{4XfffDTVCR#@
z&H7R*G7-?%4X#9F+L*u}2#XUD^SD(%kND|DZSE~$)?HuaNB_XJ*P{Q?mdDNGJ4KS|
zUL~?6ymrA_-g>xF#~6@sn&&DSdH9uxO}${_bKH)$sv~8L1zCWF*l~80IeDR~iobQ+
zbUVh3)WP^UN3}stl;CIPTZJ#jh@Nn`64Js+!PG^<6@vU)E-h&o2&{m?rCtN<;dOcs
z_cxVu>Ah%qKU+MQ$>qPD<^50l?wwe^D(<tFN6C>1>OF5|>{-zW^PoqF#sf8$ani;J
z&k1?LulVj-E~N#aBzk@13HP^Z+x4L3(hoCUj)4n5?SYr*H9{rt_-@8b6uxlJMRO_>
z1hW-CXQ8A0J~&g(4sd~BrV|yHQ;|++(i+%&BD7N^PTqi6TkS=3UIk}+4xSo}?A=Vp
zEbI>EGO!=}?m?M0y#M6U1ADRJ3M_-6B9ApU!K@93g8PCIe4c;>n9aZer3K&I1Uu#v
z;DCO)A%ruA!3!xh|2PcmK)E0!1di-Jj=PfJfut(FNJ9gp)!dha4S2g3M6AxjR;)>p
z)T2tlE-+xrU04j=Dls%d(-p;4xV@hy3Xi~A%#XrKdA45YQ){)Ou=>xi7UWqvMrl<Z
zT!%efP^J#}9|tTrnt?-qJyS};67eTls)jA=pf!{?vHoAPN)@v(oP;%^Nv=@BmR&T}
z@E_NkGq6#-G*!!N*=v+<BGmum;5KYbgUM(oN#5mp)x#8d__bVLO^lwPtU_rgW#{nZ
QLs&2WcBVu0d4V9uZ-^sQKL7v#

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
 {