fix some oopsies

Perksey · Feb 15, 2025 · Feb 22, 2025 · Mar 15, 2025 · Apr 5, 2025 · May 25, 2025
commit 510624596301f9f4caf4426f672feeff12a17b59
@@ -67,7 +67,7 @@
    }


    private SdlJoystick(ulong sdlDeviceId, nint uniqueId, SdlInputBackend backend) : base(backend, uniqueId,
        sdlDeviceId)
    {
        _sdlDeviceId = sdlDeviceId;
@@ -212,16 +212,18 @@
 
         for (byte i = 0; i < buttonCount; i++)
         {
-            var joystickInput = NativeBackend.GetJoystickButtonRaw(JoystickHandle, i);
+            var joystickInput = NativeBackend.GetJoystickButtonRaw(joystickHandle, i);
             AddButtonEvent(i, joystickInput, nowSdlTimestamp, nowTimestamp);
         }
 
         for (var i = 0; i < axisCount; i++)
         {
-            var joystickInput = NativeBackend.GetJoystickAxis(JoystickHandle, i);
+            // Sdl docs on GetJoystickAxis:
+            // "Returns a 16-bit signed integer representing the current position of the axis or 0 on failure;
+            // call SDL_GetError() for more information."
+            var joystickInput = NativeBackend.GetJoystickAxis(joystickHandle, i);
             if (joystickInput == 0)
             {
-                // this indicates an sdl error, so just set our internal axis to 0
                 joystickInput = short.MinValue;
             }
 

@@ -83,7 +83,7 @@ protected override void Release()
     {
     }
 
-    public void UpDownEvent(in PenTouchEvent evt, IPointerTarget target, long timestamp)
+    public void UpDownEvent(ref readonly PenTouchEvent evt, IPointerTarget target, long timestamp)
     {
         MotionEvent(target, evt.X, evt.Y, evt.Timestamp, timestamp);
 
@@ -101,7 +101,7 @@ public void UpDownEvent(in PenTouchEvent evt, IPointerTarget target, long timest
 
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void MotionEvent(in PenMotionEvent evt, IPointerTarget target, long timestamp) => MotionEvent(target, evt.X, evt.Y, evt.Timestamp, timestamp);
+    public void MotionEvent(ref readonly PenMotionEvent evt, IPointerTarget target, long timestamp) => MotionEvent(target, evt.X, evt.Y, evt.Timestamp, timestamp);
 
     private void MotionEvent(IPointerTarget target, float x, float y, ulong sdlTimestamp, long timestamp)
     {
@@ -116,7 +116,7 @@ private void MotionEvent(IPointerTarget target, float x, float y, ulong sdlTimes
             timestamp: timestamp);
     }
 
-    public void ButtonEvent(in PenButtonEvent evt, long timestamp)
+    public void ButtonEvent(ref readonly PenButtonEvent evt, long timestamp)
     {
         var button = (SdlPenButton)evt.Button;
         var pointerButton = button switch {
@@ -140,7 +140,7 @@ private enum SdlPenButton : byte
         Button5,
     }
 
-    public void AxisEvent(in PenAxisEvent evt, IPointerTarget target, long timestamp)
+    public void AxisEvent(ref readonly PenAxisEvent evt, IPointerTarget target, long timestamp)
     {
         switch (evt.Axis)
         {
@@ -188,7 +188,7 @@ public void AxisEvent(in PenAxisEvent evt, IPointerTarget target, long timestamp
     }
 
     // ReSharper disable once ArrangeMethodOrOperatorBody
-    public void ProximityEvent(in PenProximityEvent evt, IPointerTarget target, bool proximityIn)
+    public void ProximityEvent(ref readonly PenProximityEvent evt, IPointerTarget target, bool proximityIn, long timestamp)
     {
         // quoting the documentation:
 
@@ -204,8 +204,8 @@ public void ProximityEvent(in PenProximityEvent evt, IPointerTarget target, bool
         // a pen device to handle subsequent input events
 
         // however, we will store the proximity state of this device for future reference / debugging purposes
-        IsNear = proximityIn;
-    }
 
-    public bool IsNear { get; private set; }
+        // update my latest point to be not-looking-at
+        SetPointLookAtTarget(null, target, proximityIn, evt.Timestamp, timestamp);
+    }
 }
@@ -14,7 +14,8 @@ internal abstract partial class SdlPointerDevice
     private ISimulatedPointerTarget? _falseTarget;
     private readonly List<IPointerTarget> _myPointerTargets = new();
 
-    private unsafe ref TargetPoint CreateOrUpdateTargetPoint(IPointerTarget target, long timestamp, ulong sdlTimestamp, uint touchId,
+    private unsafe ref TargetPoint CreateOrUpdateTargetPoint(IPointerTarget target, long timestamp, ulong sdlTimestamp,
+        uint touchId,
         in Vector3? positionOnTarget, Ray3D<float>? ray, float? pressure, out TargetPoint? oldPoint)
     {
         if (touchId != 0 && OnePointOnly)
@@ -108,7 +109,7 @@ private static TargetPoint ToTargetPoint(in Vector3 posOnTarget, float pressure,
     {
         var bounds = target.Bounds;
         var min = bounds.Min.ToSystem();
-        var max  = bounds.Max.ToSystem();
+        var max = bounds.Max.ToSystem();
         var diff3 = max - min;
         var normalizedPosition = (posOnTarget - min) / diff3;
 
@@ -117,12 +118,12 @@ private static TargetPoint ToTargetPoint(in Vector3 posOnTarget, float pressure,
             normalizedPosition.X = 0;
         }
 
-        if(!float.IsFinite(normalizedPosition.Y))
+        if (!float.IsFinite(normalizedPosition.Y))
         {
             normalizedPosition.Y = 0;
         }
 
-        if(!float.IsFinite(normalizedPosition.Z))
+        if (!float.IsFinite(normalizedPosition.Z))
         {
             normalizedPosition.Z = 0;
         }
@@ -137,6 +138,24 @@ private static TargetPoint ToTargetPoint(in Vector3 posOnTarget, float pressure,
         );
     }
 
+    protected void SetPointLookAtTarget(uint? touchId, IPointerTarget target, bool lookAt, ulong sdlTimestamp,
+        long timestamp)
+    {
+        touchId = ValidateTouchId(touchId);
+        ref var point = ref CreateOrUpdateTargetPoint(
+            target: target,
+            timestamp: timestamp,
+            sdlTimestamp: sdlTimestamp,
+            touchId: touchId.Value,
+            positionOnTarget: null,
+            ray: null,
+            pressure: null,
+            oldPoint: out _);
+        point = point with {
+            Flags = lookAt ? TargetPointFlags.PointingAtTarget : TargetPointFlags.NotPointingAtTarget
+        };
+    }
+
     /// <summary>
     /// Adds or updates a point.
     /// </summary>
@@ -263,7 +282,8 @@ public void TargetDestroyed(IPointerTarget target, long timestamp, ulong sdlTime
         if (_myPointerTargets.Remove(target))
         {
             var bounds = target.Bounds;
-            TargetEvents.Enqueue(new PointerTargetChangedEvent(this, timestamp, target, false, bounds, bounds), sdlTimestamp);
+            TargetEvents.Enqueue(new PointerTargetChangedEvent(this, timestamp, target, false, bounds, bounds),
+                sdlTimestamp);
         }
     }
 

@@ -194,7 +194,7 @@

        return;

        static void DebugTiming(in TimedRawSdlEvent evt, [NotNull] ref TimedRawSdlEvent? previous)
        {
            const string fmt =
                "Needs pre-sort by {0} timestamp. Please alert maintainer.\nPrevious:{1}\nCurrent:{2}\nDifference: SDL {3} Stopwatch {4}";
@@ -202,14 +202,14 @@
            {
                if (prev.Event.Common.Timestamp > evt.Event.Common.Timestamp)
                {
                    evt.TimeMinus(prev, out var stopwatchDiff, out var sdlDiff);
                    InputLog.Error(string.Format(fmt, "SDL", previous.ToString(), evt.ToString(), sdlDiff,
                        stopwatchDiff));
                }

                if (prev.StopwatchTimestamp > evt.StopwatchTimestamp)
                {
                    evt.TimeMinus(prev, out var stopwatchDiff, out var sdlDiff);
                    InputLog.Error(string.Format(fmt, "SDL", previous.ToString(), evt.ToString(), sdlDiff,
                        stopwatchDiff));
                }
@@ -421,7 +421,7 @@
                     }
                     case EventType.MouseWheel:
                     {
-                        if (backend.TryGetOrCreatePointerTargetForWindow(evt.Motion.WindowID, out var windowTarget))
+                        if (backend.TryGetOrCreatePointerTargetForWindow(evt.Wheel.WindowID, out var windowTarget))
                         {
                             mouse.AddWheelEvent(evt.Wheel, windowTarget, timestamp);
                         }
@@ -439,7 +439,7 @@
             case EventType.PenProximityOut:
             case >= EventType.PenProximityIn and <= EventType.PenAxis:
             {
-                if (!backend.TryGetOrCreateDevice<SdlPen>(evt.Ptouch.Which, timestamp, evt.Common.Timestamp,
+                if (!backend.TryGetOrCreateDevice<SdlPen>(evt.Pproximity.Which, timestamp, evt.Common.Timestamp,
                         out var penDevice))
                 {
                     return;
@@ -452,7 +452,7 @@
                     {
                         if (backend.TryGetOrCreatePointerTargetForWindow(evt.Pproximity.WindowID, out var windowTarget))
                         {
-                            penDevice.ProximityEvent(evt: evt.Pproximity, target: windowTarget, proximityIn: type == EventType.PenProximityIn);
+                            penDevice.ProximityEvent(in evt.Pproximity, windowTarget, type == EventType.PenProximityIn, timestamp);
                         }
 
                         break;
@@ -462,29 +462,29 @@
                     {
                         if(backend.TryGetOrCreatePointerTargetForWindow(evt.Ptouch.WindowID, out var windowTarget))
                         {
-                            penDevice.UpDownEvent(evt.Ptouch, windowTarget, timestamp);
+                            penDevice.UpDownEvent(in evt.Ptouch, windowTarget, timestamp);
                         }
                         break;
                     }
                     case EventType.PenButtonDown:
                     case EventType.PenButtonUp:
                     {
-                        penDevice.ButtonEvent(evt.Pbutton, timestamp);
+                        penDevice.ButtonEvent(in evt.Pbutton, timestamp);
                         break;
                     }
                     case EventType.PenMotion:
                     {
                         if(backend.TryGetOrCreatePointerTargetForWindow(evt.Pmotion.WindowID, out var windowTarget))
                         {
-                            penDevice.MotionEvent(evt.Pmotion, windowTarget, timestamp);
+                            penDevice.MotionEvent(in evt.Pmotion, windowTarget, timestamp);
                         }
                         break;
                     }
                     case EventType.PenAxis:
                     {
                         if (backend.TryGetOrCreatePointerTargetForWindow(evt.Paxis.WindowID, out var windowTarget))
                         {
-                            penDevice.AxisEvent(evt.Paxis, windowTarget, timestamp);
+                            penDevice.AxisEvent(in evt.Paxis, windowTarget, timestamp);
                         }
 
                         break;

@@ -57,7 +57,7 @@ private void EnsureCapacity(int desiredCount)
 
         var newSize = Math.Max(_capacity * 2, desiredCount);
 
-        var newArray = GC.AllocateUninitializedArray<T>(Unsafe.SizeOf<T>() * newSize, pinned: true);
+        var newArray = GC.AllocateUninitializedArray<T>(newSize, pinned: true);
         _array?.CopyTo(newArray.AsSpan(0, _array.Length));
 
         _array = newArray;