Use game widget's mouse move event, clean up InputRouter

Author: aidencurtis

engine/Sandbox.Engine/Systems/Input/InputRouter.Input.cs

@@ -87,20 +87,10 @@ internal static void OnMouseMotion( float dx, float dy )
 	/// </summary>
 	internal static void OnMousePositionChange( float x, float y, float dx, float dy )
 	{
-		ApplyAbsoluteMousePosition( new Vector2( x, y ), new Vector2( dx, dy ) );
-	}
-
-	/// <summary>
-	/// Shared absolute-position path for native and editor-driven mouse updates.
-	/// </summary>
-	internal static void ApplyAbsoluteMousePosition( Vector2 pos, Vector2 delta )
-	{
-		MouseCursorPosition = pos;
+		MouseCursorPosition = new Vector2( x, y );
 
 		if ( InputSystem.GetRelativeMouseMode() )
-		{
-			delta = Vector2.Zero;
-		}
+			dx = dy = 0;
 
 		// If this is set, we're in capture mode - so just update the position
 		// cache we restore when capture ends. This intentionally records the
@@ -111,10 +101,10 @@ internal static void ApplyAbsoluteMousePosition( Vector2 pos, Vector2 delta )
 			return;
 		}
 
-		MouseCursorDelta += delta;
+		MouseCursorDelta += new Vector2( dx, dy );
 
 		var mouse = Contexts.FirstOrDefault( x => x.MouseState != InputContext.InputState.Ignore );
-		mouse?.In_MousePosition( MouseCursorPosition, delta );
+		mouse?.In_MousePosition( MouseCursorPosition, new Vector2( dx, dy ) );
 	}
 
 	internal static void OnGameControllerButton( int deviceId, GameControllerCode button, bool down )

engine/Sandbox.Tools/GameMode.cs

@@ -20,6 +20,8 @@ public static void SetPlayWidget( SceneRenderingWidget widget )
 
 		widget.Focused += WidgetFocused;
 		widget.Blurred += WidgetBlurred;
+		widget.MouseTracking = true;
+		widget.MouseMove += OnPlayWidgetMouseMove;
 
 		NativeEngine.InputSystem.RegisterWindowWithSDL( widget._widget.winId() );
 		g_pEngineServiceMgr.SetEngineState( widget._widget.winId(), widget.SwapChain );
@@ -40,6 +42,8 @@ public static void ClearPlayMode()
 
 		_inPlay.Focused -= WidgetFocused;
 		_inPlay.Blurred -= WidgetBlurred;
+		_inPlay.MouseMove -= OnPlayWidgetMouseMove;
+		_inPlay.MouseTracking = false;
 
 		NativeEngine.InputSystem.UnregisterWindowFromSDL( _inPlay._widget.winId() );
 
@@ -68,22 +72,15 @@ private static void WidgetBlurred( FocusChangeReason reason )
 		NativeEngine.InputSystem.OnEditorGameFocusChange( _inPlay._widget.winId(), false );
 	}
 
-	internal static void Tick()
+	private static void OnPlayWidgetMouseMove( Vector2 local )
 	{
-		// Keep game mouse position updated while the play widget is unfocused.
-		var playWidget = _inPlay;
-		if ( playWidget is null || playWidget.IsFocused )
-			return;
-
-		var local = playWidget.FromScreen( Application.CursorPosition );
-
-		// Don't snap to borders if cursor isn't over the widget.
-		if ( local.x < 0 || local.y < 0 || local.x >= playWidget.Size.x || local.y >= playWidget.Size.y )
+		// SDL handles position when the widget is focused; only fill in the gap when unfocused.
+		if ( _inPlay is null || _inPlay.IsFocused )
 			return;
 
 		var pos = new Vector2( (int)local.x, (int)local.y );
 		var delta = pos - InputRouter.MouseCursorPosition;
 
-		InputRouter.ApplyAbsoluteMousePosition( pos, delta );
+		InputRouter.OnMousePositionChange( pos.x, pos.y, delta.x, delta.y );
 	}
 }

engine/Sandbox.Tools/ToolsDll.cs

@@ -260,8 +260,6 @@ public void Tick()
 			Time.Update( scene.TimeNow, scene.TimeDelta );
 		}
 
-		GameMode.Tick();
-
 		// Escape was pressed in game and wasn't swallowed
 		// so lets change focus from the game window to the main editor
 		// window, which is going to free the mouse cursor from being captured