Changeset 24

User picture

Author: conkerjo

(2009/07/12 15:10) Over 2 years ago


  





Affected files




    

    

          

  Updated
src/AIDemos/Screens/AIDemosPauseMenuScreen.cs  Download diff




      
      
2324
25
            LoadingScreen.Load(ScreenManager, false, null, new BackgroundScreen(),
25
            LoadingScreen.Load(ScreenManager, false, null, new BackgroundScreen(),



26
                                                         new MainMenuScreen());
26
                                                         new MainMenuScreen());



27
        }
27
        }



28
        



28
    }
29
    }



29
}
30
}





          

  Updated
src/AIDemos/Screens/Demos/Demo1.cs  Download diff




      
      
2324
16
using AIDemos.GameClasses.Behaviors;
16
using AIDemos.GameClasses.Behaviors;



17
using Brains.Framework.Map;
17
using Brains.Framework.Map;



18
using Brains.Framework.Utility;
18
using Brains.Framework.Utility;



19
using Brains.Framework.Locomotion;



19
20



20
namespace AIDemos.Screens.Demos
21
namespace AIDemos.Screens.Demos



21
{
22
{


...
...
44
45



45
            CenterCamOnMap();
46
            CenterCamOnMap();



46
       
47
       



47



48
            ScreenManager.Game.ResetElapsedTime();
48
            ScreenManager.Game.ResetElapsedTime();



49
        }
49
        }



50
        
50
        



51
        private void LoadAI()
51
        private void LoadAI()



52
        {
52
        {



53
            _engine.CreateWorld(new DrawableWorld());
53
            _engine.CreateWorld(new DrawableWorld());



54
            _engine.World.LoadMapDataFromTexture(
54
            _engine.World.LoadMapDataFromTexture(content.Load<Texture2D>("DemoTextures/MAPDemo1"),



55
                content.Load<Texture2D>("DemoTextures/MAPDemo1"),
55
                                                32,



56
                32,
56
                                                typeof(DrawableGrid));



57
                typeof(DrawableGrid));



58
57



59
            //Find the marked green node
58
            //Find the marked green node



60
            _endNode= _engine.World.Map.AllCells.First(
59
            _endNode= _engine.World.Map.AllCells.First(


...
...
99
            bool gamePadDisconnected = !gamePadState.IsConnected &&
98
            bool gamePadDisconnected = !gamePadState.IsConnected &&



100
                                       input.GamePadWasConnected[playerIndex];
99
                                       input.GamePadWasConnected[playerIndex];



101
100



102
            if (input.IsPauseGame(ControllingPlayer) || gamePadDisconnected)
101
            if (!gamePadDisconnected)



103
            {
102
            {



104
                ScreenManager.AddScreen(new PauseMenuScreen(), ControllingPlayer);



105
            }



106
            else



107
            {



108
                Vector2 mousPos = new Vector2(_currentMouse.X, _currentMouse.Y);
103
                Vector2 mousPos = new Vector2(_currentMouse.X, _currentMouse.Y);



109
104



110
                if (_currentMouse.LeftButton == ButtonState.Released &&
105
                if (_currentMouse.LeftButton == ButtonState.Released &&


...
...
115
                    if (cell != null)
110
                    if (cell != null)



116
                    {
111
                    {



117
                        GameActor actor = new GameActor(cell.Position, 5);
112
                        GameActor actor = new GameActor(cell.Position, 5);



118
                        actor.Locomotion = new Brains.Framework.Locomotion.LocomotionController();
113
                        actor.Locomotion = new LocomotionController();



119
                        actor.Locomotion.MaxSpeed = 50;
114
                        actor.Locomotion.MaxSpeed = 50;



120
                        actor.Locomotion.MaxRotation = MathHelper.TwoPi;
115
                        actor.Locomotion.MaxRotation = MathHelper.TwoPi;



121
116


...
...
131
                    }
126
                    }



132
                }
127
                }



133
            }
128
            }



129



130
            base.HandleInput(input);



134
        }
131
        }



135
132



136
        public override void Draw(GameTime gameTime)
133
        public override void Draw(GameTime gameTime)





          

  Updated
src/AIDemos/Screens/Demos/Demo2.cs  Download diff




      
      
2324
133
            bool gamePadDisconnected = !gamePadState.IsConnected &&
133
            bool gamePadDisconnected = !gamePadState.IsConnected &&



134
                                       input.GamePadWasConnected[playerIndex];
134
                                       input.GamePadWasConnected[playerIndex];



135
135



136
            if (input.IsPauseGame(ControllingPlayer) || gamePadDisconnected)
136
            if (!gamePadDisconnected)



137
            {
137
            {



138
                ScreenManager.AddScreen(new PauseMenuScreen(), ControllingPlayer);



139
            }



140
            else



141
            {



142
                Vector2 mousPos = new Vector2(_currentMouse.X, _currentMouse.Y);
138
                Vector2 mousPos = new Vector2(_currentMouse.X, _currentMouse.Y);



143
139



144
                if (_currentMouse.LeftButton == ButtonState.Released &&
140
                if (_currentMouse.LeftButton == ButtonState.Released &&


...
...
164
                        actor.RootBehavior = _sequence;
160
                        actor.RootBehavior = _sequence;



165
                    }
161
                    }



166
                }
162
                }



163



167
            }
164
            }



