X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2Fviewport.cpp;h=9abe48f248261f81e8999a82eff70bc4a87a0010;hb=0ab149c70b3f984b2cc0c7a122b4aa347bc5fd79;hp=f9558d036865de4e3b388e5e22a96b1d1a8536d8;hpb=75172fd735e34082c34b47ae7c194445b53038d9;p=blank.git diff --git a/src/graphics/viewport.cpp b/src/graphics/viewport.cpp index f9558d0..9abe48f 100644 --- a/src/graphics/viewport.cpp +++ b/src/graphics/viewport.cpp @@ -165,20 +165,24 @@ void Viewport::ClearDepth() noexcept { } -void Viewport::SetCursor(const glm::vec3 &pos) { +glm::vec2 Viewport::GetPosition(const glm::vec2 &off, Gravity grav) const noexcept { + return align(grav, canv.Size(), off + canv.Offset()); +} + +void Viewport::SetCursor(const glm::vec3 &pos) noexcept { 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())); +void Viewport::SetCursor(const glm::vec3 &pos, Gravity grav) noexcept { + glm::vec2 p(GetPosition(glm::vec2(pos), grav)); cursor[3].x = p.x; cursor[3].y = p.y; cursor[3].z = pos.z; } -void Viewport::MoveCursor(const glm::vec3 &d) { +void Viewport::MoveCursor(const glm::vec3 &d) noexcept { cursor[3].x += d.x; cursor[3].y += d.y; cursor[3].z += d.z;