AxiosEngine-old Commit Details

Date:

2012-05-26 18:50:00 (13 years 4 months ago)

Author:

Natalie Adams

Branch:

xnacc-integration

Commit:

552db509979e

Parents:

dbf354faa71f

Message:

Adding AxiosCommandConsole for easy intergration with AxiosGameScreens

Adding the ability to get the InputState object from the ScreenManager

Changes:

A	axios/Engine/AxiosCommandConsole.cs (full)
M	axios/Axios_WP7.csproj (1 diff)
M	axios/Axios_Windows.csproj (1 diff)
M	axios/Axios_Xbox_360.csproj (1 diff)
M	axios/ScreenSystem/ScreenManager.cs (1 diff)

File differences

-155
156 156
157 157
158
158 159
159 160
160 161
+    <Compile Include="Dynamics\TimeStep.cs" />␍␊
    <Compile Include="Dynamics\World.cs" />␍␊
    <Compile Include="Dynamics\WorldCallbacks.cs" />␍␊
    <Compile Include="Engine\AxiosCommandConsole.cs" />␍␊
    <Compile Include="Engine\AxiosEvents.cs" />␍␊
    <Compile Include="Engine\AxiosGameObject.cs" />␍␊
    <Compile Include="Engine\AxiosGameScreen.cs" />␍␊
     <Compile Include="Dynamics\TimeStep.cs" />␍␊
     <Compile Include="Dynamics\World.cs" />␍␊
     <Compile Include="Dynamics\WorldCallbacks.cs" />␍␊
+    <Compile Include="Engine\AxiosCommandConsole.cs" />␍␊
     <Compile Include="Engine\AxiosEvents.cs" />␍␊
     <Compile Include="Engine\AxiosGameObject.cs" />␍␊
     <Compile Include="Engine\AxiosGameScreen.cs" />␍␊

-98
99 99
100 100
101
101 102
102 103
103 104
+  </ItemGroup>␍␊
  <ItemGroup>␍␊
    <Compile Include="Engine\AxiosBreakableGameObject.cs" />␍␊
    <Compile Include="Engine\AxiosCommandConsole.cs" />␍␊
    <Compile Include="Engine\AxiosEvents.cs" />␍␊
    <Compile Include="Axios_settings.cs" />␍␊
    <Compile Include="Collision\Collision.cs" />␍␊
   </ItemGroup>␍␊
   <ItemGroup>␍␊
     <Compile Include="Engine\AxiosBreakableGameObject.cs" />␍␊
+    <Compile Include="Engine\AxiosCommandConsole.cs" />␍␊
     <Compile Include="Engine\AxiosEvents.cs" />␍␊
     <Compile Include="Axios_settings.cs" />␍␊
     <Compile Include="Collision\Collision.cs" />␍␊

-149
150 150
151 151
152
152 153
153 154
154 155
+    <Compile Include="Dynamics\World.cs" />␍␊
    <Compile Include="Dynamics\WorldCallbacks.cs" />␍␊
    <Compile Include="Engine\AxiosBreakableGameObject.cs" />␍␊
    <Compile Include="Engine\AxiosCommandConsole.cs" />␍␊
    <Compile Include="Engine\AxiosEvents.cs" />␍␊
    <Compile Include="Engine\AxiosGameObject.cs" />␍␊
    <Compile Include="Engine\AxiosGameScreen.cs" />␍␊
     <Compile Include="Dynamics\World.cs" />␍␊
     <Compile Include="Dynamics\WorldCallbacks.cs" />␍␊
     <Compile Include="Engine\AxiosBreakableGameObject.cs" />␍␊
+    <Compile Include="Engine\AxiosCommandConsole.cs" />␍␊
     <Compile Include="Engine\AxiosEvents.cs" />␍␊
     <Compile Include="Engine\AxiosGameObject.cs" />␍␊
     <Compile Include="Engine\AxiosGameScreen.cs" />␍␊

-
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
+#if WINDOWS␍␊
using System;␍␊
using System.Collections.Generic;␍␊
using System.Linq;␍␊
using System.Text;␍␊
using XNACC.Console;␍␊
using Microsoft.Xna.Framework.Graphics;␍␊
␍␊
namespace Axios.Engine␍␊
{␍␊
    class AxiosCommandConsole : CommandConsoleBase␍␊
    {␍␊
        public AxiosCommandConsole(AxiosGameScreen gameScreen)␍␊
            : base(gameScreen.ScreenManager.Game)␍␊
        {␍␊
            Keyboard = gameScreen.ScreenManager.InputState;␍␊
        }␍␊
␍␊
        public AxiosCommandConsole(AxiosGameScreen gameScreen, SpriteFont font)␍␊
            : base(gameScreen.ScreenManager.Game, font)␍␊
        {␍␊
            Keyboard = gameScreen.ScreenManager.InputState;␍␊
        }␍␊
    }␍␊
}␍␊
#endif
+#if WINDOWS␍␊
+using System;␍␊
+using System.Collections.Generic;␍␊
+using System.Linq;␍␊
+using System.Text;␍␊
+using XNACC.Console;␍␊
+using Microsoft.Xna.Framework.Graphics;␍␊
+␍␊
+namespace Axios.Engine␍␊
+{␍␊
+    class AxiosCommandConsole : CommandConsoleBase␍␊
+    {␍␊
+        public AxiosCommandConsole(AxiosGameScreen gameScreen)␍␊
+            : base(gameScreen.ScreenManager.Game)␍␊
+        {␍␊
+            Keyboard = gameScreen.ScreenManager.InputState;␍␊
+        }␍␊
+␍␊
+        public AxiosCommandConsole(AxiosGameScreen gameScreen, SpriteFont font)␍␊
+            : base(gameScreen.ScreenManager.Game, font)␍␊
+        {␍␊
+            Keyboard = gameScreen.ScreenManager.InputState;␍␊
+        }␍␊
+    }␍␊
+}␍␊
+#endif

-57
58 58
59 59
60
61
62
63
64
60 65
61 66
62 67
+␍␊
        #region Properties␍␊
␍␊
        public InputState InputState␍␊
        {␍␊
            get { return input; }␍␊
            private set { input = value; }␍␊
        }␍␊
␍␊
        public SpriteFonts Fonts␍␊
        {␍␊
 ␍␊
         #region Properties␍␊
 ␍␊
+        public InputState InputState␍␊
+        {␍␊
+            get { return input; }␍␊
+            private set { input = value; }␍␊
+        }␍␊
 ␍␊
         public SpriteFonts Fonts␍␊
         {␍␊

Download the corresponding diff file

AxiosEngine-old

File differences

Branches

Tags