165
            base.HandleInput(input);



168
        }
166
        }



169
167



170
        public override void Draw(GameTime gameTime)
168
        public override void Draw(GameTime gameTime)





          

  Updated
src/AIDemos/Screens/Demos/Demo3.cs  Download diff




      
      
2324
115
        MouseState _lastMouse;
115
        MouseState _lastMouse;



116
        public override void HandleInput(InputState input)
116
        public override void HandleInput(InputState input)



117
        {
117
        {



118
            if (input == null)



119
                throw new ArgumentNullException("input");



120



121
            _lastMouse = _currentMouse;
118
            _lastMouse = _currentMouse;



122
            _currentMouse = Mouse.GetState();
119
            _currentMouse = Mouse.GetState();



123
120



124



125
            int playerIndex = (int)ControllingPlayer.Value;



126
            



127
            KeyboardState keyboardState = input.CurrentKeyboardStates[playerIndex];



128
            GamePadState gamePadState = input.CurrentGamePadStates[playerIndex];



129



130
            bool gamePadDisconnected = !gamePadState.IsConnected &&



131
                                       input.GamePadWasConnected[playerIndex];



132



133
            if (input.IsPauseGame(ControllingPlayer) || gamePadDisconnected)



134
            {



135
                ScreenManager.AddScreen(new PauseMenuScreen(), ControllingPlayer);



136
            }



137
            else



138
            {



139
              



140
            }



141



142
            base.HandleInput(input);
121
            base.HandleInput(input);



143
        }
122
        }



144
123





          

  Updated
src/AIDemos/Screens/Demos/Demo4.cs  Download diff




      
      
2324
96
            bool gamePadDisconnected = !gamePadState.IsConnected &&
96
            bool gamePadDisconnected = !gamePadState.IsConnected &&



97
                                       input.GamePadWasConnected[playerIndex];
97
                                       input.GamePadWasConnected[playerIndex];



98
98



99
            if (input.IsPauseGame(ControllingPlayer) || gamePadDisconnected)
99
            if (!gamePadDisconnected)



100
            {
100
            {



101
                ScreenManager.AddScreen(new PauseMenuScreen(), ControllingPlayer);



102
            }



103
            else



104
            {



105
                Vector2 mousPos = new Vector2(_currentMouse.X, _currentMouse.Y);
101
                Vector2 mousPos = new Vector2(_currentMouse.X, _currentMouse.Y);



106
                Vector2 mapMousePos = mousPos + primitiveBatch.CameraPosition;
102
                Vector2 mapMousePos = mousPos + primitiveBatch.CameraPosition;



107
                   
103
                   





          

  Updated
src/AIDemos/Screens/Demos/Demo5.cs  Download diff




      
      
2324
133
            bool gamePadDisconnected = !gamePadState.IsConnected &&
133
            bool gamePadDisconnected = !gamePadState.IsConnected &&



134
                                       input.GamePadWasConnected[playerIndex];
134
                                       input.GamePadWasConnected[playerIndex];



135
135



136
            if (input.IsPauseGame(ControllingPlayer) || gamePadDisconnected)
136
            



137
            {



138
                ScreenManager.AddScreen(new PauseMenuScreen(), ControllingPlayer);



139
            }



140
            else



141
            {



142
              



143
            }



144
137



145
            base.HandleInput(input);
138
            base.HandleInput(input);



146
        }
139
        }





          

  Updated
src/AIDemos/Screens/Demos/Demo6.cs  Download diff




      
      
2324
189
            bool gamePadDisconnected = !gamePadState.IsConnected &&
189
            bool gamePadDisconnected = !gamePadState.IsConnected &&



190
                                       input.GamePadWasConnected[playerIndex];
190
                                       input.GamePadWasConnected[playerIndex];



191
191



192
            if (input.IsPauseGame(ControllingPlayer) || gamePadDisconnected)
192
           



193
            {



194
                ScreenManager.AddScreen(new PauseMenuScreen(), ControllingPlayer);



195
            }



196
            else



197
            {



198
              



199
            }



200
193



201
            base.HandleInput(input);
194
            base.HandleInput(input);



202
        }
195
        }





          

  Updated
src/AIDemos/Screens/Demos/Demo7.cs  Download diff




      
      
