X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2Fui.cpp;h=ee26989a80187c5600dfaab2be12cff71873eeed;hb=1bc6f085c53cdeaa08e2c00e821d4e2e25cae1c8;hp=8e48f143b5c006f7aea3db4db9563b3c9cc05058;hpb=55dbd6b35a39888f245e247d2e140f141f918178;p=blank.git diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp index 8e48f14..ee26989 100644 --- a/src/ui/ui.cpp +++ b/src/ui/ui.cpp @@ -2,16 +2,17 @@ #include "Interface.hpp" #include "../app/Assets.hpp" +#include "../app/FrameCounter.hpp" #include "../app/init.hpp" -#include "../graphics/BlendedSprite.hpp" -#include "../graphics/DirectionalLighting.hpp" #include "../graphics/Font.hpp" +#include "../graphics/Viewport.hpp" #include "../model/shapes.hpp" #include "../world/World.hpp" #include #include #include +#include #include #include @@ -27,14 +28,8 @@ HUD::HUD(const BlockTypeRegistry &types, const Font &font) , block_label() , label_sprite() , label_transform(1.0f) -, label_color{0xFF, 0xFF, 0xFF, 0xFF} , block_visible(false) -, crosshair() -, crosshair_transform(1.0f) -, near(100.0f) -, far(-100.0f) -, projection(glm::ortho(0.0f, 1.0f, 1.0f, 0.0f, near, far)) -, view(1.0f) { +, crosshair() { block_transform = glm::translate(block_transform, glm::vec3(50.0f, 50.0f, 0.0f)); block_transform = glm::scale(block_transform, glm::vec3(50.0f)); block_transform = glm::rotate(block_transform, 3.5f, glm::vec3(1.0f, 0.0f, 0.0f)); @@ -52,16 +47,6 @@ HUD::HUD(const BlockTypeRegistry &types, const Font &font) } -void HUD::Viewport(float width, float height) noexcept { - Viewport(0, 0, width, height); -} - -void HUD::Viewport(float x, float y, float width, float height) noexcept { - projection = glm::ortho(x, width, height, y, near, far); - crosshair_transform = glm::translate(glm::vec3(width * 0.5f, height * 0.5f, 0.0f)); -} - - void HUD::Display(const Block &b) { const BlockType &type = types.Get(b.type); @@ -69,7 +54,7 @@ void HUD::Display(const Block &b) { type.FillModel(block_buf, b.Transform()); block.Update(block_buf); - font.Render(type.label.c_str(), label_color, block_label); + 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( @@ -82,30 +67,40 @@ void HUD::Display(const Block &b) { } -void HUD::Render(DirectionalLighting &world_prog, BlendedSprite &sprite_prog) noexcept { - world_prog.Activate(); +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); - GLContext::ClearDepthBuffer(); - world_prog.SetMVP(crosshair_transform, view, projection); + viewport.EnableInvertBlending(); + world_prog.SetM(viewport.CenterTransform()); crosshair.Draw(); if (block_visible) { + viewport.DisableBlending(); world_prog.SetM(block_transform); block.Draw(); - sprite_prog.Activate(); - sprite_prog.SetMVP(label_transform, view, projection); + 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(); } } -Interface::Interface(const Config &config, const Assets &assets, World &world) -: world(world) +Interface::Interface( + const Config &config, + const Assets &assets, + const FrameCounter &counter, + World &world) +: counter(counter) +, world(world) , ctrl(world.Player()) , font(assets.LoadFont("DejaVuSans", 16)) , hud(world.BlockTypes(), font) @@ -115,6 +110,11 @@ Interface::Interface(const Config &config, const Assets &assets, World &world) , aim_normal() , outline() , outline_transform(1.0f) +, show_counter(false) +, counter_tex() +, counter_sprite() +, counter_transform(1.0f) +, counter_x(935.0f) , config(config) , place_timer(256) , remove_timer(256) @@ -122,7 +122,6 @@ Interface::Interface(const Config &config, const Assets &assets, World &world) , selection(1) , fwd(0) , rev(0) { - hud.Viewport(960, 600); hud.Display(selection); } @@ -173,6 +172,10 @@ void Interface::HandlePress(const SDL_KeyboardEvent &event) { case SDLK_p: PrintSelectionInfo(); break; + + case SDLK_F3: + ToggleCounter(); + break; } } @@ -282,6 +285,26 @@ void Interface::Print(const Block &block) { << std::endl; } +void Interface::ToggleCounter() { + if ((show_counter = !show_counter)) { + UpdateCounter(); + } +} + +void Interface::UpdateCounter() { + std::stringstream s; + s << std::setprecision(3) << counter.AvgRunning() << "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 + )); +} + void Interface::Handle(const SDL_MouseMotionEvent &event) { if (config.mouse_disabled) return; @@ -364,10 +387,9 @@ void Interface::SelectPrevious() { hud.Display(selection); } -void Interface::Handle(const SDL_WindowEvent &event) noexcept { - if (event.event == SDL_WINDOWEVENT_RESIZED) { - hud.Viewport(event.data1, event.data2); - } + +void Interface::Resize(const Viewport &viewport) { + counter_x = viewport.Width() - 25.0f; } @@ -390,6 +412,10 @@ void Interface::Update(int dt) { PlaceBlock(); CheckAim(); } + + if (show_counter && counter.Changed()) { + UpdateCounter(); + } } void Interface::CheckAim() { @@ -406,16 +432,23 @@ void Interface::CheckAim() { } -void Interface::Render(DirectionalLighting &world_prog, BlendedSprite &sprite_prog) noexcept { +void Interface::Render(Viewport &viewport) noexcept { if (config.visual_disabled) return; if (aim_chunk) { - world_prog.Activate(); + DirectionalLighting &world_prog = viewport.EntityProgram(); world_prog.SetM(outline_transform); outline.Draw(); } - hud.Render(world_prog, sprite_prog); + if (show_counter) { + BlendedSprite &sprite_prog = viewport.SpriteProgram(); + sprite_prog.SetM(counter_transform); + sprite_prog.SetTexture(counter_tex); + counter_sprite.Draw(); + } + + hud.Render(viewport); } }