Skip to content

Commit

Permalink
Merge pull request #406 from Aurora2500/mousebutton_newtype
Browse files Browse the repository at this point in the history
[rcore] Added MouseButton newtype
  • Loading branch information
gen2brain authored Aug 26, 2024
2 parents 287f319 + a30a52c commit b4d0c52
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
4 changes: 3 additions & 1 deletion raylib/raylib.go
Original file line number Diff line number Diff line change
Expand Up @@ -366,9 +366,11 @@ const (
MouseMiddleButton = MouseButtonMiddle
)

type MouseButton int32

// Mouse Buttons
const (
MouseButtonLeft = iota
MouseButtonLeft MouseButton = iota
MouseButtonRight
MouseButtonMiddle
MouseButtonSide
Expand Down
16 changes: 8 additions & 8 deletions raylib/raylib_purego.go
Original file line number Diff line number Diff line change
Expand Up @@ -1788,23 +1788,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
Expand Down
8 changes: 4 additions & 4 deletions raylib/rcore.go
Original file line number Diff line number Diff line change
Expand Up @@ -1082,31 +1082,31 @@ 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)
return v
}

// 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)
return v
}

// 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)
return v
}

// 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)
Expand Down

0 comments on commit b4d0c52

Please sign in to comment.