2324
20
using AIDemos.GameClasses.Behaviors.Conditions;
20
using AIDemos.GameClasses.Behaviors.Conditions;



21
using AIDemos.GameClasses.Behaviors.Decorators;
21
using AIDemos.GameClasses.Behaviors.Decorators;



22
using Brains.Framework.Locomotion;
22
using Brains.Framework.Locomotion;



23
using Brains.Grouping;
23
using Brains.Framework.Grouping;



24
24



25



25
namespace AIDemos.Screens.Demos
26
namespace AIDemos.Screens.Demos



26
{
27
{



27
    public class Demo7 : DemoGameScreen
28
    public class Demo7 : DemoGameScreen


...
...
160
            bool gamePadDisconnected = !gamePadState.IsConnected &&
161
            bool gamePadDisconnected = !gamePadState.IsConnected &&



161
                                       input.GamePadWasConnected[playerIndex];
162
                                       input.GamePadWasConnected[playerIndex];



162
163



163
            if (input.IsPauseGame(ControllingPlayer) || gamePadDisconnected)
164
           



164
            {



165
                ScreenManager.AddScreen(new PauseMenuScreen(), ControllingPlayer);



166
            }



167
            else



168
            {



169
              



170
            }



171
165



172
            base.HandleInput(input);
166
            base.HandleInput(input);



173
        }
167
        }





          

  Updated
src/AIDemos/Screens/Demos/DemoGameScreen.cs  Download diff




      
      
2324
96
        }
96
        }



97
        public override void HandleInput(InputState input)
97
        public override void HandleInput(InputState input)



98
        {
98
        {



99
            int playerIndex = (int)ControllingPlayer.Value;



100
            GamePadState gamePadState = input.CurrentGamePadStates[playerIndex];



101
            



99
           
102
           



100
            PlayerIndex index;
103
            PlayerIndex index;



101
            if (input.IsNewKeyPress(Keys.PageDown, null, out index))
104
            if (input.IsNewKeyPress(Keys.PageDown, null, out index))


...
...
110
            {
113
            {



111
                primitiveBatch.Zoom = 1f;
114
                primitiveBatch.Zoom = 1f;



112
            }
115
            }



116



117
            bool gamePadDisconnected = !gamePadState.IsConnected &&



118
                                    input.GamePadWasConnected[playerIndex];



119



120
            if (input.IsPauseGame(ControllingPlayer) || gamePadDisconnected)



121
            {



122
                ScreenManager.AddScreen(new AIDemosPauseMenuScreen(), ControllingPlayer);



123
            }



113
            base.HandleInput(input);
124
            base.HandleInput(input);



114
        }
125
        }



115
    }
126
    }





          

  Updated
src/BRAINSFramework/Grouping/Group.cs  Download diff




      
      
2324
5
using Brains.Framework;
5
using Brains.Framework;



6
using Brains.Framework.Utility;
6
using Brains.Framework.Utility;



7
7



8
namespace Brains.Grouping
8
namespace Brains.Framework.Grouping



9
{
9
{



10
    public class Group
10
    public class Group



11
    {
11
    {





          

  Updated
src/BRAINSFramework/Locomotion/LocomtionSteering.cs  Download diff




      
      
2324
4
using System.Text;
4
using System.Text;



5
using Microsoft.Xna.Framework;
5
using Microsoft.Xna.Framework;



6
using Brains.Framework.Utility;
6
using Brains.Framework.Utility;



7
using Brains.Grouping;
7
using Brains.Framework.Grouping;



8
8



9



9
namespace Brains.Framework.Locomotion
10
namespace Brains.Framework.Locomotion



10
{
11
{



11
    /// <summary>
12
    /// <summary>





          

  Updated
src/BRAINSFramework/World.cs  Download diff




      
      
2324
10
using Brains.Framework.Map;
10
using Brains.Framework.Map;



11
using Brains.Framework.Utility;
11
using Brains.Framework.Utility;



12
using Brains.Framework.Behaviors.PathFinding;
12
using Brains.Framework.Behaviors.PathFinding;



13
using Brains.Grouping;
13
using Brains.Framework.Grouping;



14



14
namespace Brains.Framework
15
namespace Brains.Framework



15
{
16
{



16
    /// <summary>
17
    /// <summary>


...
...
139
            }
140
            }



140
            
141
            



141
        }
142
        }



142



143
      



144
       
143
       



145
        public void AnotateMap()
144
        public void AnotateMap()



146
        {
145
        {


...
...
799
        {
798
        {



800
            Groups.Add(group.GroupID, group);
799
            Groups.Add(group.GroupID, group);



801
        }
800
        }



801



802
        public Group GetGroup(int id)
802
        public Group GetGroup(int id)



803
        {
803
        {



804
            return Groups[id];
804
            return Groups[id];