Added timestamp to platform events.

SickheadGames · Aug 24, 2024 · ccd6e48 · ccd6e48
1 parent 3af0aae
commit ccd6e48
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/MonoGame.Framework/Platform/Native/Platform.Interop.cs b/MonoGame.Framework/Platform/Native/Platform.Interop.cs
@@ -99,21 +99,24 @@ internal struct MGP_Event
     public EventType Type;
 
     [FieldOffset(4)]
+    public ulong Timestamp;
+
+    [FieldOffset(12)]
     public MGP_KeyEvent Key;
 
-    [FieldOffset(4)]
+    [FieldOffset(12)]
     public MGP_MouseMoveEvent MouseMove;
 
-    [FieldOffset(4)]
+    [FieldOffset(12)]
     public MGP_MouseButtonEvent MouseButton;
 
-    [FieldOffset(4)]
+    [FieldOffset(12)]
     public MGP_MouseWheelEvent MouseWheel;
 
-    [FieldOffset(4)]
+    [FieldOffset(12)]
     public MGP_DropEvent Drop;
 
-    [FieldOffset(4)]
+    [FieldOffset(12)]
     public MGP_WindowEvent Window;
 
 }

diff --git a/src/monogame/include/csharp_structs.h b/src/monogame/include/csharp_structs.h
@@ -150,12 +150,13 @@ struct MGP_Event
 {
 union {
     MGEventType Type;
-    MG_FIELD_OFFSET(4, MGP_KeyEvent, Key);
-    MG_FIELD_OFFSET(4, MGP_MouseMoveEvent, MouseMove);
-    MG_FIELD_OFFSET(4, MGP_MouseButtonEvent, MouseButton);
-    MG_FIELD_OFFSET(4, MGP_MouseWheelEvent, MouseWheel);
-    MG_FIELD_OFFSET(4, MGP_DropEvent, Drop);
-    MG_FIELD_OFFSET(4, MGP_WindowEvent, Window);
+    MG_FIELD_OFFSET(4, mgulong, Timestamp);
+    MG_FIELD_OFFSET(12, MGP_KeyEvent, Key);
+    MG_FIELD_OFFSET(12, MGP_MouseMoveEvent, MouseMove);
+    MG_FIELD_OFFSET(12, MGP_MouseButtonEvent, MouseButton);
+    MG_FIELD_OFFSET(12, MGP_MouseWheelEvent, MouseWheel);
+    MG_FIELD_OFFSET(12, MGP_DropEvent, Drop);
+    MG_FIELD_OFFSET(12, MGP_WindowEvent, Window);
 };
 };
 #pragma pack(pop)

diff --git a/src/monogame/sdl/MGP_sdl.cpp b/src/monogame/sdl/MGP_sdl.cpp
@@ -264,6 +264,8 @@ mgbool MGP_Platform_PollEvent(MGP_Platform* platform, MGP_Event& event_)
 
     while (SDL_PollEvent(&ev) == 1)
     {
+        event_.Timestamp = SDL_GetTicks64();
+
         switch (ev.type)
         {
         case SDL_QUIT: