casting hell

Kade-github · Kade-github · commit 58a8557c8de2 · 2025-04-08T18:56:13.000-07:00
diff --git a/ndll/Windows/lime-debug.ndll b/ndll/Windows/lime-debug.ndll
diff --git a/ndll/Windows/lime-debug.ndll.hash b/ndll/Windows/lime-debug.ndll.hash
@@ -1 +1 @@
-bd1f31d928e977ceb6673c7ab77c9668
+1a5d381ca5f27d46296683fd08240b2f
diff --git a/ndll/Windows/lime.ndll b/ndll/Windows/lime.ndll
diff --git a/ndll/Windows/lime.ndll.hash b/ndll/Windows/lime.ndll.hash
@@ -1 +1 @@
-a4138eafd7b92befd4a01e95749caec1
+522d51f5e624e7557044d14248906b90
diff --git a/ndll/Windows64/lime-debug.ndll b/ndll/Windows64/lime-debug.ndll
diff --git a/ndll/Windows64/lime-debug.ndll.hash b/ndll/Windows64/lime-debug.ndll.hash
@@ -1 +1 @@
-730720f4812c729410a4ae4a906a915a
+1b2907bbb6231f626ab6ec1ad0eb2b28
diff --git a/ndll/Windows64/lime.ndll b/ndll/Windows64/lime.ndll
diff --git a/ndll/Windows64/lime.ndll.hash b/ndll/Windows64/lime.ndll.hash
@@ -1 +1 @@
-48f699b586407446fa8cbd7e3b4b26c3
+9d2b1d3e5c462358520277137b0bedd9
diff --git a/project/include/system/System.h b/project/include/system/System.h
@@ -30,7 +30,6 @@ namespace lime {
 			static void GCExitBlocking ();
 			static void GCTryEnterBlocking ();
 			static void GCTryExitBlocking ();
-			static int GetTicks ();
 			static bool GetAllowScreenTimeout ();
 			static std::wstring* GetDeviceModel ();
 			static std::wstring* GetDeviceVendor ();
@@ -46,6 +45,7 @@ namespace lime {
 			static std::wstring* GetPlatformName ();
 			static std::wstring* GetPlatformVersion ();
 			static double GetTimer ();
+			static double GetTimerNS();
 			#if defined(HX_WINDOWS) && !defined (HX_WINRT)
 			static int GetWindowsConsoleMode (int handleType);
 			#endif
@@ -365,4 +365,4 @@ std::size_t _mbsrtowcs(wchar_t * ws, const char **src, std::size_t wn, std::mbst
 #endif
 
 
-#endif
+#endif
diff --git a/project/include/ui/GamepadEvent.h b/project/include/ui/GamepadEvent.h
@@ -28,7 +28,7 @@ namespace lime {
 		int id;
 		GamepadEventType type;
 		double axisValue;
-		int timestamp;
+		uint64_t timestamp;
 
 		static ValuePointer* callback;
 		static ValuePointer* eventObject;
@@ -43,4 +43,4 @@ namespace lime {
 }
 
 
-#endif
+#endif
diff --git a/project/include/ui/KeyEvent.h b/project/include/ui/KeyEvent.h
@@ -25,7 +25,7 @@ namespace lime {
 		int modifier;
 		KeyEventType type;
 		int windowID;
-		int timestamp;
+		uint64_t timestamp;
 
 		static ValuePointer* callback;
 		static ValuePointer* eventObject;
@@ -40,4 +40,4 @@ namespace lime {
 }
 
 
-#endif
+#endif
diff --git a/project/src/ExternalInterface.cpp b/project/src/ExternalInterface.cpp
@@ -2714,18 +2714,6 @@ namespace lime {
 
 	}
 
-	int lime_sdl_get_ticks () {
-
-		return System::GetTicks();
-
-	}
-
-
-	HL_PRIM int HL_NAME(hl_sdl_get_ticks) () {
-
-		return System::GetTicks();
-
-	}
 
 	bool lime_system_get_allow_screen_timeout () {
 
@@ -3057,6 +3045,19 @@ namespace lime {
 
 	}
 
+	double lime_system_get_timer_ns () {
+
+		return System::GetTimerNS ();
+
+	}
+
+
+	HL_PRIM double HL_NAME(hl_system_get_timer_ns) () {
+
+		return System::GetTimerNS ();
+
+	}
+
 
 	int lime_system_get_windows_console_mode (int handleType) {
 
@@ -4066,7 +4067,6 @@ namespace lime {
 	DEFINE_PRIME3 (lime_png_decode_file);
 	DEFINE_PRIME2v (lime_render_event_manager_register);
 	DEFINE_PRIME2v (lime_sensor_event_manager_register);
-	DEFINE_PRIME0 (lime_sdl_get_ticks);
 	DEFINE_PRIME0 (lime_system_get_allow_screen_timeout);
 	DEFINE_PRIME0 (lime_system_get_device_model);
 	DEFINE_PRIME0 (lime_system_get_device_vendor);
@@ -4079,6 +4079,7 @@ namespace lime {
 	DEFINE_PRIME0 (lime_system_get_platform_name);
 	DEFINE_PRIME0 (lime_system_get_platform_version);
 	DEFINE_PRIME0 (lime_system_get_timer);
+	DEFINE_PRIME0 (lime_system_get_timer_ns);
 	DEFINE_PRIME1 (lime_system_get_windows_console_mode);
 	DEFINE_PRIME1v (lime_system_open_file);
 	DEFINE_PRIME2v (lime_system_open_url);
@@ -4258,7 +4259,6 @@ namespace lime {
 	DEFINE_HL_PRIM (_TIMAGEBUFFER, hl_png_decode_file, _STRING _BOOL _TIMAGEBUFFER);
 	DEFINE_HL_PRIM (_VOID, hl_render_event_manager_register, _FUN (_VOID, _NO_ARG) _TRENDER_EVENT);
 	DEFINE_HL_PRIM (_VOID, hl_sensor_event_manager_register, _FUN (_VOID, _NO_ARG) _TSENSOR_EVENT);
-	DEFINE_HL_PRIM (_I32, hl_sdl_get_ticks, _NO_ARG);
 	DEFINE_HL_PRIM (_BOOL, hl_system_get_allow_screen_timeout, _NO_ARG);
 	DEFINE_HL_PRIM (_BYTES, hl_system_get_device_model, _NO_ARG);
 	DEFINE_HL_PRIM (_BYTES, hl_system_get_device_vendor, _NO_ARG);
@@ -4271,6 +4271,7 @@ namespace lime {
 	DEFINE_HL_PRIM (_BYTES, hl_system_get_platform_name, _NO_ARG);
 	DEFINE_HL_PRIM (_BYTES, hl_system_get_platform_version, _NO_ARG);
 	DEFINE_HL_PRIM (_F64, hl_system_get_timer, _NO_ARG);
+	DEFINE_HL_PRIM (_I64, hl_system_get_timer_ns, _NO_ARG);
 	DEFINE_HL_PRIM (_I32, hl_system_get_windows_console_mode, _I32);
 	DEFINE_HL_PRIM (_VOID, hl_system_open_file, _STRING);
 	DEFINE_HL_PRIM (_VOID, hl_system_open_url, _STRING _STRING);
diff --git a/project/src/backend/sdl3/SDLApplication.cpp b/project/src/backend/sdl3/SDLApplication.cpp
@@ -424,6 +424,7 @@ namespace lime {
 					gamepadEvent.type = GAMEPAD_BUTTON_DOWN;
 					gamepadEvent.button = event->gbutton.button;
 					gamepadEvent.id = event->gbutton.which;
+					gamepadEvent.timestamp = event->gbutton.timestamp;
 
 					GamepadEvent::Dispatch (&gamepadEvent);
 					break;
@@ -433,6 +434,7 @@ namespace lime {
 					gamepadEvent.type = GAMEPAD_BUTTON_UP;
 					gamepadEvent.button = event->gbutton.button;
 					gamepadEvent.id = event->gbutton.which;
+					gamepadEvent.timestamp = event->gbutton.timestamp;
 
 					GamepadEvent::Dispatch (&gamepadEvent);
 					break;
@@ -575,6 +577,7 @@ namespace lime {
 			keyEvent.keyCode = event->key.key;
 			keyEvent.modifier = event->key.mod;
 			keyEvent.windowID = event->key.windowID;
+			keyEvent.timestamp = event->key.timestamp;
 
 			if (keyEvent.type == KEY_DOWN) {
 
diff --git a/project/src/backend/sdl3/SDLSystem.cpp b/project/src/backend/sdl3/SDLSystem.cpp
@@ -610,6 +610,12 @@ namespace lime {
 
 	}
 
+	double System::GetTimerNS() {
+
+		return SDL_GetTicksNS();
+
+	}
+
 
 	bool System::SetAllowScreenTimeout (bool allow) {
 
diff --git a/project/src/ui/GamepadEvent.cpp b/project/src/ui/GamepadEvent.cpp
@@ -13,7 +13,7 @@ namespace lime {
 	static int id_id;
 	static int id_type;
 	static int id_value;
-	static int id_timestamp;
+	static uint64_t id_timestamp;
 	static bool init = false;
 
 
@@ -54,7 +54,7 @@ namespace lime {
 				alloc_field (object, id_id, alloc_int (event->id));
 				alloc_field (object, id_type, alloc_int (event->type));
 				alloc_field (object, id_value, alloc_float (event->axisValue));
-				alloc_field (object, id_timestamp, alloc_int (event->timestamp));
+				alloc_field (object, id_timestamp, alloc_float (event->timestamp));
 
 			} else {
 
@@ -76,4 +76,4 @@ namespace lime {
 	}
 
 
-}
+}
diff --git a/project/src/ui/KeyEvent.cpp b/project/src/ui/KeyEvent.cpp
@@ -12,7 +12,7 @@ namespace lime {
 	static int id_modifier;
 	static int id_type;
 	static int id_windowID;
-	static int id_timestamp;
+	static uint64_t id_timestamp;
 	static bool init = false;
 
 
@@ -50,7 +50,7 @@ namespace lime {
 				alloc_field (object, id_modifier, alloc_int (event->modifier));
 				alloc_field (object, id_type, alloc_int (event->type));
 				alloc_field (object, id_windowID, alloc_int (event->windowID));
-				alloc_field (object, id_timestamp, alloc_int (event->timestamp));
+				alloc_field (object, id_timestamp, alloc_float (event->timestamp));
 
 			} else {
 
@@ -70,4 +70,4 @@ namespace lime {
 	}
 
 
-}
+}
diff --git a/src/lime/_internal/backend/native/NativeApplication.hx b/src/lime/_internal/backend/native/NativeApplication.hx
@@ -293,7 +293,7 @@ class NativeApplication
 			var int32:Float = keyEventInfo.keyCode;
 			var keyCode:KeyCode = Std.int(int32);
 			var modifier:KeyModifier = keyEventInfo.modifier;
-			var timestamp = keyEventInfo.timestamp;
+			var timestamp:haxe.Int64 = keyEventInfo.timestamp;
 
 			switch (type)
 			{
@@ -831,16 +831,15 @@ private enum abstract JoystickEventType(Int)
 	public var type:KeyEventType;
 	public var windowID:Int;
 
-	// TODO: This should probably be an Int64
-	public var timestamp:Int = 0;
+	public var timestamp:haxe.Int64 = 0;
 
-	public function new(type:KeyEventType = null, windowID:Int = 0, keyCode: Float = 0, modifier:Int = 0, timestamp:Int = 0)
+	public function new(type:KeyEventType = null, windowID:Int = 0, keyCode: Float = 0, modifier:Int = 0, timestamp:Null<haxe.Int64> = null)
 	{
 		this.type = type;
 		this.windowID = windowID;
 		this.keyCode = keyCode;
 		this.modifier = modifier;
-		this.timestamp = timestamp;
+		this.timestamp = timestamp ?? haxe.Int64.ofInt(0);
 	}
 
 	public function clone():KeyEventInfo
diff --git a/src/lime/_internal/backend/native/NativeCFFI.hx b/src/lime/_internal/backend/native/NativeCFFI.hx
@@ -243,8 +243,6 @@ class NativeCFFI
 
 	@:cffi private static function lime_sensor_event_manager_register(callback:Dynamic, eventObject:Dynamic):Void;
 
-	@:cffi private static function lime_sdl_get_ticks():Int;
-
 	@:cffi private static function lime_system_get_allow_screen_timeout():Bool;
 
 	@:cffi private static function lime_system_set_allow_screen_timeout(value:Bool):Bool;
@@ -270,6 +268,7 @@ class NativeCFFI
 	@:cffi private static function lime_system_get_platform_version():Dynamic;
 
 	@:cffi private static function lime_system_get_timer():Float;
+	@:cffi private static function lime_system_get_timer_ns():Float;
 
 	@:cffi private static function lime_system_open_file(path:String):Void;
 
@@ -528,7 +527,6 @@ class NativeCFFI
 		"lime_render_event_manager_register", "oov", false));
 	private static var lime_sensor_event_manager_register = new cpp.Callable<cpp.Object->cpp.Object->cpp.Void>(cpp.Prime._loadPrime("lime",
 		"lime_sensor_event_manager_register", "oov", false));
-	private static var lime_sdl_get_ticks = new cpp.Callable<Void->Int>(cpp.Prime._loadPrime("lime", "lime_sdl_get_ticks", "i", false));
 	private static var lime_system_get_allow_screen_timeout = new cpp.Callable<Void->Bool>(cpp.Prime._loadPrime("lime",
 		"lime_system_get_allow_screen_timeout", "b", false));
 	private static var lime_system_set_allow_screen_timeout = new cpp.Callable<Bool->Bool>(cpp.Prime._loadPrime("lime",
@@ -550,6 +548,7 @@ class NativeCFFI
 	private static var lime_system_get_platform_version = new cpp.Callable<Void->cpp.Object>(cpp.Prime._loadPrime("lime", "lime_system_get_platform_version",
 		"o", false));
 	private static var lime_system_get_timer = new cpp.Callable<Void->Float>(cpp.Prime._loadPrime("lime", "lime_system_get_timer", "d", false));
+	private static var lime_system_get_timer_ns = new cpp.Callable<Void->Float>(cpp.Prime._loadPrime("lime", "lime_system_get_timer_ns", "d", false));
 	private static var lime_system_open_file = new cpp.Callable<String->cpp.Void>(cpp.Prime._loadPrime("lime", "lime_system_open_file", "sv", false));
 	private static var lime_system_open_url = new cpp.Callable<String->String->cpp.Void>(cpp.Prime._loadPrime("lime", "lime_system_open_url", "ssv", false));
 	private static var lime_text_event_manager_register = new cpp.Callable<cpp.Object->cpp.Object->cpp.Void>(cpp.Prime._loadPrime("lime",
@@ -727,7 +726,6 @@ class NativeCFFI
 	private static var lime_png_decode_file = CFFI.load("lime", "lime_png_decode_file", 3);
 	private static var lime_render_event_manager_register = CFFI.load("lime", "lime_render_event_manager_register", 2);
 	private static var lime_sensor_event_manager_register = CFFI.load("lime", "lime_sensor_event_manager_register", 2);
-	private static var lime_sdl_get_ticks = CFFI.load("lime", "lime_sdl_get_ticks", 0);
 	private static var lime_system_get_allow_screen_timeout = CFFI.load("lime", "lime_system_get_allow_screen_timeout", 0);
 	private static var lime_system_set_allow_screen_timeout = CFFI.load("lime", "lime_system_set_allow_screen_timeout", 1);
 	private static var lime_system_get_device_model = CFFI.load("lime", "lime_system_get_device_model", 0);
@@ -741,6 +739,7 @@ class NativeCFFI
 	private static var lime_system_get_platform_name = CFFI.load("lime", "lime_system_get_platform_name", 0);
 	private static var lime_system_get_platform_version = CFFI.load("lime", "lime_system_get_platform_version", 0);
 	private static var lime_system_get_timer = CFFI.load("lime", "lime_system_get_timer", 0);
+	private static var lime_system_get_timer_ns = CFFI.load("lime", "lime_system_get_timer_ns", 0);
 	private static var lime_system_open_file = CFFI.load("lime", "lime_system_open_file", 1);
 	private static var lime_system_open_url = CFFI.load("lime", "lime_system_open_url", 2);
 	private static var lime_text_event_manager_register = CFFI.load("lime", "lime_text_event_manager_register", 2);
@@ -1181,11 +1180,6 @@ class NativeCFFI
 	@:hlNative("lime", "hl_sensor_event_manager_register") private static function lime_sensor_event_manager_register(callback:Void->Void,
 		eventObject:SensorEventInfo):Void {}
 
-	@:hlNative("lime", "hl_sdl_get_ticks") private static function lime_sdl_get_ticks():Int
-	{
-		return 0;
-	}
-
 	@:hlNative("lime", "hl_system_get_allow_screen_timeout") private static function lime_system_get_allow_screen_timeout():Bool
 	{
 		return false;
@@ -1251,6 +1245,11 @@ class NativeCFFI
 		return 0;
 	}
 
+	@:hlNative("lime", "hl_system_get_timer_ns") private static function lime_system_get_timer_ns():Float
+	{
+		return 0;
+	}
+
 	@:hlNative("lime", "hl_system_open_file") private static function lime_system_open_file(path:String):Void {}
 
 	@:hlNative("lime", "hl_system_open_url") private static function lime_system_open_url(url:String, target:String):Void {}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-bd1f31d928e977ceb6673c7ab77c9668`
	`1`	`+1a5d381ca5f27d46296683fd08240b2f`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-a4138eafd7b92befd4a01e95749caec1`
	`1`	`+522d51f5e624e7557044d14248906b90`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-730720f4812c729410a4ae4a906a915a`
	`1`	`+1b2907bbb6231f626ab6ec1ad0eb2b28`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-48f699b586407446fa8cbd7e3b4b26c3`
	`1`	`+9d2b1d3e5c462358520277137b0bedd9`