summaryrefslogtreecommitdiffhomepage
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/Makefile1
-rw-r--r--examples/core/core_multitouch.c90
-rw-r--r--examples/core/core_multitouch.pngbin0 -> 17177 bytes
-rw-r--r--examples/models/models_yaw_pitch_roll.c3
-rw-r--r--examples/physac/physics_restitution.c3
-rw-r--r--examples/shapes/shapes_colors_palette.pngbin5230 -> 6591 bytes
-rw-r--r--examples/text/resources/custom_alagard.pngbin37935 -> 45351 bytes
-rw-r--r--examples/text/resources/custom_jupiter_crash.pngbin23596 -> 29128 bytes
-rw-r--r--examples/text/resources/custom_mecha.pngbin26597 -> 32399 bytes
-rw-r--r--examples/text/resources/fonts/alagard.pngbin4424 -> 3626 bytes
-rw-r--r--examples/text/resources/fonts/alpha_beta.pngbin2442 -> 2424 bytes
-rw-r--r--examples/text/resources/fonts/jupiter_crash.pngbin3478 -> 2975 bytes
-rw-r--r--examples/text/resources/fonts/mecha.pngbin2399 -> 2355 bytes
-rw-r--r--examples/text/resources/fonts/pixantiqua.pngbin3003 -> 2739 bytes
-rw-r--r--examples/text/resources/fonts/pixelplay.pngbin2912 -> 2835 bytes
-rw-r--r--examples/text/resources/fonts/romulus.pngbin2932 -> 2702 bytes
-rw-r--r--examples/text/resources/fonts/setback.pngbin2539 -> 2517 bytes
-rw-r--r--examples/textures/resources/custom_jupiter_crash.pngbin23596 -> 29128 bytes
-rw-r--r--examples/textures/resources/scarfy.pngbin33146 -> 10495 bytes
19 files changed, 95 insertions, 2 deletions
diff --git a/examples/Makefile b/examples/Makefile
index a7a85661..a26e0bbb 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -375,6 +375,7 @@ EXAMPLES = \
core/core_2d_camera \
core/core_world_screen \
core/core_vr_simulator \
+ core/core_multitouch \
shapes/shapes_logo_raylib \
shapes/shapes_basic_shapes \
shapes/shapes_colors_palette \
diff --git a/examples/core/core_multitouch.c b/examples/core/core_multitouch.c
new file mode 100644
index 00000000..c059ac03
--- /dev/null
+++ b/examples/core/core_multitouch.c
@@ -0,0 +1,90 @@
+/*******************************************************************************************
+*
+* raylib [core] example - Multitouch input
+*
+* 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
+*
+********************************************************************************************/
+
+#include "raylib.h"
+#include <stdio.h>
+
+int main()
+{
+ // Initialization
+ //--------------------------------------------------------------------------------------
+ int screenWidth = 800;
+ int screenHeight = 450;
+
+ InitWindow(screenWidth, screenHeight, "raylib [core] example - multitouch input");
+
+ Vector2 ballPosition = { -100.0f, -100.0f };
+ Color ballColor;
+ int PressedCounter = 0;
+ Vector2 TouchPos;
+ char Str[16];
+
+ SetTargetFPS(60);
+ //---------------------------------------------------------------------------------------
+
+ // Main game loop
+ while (!WindowShouldClose()) // Detect window close button or ESC key
+ {
+ // Update
+ //----------------------------------------------------------------------------------
+ ballPosition = GetMousePosition();
+
+ ballColor = BEIGE;
+
+ if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) ballColor = MAROON;
+ 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--;
+ //----------------------------------------------------------------------------------
+
+ // Draw
+ //----------------------------------------------------------------------------------
+ BeginDrawing();
+
+ ClearBackground(RAYWHITE);
+
+ // Multitouch
+ for (int i = 0; i < MAX_TOUCH_POINTS; ++i)
+ {
+ TouchPos = 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
+ {
+ 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 the normal mouse location
+ DrawCircleV(ballPosition, 30 + (PressedCounter * 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);
+
+ EndDrawing();
+ //----------------------------------------------------------------------------------
+ }
+
+ // De-Initialization
+ //--------------------------------------------------------------------------------------
+ CloseWindow(); // Close window and OpenGL context
+ //--------------------------------------------------------------------------------------
+
+ return 0;
+} \ No newline at end of file
diff --git a/examples/core/core_multitouch.png b/examples/core/core_multitouch.png
new file mode 100644
index 00000000..74284f82
--- /dev/null
+++ b/examples/core/core_multitouch.png
Binary files differ
diff --git a/examples/models/models_yaw_pitch_roll.c b/examples/models/models_yaw_pitch_roll.c
index 0dcf8c70..88b0a610 100644
--- a/examples/models/models_yaw_pitch_roll.c
+++ b/examples/models/models_yaw_pitch_roll.c
@@ -5,8 +5,7 @@
* This example has been created using raylib 1.8 (www.raylib.com)
* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
*
-* Example based on Berni work on Raspberry Pi:
-* http://forum.raylib.com/index.php?p=/discussion/124/line-versus-triangle-drawing-order
+* Example based on Berni work on Raspberry Pi.
*
* Copyright (c) 2017 Ramon Santamaria (@raysan5)
*
diff --git a/examples/physac/physics_restitution.c b/examples/physac/physics_restitution.c
index d2ec49db..197e6eb5 100644
--- a/examples/physac/physics_restitution.c
+++ b/examples/physac/physics_restitution.c
@@ -51,6 +51,9 @@ int main()
circleC->restitution = 1;
SetTargetFPS(60);
+
+ // Restitution demo needs a very tiny physics time step for a proper simulation
+ SetPhysicsTimeStep(1.0/60.0/100 * 1000);
//--------------------------------------------------------------------------------------
// Main game loop
diff --git a/examples/shapes/shapes_colors_palette.png b/examples/shapes/shapes_colors_palette.png
index dd3cf4a5..4073b670 100644
--- a/examples/shapes/shapes_colors_palette.png
+++ b/examples/shapes/shapes_colors_palette.png
Binary files differ
diff --git a/examples/text/resources/custom_alagard.png b/examples/text/resources/custom_alagard.png
index c3eb63b7..63426555 100644
--- a/examples/text/resources/custom_alagard.png
+++ b/examples/text/resources/custom_alagard.png
Binary files differ
diff --git a/examples/text/resources/custom_jupiter_crash.png b/examples/text/resources/custom_jupiter_crash.png
index 451b591f..2deaaeff 100644
--- a/examples/text/resources/custom_jupiter_crash.png
+++ b/examples/text/resources/custom_jupiter_crash.png
Binary files differ
diff --git a/examples/text/resources/custom_mecha.png b/examples/text/resources/custom_mecha.png
index 59caab2c..a8c9e06e 100644
--- a/examples/text/resources/custom_mecha.png
+++ b/examples/text/resources/custom_mecha.png
Binary files differ
diff --git a/examples/text/resources/fonts/alagard.png b/examples/text/resources/fonts/alagard.png
index 3ac4bf1c..c0c54273 100644
--- a/examples/text/resources/fonts/alagard.png
+++ b/examples/text/resources/fonts/alagard.png
Binary files differ
diff --git a/examples/text/resources/fonts/alpha_beta.png b/examples/text/resources/fonts/alpha_beta.png
index c362bfb1..8a0c2733 100644
--- a/examples/text/resources/fonts/alpha_beta.png
+++ b/examples/text/resources/fonts/alpha_beta.png
Binary files differ
diff --git a/examples/text/resources/fonts/jupiter_crash.png b/examples/text/resources/fonts/jupiter_crash.png
index 1f5172fb..4972c02e 100644
--- a/examples/text/resources/fonts/jupiter_crash.png
+++ b/examples/text/resources/fonts/jupiter_crash.png
Binary files differ
diff --git a/examples/text/resources/fonts/mecha.png b/examples/text/resources/fonts/mecha.png
index 8022d18c..9213fa2d 100644
--- a/examples/text/resources/fonts/mecha.png
+++ b/examples/text/resources/fonts/mecha.png
Binary files differ
diff --git a/examples/text/resources/fonts/pixantiqua.png b/examples/text/resources/fonts/pixantiqua.png
index ce422e7e..17ad1ab7 100644
--- a/examples/text/resources/fonts/pixantiqua.png
+++ b/examples/text/resources/fonts/pixantiqua.png
Binary files differ
diff --git a/examples/text/resources/fonts/pixelplay.png b/examples/text/resources/fonts/pixelplay.png
index bf8f8818..fbf6430d 100644
--- a/examples/text/resources/fonts/pixelplay.png
+++ b/examples/text/resources/fonts/pixelplay.png
Binary files differ
diff --git a/examples/text/resources/fonts/romulus.png b/examples/text/resources/fonts/romulus.png
index 46ccc327..648aa8b0 100644
--- a/examples/text/resources/fonts/romulus.png
+++ b/examples/text/resources/fonts/romulus.png
Binary files differ
diff --git a/examples/text/resources/fonts/setback.png b/examples/text/resources/fonts/setback.png
index 086f3e27..1630a733 100644
--- a/examples/text/resources/fonts/setback.png
+++ b/examples/text/resources/fonts/setback.png
Binary files differ
diff --git a/examples/textures/resources/custom_jupiter_crash.png b/examples/textures/resources/custom_jupiter_crash.png
index 451b591f..2deaaeff 100644
--- a/examples/textures/resources/custom_jupiter_crash.png
+++ b/examples/textures/resources/custom_jupiter_crash.png
Binary files differ
diff --git a/examples/textures/resources/scarfy.png b/examples/textures/resources/scarfy.png
index beb5ffa0..4803ef77 100644
--- a/examples/textures/resources/scarfy.png
+++ b/examples/textures/resources/scarfy.png
Binary files differ