From afca9ac4b576efc36ee149236753a835f12f988f Mon Sep 17 00:00:00 2001 From: Aurora Date: Mon, 12 Aug 2024 22:52:35 +0100 Subject: [PATCH 1/2] Added MouseButton newtype --- raylib/raylib.go | 4 +++- raylib/rcore.go | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/raylib/raylib.go b/raylib/raylib.go index 8c9e46b7..661d6917 100644 --- a/raylib/raylib.go +++ b/raylib/raylib.go @@ -366,9 +366,11 @@ const ( MouseMiddleButton = MouseButtonMiddle ) +type MouseButton int32 + // Mouse Buttons const ( - MouseButtonLeft = iota + MouseButtonLeft MouseButton = iota MouseButtonRight MouseButtonMiddle MouseButtonSide diff --git a/raylib/rcore.go b/raylib/rcore.go index 9737e082..8c322ae1 100644 --- a/raylib/rcore.go +++ b/raylib/rcore.go @@ -1082,7 +1082,7 @@ func SetGamepadMappings(mappings string) int32 { } // IsMouseButtonPressed - Detect if a mouse button has been pressed once -func IsMouseButtonPressed(button int32) bool { +func IsMouseButtonPressed(button MouseButton) bool { cbutton := (C.int)(button) ret := C.IsMouseButtonPressed(cbutton) v := bool(ret) @@ -1090,7 +1090,7 @@ func IsMouseButtonPressed(button int32) bool { } // IsMouseButtonDown - Detect if a mouse button is being pressed -func IsMouseButtonDown(button int32) bool { +func IsMouseButtonDown(button MouseButton) bool { cbutton := (C.int)(button) ret := C.IsMouseButtonDown(cbutton) v := bool(ret) @@ -1098,7 +1098,7 @@ func IsMouseButtonDown(button int32) bool { } // IsMouseButtonReleased - Detect if a mouse button has been released once -func IsMouseButtonReleased(button int32) bool { +func IsMouseButtonReleased(button MouseButton) bool { cbutton := (C.int)(button) ret := C.IsMouseButtonReleased(cbutton) v := bool(ret) @@ -1106,7 +1106,7 @@ func IsMouseButtonReleased(button int32) bool { } // IsMouseButtonUp - Detect if a mouse button is NOT being pressed -func IsMouseButtonUp(button int32) bool { +func IsMouseButtonUp(button MouseButton) bool { cbutton := (C.int)(button) ret := C.IsMouseButtonUp(cbutton) v := bool(ret) From a30a52c553688c5d3b9a9b42b171de224b2f9b43 Mon Sep 17 00:00:00 2001 From: Aurora Date: Tue, 13 Aug 2024 12:27:47 +0100 Subject: [PATCH 2/2] changed raylib_purego.go to use the new type --- raylib/raylib_purego.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/raylib/raylib_purego.go b/raylib/raylib_purego.go index 53d061d8..97148049 100644 --- a/raylib/raylib_purego.go +++ b/raylib/raylib_purego.go @@ -1757,23 +1757,23 @@ func SetGamepadMappings(mappings string) int32 { } // IsMouseButtonPressed - Check if a mouse button has been pressed once -func IsMouseButtonPressed(button int32) bool { - return isMouseButtonPressed(button) +func IsMouseButtonPressed(button MouseButton) bool { + return isMouseButtonPressed(int32(button)) } // IsMouseButtonDown - Check if a mouse button is being pressed -func IsMouseButtonDown(button int32) bool { - return isMouseButtonDown(button) +func IsMouseButtonDown(button MouseButton) bool { + return isMouseButtonDown(int32(button)) } // IsMouseButtonReleased - Check if a mouse button has been released once -func IsMouseButtonReleased(button int32) bool { - return isMouseButtonReleased(button) +func IsMouseButtonReleased(button MouseButton) bool { + return isMouseButtonReleased(int32(button)) } // IsMouseButtonUp - Check if a mouse button is NOT being pressed -func IsMouseButtonUp(button int32) bool { - return isMouseButtonUp(button) +func IsMouseButtonUp(button MouseButton) bool { + return isMouseButtonUp(int32(button)) } // GetMouseX - Get mouse position X