axiosengine 

axiosengine Commit Details


Date:2015-01-01 14:36:46 (10 years 10 months ago)
Author:Natalie Adams
Branch:master
Commit:b6e6744a88c2ad05cd4a4690f621bbaaed487497
Parents: 67ab74899fa60e78bc5cde08f180fbd225451280
Message:Adding extension for rectangleitem to get position in Farseer units ( getSimPosition ) Adding extension for vector2 to convert back and forth between sim and display units
Changes:

File differences

axios.sln
4343
4444
4545
46
4746
4847
4948
......
6160
6261
6362
64
6563
6664
6765
......
7977
8078
8179
82
8380
8481
8582
␉␉{742C938F-997D-4EFD-95D2-BB09CDADCD2E}.Release|Xbox 360.Build.0 = Release|x86␍␊
␉␉{B5664516-72B7-4BA3-9F72-25CAA90867D8}.Debug|Any CPU.ActiveCfg = Debug|Xbox 360␍␊
␉␉{B5664516-72B7-4BA3-9F72-25CAA90867D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Xbox 360␍␊
␉␉{B5664516-72B7-4BA3-9F72-25CAA90867D8}.Debug|Mixed Platforms.Build.0 = Debug|Xbox 360␍␊
␉␉{B5664516-72B7-4BA3-9F72-25CAA90867D8}.Debug|Windows Phone.ActiveCfg = Debug|Xbox 360␍␊
␉␉{B5664516-72B7-4BA3-9F72-25CAA90867D8}.Debug|Windows Phone.Build.0 = Debug|Xbox 360␍␊
␉␉{B5664516-72B7-4BA3-9F72-25CAA90867D8}.Debug|x86.ActiveCfg = Debug|Xbox 360␍␊
␉␉{B5664516-72B7-4BA3-9F72-25CAA90867D8}.Release|Xbox 360.Build.0 = Release|Xbox 360␍␊
␉␉{C09D9005-76AC-4F1A-9479-2787BB3DB158}.Debug|Any CPU.ActiveCfg = Debug|Windows Phone␍␊
␉␉{C09D9005-76AC-4F1A-9479-2787BB3DB158}.Debug|Mixed Platforms.ActiveCfg = Debug|Windows Phone␍␊
␉␉{C09D9005-76AC-4F1A-9479-2787BB3DB158}.Debug|Mixed Platforms.Build.0 = Debug|Windows Phone␍␊
␉␉{C09D9005-76AC-4F1A-9479-2787BB3DB158}.Debug|Windows Phone.ActiveCfg = Debug|Windows Phone␍␊
␉␉{C09D9005-76AC-4F1A-9479-2787BB3DB158}.Debug|Windows Phone.Build.0 = Debug|Windows Phone␍␊
␉␉{C09D9005-76AC-4F1A-9479-2787BB3DB158}.Debug|x86.ActiveCfg = Debug|Windows Phone␍␊
␉␉{C09D9005-76AC-4F1A-9479-2787BB3DB158}.Release|Xbox 360.Build.0 = Release|Windows Phone␍␊
␉␉{A622337F-9AE6-492A-85D6-01CCE0D7F9B4}.Debug|Any CPU.ActiveCfg = Debug|x86␍␊
␉␉{A622337F-9AE6-492A-85D6-01CCE0D7F9B4}.Debug|Mixed Platforms.ActiveCfg = Debug|x86␍␊
␉␉{A622337F-9AE6-492A-85D6-01CCE0D7F9B4}.Debug|Mixed Platforms.Build.0 = Debug|x86␍␊
␉␉{A622337F-9AE6-492A-85D6-01CCE0D7F9B4}.Debug|Windows Phone.ActiveCfg = Debug|x86␍␊
␉␉{A622337F-9AE6-492A-85D6-01CCE0D7F9B4}.Debug|x86.ActiveCfg = Debug|x86␍␊
␉␉{A622337F-9AE6-492A-85D6-01CCE0D7F9B4}.Debug|x86.Build.0 = Debug|x86␍␊
axios/Axios_WP7.csproj
174174
175175
176176
177
177178
178179
180
179181
180182
181183
<Compile Include="Engine\Extensions\Double.cs" />␍␊
<Compile Include="Engine\Extensions\InputState.cs" />␍␊
<Compile Include="Engine\Extensions\MouseState.cs" />␍␊
<Compile Include="Engine\Extensions\RectangleItemProperties.cs" />␍␊
<Compile Include="Engine\Extensions\String.cs" />␍␊
<Compile Include="Engine\Extensions\Texture2D.cs" />␍␊
<Compile Include="Engine\Extensions\Vector2.cs" />␍␊
<Compile Include="Engine\File\AxiosFile.cs" />␍␊
<Compile Include="Engine\File\AxiosIsolatedFile.cs" />␍␊
<Compile Include="Engine\File\AxiosRegularFile.cs" />␍␊
axios/Axios_Windows.csproj
226226
227227
228228
229
229230
230231
232
231233
232234
233235
<Compile Include="Engine\Extensions\InputState.cs" />␍␊
<Compile Include="Engine\Extensions\Double.cs" />␍␊
<Compile Include="Engine\Extensions\MouseState.cs" />␍␊
<Compile Include="Engine\Extensions\RectangleItemProperties.cs" />␍␊
<Compile Include="Engine\Extensions\String.cs" />␍␊
<Compile Include="Engine\Extensions\Texture2D.cs" />␍␊
<Compile Include="Engine\Extensions\Vector2.cs" />␍␊
<Compile Include="Engine\File\AxiosFile.cs" />␍␊
<Compile Include="Engine\File\AxiosIsolatedFile.cs" />␍␊
<Compile Include="Engine\File\AxiosRegularFile.cs" />␍␊
axios/Axios_Xbox_360.csproj
167167
168168
169169
170
170171
171172
173
172174
173175
174176
<Compile Include="Engine\Extensions\Double.cs" />␍␊
<Compile Include="Engine\Extensions\InputState.cs" />␍␊
<Compile Include="Engine\Extensions\MouseState.cs" />␍␊
<Compile Include="Engine\Extensions\RectangleItemProperties.cs" />␍␊
<Compile Include="Engine\Extensions\String.cs" />␍␊
<Compile Include="Engine\Extensions\Texture2D.cs" />␍␊
<Compile Include="Engine\Extensions\Vector2.cs" />␍␊
<Compile Include="Engine\File\AxiosFile.cs" />␍␊
<Compile Include="Engine\File\AxiosIsolatedFile.cs" />␍␊
<Compile Include="Engine\File\AxiosRegularFile.cs" />␍␊
axios/Axios_settings.cs
134134
135135
136136
137
138
137139
138140
139141
* - Removing cache from Gleed2D as ContentManager automatically does this␍␊
* - Adding cache␍␊
* - Adding XOR Shift random class␍␊
* - Adding extension for rectangleitem to get position in Farseer units ( getSimPosition )␍␊
* - Adding extension for vector2 to convert back and forth between sim and display units␍␊
* ␍␊
*/␍␊
#endregion␍␊
axios/Engine/AxiosGameScreen.cs
11
22
3
4
5
36
7
8
9
10
411
512
613
714
815
16
917
18
19
20
1021
1122
1223
13
1424
15
16
17
18
19
20
21
22
23
2425
2526
2627
......
547548
548549
549550
550
551
552
553
554
555
556
557
558
559
551560
552561
553562
using System;␍␊
using System.Collections.Generic;␍␊
using System.Diagnostics;␍␊
using System.IO;␍␊
using System.IO.Compression;␍␊
using System.Linq;␍␊
using System.Xml.Linq;␍␊
using Axios.Engine.Extensions;␍␊
using Axios.Engine.File;␍␊
using Axios.Engine.Gleed2D;␍␊
using Axios.Engine.Interfaces;␍␊
using Axios.Engine.Log;␍␊
using Axios.Engine.Structures;␍␊
using Axios.Engine.UI;␍␊
using FarseerPhysics.Dynamics;␍␊
using FarseerPhysics.Factories;␍␊
using FarseerPhysics.SamplesFramework;␍␊
using GameStateManagement;␍␊
using Gleed2D.Core;␍␊
using Gleed2D.InGame;␍␊
using Microsoft.Xna.Framework;␍␊
using Microsoft.Xna.Framework.Content;␍␊
using Microsoft.Xna.Framework.Graphics;␍␊
using GameStateManagement;␍␊
using Microsoft.Xna.Framework.Input;␍␊
using Axios.Engine.Extensions;␍␊
using System.IO;␍␊
using System.IO.Compression;␍␊
using Gleed2D.InGame;␍␊
using Axios.Engine.File;␍␊
using System.Xml.Linq;␍␊
using Gleed2D.Core;␍␊
using System.Diagnostics;␍␊
using Axios.Engine.Gleed2D;␍␊
␍␊
namespace Axios.Engine␍␊
{␍␊
␍␊
public virtual void LoadRectangleItem(RectangleItemProperties rectangleitem, Layer l)␍␊
{␍␊
␍␊
if (l.Properties.CustomProperties.Keys.Contains("Collision") && (bool)l.Properties.CustomProperties["Collision"].Value)␍␊
{␍␊
Body b = BodyFactory.CreateRectangle(this.World, ConvertUnits.ToSimUnits(rectangleitem.Width), ConvertUnits.ToSimUnits(rectangleitem.Height), 1f);␍␊
b.Position = rectangleitem.getSimPosition();␍␊
//b.Position.X += ␍␊
b.IsStatic = true;␍␊
b.BodyType = BodyType.Static;␍␊
b.UserData = this;␍␊
}␍␊
}␍␊
␍␊
public virtual void LoadTextureItem(TextureItemProperties textureitem, Layer l)␍␊
axios/Engine/Extensions/RectangleItemProperties.cs
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
using System;␊
using System.Collections.Generic;␊
using System.Linq;␊
using System.Text;␊
using Microsoft.Xna.Framework;␊
using Gleed2D.InGame;␊
using FarseerPhysics.SamplesFramework;␊
␊
namespace Axios.Engine.Extensions␊
{␊
public static class AxiosExtensions_RectangleItemProperties␊
{␊
public static Vector2 getSimPosition(this RectangleItemProperties prop)␊
{␊
Vector2 pos = ConvertUnits.ToSimUnits(prop.Position);␊
pos.X += ConvertUnits.ToSimUnits(prop.Width / 2);␊
pos.Y += ConvertUnits.ToSimUnits(prop.Height / 2);␊
return pos;␊
}␊
}␊
}␊
axios/Engine/Extensions/Vector2.cs
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
using System;␊
using System.Collections.Generic;␊
using System.Linq;␊
using System.Text;␊
using Microsoft.Xna.Framework;␊
using Gleed2D.InGame;␊
using FarseerPhysics.SamplesFramework;␊
␊
namespace Axios.Engine.Extensions␊
{␊
public static class AxiosExtensions_Vector2␊
{␊
public static Vector2 toSimUnits(this Vector2 vec)␊
{␊
return ConvertUnits.ToSimUnits(vec);␊
}␊
␊
public static Vector2 toDisplayUnits(this Vector2 vec)␊
{␊
return ConvertUnits.ToDisplayUnits(vec);␊
}␊
}␊
}␊

Archive Download the corresponding diff file

Branches

Number of commits:
Page rendered in 0.17745s using 14 queries.