Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-26 06:28:35 +01:00
Code Issues Projects Releases Wiki Activity

added some events to MlemGame to allow for mouse handling to be disabled easily in the android version

Browse source
This commit is contained in:
Ellpeck 2019-09-05 14:27:18 +02:00
parent 12a2e92c09
commit b812bbe677
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Demos.Android/Activity1.cs
View file

@ -18,6 +18,8 @@ namespace AndroidDemos {
protected override void OnCreate(Bundle bundle) { protected override void OnCreate(Bundle bundle) {
base.OnCreate(bundle); base.OnCreate(bundle);
var g = new GameImpl(); var g = new GameImpl();
// disable mouse handling for android to make emulator behavior more coherent
g.OnLoadContent += game => game.InputHandler.HandleMouse = false;
this.SetContentView((View) g.Services.GetService(typeof(View))); this.SetContentView((View) g.Services.GetService(typeof(View)));
g.Run(); g.Run();
} }

11
MLEM.Startup/MlemGame.cs
View file

@ -18,6 +18,10 @@ namespace MLEM.Startup {
public InputHandler InputHandler { get; protected set; } public InputHandler InputHandler { get; protected set; }
public UiSystem UiSystem { get; protected set; } public UiSystem UiSystem { get; protected set; }
public GenericCallback OnLoadContent;
public TimeCallback OnUpdate;
public TimeCallback OnDraw;
public MlemGame(int windowWidth = 1280, int windowHeight = 720, bool vsync = false, bool allowResizing = true, string contentDir = "Content") { public MlemGame(int windowWidth = 1280, int windowHeight = 720, bool vsync = false, bool allowResizing = true, string contentDir = "Content") {
instance = this; instance = this;
this.GraphicsDeviceManager = new GraphicsDeviceManager(this) { this.GraphicsDeviceManager = new GraphicsDeviceManager(this) {
@ -33,6 +37,7 @@ namespace MLEM.Startup {
this.SpriteBatch = new SpriteBatch(this.GraphicsDevice); this.SpriteBatch = new SpriteBatch(this.GraphicsDevice);
this.InputHandler = new InputHandler(); this.InputHandler = new InputHandler();
this.UiSystem = new UiSystem(this.Window, this.GraphicsDevice, new UntexturedStyle(this.SpriteBatch), this.InputHandler); this.UiSystem = new UiSystem(this.Window, this.GraphicsDevice, new UntexturedStyle(this.SpriteBatch), this.InputHandler);
this.OnLoadContent?.Invoke(this);
} }
protected override void Update(GameTime gameTime) { protected override void Update(GameTime gameTime) {
@ -41,6 +46,7 @@ namespace MLEM.Startup {
this.InputHandler.Update(); this.InputHandler.Update();
this.UiSystem.Update(gameTime); this.UiSystem.Update(gameTime);
this.OnUpdate?.Invoke(this, gameTime);
CoroutineHandler.Tick(gameTime.GetElapsedSeconds()); CoroutineHandler.Tick(gameTime.GetElapsedSeconds());
CoroutineHandler.RaiseEvent(CoroutineEvents.Update); CoroutineHandler.RaiseEvent(CoroutineEvents.Update);
} }
@ -49,6 +55,7 @@ namespace MLEM.Startup {
this.UiSystem.DrawEarly(gameTime, this.SpriteBatch); this.UiSystem.DrawEarly(gameTime, this.SpriteBatch);
this.DoDraw(gameTime); this.DoDraw(gameTime);
this.UiSystem.Draw(gameTime, this.SpriteBatch); this.UiSystem.Draw(gameTime, this.SpriteBatch);
this.OnDraw?.Invoke(this, gameTime);
CoroutineHandler.RaiseEvent(CoroutineEvents.Draw); CoroutineHandler.RaiseEvent(CoroutineEvents.Draw);
} }
@ -60,5 +67,9 @@ namespace MLEM.Startup {
return instance.Content.Load<T>(name); return instance.Content.Load<T>(name);
} }
public delegate void GenericCallback(MlemGame game);
public delegate void TimeCallback(MlemGame game, GameTime time);
} }
} }