Merge remote-tracking branch 'origin/Menu' into WeaponSystem

# Conflicts: # resources/Schema/Entities/Player.xml # resources/Schema/Types/Entity.xsd
2016-02-12 02:30:38 +01:00
parent bee0630a26 6442254575
commit 47053285c8
16 changed files with 335 additions and 12 deletions
@@ -0,0 +1,17 @@
+#ifndef AmmunitionHUDSystem_h__
+#define AmmunitionHUDSystem_h__
+
+#include "../../Engine/Core/System.h"
+#include "../../Engine/GLM.h"
+
+class AmmunitionHUDSystem : public ImpureSystem
+{
+public:
+    AmmunitionHUDSystem(SystemParams params)
+        : System(params)
+    { }
+
+    virtual void Update(double dt) override;
+};
+
+#endif
@@ -3,13 +3,11 @@

 #include "../../Engine/Core/System.h"
 #include "../../Engine/GLM.h"
-#include "../../Engine/Rendering/ESetCamera.h"
-#include <imgui/imgui.h>

-class PlayerHUDSystem : public ImpureSystem
+class HealthHUDSystem : public ImpureSystem
 {
 public:
-    PlayerHUDSystem(SystemParams params)
+    HealthHUDSystem(SystemParams params)
        : System(params)
    { }