Tweaked Mouse interface

attilaz · Sep 22, 2014 · 3ad7801 · 3ad7801
1 parent de21f75
commit 3ad7801
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/code/Modules/Input/Core/Mouse.cc b/code/Modules/Input/Core/Mouse.cc
@@ -34,7 +34,7 @@ Mouse::onButtonUp(Button btn) {
 
 //------------------------------------------------------------------------------
 void
-Mouse::onPos(const glm::vec2& pos) {
+Mouse::onPosMov(const glm::vec2& pos) {
     this->Movement = pos - this->Position;
     this->Position = pos;
 }

diff --git a/code/Modules/Input/Core/Mouse.h b/code/Modules/Input/Core/Mouse.h
@@ -45,7 +45,7 @@ class Mouse {
     /// call when mouse button up event happens
     void onButtonUp(Button btn);
     /// called to update position and movement
-    void onPos(const glm::vec2& pos);
+    void onPosMov(const glm::vec2& pos);
     /// reset the mouse state
     void reset();
 

diff --git a/code/Modules/Input/emsc/emscInputMgr.cc b/code/Modules/Input/emsc/emscInputMgr.cc
@@ -180,7 +180,7 @@ emscInputMgr::emscMouseMove(int eventType, const EmscriptenMouseEvent* e, void*
     }
     else {
         const glm::vec2 pos((float32)e->canvasX, (float32)e->canvasY);
-        self->mouse.onPos(pos);
+        self->mouse.onPosMov(pos);
     }
     return self->getCursorMode() == CursorMode::Disabled;    
 }

diff --git a/code/Modules/Input/glfw/glfwInputMgr.cc b/code/Modules/Input/glfw/glfwInputMgr.cc
@@ -165,7 +165,7 @@ void
 glfwInputMgr::cursorPosCallback(GLFWwindow* win, double glfwX, double glfwY) {
     if (nullptr != self) {
         const glm::vec2 pos((float32)glfwX, (float32)glfwY);
-        self->mouse.onPos(pos);
+        self->mouse.onPosMov(pos);
     }
 }