split geometry lib

[blank.git] / src / graphics / viewport.cpp

diff --git a/src/graphics/viewport.cpp b/src/graphics/viewport.cpp
index f9558d036865de4e3b388e5e22a96b1d1a8536d8..c46ef28c76fa91bbc6da470615319f69ad75bc73 100644 (file)
--- a/src/graphics/viewport.cpp
+++ b/src/graphics/viewport.cpp
@@ -4,7 +4,7 @@
 #include "Viewport.hpp"
 
 #include "../app/init.hpp"
-#include "../model/geometry.hpp"
+#include "../geometry/const.hpp"
 
 #include <GL/glew.h>
 #include <glm/gtc/matrix_transform.hpp>
@@ -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;