diff --git a/resources/Schema/Entities/RenderingWorld.xml b/resources/Schema/Entities/RenderingWorld.xml
index 7ecd25c9..73cafdb9 100644
--- a/resources/Schema/Entities/RenderingWorld.xml
+++ b/resources/Schema/Entities/RenderingWorld.xml
@@ -9,7 +9,7 @@
- 69.990005493164063
+ 65.990005493164063
@@ -21,6 +21,7 @@
Models/Assault.obj
+
@@ -53,8 +54,8 @@
- 0.69990003108978271
-
+ 0.65990006923675537
+
Models/Core/UnitHexagon.obj
@@ -83,7 +84,7 @@
Models/SecondaryWeapon.fbx
-
+
@@ -110,7 +111,7 @@
Models/SecondaryWeapon.fbx
-
+
@@ -121,8 +122,68 @@
+
+
+
+ 24
+ Fonts/DroidSans.ttf,60
+
+
+
+
+
+
+
+
+
+
+ 262
+ Fonts/DroidSans.ttf,60
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 65/100
+ Fonts/DroidSans.ttf,60
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.65990006923675537
+
+
+
+ Models/Core/UnitRaptor.obj
+
+
+
+
+
+
+
+
+
+
@@ -145,6 +206,7 @@
Models/Assault.obj
+
@@ -157,6 +219,7 @@
Welcome!
Fonts/DroidSans.ttf,1280
+
@@ -167,32 +230,40 @@
- 2
-
+ 3
+
-
-
+
+
+ Models/Core/UnitSphere.obj
+
+
- 6
+ 70
0.5
+
+
+ Models/Core/UnitSphere.obj
+
+
- 8
+ 70
@@ -204,21 +275,30 @@
+
+ Models/Core/UnitSphere.obj
+
+
- 6
+ 70
0.5
+
+
+ Models/Core/UnitSphere.obj
+
+
- 8
+ 70
@@ -230,21 +310,30 @@
+
+ Models/Core/UnitSphere.obj
+
+
- 6
+ 70
0.5
+
+
+ Models/Core/UnitSphere.obj
+
+
-
- 8
+
+ 70
@@ -256,19 +345,28 @@
+
+ Models/Core/UnitSphere.obj
+
+
- 6
+ 70
0.5
+
+
+ Models/Core/UnitSphere.obj
+
+
- 8
+ 70
@@ -284,6 +382,7 @@
Models/Assault.obj
+
@@ -291,14 +390,15 @@
-
+
- 0.80000001192092896
+ 0.10000000149011612
Models/DirectionalLightWidget.obj
+
@@ -311,6 +411,7 @@
Models/Core/UnitCube.obj
+
diff --git a/src/Game/Systems/PlayerHUD.cpp b/src/Game/Systems/PlayerHUD.cpp
index 57e0e2f8..55d0c3f1 100644
--- a/src/Game/Systems/PlayerHUD.cpp
+++ b/src/Game/Systems/PlayerHUD.cpp
@@ -11,32 +11,12 @@ PlayerHUD::PlayerHUD(World* world, EventBroker* eventBrokerer)
PlayerHUD::~PlayerHUD()
{
-//
+
}
void PlayerHUD::Update(double dt)
{
-
- if(ImGui::Button("Set Camera", ImVec2(70, 20))){
- auto cameras = m_World->GetComponents("Camera");
-
- if(cameras == nullptr) {
- return;
- }
-
- EntityWrapper ew = EntityWrapper(m_World, (*cameras->begin()).EntityID);
-
- if (ew.Valid()) {
- Events::SetCamera e;
- e.CameraEntity = ew;
- m_EventBroker->Publish(e);
- } else {
- LOG_INFO("Coulnd't find a camera");
- }
- }
-
-
auto healthHUDs = m_World->GetComponents("HealthHUD");
if (healthHUDs == nullptr) {
return;
@@ -57,14 +37,12 @@ void PlayerHUD::Update(double dt)
if (entityIDParent.HasComponent("Health")) {
if (entity.HasComponent("Text")) {
-
std::string s = "";
s = s + std::to_string((int)(double)entityIDParent["Health"]["Health"]);
s = s + "/";
s = s + std::to_string((int)(double)entityIDParent["Health"]["MaxHealth"]);
-
float healthPercentage = (double)entityIDParent["Health"]["Health"]/(double)entityIDParent["Health"]["MaxHealth"];
- (glm::vec4&) entity["Text"]["Color"] = glm::vec4(1.0 - healthPercentage, healthPercentage, 0.f, 0.f);
+ (glm::vec4&)entity["Text"]["Color"] = glm::vec4(1.0 - healthPercentage, 0.f, healthPercentage, 1.f);
entity["Text"]["Content"] = s;
}