From 2178368d71dc55ed56c4745a6e7668e0a6f490c9 Mon Sep 17 00:00:00 2001
From: cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475>
Date: Thu, 11 Jul 2019 15:25:54 +0000
Subject: [PATCH] Update mouse position for CSceneNodeAnimatorCameraMaya also
 on click events. Before it updated only on move events. That could lead to
 troubles when the camera was actived by click as it then started the rotation
 with the position of the last move event it had.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5835 dfc29bdd-3216-0410-991c-e03cc46cb475
---
 .../Irrlicht/CSceneNodeAnimatorCameraMaya.cpp | 19 ++++++++++++++-----
 .../Irrlicht/CSceneNodeAnimatorCameraMaya.h   |  1 +
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/source/Irrlicht/CSceneNodeAnimatorCameraMaya.cpp b/source/Irrlicht/CSceneNodeAnimatorCameraMaya.cpp
index a5e49326..a7d2b211 100644
--- a/source/Irrlicht/CSceneNodeAnimatorCameraMaya.cpp
+++ b/source/Irrlicht/CSceneNodeAnimatorCameraMaya.cpp
@@ -58,32 +58,34 @@ bool CSceneNodeAnimatorCameraMaya::OnEvent(const SEvent& event)
 	{
 	case EMIE_LMOUSE_PRESSED_DOWN:
 		MouseKeys[0] = true;
+		updateMousePos();
 		break;
 	case EMIE_RMOUSE_PRESSED_DOWN:
 		MouseKeys[2] = true;
+		updateMousePos();
 		break;
 	case EMIE_MMOUSE_PRESSED_DOWN:
 		MouseKeys[1] = true;
+		updateMousePos();
 		break;
 	case EMIE_LMOUSE_LEFT_UP:
 		MouseKeys[0] = false;
+		updateMousePos();
 		break;
 	case EMIE_RMOUSE_LEFT_UP:
 		MouseKeys[2] = false;
+		updateMousePos();
 		break;
 	case EMIE_MMOUSE_LEFT_UP:
 		MouseKeys[1] = false;
+		updateMousePos();
 		break;
 	case EMIE_MOUSE_MOVED:
 		// check states again because sometimes the gui has already caught events
 		MouseKeys[0] = event.MouseInput.isLeftPressed();
 		MouseKeys[2] = event.MouseInput.isRightPressed();
 		MouseKeys[1] = event.MouseInput.isMiddlePressed();
-
-		if ( CursorControl )
-		{
-			MousePos = CursorControl->getRelativePosition();
-		}
+		updateMousePos();
 		break;
 	case EMIE_MOUSE_WHEEL:
 	case EMIE_LMOUSE_DOUBLE_CLICK:
@@ -98,6 +100,13 @@ bool CSceneNodeAnimatorCameraMaya::OnEvent(const SEvent& event)
 	return true;
 }
 
+void CSceneNodeAnimatorCameraMaya::updateMousePos()
+{
+	if ( CursorControl )
+	{
+		MousePos = CursorControl->getRelativePosition();
+	}
+}
 
 //! OnAnimate() is called just before rendering the whole scene.
 void CSceneNodeAnimatorCameraMaya::animateNode(ISceneNode *node, u32 timeMs)
diff --git a/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h b/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h
index 69c95793..de03358e 100644
--- a/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h
+++ b/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h
@@ -96,6 +96,7 @@ namespace scene
 
 	private:
 
+		void updateMousePos();
 		void allKeysUp();
 		void animate();
 		bool isMouseKeyDown(s32 key) const;