twix/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-12-25 10:22:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added support for additional mouse buttons (#1753)

Browse Source 
* Added support for additional mouse buttons

* Renamed mouse button enum

Co-authored-by: Lambert Wang <lambert.ww@gmail.com>
This commit is contained in:
Lambert Wang
2021-05-08 09:26:24 -07:00
committed by GitHub
parent 2565c01158
commit 2545f62565
27 changed files with 81 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/textures/textures_bunnymark.c
View File

@ -49,7 +49,7 @@ int main(void)
{
// Update
//----------------------------------------------------------------------------------
if (IsMouseButtonDown(MOUSE_LEFT_BUTTON))
if (IsMouseButtonDown(MOUSE_BUTTON_LEFT))
{
// Create more bunnies
for (int i = 0; i < 100; i++)

2
examples/textures/textures_draw_tiled.c
View File

@ -75,7 +75,7 @@ int main(int argc, char **argv)
screenHeight = GetScreenHeight();
// Handle mouse
if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON))
if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT))
{
const Vector2 mouse = GetMousePosition();

2
examples/textures/textures_image_generation.c
View File

@ -59,7 +59,7 @@ int main(void)
{
// Update
//----------------------------------------------------------------------------------
if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON) || IsKeyPressed(KEY_RIGHT))
if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT) || IsKeyPressed(KEY_RIGHT))
{
currentTexture = (currentTexture + 1)%NUM_TEXTURES; // Cycle between the textures
}

2
examples/textures/textures_image_processing.c
View File

@ -80,7 +80,7 @@ int main(void)
{
mouseHoverRec = i;
if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON))
if (IsMouseButtonReleased(MOUSE_BUTTON_LEFT))
{
currentProcess = i;
textureReload = true;

12
examples/textures/textures_mouse_painting.c
View File

@ -88,7 +88,7 @@ int main(void)
else colorMouseHover = -1;
}
if ((colorMouseHover >= 0) && IsMouseButtonPressed(MOUSE_LEFT_BUTTON))
if ((colorMouseHover >= 0) && IsMouseButtonPressed(MOUSE_BUTTON_LEFT))
{
colorSelected = colorMouseHover;
colorSelectedPrev = colorSelected;
@ -107,7 +107,7 @@ int main(void)
EndTextureMode();
}
if (IsMouseButtonDown(MOUSE_LEFT_BUTTON) || (GetGestureDetected() == GESTURE_DRAG))
if (IsMouseButtonDown(MOUSE_BUTTON_LEFT) || (GetGestureDetected() == GESTURE_DRAG))
{
// Paint circle into render texture
// NOTE: To avoid discontinuous circles, we could store
@ -117,7 +117,7 @@ int main(void)
EndTextureMode();
}
if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON))
if (IsMouseButtonDown(MOUSE_BUTTON_RIGHT))
{
if (!mouseWasPressed)
{
@ -132,7 +132,7 @@ int main(void)
if (mousePos.y > 50) DrawCircle((int)mousePos.x, (int)mousePos.y, brushSize, colors[0]);
EndTextureMode();
}
else if (IsMouseButtonReleased(MOUSE_RIGHT_BUTTON) && mouseWasPressed)
else if (IsMouseButtonReleased(MOUSE_BUTTON_RIGHT) && mouseWasPressed)
{
colorSelected = colorSelectedPrev;
mouseWasPressed = false;
@ -144,7 +144,7 @@ int main(void)
// Image saving logic
// NOTE: Saving painted texture to a default named image
if ((btnSaveMouseHover && IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) || IsKeyPressed(KEY_S))
if ((btnSaveMouseHover && IsMouseButtonReleased(MOUSE_BUTTON_LEFT)) || IsKeyPressed(KEY_S))
{
Image image = GetTextureData(target.texture);
ImageFlipVertical(&image);
@ -177,7 +177,7 @@ int main(void)
// Draw drawing circle for reference
if (mousePos.y > 50)
{
if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON)) DrawCircleLines((int)mousePos.x, (int)mousePos.y, brushSize, GRAY);
if (IsMouseButtonDown(MOUSE_BUTTON_RIGHT)) DrawCircleLines((int)mousePos.x, (int)mousePos.y, brushSize, GRAY);
else DrawCircle(GetMouseX(), GetMouseY(), brushSize, colors[colorSelected]);
}

4
examples/textures/textures_sprite_button.c
View File

@ -53,10 +53,10 @@ int main(void)
// Check button state
if (CheckCollisionPointRec(mousePoint, btnBounds))
{
if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) btnState = 2;
if (IsMouseButtonDown(MOUSE_BUTTON_LEFT)) btnState = 2;
else btnState = 1;
if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) btnAction = true;
if (IsMouseButtonReleased(MOUSE_BUTTON_LEFT)) btnAction = true;
}
else btnState = 0;

2
examples/textures/textures_sprite_explosion.c
View File

@ -53,7 +53,7 @@ int main(void)
//----------------------------------------------------------------------------------
// Check for mouse button pressed and activate explosion (if not active)
if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON) && !active)
if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT) && !active)
{
position = GetMousePosition();
active = true;