X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fui.cpp;h=f9836ba65a6af4035d7b95e8934c27eebcdced2c;hb=a32b120a2c06d3c7ad6a217bc46bba9e76d75d93;hp=e53cff606291d12d4f4fde960a49af38fa169f01;hpb=afd253b2dd10fdf2d4655d3d4a5766e6aa8c1a2c;p=blank.git

diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp
index e53cff6..f9836ba 100644
--- a/src/ui/ui.cpp
+++ b/src/ui/ui.cpp
@@ -72,17 +72,18 @@ void HUD::Display(const Block &b) {
 void HUD::Render(Viewport &viewport) noexcept {
 	viewport.ClearDepth();
 
-	DirectionalLighting &world_prog = viewport.HUDProgram();
-	world_prog.SetLightDirection({ 1.0f, 3.0f, 5.0f });
-	// disable distance fog
-	world_prog.SetFogDensity(0.0f);
-
+	PlainColor &outline_prog = viewport.HUDOutlineProgram();
 	viewport.EnableInvertBlending();
 	viewport.SetCursor(glm::vec3(0.0f), Gravity::CENTER);
-	world_prog.SetM(viewport.Cursor());
+	outline_prog.SetM(viewport.Cursor());
 	crosshair.Draw();
 
 	if (block_visible) {
+		DirectionalLighting &world_prog = viewport.HUDProgram();
+		world_prog.SetLightDirection({ 1.0f, 3.0f, 5.0f });
+		// disable distance fog
+		world_prog.SetFogDensity(0.0f);
+
 		viewport.DisableBlending();
 		world_prog.SetM(block_transform);
 		block.Draw();
@@ -98,8 +99,7 @@ Interface::Interface(
 : env(env)
 , world(world)
 , ctrl(world.Player())
-, font(env.assets.LoadFont("DejaVuSans", 16))
-, hud(world.BlockTypes(), font)
+, hud(world.BlockTypes(), env.assets.small_ui_font)
 , aim{{ 0, 0, 0 }, { 0, 0, -1 }}
 , aim_chunk(nullptr)
 , aim_block(0)
@@ -107,7 +107,7 @@ Interface::Interface(
 , outline()
 , outline_transform(1.0f)
 , counter_text()
-, messages(font)
+, messages(env.assets.small_ui_font)
 , msg_timer(5000)
 , config(config)
 , place_timer(256)
@@ -123,7 +123,7 @@ Interface::Interface(
 	counter_text.Foreground(glm::vec4(1.0f));
 	counter_text.Background(glm::vec4(0.5f));
 	position_text.Hide();
-	position_text.Position(glm::vec3(-25.0f, 25.0f + font.LineSkip(), 0.0f), Gravity::NORTH_EAST);
+	position_text.Position(glm::vec3(-25.0f, 25.0f + env.assets.small_ui_font.LineSkip(), 0.0f), Gravity::NORTH_EAST);
 	position_text.Foreground(glm::vec4(1.0f));
 	position_text.Background(glm::vec4(0.5f));
 	messages.Position(glm::vec3(25.0f, -25.0f, 0.0f), Gravity::SOUTH_WEST);
@@ -355,13 +355,13 @@ void Interface::UpdateCounter() {
 		"avg: " << env.counter.Average().running << "ms, "
 		"peak: " << env.counter.Peak().running << "ms";
 	std::string text = s.str();
-	counter_text.Set(font, text);
+	counter_text.Set(env.assets.small_ui_font, text);
 }
 
 void Interface::UpdatePosition() {
 	std::stringstream s;
 	s << std::setprecision(3) << "pos: " << ctrl.Controlled().AbsolutePosition();
-	position_text.Set(font, s.str());
+	position_text.Set(env.assets.small_ui_font, s.str());
 }
 
 
@@ -410,7 +410,6 @@ void Interface::PlaceBlock() {
 		next_pos -= aim_normal * glm::vec3(Chunk::Extent());
 	}
 	mod_chunk->SetBlock(next_pos, selection);
-	mod_chunk->Invalidate();
 
 	if (config.audio_disabled) return;
 	const Entity &player = ctrl.Controlled();
@@ -423,7 +422,6 @@ void Interface::PlaceBlock() {
 void Interface::RemoveBlock() noexcept {
 	if (!aim_chunk) return;
 	aim_chunk->SetBlock(aim_block, remove);
-	aim_chunk->Invalidate();
 
 	if (config.audio_disabled) return;
 	const Entity &player = ctrl.Controlled();
@@ -514,9 +512,9 @@ void Interface::CheckAim() {
 		outl_buf.Clear();
 		aim_chunk->Type(aim_chunk->BlockAt(aim_block)).FillOutlineModel(outl_buf);
 		outline.Update(outl_buf);
-		outline_transform = glm::scale(glm::vec3(1.0002f));
-		outline_transform *= aim_chunk->Transform(world.Player().ChunkCoords());
+		outline_transform = aim_chunk->Transform(world.Player().ChunkCoords());
 		outline_transform *= aim_chunk->ToTransform(Chunk::ToPos(aim_block), aim_block);
+		outline_transform *= glm::scale(glm::vec3(1.005f));
 	} else {
 		aim_chunk = nullptr;
 	}
@@ -527,8 +525,8 @@ void Interface::Render(Viewport &viewport) noexcept {
 	if (config.visual_disabled) return;
 
 	if (aim_chunk) {
-		DirectionalLighting &world_prog = viewport.EntityProgram();
-		world_prog.SetM(outline_transform);
+		PlainColor &outline_prog = viewport.WorldOutlineProgram();
+		outline_prog.SetM(outline_transform);
 		outline.Draw();
 	}