X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2Fviewport.cpp;h=48bd5ee32ce017751f436a25a8228a51f5703059;hb=a32b120a2c06d3c7ad6a217bc46bba9e76d75d93;hp=060738016233d00e197190106d907fe1db750eeb;hpb=5d2da8a07411ad6417d6ed8d1be997189cf5ce89;p=blank.git diff --git a/src/graphics/viewport.cpp b/src/graphics/viewport.cpp index 0607380..48bd5ee 100644 --- a/src/graphics/viewport.cpp +++ b/src/graphics/viewport.cpp @@ -76,7 +76,7 @@ void Canvas::UpdateProjection() noexcept { Viewport::Viewport() : cam() , canv() -, center(1.0f) +, cursor(1.0f) , chunk_prog() , entity_prog() , sprite_prog() @@ -128,8 +128,6 @@ void Viewport::Resize(int w, int h) noexcept { cam.Aspect(fw, fh); canv.Resize(fw, fh); - center = glm::translate(glm::vec3(fw * 0.5f, fh * 0.5f, 0.0f)); - chunk_prog.SetProjection(Perspective()); if (active_prog == HUD) { entity_prog.SetProjection(Ortho()); @@ -148,6 +146,26 @@ void Viewport::ClearDepth() noexcept { } +void Viewport::SetCursor(const glm::vec3 &pos) { + cursor[3].x = pos.x; + cursor[3].y = pos.y; + cursor[3].z = pos.z; +} + +void Viewport::SetCursor(const glm::vec3 &pos, Gravity grav) { + glm::vec2 p(align(grav, canv.Size(), glm::vec2(pos) + canv.Offset())); + cursor[3].x = p.x; + cursor[3].y = p.y; + cursor[3].z = pos.z; +} + +void Viewport::MoveCursor(const glm::vec3 &d) { + cursor[3].x += d.x; + cursor[3].y += d.y; + cursor[3].z += d.z; +} + + BlockLighting &Viewport::ChunkProgram() noexcept { if (active_prog != CHUNK) { chunk_prog.Activate(); @@ -182,6 +200,24 @@ DirectionalLighting &Viewport::HUDProgram() noexcept { return entity_prog; } +PlainColor &Viewport::WorldOutlineProgram() noexcept { + if (active_prog != OUTLINE_WORLD) { + outline_prog.Activate(); + outline_prog.SetVP(cam.View(), cam.Projection()); + active_prog = OUTLINE_WORLD; + } + return outline_prog; +} + +PlainColor &Viewport::HUDOutlineProgram() noexcept { + if (active_prog != OUTLINE_HUD) { + outline_prog.Activate(); + outline_prog.SetVP(canv.View(), canv.Projection()); + active_prog = OUTLINE_HUD; + } + return outline_prog; +} + BlendedSprite &Viewport::SpriteProgram() noexcept { if (active_prog != SPRITE) { sprite_prog.Activate();