From cbec3ddd90972238dbaa808196d9976a900f5840 Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Sat, 24 Aug 2013 14:10:21 -0400
Subject: [PATCH] register main framework objects as services with
 ServiceContainer

---
 Blarg.GameFramework.SDL2/SDLApplication.cs |  2 ++
 Blarg.GameFramework/BaseApplication.cs     | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/Blarg.GameFramework.SDL2/SDLApplication.cs b/Blarg.GameFramework.SDL2/SDLApplication.cs
index 9eee848..749f8ff 100644
--- a/Blarg.GameFramework.SDL2/SDLApplication.cs
+++ b/Blarg.GameFramework.SDL2/SDLApplication.cs
@@ -147,6 +147,8 @@ namespace Blarg.GameFramework
 
 			Framework.Set(this);
 
+			Logger.Info(LOG_TAG, "Framework initialization complete, beginning game application set up.");
+
 			OnInit();
 			OnNewContext();
 			OnResize(ScreenOrientation.Rotation0, _windowInfo.ClientRectangle);
diff --git a/Blarg.GameFramework/BaseApplication.cs b/Blarg.GameFramework/BaseApplication.cs
index 99a2e4f..82d5005 100644
--- a/Blarg.GameFramework/BaseApplication.cs
+++ b/Blarg.GameFramework/BaseApplication.cs
@@ -49,6 +49,17 @@ namespace Blarg.GameFramework
 			GraphicsDevice = new GraphicsDevice(GL);
 			GraphicsDevice.OnInit();
 
+			Logger.Info(LOG_TAG, "Registering framework objects with services container.");
+			Services.Register(Logger);
+			Services.Register(FileSystem);
+			if (Keyboard != null)
+				Services.Register(Keyboard);
+			if (Mouse != null)
+				Services.Register(Mouse);
+			if (TouchScreen != null)
+				Services.Register(TouchScreen);
+			Services.Register(GraphicsDevice);
+
 			Logger.Info(LOG_TAG, "Game app init.");
 			GameApp.OnInit();
 		}