X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.cpp;h=798355d61e9f6eb054ac640c4cb52af4b57767d9;hb=d6435142245c019523b9385048d6d79bdd2565f2;hp=e8f92689f2fe8cc4cda80cc987baf0aa79b89819;hpb=66d7cf56cfbb565dd4700d94e5f338a39a40edeb;p=blank.git

diff --git a/src/app.cpp b/src/app.cpp
index e8f9268..798355d 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -20,6 +20,7 @@ Application::Application()
 , pitch_sensitivity(-0.0025f)
 , yaw_sensitivity(-0.001f)
 , cam()
+, hud()
 , world()
 , outline()
 , outline_visible(false)
@@ -42,10 +43,12 @@ Application::Application()
 	glGenVertexArrays(1, &VertexArrayID);
 	glBindVertexArray(VertexArrayID);
 
-	cam.Position(glm::vec3(0, 4, 4));
-
 	world.Generate();
 
+	cam.Position(glm::vec3(0, 4, 4));
+	hud.Viewport(960, 600);
+	hud.Display(*world.BlockTypes()[place_id]);
+
 	glClearColor(0.0, 0.0, 0.0, 1.0);
 }
 
@@ -121,6 +124,7 @@ void Application::HandleEvents() {
 				switch (event.window.event) {
 					case SDL_WINDOWEVENT_RESIZED:
 						cam.Viewport(event.window.data1, event.window.data2);
+						hud.Viewport(event.window.data1, event.window.data2);
 						break;
 					default:
 						break;
@@ -171,6 +175,7 @@ void Application::Update(int dt) {
 	if (pick) {
 		if (chunk) {
 			place_id = chunk->BlockAt(blkid).type->id;
+			hud.Display(*world.BlockTypes()[place_id]);
 		}
 		pick = false;
 	}
@@ -201,6 +206,7 @@ void Application::Render() {
 
 	program.Activate();
 
+	program.SetLightDirection({ -1.0f, -3.0f, -2.0f });
 	program.SetVP(cam.View(), cam.Projection());
 
 	for (Chunk &chunk : world.LoadedChunks()) {
@@ -213,6 +219,8 @@ void Application::Render() {
 		outline.Draw();
 	}
 
+	hud.Render(program);
+
 	window.Flip();
 }