Merge remote-tracking branch 'origin/Menu'

# Conflicts: # include/Engine/Rendering/ModelJob.h # resources/Schema/Components.xsd # resources/Schema/Entities/Player.xml # resources/Schema/Entities/RenderingWorld.xml # src/Game/Game.cpp
2016-01-25 00:25:03 +01:00
parent 7b348379ac d03b3fb071
commit b95c1fdfa4
18 changed files with 357 additions and 109 deletions
@@ -0,0 +1,23 @@
+#ifndef PlayerHUD_h__
+#define PlayerHUD_h__
+
+#include "../../Engine/Core/System.h"
+#include "../../Engine/GLM.h"
+#include "../../Engine/Rendering/ESetCamera.h"
+#include <imgui/imgui.h>
+
+class PlayerHUD : public ImpureSystem
+{
+public:
+    PlayerHUD(World* world, EventBroker* eventBrokerer);
+    ~PlayerHUD();
+
+    virtual void Update(double dt) override;
+
+private:
+    World* m_World;
+    EventBroker* m_EventBroker;
+
+};
+
+#endif