AxiosEngine-old 

AxiosEngine-old Commit Details


Date:2012-03-23 22:19:00 (12 years 8 months ago)
Author:nathan@daedalus
Branch:default
Commit:89349dfb8461
Parents: 5f677872a79b
Message:Adding support for a rectangle class that uses floats instead of ints

Changes:
Aaxios/Engine/Structures/AxiosPoint.cs (full)
Aaxios/Engine/Structures/AxiosRectangle.cs (full)
Maxios/Axios_WP7.csproj (1 diff)
Maxios/Axios_Windows.csproj (1 diff)
Maxios/Axios_Xbox_360.csproj (1 diff)
Maxios/Axios_settings.cs (1 diff)
Maxios/Engine/AxiosGameScreen.cs (1 diff)
Maxios/Properties/AssemblyInfo.cs (1 diff)

File differences

axios/Axios_WP7.csproj
179179
180180
181181
182
182183
183184
184185
<Compile Include="Engine\SimpleAxiosGameObject.cs" />
<Compile Include="Engine\SimpleDrawableAxiosGameObject.cs" />
<Compile Include="Engine\Singleton.cs" />
<Compile Include="Engine\Structures\AxiosRectangle.cs" />
<Compile Include="Engine\UI\AxiosButton.cs" />
<Compile Include="Engine\UI\AxiosUIObject.cs" />
<Compile Include="Factories\BodyFactory.cs" />
axios/Axios_Windows.csproj
219219
220220
221221
222
222223
223224
224225
<Compile Include="Engine\Interfaces\IAxiosGameObject.cs" />
<Compile Include="Engine\Interfaces\IDrawableAxiosGameObject.cs" />
<Compile Include="Engine\Log\AxiosLog.cs" />
<Compile Include="Engine\Structures\AxiosRectangle.cs" />
<Compile Include="Engine\SimpleAxiosGameObject.cs" />
<Compile Include="Engine\SimpleDrawableAxiosGameObject.cs" />
<Compile Include="Engine\AxiosTimer.cs" />
axios/Axios_Xbox_360.csproj
172172
173173
174174
175
175176
176177
177178
<Compile Include="Engine\SimpleAxiosGameObject.cs" />
<Compile Include="Engine\SimpleDrawableAxiosGameObject.cs" />
<Compile Include="Engine\Singleton.cs" />
<Compile Include="Engine\Structures\AxiosRectangle.cs" />
<Compile Include="Engine\UI\AxiosButton.cs" />
<Compile Include="Engine\UI\AxiosUIObject.cs" />
<Compile Include="Factories\BodyFactory.cs" />
axios/Axios_settings.cs
4848
4949
5050
51
52
5153
5254
5355
* - Adding field to allow/disallow automated mouse joints per object
* - Fixing bug with last screen not exiting if it is a background screen
*
* 1.0.1.1 - 3/22/2012
*
*
*/
axios/Engine/AxiosGameScreen.cs
283283
284284
285285
286
286
287287
288288
289289
290290
291
291
292292
293
294
293
294
295295
296296
297297
Rectangle uirect;
bool foundobject = false;
Vector2 mousepos = ConvertUnits.ToSimUnits(input.Cursor);
Vector2 objpos;
//Vector2 objpos;
//System.Diagnostics.Debugger.Break();
foreach(AxiosUIObject uiobject in _uiobjects)
{
uiobjpos = uiobject.Position;
objpos = this.Camera.ConvertScreenToWorld(uiobjpos);
//objpos = this.Camera.ConvertScreenToWorld(uiobjpos);
uirect = new Rectangle((int)uiobjpos.X, (int)uiobjpos.Y, (int)ConvertUnits.ToSimUnits(uiobject.Width), (int)ConvertUnits.ToSimUnits(uiobject.Height));
uirect = new Rectangle((int)uiobjpos.X, (int)uiobjpos.Y, (int)Math.Ceiling(ConvertUnits.ToSimUnits(uiobject.Width)), (int)Math.Ceiling(ConvertUnits.ToSimUnits(uiobject.Height) + 1));
if (uirect.Contains((int)position.X, (int)position.Y))
{
axios/Engine/Structures/AxiosPoint.cs
1
2
3
4
5
6
7
8
9
10
11
12
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Axios.Engine.Structures
{
class AxiosPoint
{
}
}
axios/Engine/Structures/AxiosRectangle.cs
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Axios.Engine.Structures
{
class AxiosRectangle
{
private float _width;
private float _height;
private float _x;
private float _y;
public float Width
{
get { return _width; }
set { _width = value; }
}
public float Height
{
get { return _height; }
set { _height = value; }
}
public float X
{
get { return _x; }
set { _x = value; }
}
public float Y
{
get { return _y; }
set { _y = value; }
}
public float Top
{
}
public float Bottom
{
get { return _y + _height; }
}
public bool Intersect(AxiosRectangle rect)
{
bool intersects = false;
return intersects;
}
public AxiosRectangle(float X, float Y, float width, float height)
{
_width = width;
_height = height;
_x = X;
_y = Y;
}
}
}
axios/Properties/AssemblyInfo.cs
3131
3232
3333
34
34
3535
3636
3737
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.0.0.9")]
[assembly: AssemblyVersion("1.0.1.0")]
#if DEBUG
[assembly: AssemblyConfiguration("Debug")]

Archive Download the corresponding diff file

Page rendered in 0.55920s using 13 queries.