From 910befbff90737493a40481fcfa5f31c66e6ac5b Mon Sep 17 00:00:00 2001 From: danil Date: Thu, 18 Jan 2024 10:53:31 +0200 Subject: [PATCH] replace occurences with MOUSE_* --- Examples/Core/InputMouse.cs | 6 +++--- Examples/Core/Picking3D.cs | 2 +- Examples/Models/MeshGeneration.cs | 2 +- Examples/Models/ModelLoading.cs | 2 +- Examples/Shaders/HotReloading.cs | 2 +- Examples/Shaders/JuliaSet.cs | 6 +++--- Examples/Shapes/LinesBezier.cs | 4 ++-- Examples/Shapes/RectangleScaling.cs | 4 ++-- Examples/Text/RectangleBounds.cs | 4 ++-- Examples/Textures/Bunnymark.cs | 2 +- Examples/Textures/DrawTiled.cs | 2 +- Examples/Textures/ImageGeneration.cs | 2 +- Examples/Textures/ImageProcessing.cs | 2 +- Examples/Textures/MousePainting.cs | 10 +++++----- Examples/Textures/SpriteButton.cs | 4 ++-- Examples/Textures/SpriteExplosion.cs | 2 +- Examples/Textures/TexturedCurve.cs | 2 +- 17 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Examples/Core/InputMouse.cs b/Examples/Core/InputMouse.cs index 141250c..6d4ae15 100644 --- a/Examples/Core/InputMouse.cs +++ b/Examples/Core/InputMouse.cs @@ -38,15 +38,15 @@ public class InputMouse //---------------------------------------------------------------------------------- ballPosition = GetMousePosition(); - if (IsMouseButtonPressed(MouseButton.MOUSE_LEFT_BUTTON)) + if (IsMouseButtonPressed(MouseButton.Left)) { ballColor = Color.Maroon; } - else if (IsMouseButtonPressed(MouseButton.MOUSE_MIDDLE_BUTTON)) + else if (IsMouseButtonPressed(MouseButton.Middle)) { ballColor = Color.Lime; } - else if (IsMouseButtonPressed(MouseButton.MOUSE_RIGHT_BUTTON)) + else if (IsMouseButtonPressed(MouseButton.Right)) { ballColor = Color.DarkBlue; } diff --git a/Examples/Core/Picking3D.cs b/Examples/Core/Picking3D.cs index 696dca2..afe8c10 100644 --- a/Examples/Core/Picking3D.cs +++ b/Examples/Core/Picking3D.cs @@ -50,7 +50,7 @@ public class Picking3d //---------------------------------------------------------------------------------- UpdateCamera(ref camera, CameraMode.Free); - if (IsMouseButtonPressed(MouseButton.MOUSE_LEFT_BUTTON)) + if (IsMouseButtonPressed(MouseButton.Left)) { if (!collision.Hit) { diff --git a/Examples/Models/MeshGeneration.cs b/Examples/Models/MeshGeneration.cs index 2a06561..e4b27c4 100644 --- a/Examples/Models/MeshGeneration.cs +++ b/Examples/Models/MeshGeneration.cs @@ -72,7 +72,7 @@ public class MeshGeneration //---------------------------------------------------------------------------------- UpdateCamera(ref camera, CameraMode.Orbital); - if (IsMouseButtonPressed(MouseButton.MOUSE_LEFT_BUTTON)) + if (IsMouseButtonPressed(MouseButton.Left)) { // Cycle between the textures currentModel = (currentModel + 1) % models.Length; diff --git a/Examples/Models/ModelLoading.cs b/Examples/Models/ModelLoading.cs index 12af18f..51ffcba 100644 --- a/Examples/Models/ModelLoading.cs +++ b/Examples/Models/ModelLoading.cs @@ -98,7 +98,7 @@ public class ModelLoading } // Select model on mouse click - if (IsMouseButtonPressed(MouseButton.MOUSE_LEFT_BUTTON)) + if (IsMouseButtonPressed(MouseButton.Left)) { // Check collision between ray and box if (GetRayCollisionBox(GetMouseRay(GetMousePosition(), camera), bounds).Hit) diff --git a/Examples/Shaders/HotReloading.cs b/Examples/Shaders/HotReloading.cs index 3b9788f..f3d5d29 100644 --- a/Examples/Shaders/HotReloading.cs +++ b/Examples/Shaders/HotReloading.cs @@ -63,7 +63,7 @@ public class HotReloading Raylib.SetShaderValue(shader, mouseLoc, mousePos, ShaderUniformDataType.Vec2); // Hot shader reloading - if (shaderAutoReloading || (IsMouseButtonPressed(MouseButton.MOUSE_LEFT_BUTTON))) + if (shaderAutoReloading || (IsMouseButtonPressed(MouseButton.Left))) { long currentFragShaderModTime = GetFileModTime(fragShaderFileName); diff --git a/Examples/Shaders/JuliaSet.cs b/Examples/Shaders/JuliaSet.cs index 0dc169c..b74f75d 100644 --- a/Examples/Shaders/JuliaSet.cs +++ b/Examples/Shaders/JuliaSet.cs @@ -161,14 +161,14 @@ public class JuliaSet // TODO: The idea is to zoom and move around with mouse // Probably offset movement should be proportional to zoom level - if (IsMouseButtonDown(MouseButton.MOUSE_LEFT_BUTTON) || IsMouseButtonDown(MouseButton.MOUSE_RIGHT_BUTTON)) + if (IsMouseButtonDown(MouseButton.Left) || IsMouseButtonDown(MouseButton.Right)) { - if (IsMouseButtonDown(MouseButton.MOUSE_LEFT_BUTTON)) + if (IsMouseButtonDown(MouseButton.Left)) { zoom += zoom * 0.003f; } - if (IsMouseButtonDown(MouseButton.MOUSE_RIGHT_BUTTON)) + if (IsMouseButtonDown(MouseButton.Right)) { zoom -= zoom * 0.003f; } diff --git a/Examples/Shapes/LinesBezier.cs b/Examples/Shapes/LinesBezier.cs index 54d392d..7861de4 100644 --- a/Examples/Shapes/LinesBezier.cs +++ b/Examples/Shapes/LinesBezier.cs @@ -37,11 +37,11 @@ public class LinesBezier { // Update //---------------------------------------------------------------------------------- - if (IsMouseButtonDown(MouseButton.MOUSE_LEFT_BUTTON)) + if (IsMouseButtonDown(MouseButton.Left)) { start = GetMousePosition(); } - else if (IsMouseButtonDown(MouseButton.MOUSE_RIGHT_BUTTON)) + else if (IsMouseButtonDown(MouseButton.Right)) { end = GetMousePosition(); } diff --git a/Examples/Shapes/RectangleScaling.cs b/Examples/Shapes/RectangleScaling.cs index 10ac774..36c279b 100644 --- a/Examples/Shapes/RectangleScaling.cs +++ b/Examples/Shapes/RectangleScaling.cs @@ -56,7 +56,7 @@ public class RectangleScaling CheckCollisionPointRec(mousePosition, area)) { mouseScaleReady = true; - if (IsMouseButtonPressed(MouseButton.MOUSE_LEFT_BUTTON)) + if (IsMouseButtonPressed(MouseButton.Left)) { mouseScaleMode = true; } @@ -82,7 +82,7 @@ public class RectangleScaling rec.Height = MOUSE_SCALE_MARK_SIZE; } - if (IsMouseButtonReleased(MouseButton.MOUSE_LEFT_BUTTON)) + if (IsMouseButtonReleased(MouseButton.Left)) { mouseScaleMode = false; } diff --git a/Examples/Text/RectangleBounds.cs b/Examples/Text/RectangleBounds.cs index 727f138..b5ef7eb 100644 --- a/Examples/Text/RectangleBounds.cs +++ b/Examples/Text/RectangleBounds.cs @@ -68,7 +68,7 @@ public class RectangleBounds // Container resizing logic if (resizing) { - if (IsMouseButtonReleased(MouseButton.MOUSE_LEFT_BUTTON)) + if (IsMouseButtonReleased(MouseButton.Left)) { resizing = false; } @@ -82,7 +82,7 @@ public class RectangleBounds else { // Check if we're resizing - if (IsMouseButtonDown(MouseButton.MOUSE_LEFT_BUTTON) && CheckCollisionPointRec(mouse, resizer)) + if (IsMouseButtonDown(MouseButton.Left) && CheckCollisionPointRec(mouse, resizer)) { resizing = true; } diff --git a/Examples/Textures/Bunnymark.cs b/Examples/Textures/Bunnymark.cs index c1f0060..2e1a22d 100644 --- a/Examples/Textures/Bunnymark.cs +++ b/Examples/Textures/Bunnymark.cs @@ -53,7 +53,7 @@ public class Bunnymark { // Update //---------------------------------------------------------------------------------- - if (IsMouseButtonDown(MouseButton.MOUSE_LEFT_BUTTON)) + if (IsMouseButtonDown(MouseButton.Left)) { // Create more bunnies for (int i = 0; i < 100; i++) diff --git a/Examples/Textures/DrawTiled.cs b/Examples/Textures/DrawTiled.cs index cc121f6..e069926 100644 --- a/Examples/Textures/DrawTiled.cs +++ b/Examples/Textures/DrawTiled.cs @@ -96,7 +96,7 @@ public class DrawTiled screenHeight = GetScreenHeight(); // Handle mouse - if (IsMouseButtonPressed(MouseButton.MOUSE_LEFT_BUTTON)) + if (IsMouseButtonPressed(MouseButton.Left)) { Vector2 mouse = GetMousePosition(); diff --git a/Examples/Textures/ImageGeneration.cs b/Examples/Textures/ImageGeneration.cs index 4fad323..dacff9a 100644 --- a/Examples/Textures/ImageGeneration.cs +++ b/Examples/Textures/ImageGeneration.cs @@ -58,7 +58,7 @@ public class ImageGeneration { // Update //---------------------------------------------------------------------------------- - if (IsMouseButtonPressed(MouseButton.MOUSE_LEFT_BUTTON) || IsKeyPressed(KeyboardKey.Right)) + if (IsMouseButtonPressed(MouseButton.Left) || IsKeyPressed(KeyboardKey.Right)) { // Cycle between the textures currentTexture = (currentTexture + 1) % NumTextures; diff --git a/Examples/Textures/ImageProcessing.cs b/Examples/Textures/ImageProcessing.cs index 7095e67..c28a263 100644 --- a/Examples/Textures/ImageProcessing.cs +++ b/Examples/Textures/ImageProcessing.cs @@ -87,7 +87,7 @@ public class ImageProcessing { mouseHoverRec = i; - if (IsMouseButtonReleased(MouseButton.MOUSE_LEFT_BUTTON)) + if (IsMouseButtonReleased(MouseButton.Left)) { currentProcess = (ImageProcess)i; textureReload = true; diff --git a/Examples/Textures/MousePainting.cs b/Examples/Textures/MousePainting.cs index 55fb4d5..62f4692 100644 --- a/Examples/Textures/MousePainting.cs +++ b/Examples/Textures/MousePainting.cs @@ -126,7 +126,7 @@ public class MousePainting } } - if ((colorMouseHover >= 0) && IsMouseButtonPressed(MouseButton.MOUSE_LEFT_BUTTON)) + if ((colorMouseHover >= 0) && IsMouseButtonPressed(MouseButton.Left)) { colorSelected = colorMouseHover; colorSelectedPrev = colorSelected; @@ -152,7 +152,7 @@ public class MousePainting EndTextureMode(); } - if (IsMouseButtonDown(MouseButton.MOUSE_LEFT_BUTTON)) + if (IsMouseButtonDown(MouseButton.Left)) { // Paint circle into render texture // NOTE: To avoid discontinuous circles, we could store @@ -165,7 +165,7 @@ public class MousePainting EndTextureMode(); } - else if (IsMouseButtonDown(MouseButton.MOUSE_RIGHT_BUTTON)) + else if (IsMouseButtonDown(MouseButton.Right)) { colorSelected = 0; @@ -195,7 +195,7 @@ public class MousePainting // Image saving logic // NOTE: Saving painted texture to a default named image - if ((btnSaveMouseHover && IsMouseButtonReleased(MouseButton.MOUSE_LEFT_BUTTON)) || + if ((btnSaveMouseHover && IsMouseButtonReleased(MouseButton.Left)) || IsKeyPressed(KeyboardKey.S)) { Image image = LoadImageFromTexture(target.Texture); @@ -229,7 +229,7 @@ public class MousePainting // Draw drawing circle for reference if (mousePos.Y > 50) { - if (IsMouseButtonDown(MouseButton.MOUSE_RIGHT_BUTTON)) + if (IsMouseButtonDown(MouseButton.Right)) { DrawCircleLines((int)mousePos.X, (int)mousePos.Y, brushSize, colors[colorSelected]); } diff --git a/Examples/Textures/SpriteButton.cs b/Examples/Textures/SpriteButton.cs index 8d9fb42..c2de041 100644 --- a/Examples/Textures/SpriteButton.cs +++ b/Examples/Textures/SpriteButton.cs @@ -67,7 +67,7 @@ public class SpriteButton // Check button state if (CheckCollisionPointRec(mousePoint, btnBounds)) { - if (IsMouseButtonDown(MouseButton.MOUSE_LEFT_BUTTON)) + if (IsMouseButtonDown(MouseButton.Left)) { btnState = 2; } @@ -76,7 +76,7 @@ public class SpriteButton btnState = 1; } - if (IsMouseButtonReleased(MouseButton.MOUSE_LEFT_BUTTON)) + if (IsMouseButtonReleased(MouseButton.Left)) { btnAction = true; } diff --git a/Examples/Textures/SpriteExplosion.cs b/Examples/Textures/SpriteExplosion.cs index a17863a..f748686 100644 --- a/Examples/Textures/SpriteExplosion.cs +++ b/Examples/Textures/SpriteExplosion.cs @@ -62,7 +62,7 @@ public class SpriteExplosion //---------------------------------------------------------------------------------- // Check for mouse button pressed and activate explosion (if not active) - if (IsMouseButtonPressed(MouseButton.MOUSE_LEFT_BUTTON) && !active) + if (IsMouseButtonPressed(MouseButton.Left) && !active) { position = GetMousePosition(); active = true; diff --git a/Examples/Textures/TexturedCurve.cs b/Examples/Textures/TexturedCurve.cs index ed35813..44f16d0 100644 --- a/Examples/Textures/TexturedCurve.cs +++ b/Examples/Textures/TexturedCurve.cs @@ -133,7 +133,7 @@ public unsafe class TexturedCurve static void UpdateCurve() { // If the mouse is not down, we are not editing the curve so clear the selection - if (!IsMouseButtonDown(MouseButton.MOUSE_LEFT_BUTTON)) + if (!IsMouseButtonDown(MouseButton.Left)) { return; }