Added pointers of most commonly used subsystems to Context

Source/Atomic/Core/Context.h

@@ -38,6 +38,27 @@ public:
     virtual void EndSendEvent(Context* context, Object* sender, StringHash eventType, VariantMap& eventData) = 0;
 };
 
+class Metrics;
+class Engine;
+class Time;
+class WorkQueue;
+class Profiler;
+class FileSystem;
+class Log;
+class ResourceCache;
+class Localization;
+class Network;
+class Web;
+class Database;
+class Input;
+class Audio;
+class UI;
+class SystemUI;
+class Graphics;
+class Renderer;
+class Console;
+class DebugHud;
+
 // ATOMIC END
 
 /// Tracking structure for event receivers.
@@ -228,6 +249,27 @@ public:
     void AddGlobalEventListener(GlobalEventListener* listener) { globalEventListeners_.Push(listener); }
     void RemoveGlobalEventListener(GlobalEventListener* listener) { globalEventListeners_.Erase(globalEventListeners_.Find(listener)); }
 
+    WeakPtr<Engine> engine_;
+    WeakPtr<Time> time_;
+    WeakPtr<WorkQueue> workQueue_;
+    WeakPtr<Profiler> profiler_;
+    WeakPtr<FileSystem> fileSystem_;
+    WeakPtr<Log> log_;
+    WeakPtr<ResourceCache> cache_;
+    WeakPtr<Localization> l18n_;
+    WeakPtr<Network> network_;
+    WeakPtr<Web> web_;
+    WeakPtr<Database> db_;
+    WeakPtr<Input> input_;
+    WeakPtr<Audio> audio_;
+    WeakPtr<UI> ui_;
+    WeakPtr<SystemUI> systemUi_;
+    WeakPtr<Graphics> graphics_;
+    WeakPtr<Renderer> renderer_;
+    WeakPtr<Console> console_;
+    WeakPtr<DebugHud> debugHud_;
+    WeakPtr<Metrics> metrics_;
+
     // ATOMIC END
 
 private:

Source/Atomic/Engine/Engine.cpp

@@ -43,6 +43,8 @@
 // ATOMIC BEGIN
 #include "../Resource/XMLFile.h"
 #include "../UI/SystemUI/SystemUI.h"
+#include "../UI/SystemUI/Console.h"
+#include "../UI/SystemUI/DebugHud.h"
 // ATOMIC END
 
 #ifdef ATOMIC_NAVIGATION
@@ -348,6 +350,29 @@ bool Engine::Initialize(const VariantMap& parameters)
 
     // ATOMIC BEGIN
     context_->RegisterSubsystem(new SystemUI(context_));
+
+    context_->engine_ = GetSubsystem<Engine>();
+    context_->time_ = GetSubsystem<Time>();
+    context_->workQueue_ = GetSubsystem<WorkQueue>();
+    context_->profiler_ = GetSubsystem<Profiler>();
+    context_->fileSystem_ = GetSubsystem<FileSystem>();
+    context_->log_ = GetSubsystem<Log>();
+    context_->cache_ = GetSubsystem<ResourceCache>();
+    context_->l18n_ = GetSubsystem<Localization>();
+    context_->network_ = GetSubsystem<Network>();
+    context_->web_ = GetSubsystem<Web>();
+#ifdef ATOMIC_DATABASE
+    context_->db_ = GetSubsystem<Database>();
+#endif
+    context_->input_ = GetSubsystem<Input>();
+    context_->audio_ = GetSubsystem<Audio>();
+    context_->ui_ = GetSubsystem<UI>();
+    context_->systemUi_ = GetSubsystem<SystemUI>();
+    context_->graphics_ = GetSubsystem<Graphics>();
+    context_->renderer_ = GetSubsystem<Renderer>();
+    context_->console_ = GetSubsystem<Console>();
+    context_->debugHud_ = GetSubsystem<DebugHud>();
+    context_->metrics_ = GetSubsystem<Metrics>();
     // ATOMIC END
 
     frameTimer_.Reset();