diff options
| author | Ray <[email protected]> | 2019-04-12 13:29:53 +0200 |
|---|---|---|
| committer | Ray <[email protected]> | 2019-04-12 13:29:53 +0200 |
| commit | 99537efccf077c0425c1de1188df632bfe96d125 (patch) | |
| tree | 57df26454d3ca6eb31c7c577ee42846ef6ad0be1 /examples/core | |
| parent | 4e58d4102c0f466730971e7f7cd685b7359343ab (diff) | |
| download | raylib-99537efccf077c0425c1de1188df632bfe96d125.tar.gz raylib-99537efccf077c0425c1de1188df632bfe96d125.zip | |
Review some examples
Diffstat (limited to 'examples/core')
| -rw-r--r-- | examples/core/core_input_multitouch.c (renamed from examples/core/core_multitouch.c) | 39 | ||||
| -rw-r--r-- | examples/core/core_input_multitouch.png (renamed from examples/core/core_multitouch.png) | bin | 17177 -> 17177 bytes |
2 files changed, 18 insertions, 21 deletions
diff --git a/examples/core/core_multitouch.c b/examples/core/core_input_multitouch.c index c059ac03..ef8fa7ae 100644 --- a/examples/core/core_multitouch.c +++ b/examples/core/core_input_multitouch.c @@ -1,17 +1,15 @@ /******************************************************************************************* * -* raylib [core] example - Multitouch input +* raylib [core] example - Input multitouch * * This example has been created using raylib 2.1 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * -* Copyright (c) 2014 Ramon Santamaria (@raysan5) -* Example by Berni +* Copyright (c) 2014-2019 Berni and Ramon Santamaria (@raysan5) * ********************************************************************************************/ #include "raylib.h" -#include <stdio.h> int main() { @@ -20,13 +18,13 @@ int main() int screenWidth = 800; int screenHeight = 450; - InitWindow(screenWidth, screenHeight, "raylib [core] example - multitouch input"); + InitWindow(screenWidth, screenHeight, "raylib [core] example - input multitouch"); Vector2 ballPosition = { -100.0f, -100.0f }; - Color ballColor; - int PressedCounter = 0; - Vector2 TouchPos; - char Str[16]; + Color ballColor = BEIGE; + + int touchCounter = 0; + Vector2 touchPosition; SetTargetFPS(60); //--------------------------------------------------------------------------------------- @@ -44,11 +42,11 @@ int main() if (IsMouseButtonDown(MOUSE_MIDDLE_BUTTON)) ballColor = LIME; if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON)) ballColor = DARKBLUE; - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) PressedCounter = 10; - if (IsMouseButtonPressed(MOUSE_MIDDLE_BUTTON)) PressedCounter = 10; - if (IsMouseButtonPressed(MOUSE_RIGHT_BUTTON)) PressedCounter = 10; - if(PressedCounter > 0) - PressedCounter--; + if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) touchCounter = 10; + if (IsMouseButtonPressed(MOUSE_MIDDLE_BUTTON)) touchCounter = 10; + if (IsMouseButtonPressed(MOUSE_RIGHT_BUTTON)) touchCounter = 10; + + if (touchCounter > 0) touchCounter--; //---------------------------------------------------------------------------------- // Draw @@ -60,19 +58,18 @@ int main() // Multitouch for (int i = 0; i < MAX_TOUCH_POINTS; ++i) { - TouchPos = GetTouchPosition(i); // Get the touch point + touchPosition = GetTouchPosition(i); // Get the touch point - if( (TouchPos.x >= 0) && (TouchPos.y >= 0) ) // Make sure point is not (-1,-1) as this means there is no touch for it + if ((touchPosition.x >= 0) && (touchPosition.y >= 0)) // Make sure point is not (-1,-1) as this means there is no touch for it { - DrawCircleV(TouchPos, 34, ORANGE); // Draw a circle there - - sprintf(Str,"%d",i); - DrawText(Str, TouchPos.x - 10, TouchPos.y - 70, 40, BLACK); // Also show its index number + // Draw circle and touch index number + DrawCircleV(touchPosition, 34, ORANGE); + DrawText(FormatText("%d", i), touchPosition.x - 10, touchPosition.y - 70, 40, BLACK); } } // Draw the normal mouse location - DrawCircleV(ballPosition, 30 + (PressedCounter * 3), ballColor); + DrawCircleV(ballPosition, 30 + (touchCounter*3), ballColor); DrawText("move ball with mouse and click mouse button to change color", 10, 10, 20, DARKGRAY); DrawText("touch the screen at multiple locations to get multiple balls", 10, 30, 20, DARKGRAY); diff --git a/examples/core/core_multitouch.png b/examples/core/core_input_multitouch.png Binary files differindex 74284f82..74284f82 100644 --- a/examples/core/core_multitouch.png +++ b/examples/core/core_input_multitouch.png |
