HUD has icons

Author: Holly-Buteau

src/HUD.cpp

@@ -23,13 +23,45 @@ HUD :: HUD(Window* window, Input* input, Cache<Resource,std::string>* cache, Pla
             to_string(int(sw / 36.0f + 0.5f))),
         cache
     );
-    m_pText = std::make_shared<Text>(m_pFont);
-    add(m_pText);
-    
+
+	m_pStarText = std::make_shared<Text>(m_pFont);
+	m_pLivesText = std::make_shared<Text>(m_pFont);
+	m_pHealthText = std::make_shared<Text>(m_pFont);
+
+	m_pLivesText->position(glm::vec3(sw / 2.0f, 0.0f, 0.0f));
+	m_pHealthText->position(glm::vec3(sw, 0.0f, 0.0f));
+
+	m_pStarText->align(Text::LEFT);
+	m_pLivesText->align(Text::CENTER);
+	m_pHealthText->align(Text::RIGHT);
+
+    add(m_pStarText);
+	add(m_pLivesText);
+	add(m_pHealthText);
+
     set(0, 0, 0);
 
     auto _this = this;
     m_HealthCon = m_pPlayer->on_health_change.connect([_this](int){_this->m_bDirty = true; });
+
+	auto mat = make_shared<MeshMaterial>("items.png", m_pCache);
+
+	m_pHeart = make_shared<Mesh>(
+		make_shared<MeshGeometry>(Prefab::quad(vec2(sw / 24, sw / 24))),
+		vector<shared_ptr<IMeshModifier>>{
+		make_shared<Wrap>(Prefab::tile_wrap(
+			// Y Y (height is tile size for both dims)
+			uvec2(16, 16),
+			// X Y
+			uvec2(mat->texture()->size().x, mat->texture()->size().y),
+			1
+		))
+	}, mat
+		);
+
+	add(m_pHeart);
+	
+
 }
 
 
@@ -52,15 +84,24 @@ void HUD :: redraw() {
 
     //m_pCanvas->dirty(true);
 
-    m_pText->set("  " + to_string(m_Stars) + "/" + to_string(m_MaxStars) + "\n"
-        + "Health: " + to_string(m_pPlayer->health()) + "/100" + "\n"
-        + "Lives: " + to_string(m_pPlayer->lives()));
+	m_pStarText->set("  " + to_string(m_Stars) + "/" + to_string(m_MaxStars));
+	m_pHealthText->set("  " + to_string(m_pPlayer->health()) + "%");
+	m_pLivesText->set("  " + to_string(m_pPlayer->lives()));
+
+	
 }
 
 
 void HUD :: logic_self(Freq::Time) {
     if (m_bDirty) {
         redraw();
+
+		//m_pHeart->position(m_pHealthText->position() - glm::vec3(
+
+		//	m_pHealthText->children()[0]->box().size().x, 0.0f, 0.0f
+
+		//));
+
         m_bDirty = false;
     }
 }

src/HUD.h

@@ -46,9 +46,12 @@ class HUD: public Node {
         //std::shared_ptr<Canvas> m_pCanvas;
         Cache<Resource, std::string>* m_pCache;
         std::shared_ptr<Mesh> m_pMesh;
+		std::shared_ptr<Mesh> m_pHeart;
 
         std::shared_ptr<Font> m_pFont;
-        std::shared_ptr<Text> m_pText;
+        std::shared_ptr<Text> m_pLivesText;
+		std::shared_ptr<Text> m_pHealthText;
+		std::shared_ptr<Text> m_pStarText;
         Player* m_pPlayer = nullptr;
 
         boost::signals2::scoped_connection m_HealthCon;