X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2Fui.cpp;h=43a5f5d1ca68ef5b44d9ad3766d99e1154dd5670;hb=0e3f96ecb9ade07a7b831078fee025aff44d44d4;hp=ee26989a80187c5600dfaab2be12cff71873eeed;hpb=1bc6f085c53cdeaa08e2c00e821d4e2e25cae1c8;p=blank.git diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp index ee26989..43a5f5d 100644 --- a/src/ui/ui.cpp +++ b/src/ui/ui.cpp @@ -26,8 +26,6 @@ HUD::HUD(const BlockTypeRegistry &types, const Font &font) , block_buf() , block_transform(1.0f) , block_label() -, label_sprite() -, label_transform(1.0f) , block_visible(false) , crosshair() { block_transform = glm::translate(block_transform, glm::vec3(50.0f, 50.0f, 0.0f)); @@ -44,6 +42,14 @@ HUD::HUD(const BlockTypeRegistry &types, const Font &font) }); crosshair.colors.resize(4, { 10.0f, 10.0f, 10.0f }); crosshair.Invalidate(); + + block_label.Position( + glm::vec3(50.0f, 85.0f, 0.0f), + Gravity::NORTH_WEST, + Gravity::NORTH + ); + block_label.Foreground(glm::vec4(1.0f)); + block_label.Background(glm::vec4(0.5f)); } @@ -54,14 +60,7 @@ void HUD::Display(const Block &b) { type.FillModel(block_buf, b.Transform()); block.Update(block_buf); - font.Render(type.label.c_str(), block_label); - glm::vec2 size(font.TextSize(type.label.c_str())); - label_sprite.LoadRect(size.x, size.y); - label_transform = glm::translate(glm::vec3( - std::max(5.0f, 50.0f - std::round(size.x * 0.5f)), - 70.0f + size.y, - 0.75f - )); + block_label.Set(font, type.label); block_visible = type.visible; } @@ -76,20 +75,15 @@ void HUD::Render(Viewport &viewport) noexcept { world_prog.SetFogDensity(0.0f); viewport.EnableInvertBlending(); - world_prog.SetM(viewport.CenterTransform()); + viewport.SetCursor(glm::vec3(0.0f), Gravity::CENTER); + world_prog.SetM(viewport.Cursor()); crosshair.Draw(); if (block_visible) { viewport.DisableBlending(); world_prog.SetM(block_transform); block.Draw(); - - BlendedSprite &sprite_prog = viewport.SpriteProgram(); - sprite_prog.SetM(label_transform); - sprite_prog.SetTexture(block_label); - sprite_prog.SetFG(glm::vec4(1.0f)); - sprite_prog.SetBG(glm::vec4(0.5f)); - label_sprite.Draw(); + block_label.Render(viewport); } } @@ -110,11 +104,9 @@ Interface::Interface( , aim_normal() , outline() , outline_transform(1.0f) -, show_counter(false) -, counter_tex() -, counter_sprite() -, counter_transform(1.0f) -, counter_x(935.0f) +, counter_text() +, messages(font) +, msg_timer(5000) , config(config) , place_timer(256) , remove_timer(256) @@ -122,6 +114,13 @@ Interface::Interface( , selection(1) , fwd(0) , rev(0) { + counter_text.Hide(); + counter_text.Position(glm::vec3(-25.0f, 25.0f, 0.0f), Gravity::NORTH_EAST); + counter_text.Foreground(glm::vec4(1.0f)); + counter_text.Background(glm::vec4(0.5f)); + messages.Position(glm::vec3(25.0f, -25.0f, 0.0f), Gravity::SOUTH_WEST); + messages.Foreground(glm::vec4(1.0f)); + messages.Background(glm::vec4(0.5f)); hud.Display(selection); } @@ -216,61 +215,83 @@ void Interface::TurnBlock() { void Interface::ToggleCollision() { ctrl.Controlled().WorldCollidable(!ctrl.Controlled().WorldCollidable()); - std::cout << "collision " << (ctrl.Controlled().WorldCollidable() ? "on" : "off") << std::endl; + if (ctrl.Controlled().WorldCollidable()) { + PostMessage("collision on"); + } else { + PostMessage("collision off"); + } } void Interface::PrintBlockInfo() { std::cout << std::endl; if (!aim_chunk) { - std::cout << "not looking at any block" << std::endl; + PostMessage("not looking at any block"); Ray aim = ctrl.Aim(); - std::cout << "aim ray: " << aim.orig << ", " << aim.dir << std::endl; + std::stringstream s; + s << "aim ray: " << aim.orig << ", " << aim.dir; + PostMessage(s.str()); return; } - std::cout << "looking at block " << aim_block + std::stringstream s; + s << "looking at block " << aim_block << " " << Chunk::ToCoords(aim_block) << " of chunk " << aim_chunk->Position() - << std::endl; + ; + PostMessage(s.str()); Print(aim_chunk->BlockAt(aim_block)); } void Interface::PrintChunkInfo() { std::cout << std::endl; if (!aim_chunk) { - std::cout << "not looking at any block" << std::endl; + PostMessage("not looking at any block"); return; } - std::cout << "looking at chunk " - << aim_chunk->Position() - << std::endl; + std::stringstream s; + s << "looking at chunk " << aim_chunk->Position(); + PostMessage(s.str()); - std::cout << " neighbors:" << std::endl; + PostMessage(" neighbors:"); if (aim_chunk->HasNeighbor(Block::FACE_LEFT)) { - std::cout << " left " << aim_chunk->GetNeighbor(Block::FACE_LEFT).Position() << std::endl; + s.str(""); + s << " left " << aim_chunk->GetNeighbor(Block::FACE_LEFT).Position(); + PostMessage(s.str()); } if (aim_chunk->HasNeighbor(Block::FACE_RIGHT)) { - std::cout << " right " << aim_chunk->GetNeighbor(Block::FACE_RIGHT).Position() << std::endl; + s.str(""); + s << " right " << aim_chunk->GetNeighbor(Block::FACE_RIGHT).Position(); + PostMessage(s.str()); } if (aim_chunk->HasNeighbor(Block::FACE_UP)) { - std::cout << " up " << aim_chunk->GetNeighbor(Block::FACE_UP).Position() << std::endl; + s.str(""); + s << " up " << aim_chunk->GetNeighbor(Block::FACE_UP).Position(); + PostMessage(s.str()); } if (aim_chunk->HasNeighbor(Block::FACE_DOWN)) { - std::cout << " down " << aim_chunk->GetNeighbor(Block::FACE_DOWN).Position() << std::endl; + s.str(""); + s << " down " << aim_chunk->GetNeighbor(Block::FACE_DOWN).Position(); + PostMessage(s.str()); } if (aim_chunk->HasNeighbor(Block::FACE_FRONT)) { - std::cout << " front " << aim_chunk->GetNeighbor(Block::FACE_FRONT).Position() << std::endl; + s.str(""); + s << " front " << aim_chunk->GetNeighbor(Block::FACE_FRONT).Position(); + PostMessage(s.str()); } if (aim_chunk->HasNeighbor(Block::FACE_BACK)) { - std::cout << " back " << aim_chunk->GetNeighbor(Block::FACE_BACK).Position() << std::endl; + s.str(""); + s << " back " << aim_chunk->GetNeighbor(Block::FACE_BACK).Position(); + PostMessage(s.str()); } std::cout << std::endl; } void Interface::PrintLightInfo() { - std::cout + std::stringstream s; + s << "light level " << world.PlayerChunk().GetLight(world.Player().Position()) << " at position " << world.Player().Position() - << std::endl; + ; + PostMessage(s.str()); } void Interface::PrintSelectionInfo() { @@ -279,30 +300,28 @@ void Interface::PrintSelectionInfo() { } void Interface::Print(const Block &block) { - std::cout << "type: " << block.type + std::stringstream s; + s << "type: " << block.type << ", face: " << block.GetFace() << ", turn: " << block.GetTurn() - << std::endl; + ; + PostMessage(s.str()); } void Interface::ToggleCounter() { - if ((show_counter = !show_counter)) { + counter_text.Toggle(); + if (counter_text.Visible()) { UpdateCounter(); } } void Interface::UpdateCounter() { std::stringstream s; - s << std::setprecision(3) << counter.AvgRunning() << "ms"; + s << std::setprecision(3) << + "avg: " << counter.Average().running << "ms, " + "peak: " << counter.Peak().running << "ms"; std::string text = s.str(); - font.Render(text.c_str(), counter_tex); - glm::vec2 size(font.TextSize(text.c_str())); - counter_sprite.LoadRect(size.x, size.y); - counter_transform = glm::translate(glm::vec3( - counter_x - size.x, - 25.0f, - 0.75f - )); + counter_text.Set(font, text); } @@ -388,8 +407,11 @@ void Interface::SelectPrevious() { } -void Interface::Resize(const Viewport &viewport) { - counter_x = viewport.Width() - 25.0f; +void Interface::PostMessage(const char *msg) { + messages.PushLine(msg); + msg_timer.Reset(); + msg_timer.Start(); + std::cout << msg << std::endl; } @@ -397,12 +419,17 @@ void Interface::Update(int dt) { ctrl.Velocity(glm::vec3(fwd - rev) * config.move_velocity); ctrl.Update(dt); + msg_timer.Update(dt); place_timer.Update(dt); remove_timer.Update(dt); aim = ctrl.Aim(); CheckAim(); + if (msg_timer.HitOnce()) { + msg_timer.Stop(); + } + if (remove_timer.Hit()) { RemoveBlock(); CheckAim(); @@ -413,7 +440,7 @@ void Interface::Update(int dt) { CheckAim(); } - if (show_counter && counter.Changed()) { + if (counter_text.Visible() && counter.Changed()) { UpdateCounter(); } } @@ -441,11 +468,12 @@ void Interface::Render(Viewport &viewport) noexcept { outline.Draw(); } - if (show_counter) { - BlendedSprite &sprite_prog = viewport.SpriteProgram(); - sprite_prog.SetM(counter_transform); - sprite_prog.SetTexture(counter_tex); - counter_sprite.Draw(); + if (counter_text.Visible()) { + counter_text.Render(viewport); + } + + if (msg_timer.Running()) { + messages.Render(viewport); } hud.Render(viewport);