summaryrefslogtreecommitdiffhomepage
path: root/examples/textures
diff options
context:
space:
mode:
authorLambert Wang <[email protected]>2021-05-08 09:26:24 -0700
committerGitHub <[email protected]>2021-05-08 18:26:24 +0200
commit2545f62565fd246d1c59bf9a6bcf4942f4ad12ad (patch)
tree817bd3580c3b7c4037a545d552d90f699be879b3 /examples/textures
parent2565c011580fda074e0f3dceacd5e6a1476b3284 (diff)
downloadraylib-2545f62565fd246d1c59bf9a6bcf4942f4ad12ad.tar.gz
raylib-2545f62565fd246d1c59bf9a6bcf4942f4ad12ad.zip
Added support for additional mouse buttons (#1753)
* Added support for additional mouse buttons * Renamed mouse button enum Co-authored-by: Lambert Wang <[email protected]>
Diffstat (limited to 'examples/textures')
-rw-r--r--examples/textures/textures_bunnymark.c2
-rw-r--r--examples/textures/textures_draw_tiled.c2
-rw-r--r--examples/textures/textures_image_generation.c2
-rw-r--r--examples/textures/textures_image_processing.c2
-rw-r--r--examples/textures/textures_mouse_painting.c12
-rw-r--r--examples/textures/textures_sprite_button.c4
-rw-r--r--examples/textures/textures_sprite_explosion.c2
7 files changed, 13 insertions, 13 deletions
diff --git a/examples/textures/textures_bunnymark.c b/examples/textures/textures_bunnymark.c
index b92b3d41..9be7c596 100644
--- a/examples/textures/textures_bunnymark.c
+++ b/examples/textures/textures_bunnymark.c
@@ -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++)
diff --git a/examples/textures/textures_draw_tiled.c b/examples/textures/textures_draw_tiled.c
index 842be11e..bc2b1724 100644
--- a/examples/textures/textures_draw_tiled.c
+++ b/examples/textures/textures_draw_tiled.c
@@ -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();
diff --git a/examples/textures/textures_image_generation.c b/examples/textures/textures_image_generation.c
index 0bb10583..e2513a87 100644
--- a/examples/textures/textures_image_generation.c
+++ b/examples/textures/textures_image_generation.c
@@ -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
}
diff --git a/examples/textures/textures_image_processing.c b/examples/textures/textures_image_processing.c
index a18b1572..bb47330b 100644
--- a/examples/textures/textures_image_processing.c
+++ b/examples/textures/textures_image_processing.c
@@ -80,7 +80,7 @@ int main(void)
{
mouseHoverRec = i;
- if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON))
+ if (IsMouseButtonReleased(MOUSE_BUTTON_LEFT))
{
currentProcess = i;
textureReload = true;
diff --git a/examples/textures/textures_mouse_painting.c b/examples/textures/textures_mouse_painting.c
index 5cfbe6e0..3001e853 100644
--- a/examples/textures/textures_mouse_painting.c
+++ b/examples/textures/textures_mouse_painting.c
@@ -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]);
}
diff --git a/examples/textures/textures_sprite_button.c b/examples/textures/textures_sprite_button.c
index 6ca4ea90..3d1a1834 100644
--- a/examples/textures/textures_sprite_button.c
+++ b/examples/textures/textures_sprite_button.c
@@ -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;
diff --git a/examples/textures/textures_sprite_explosion.c b/examples/textures/textures_sprite_explosion.c
index 2394f6a8..4cb76906 100644
--- a/examples/textures/textures_sprite_explosion.c
+++ b/examples/textures/textures_sprite_explosion.c
@@ -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;