mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-11-11 21:08:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed the right and left button not working (#1595)

Browse Source
This commit is contained in:
Redcamellia
2021-02-20 13:18:43 +03:00
committed by GitHub
parent 2375464213
commit 0a8cb60eee
1 changed files with 60 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
examples/textures/textures_mouse_painting.c
View File

@@ -35,7 +35,7 @@ int main(void)
for (int i = 0; i < MAX_COLORS_COUNT; i++) for (int i = 0; i < MAX_COLORS_COUNT; i++)
{ {
colorsRecs[i].x = 10 + 30*i + 2*i; colorsRecs[i].x = 10 + 30 * i + 2 * i;
colorsRecs[i].y = 10; colorsRecs[i].y = 10;
colorsRecs[i].width = 30; colorsRecs[i].width = 30;
colorsRecs[i].height = 30; colorsRecs[i].height = 30;
@@ -45,6 +45,7 @@ int main(void)
int colorSelectedPrev = colorSelected; int colorSelectedPrev = colorSelected;
int colorMouseHover = 0; int colorMouseHover = 0;
int brushSize = 20; int brushSize = 20;
bool mouseWasPressed = false;
Rectangle btnSaveRec = { 750, 10, 40, 30 }; Rectangle btnSaveRec = { 750, 10, 40, 30 };
bool btnSaveMouseHover = false; bool btnSaveMouseHover = false;
@@ -94,7 +95,7 @@ int main(void)
} }
// Change brush size // Change brush size
brushSize += GetMouseWheelMove()*5; brushSize += GetMouseWheelMove() * 5;
if (brushSize < 2) brushSize = 2; if (brushSize < 2) brushSize = 2;
if (brushSize > 50) brushSize = 50; if (brushSize > 50) brushSize = 50;
@@ -118,14 +119,24 @@ int main(void)
if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON)) if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON))
{ {
colorSelected = 0; if (!mouseWasPressed)
{
colorSelectedPrev = colorSelected;
colorSelected = 0;
}
mouseWasPressed = true;
// Erase circle from render texture // Erase circle from render texture
BeginTextureMode(target); BeginTextureMode(target);
if (mousePos.y > 50) DrawCircle(mousePos.x, mousePos.y, brushSize, colors[0]); if (mousePos.y > 50) DrawCircle(mousePos.x, mousePos.y, brushSize, colors[0]);
EndTextureMode(); EndTextureMode();
} }
else colorSelected = colorSelectedPrev; else if (IsMouseButtonReleased(MOUSE_RIGHT_BUTTON) && mouseWasPressed)
{
colorSelected = colorSelectedPrev;
mouseWasPressed = false;
}
// Check mouse hover save button // Check mouse hover save button
if (CheckCollisionPointRec(mousePos, btnSaveRec)) btnSaveMouseHover = true; if (CheckCollisionPointRec(mousePos, btnSaveRec)) btnSaveMouseHover = true;
@@ -158,42 +169,44 @@ int main(void)
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
BeginDrawing(); BeginDrawing();
ClearBackground(RAYWHITE); ClearBackground(RAYWHITE);
// NOTE: Render texture must be y-flipped due to default OpenGL coordinates (left-bottom) // NOTE: Render texture must be y-flipped due to default OpenGL coordinates (left-bottom)
DrawTextureRec(target.texture, (Rectangle){ 0, 0, target.texture.width, -target.texture.height }, (Vector2){ 0, 0 }, WHITE); DrawTextureRec(target.texture, (Rectangle) { 0, 0, target.texture.width, -target.texture.height }, (Vector2) { 0, 0 }, WHITE);
// Draw drawing circle for reference // Draw drawing circle for reference
if (mousePos.y > 50) if (mousePos.y > 50)
{ {
if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON)) DrawCircleLines(mousePos.x, mousePos.y, brushSize, GRAY); if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON)) DrawCircleLines(mousePos.x, mousePos.y, brushSize, GRAY);
else DrawCircle(GetMouseX(), GetMouseY(), brushSize, colors[colorSelected]); else DrawCircle(GetMouseX(), GetMouseY(), brushSize, colors[colorSelected]);
} }
// Draw top panel // Draw top panel
DrawRectangle(0, 0, GetScreenWidth(), 50, RAYWHITE); DrawRectangle(0, 0, GetScreenWidth(), 50, RAYWHITE);
DrawLine(0, 50, GetScreenWidth(), 50, LIGHTGRAY); DrawLine(0, 50, GetScreenWidth(), 50, LIGHTGRAY);
// Draw color selection rectangles // Draw color selection rectangles
for (int i = 0; i < MAX_COLORS_COUNT; i++) DrawRectangleRec(colorsRecs[i], colors[i]); for (int i = 0; i < MAX_COLORS_COUNT; i++) DrawRectangleRec(colorsRecs[i], colors[i]);
DrawRectangleLines(10, 10, 30, 30, LIGHTGRAY); DrawRectangleLines(10, 10, 30, 30, LIGHTGRAY);
if (colorMouseHover >= 0) DrawRectangleRec(colorsRecs[colorMouseHover], Fade(WHITE, 0.6f)); if (colorMouseHover >= 0) DrawRectangleRec(colorsRecs[colorMouseHover], Fade(WHITE, 0.6f));
DrawRectangleLinesEx((Rectangle){ colorsRecs[colorSelected].x - 2, colorsRecs[colorSelected].y - 2, DrawRectangleLinesEx((Rectangle) {
colorsRecs[colorSelected].width + 4, colorsRecs[colorSelected].height + 4 }, 2, BLACK); colorsRecs[colorSelected].x - 2, colorsRecs[colorSelected].y - 2,
colorsRecs[colorSelected].width + 4, colorsRecs[colorSelected].height + 4
}, 2, BLACK);
// Draw save image button // Draw save image button
DrawRectangleLinesEx(btnSaveRec, 2, btnSaveMouseHover? RED : BLACK); DrawRectangleLinesEx(btnSaveRec, 2, btnSaveMouseHover ? RED : BLACK);
DrawText("SAVE!", 755, 20, 10, btnSaveMouseHover? RED : BLACK); DrawText("SAVE!", 755, 20, 10, btnSaveMouseHover ? RED : BLACK);
// Draw save image message // Draw save image message
if (showSaveMessage) if (showSaveMessage)
{ {
DrawRectangle(0, 0, GetScreenWidth(), GetScreenHeight(), Fade(RAYWHITE, 0.8f)); DrawRectangle(0, 0, GetScreenWidth(), GetScreenHeight(), Fade(RAYWHITE, 0.8f));
DrawRectangle(0, 150, GetScreenWidth(), 80, BLACK); DrawRectangle(0, 150, GetScreenWidth(), 80, BLACK);
DrawText("IMAGE SAVED: my_amazing_texture_painting.png", 150, 180, 20, RAYWHITE); DrawText("IMAGE SAVED: my_amazing_texture_painting.png", 150, 180, 20, RAYWHITE);
} }
EndDrawing(); EndDrawing();
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------