natalie/axiosengine
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

+ * - Adding properties in DrawableAxiosGameObject to turn on/off the following:

Browse Source 
+ *   - AdjustUnits
+ *   - RelativeToCamera
+ * - Cleaning and sorting using statements
This commit is contained in:
nathan@daedalus 2012-03-24 18:06:51 -05:00
parent 2cbd7a4910
commit 7d3c8a9f39
26 changed files with 53 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
axios.suo
View File

Binary file not shown.

17
axios/Axios_settings.cs
View File

@ -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
{

7
axios/Engine/AxiosBreakableGameObject.cs
View File

@ -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;

3
axios/Engine/AxiosEvents.cs
View File

@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using FarseerPhysics.SamplesFramework;
namespace Axios.Engine

8
axios/Engine/AxiosGameObject.cs
View File

@ -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
{

22
axios/Engine/AxiosGameScreen.cs
View File

@ -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
{

3
axios/Engine/AxiosTimer.cs
View File

@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Axios.Engine.Interfaces;
using Microsoft.Xna.Framework;

6
axios/Engine/Data/AxiosCSV.cs
View File

@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

using Axios.Engine.File;
namespace Axios.Engine.Data

38
axios/Engine/DrawableAxiosGameObject.cs
View File

@ -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

6
axios/Engine/Extensions/String.cs
View File

@ -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

8
axios/Engine/Extensions/Texture2D.cs
View File

@ -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

3
axios/Engine/File/AxiosFile.cs
View File

@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO;
using Axios.Engine.Interfaces;

7
axios/Engine/File/AxiosIsolatedFile.cs
View File

@ -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

6
axios/Engine/File/AxiosRegularFile.cs
View File

@ -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;

6
axios/Engine/File/AxiosTitleFile.cs
View File

@ -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
{

6
axios/Engine/Interfaces/IAxiosFile.cs
View File

@ -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
{

6
axios/Engine/Interfaces/IAxiosGameObject.cs
View File

@ -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

6
axios/Engine/Interfaces/IDrawableAxiosGameObject.cs
View File

@ -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
{

3
axios/Engine/Log/AxiosLog.cs
View File

@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Axios.Engine;
namespace Axios.Engine.Log
{

6
axios/Engine/SimpleAxiosGameObject.cs
View File

@ -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

16
axios/Engine/SimpleDrawableAxiosGameObject.cs
View File

@ -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
{

3
axios/Engine/Singleton.cs
View File

@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Axios.Engine
{

6
axios/Engine/Structures/AxiosPoint.cs
View File

@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace Axios.Engine.Structures
{
public class AxiosPoint

3
axios/Engine/Structures/AxiosRectangle.cs
View File

@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Axios.Engine.Structures
{

10
axios/Engine/UI/AxiosButton.cs
View File

@ -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
{

5
axios/Engine/UI/AxiosUIObject.cs
View File

@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Axios.Engine;
namespace Axios.Engine.UI
{