Add FPS to all examples, add mouse examples

cirosantilli · cirosantilli · commit a55cae5b63ae · 2016-10-28T11:06:44.000+01:00
diff --git a/sdl/README.md b/sdl/README.md
@@ -4,6 +4,7 @@
 1.  Examples
     1.  [SDL_RenderDrawPoint](render_draw_point.c)
     1.  [SDL_RenderDrawRect](render_draw_rect.c)
+        1.  [Render draw point rect](render_draw_point_rect.c)
     1.  [Check A pressed](check_a_pressed.c)
     1.  [Error handling](error_handling.c)
     1.  [Animation](animation.c)
@@ -17,6 +18,9 @@
         1.  [heatmap](heatmap.c)
         1.  [heatmap streaming](heatmap_streaming.c)
         1.  [heatmap shader](heatmap_shader.c)
+    1.  [Mouse](mouse.c)
+        1. [Mouse rect](mouse_rect.c)
+        1. [Mouse point rect](mouse_point_rect.c)
     1.  [OpenGL](opengl.c)
     1.  Audio
         1.  [Sound frequency](sound_frequency.c)
diff --git a/sdl/animation.c b/sdl/animation.c
@@ -4,9 +4,7 @@ TODO find source saying the good way to control speed.
 Simple movement that has an absolute equation.
 */
 
-#include <stdlib.h>
-
-#include <SDL2/SDL.h>
+#include "common.h"
 
 #define WINDOW_WIDTH 600
 #define RECT_WIDTH WINDOW_WIDTH / 30
@@ -26,6 +24,7 @@ int main(void) {
     rect.w = RECT_WIDTH;
     rect.h = RECT_WIDTH;
     initial_time = SDL_GetTicks();
+    common_fps_init();
     while (1) {
         rect.x = ((int)(
                 SCREENS_PER_SECOND
@@ -39,6 +38,7 @@ int main(void) {
         SDL_RenderPresent(renderer);
         if (SDL_PollEvent(&event) && event.type == SDL_QUIT)
             break;
+        common_fps_update_and_print();
     }
     SDL_DestroyRenderer(renderer);
     SDL_DestroyWindow(window);
diff --git a/sdl/animation_random_walk.c b/sdl/animation_random_walk.c
@@ -2,10 +2,7 @@
 Random walk.
 */
 
-#include <stdlib.h>
-#include <time.h>
-
-#include <SDL2/SDL.h>
+#include "common.h"
 
 #define WINDOW_WIDTH 600
 #define RECT_WIDTH (WINDOW_WIDTH / 30)
@@ -29,11 +26,8 @@ int main(void) {
     SDL_Rect rect;
     SDL_Renderer *renderer;
     SDL_Window *window;
-    unsigned int current_time;
-    double magnitude;
-    unsigned int last_time;
-    double x;
-    double y;
+    double x, y, magnitude;
+    unsigned int current_time, last_time;
 
     srand(time(NULL));
     SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO);
@@ -43,6 +37,7 @@ int main(void) {
     rect.w = RECT_WIDTH;
     rect.h = RECT_WIDTH;
     last_time = SDL_GetTicks();
+    common_fps_init();
     while (1) {
         if (SDL_PollEvent(&event) && event.type == SDL_QUIT)
             break;
@@ -58,6 +53,7 @@ int main(void) {
             SDL_RenderFillRect(renderer, &rect);
             SDL_RenderPresent(renderer);
         }
+        common_fps_update_and_print();
     }
     SDL_DestroyRenderer(renderer);
     SDL_DestroyWindow(window);
diff --git a/sdl/animation_user_control.c b/sdl/animation_user_control.c
@@ -4,10 +4,7 @@ Use controls a square.
 https://www.libsdl.org/release/SDL-1.2.15/docs/html/guideinputkeyboard.html
 */
 
-#include <stdlib.h>
-#include <time.h>
-
-#include <SDL2/SDL.h>
+#include "common.h"
 
 #define WINDOW_WIDTH 600
 #define RECT_WIDTH (WINDOW_WIDTH / 30)
@@ -40,11 +37,13 @@ int main(void) {
 
     SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO);
     SDL_CreateWindowAndRenderer(WINDOW_WIDTH, WINDOW_WIDTH, 0, &window, &renderer);
+    SDL_SetWindowTitle(window, "arrow keys: move");
     rect.x = WINDOW_WIDTH / 2;
     rect.y = WINDOW_WIDTH / 2;
     rect.w = RECT_WIDTH;
     rect.h = RECT_WIDTH;
     last_time = SDL_GetTicks();
+    common_fps_init();
     while (!quit) {
         while (SDL_PollEvent(&event) == 1) {
             if (event.type == SDL_QUIT) {
@@ -97,6 +96,7 @@ int main(void) {
             SDL_RenderFillRect(renderer, &rect);
             SDL_RenderPresent(renderer);
         }
+        common_fps_update_and_print();
     }
     SDL_DestroyRenderer(renderer);
     SDL_DestroyWindow(window);
diff --git a/sdl/animation_user_control_discrete.c b/sdl/animation_user_control_discrete.c
@@ -5,9 +5,7 @@ Using float coordinates would lead to an internal invisible state,
 which is weird (you can be either at the left or right corner of the active square).
 */
 
-#include <stdlib.h>
-
-#include <SDL2/SDL.h>
+#include "common.h"
 
 #define WINDOW_WIDTH 600
 #define RECTS_PER_WINDOW (10)
@@ -28,17 +26,21 @@ int main(void) {
     SDL_Renderer *renderer;
     SDL_Window *window;
     double current_time_s, last_key_pressed_time_s;
-    unsigned int x = RECTS_PER_WINDOW / 2, y = RECTS_PER_WINDOW / 2;
-    int quit = 0;
-    int speed_x = 0, speed_y = 0;
-    int key_pressed;
+    unsigned int x = RECTS_PER_WINDOW / 2,
+                 y = RECTS_PER_WINDOW / 2;
+    int key_pressed,
+        quit = 0,
+        speed_x = 0,
+        speed_y = 0;
     unsigned int current_time, last_time;
 
     SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO);
     SDL_CreateWindowAndRenderer(WINDOW_WIDTH, WINDOW_WIDTH, 0, &window, &renderer);
+    SDL_SetWindowTitle(window, "arrow keys: move");
     rect.w = RECT_WIDTH;
     rect.h = RECT_WIDTH;
     last_key_pressed_time_s = SDL_GetTicks() / 1000.0;
+    common_fps_init();
     while (!quit) {
         current_time = SDL_GetTicks();
         current_time_s = current_time / 1000.0;
@@ -98,6 +100,7 @@ int main(void) {
             SDL_RenderPresent(renderer);
         }
         last_time = current_time;
+        common_fps_update_and_print();
     }
     SDL_DestroyRenderer(renderer);
     SDL_DestroyWindow(window);
diff --git a/sdl/heatmap_streaming.c b/sdl/heatmap_streaming.c
@@ -36,8 +36,8 @@ int main(void) {
             for (y = 0; y < WINDOW_HEIGHT; y++) {
                 xc = CENTER_X - x;
                 yc = CENTER_Y - y;
-                z = COLOR_MAX * 0.5 * (1.0 + (sin(PI2 * (sqrt(xc*xc + yc*yc) - SPEED * dt) / PERIOD)));
-                /*z = (int)(x + y + SPEED * dt) % COLOR_MAX;*/
+                /*z = COLOR_MAX * 0.5 * (1.0 + (sin(PI2 * (sqrt(xc*xc + yc*yc) - SPEED * dt) / PERIOD)));*/
+                z = (int)(x + y + SPEED * dt) % COLOR_MAX;
                 base = ((Uint8 *)pixels) + (4 * (x * WINDOW_WIDTH + y));
                 base[0] = 0;
                 base[1] = 0;
diff --git a/sdl/mouse.c b/sdl/mouse.c
@@ -0,0 +1,29 @@
+/* Print mouse position to stdout. */
+
+#include "common.h"
+
+int main(void) {
+    SDL_Event event;
+    SDL_Window *window;
+    int x, y, last_x, last_y;
+    window = SDL_CreateWindow(__FILE__, 0, 0, 500, 500, SDL_WINDOW_OPENGL);
+    x = 0;
+    y = 0;
+    last_x = 0;
+    last_y = 0;
+    common_fps_init();
+    while (1) {
+        if (SDL_PollEvent(&event) && event.type == SDL_QUIT)
+            break;
+        SDL_GetMouseState(&x, &y);
+        if (x != last_x || y != last_y) {
+            printf("%d %d\n", x, y);
+            last_x = x;
+            last_y = y;
+        }
+        common_fps_update_and_print();
+    }
+    SDL_DestroyWindow(window);
+    SDL_Quit();
+    return EXIT_SUCCESS;
+}
diff --git a/sdl/mouse_point_rect.c b/sdl/mouse_point_rect.c
@@ -0,0 +1,47 @@
+#include "common.h"
+
+#define WINDOW_WIDTH 1000
+#define WINDOW_HEIGHT WINDOW_WIDTH
+
+int main(void) {
+    SDL_Event event;
+    SDL_Rect rect;
+    SDL_Renderer *renderer;
+    SDL_Window *window;
+    int i, j, x, y, half_w, half_h;
+
+    SDL_Init(SDL_INIT_VIDEO);
+    SDL_CreateWindowAndRenderer(WINDOW_WIDTH, WINDOW_WIDTH, 0, &window, &renderer);
+    rect.x = WINDOW_WIDTH / 2;
+    rect.y = WINDOW_WIDTH / 2;
+    rect.w = 3 * WINDOW_WIDTH / 4;
+    rect.h = 3 * WINDOW_WIDTH / 4;
+    half_w = rect.w / 2;
+    half_h = rect.h / 2;
+    common_fps_init();
+    while (1) {
+        if (SDL_PollEvent(&event) && event.type == SDL_QUIT)
+            break;
+        SDL_GetMouseState(&x, &y);
+        if (x != rect.x || y != rect.y) {
+            rect.x = x - half_w;
+            rect.y = y - half_h;
+            SDL_SetRenderDrawColor(renderer, 0, 0, 0, 0);
+            SDL_RenderClear(renderer);
+            for (i = 0; i < rect.w; ++i) {
+                for (j = 0; j < rect.h; ++j) {
+                    if ((i + j) & 1) {
+                        SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
+                        SDL_RenderDrawPoint(renderer, x + i - half_w, y + j - half_h);
+                    }
+                }
+            }
+            SDL_RenderPresent(renderer);
+        }
+        common_fps_update_and_print();
+    }
+    SDL_DestroyRenderer(renderer);
+    SDL_DestroyWindow(window);
+    SDL_Quit();
+    return EXIT_SUCCESS;
+}
diff --git a/sdl/mouse_rect.c b/sdl/mouse_rect.c
@@ -0,0 +1,40 @@
+#include "common.h"
+
+#define WINDOW_WIDTH 600
+
+int main(void) {
+    SDL_Event event;
+    SDL_Rect rect;
+    SDL_Renderer *renderer;
+    SDL_Window *window;
+    int x, y, half_w, half_h;
+
+    SDL_Init(SDL_INIT_VIDEO);
+    SDL_CreateWindowAndRenderer(WINDOW_WIDTH, WINDOW_WIDTH, 0, &window, &renderer);
+    rect.x = WINDOW_WIDTH / 2;
+    rect.y = WINDOW_WIDTH / 2;
+    rect.w = WINDOW_WIDTH / 6;
+    rect.h = WINDOW_WIDTH / 6;
+    half_w = rect.w / 2;
+    half_h = rect.h / 2;
+    common_fps_init();
+    while (1) {
+        SDL_SetRenderDrawColor(renderer, 0, 0, 0, 0);
+        SDL_RenderClear(renderer);
+        SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255);
+        SDL_RenderFillRect(renderer, &rect);
+        SDL_RenderPresent(renderer);
+        if (SDL_PollEvent(&event) && event.type == SDL_QUIT)
+            break;
+        SDL_GetMouseState(&x, &y);
+        if (x != rect.x || y != rect.y) {
+            rect.x = x - half_w;
+            rect.y = y - half_h;
+        }
+        common_fps_update_and_print();
+    }
+    SDL_DestroyRenderer(renderer);
+    SDL_DestroyWindow(window);
+    SDL_Quit();
+    return EXIT_SUCCESS;
+}
diff --git a/sdl/render_draw_point.c b/sdl/render_draw_point.c
@@ -2,9 +2,7 @@
 http://stackoverflow.com/questions/20579658/pixel-drawing-in-sdl2-0
 */
 
-#include <stdlib.h>
-
-#include <SDL2/SDL.h>
+#include "common.h"
 
 #define WINDOW_WIDTH 600
 
@@ -22,9 +20,11 @@ int main(void) {
     for (i = 0; i < WINDOW_WIDTH; ++i)
         SDL_RenderDrawPoint(renderer, i, i);
     SDL_RenderPresent(renderer);
+    common_fps_init();
     while (1) {
         if (SDL_PollEvent(&event) && event.type == SDL_QUIT)
             break;
+        common_fps_update_and_print();
     }
     SDL_DestroyRenderer(renderer);
     SDL_DestroyWindow(window);
diff --git a/sdl/render_draw_point_rect.c b/sdl/render_draw_point_rect.c
@@ -0,0 +1,45 @@
+/*
+Draw a rectangle with points.
+
+Bad idea, because the GPU can make that operation faster for quads,
+and SDL_rect uses that power by default.
+
+So just to see how bad the naive method is.
+*/
+
+#include "common.h"
+
+#define WINDOW_WIDTH 500
+#define WINDOW_HEIGHT WINDOW_WIDTH
+
+int main(void) {
+    SDL_Event event;
+    SDL_Renderer *renderer;
+    SDL_Window *window;
+    int x, y;
+
+    SDL_Init(SDL_INIT_VIDEO);
+    SDL_CreateWindowAndRenderer(WINDOW_WIDTH, WINDOW_WIDTH, 0, &window, &renderer);
+    SDL_RenderPresent(renderer);
+    common_fps_init();
+    while (1) {
+        if (SDL_PollEvent(&event) && event.type == SDL_QUIT)
+            break;
+        SDL_SetRenderDrawColor(renderer, 0, 0, 0, 0);
+        SDL_RenderClear(renderer);
+        for (x = 0; x < WINDOW_WIDTH; ++x) {
+            for (y = 0; y < WINDOW_HEIGHT; ++y) {
+                if ((x + y) & 1) {
+                    SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
+                    SDL_RenderDrawPoint(renderer, x, y);
+                }
+            }
+        }
+        SDL_RenderPresent(renderer);
+        common_fps_update_and_print();
+    }
+    SDL_DestroyRenderer(renderer);
+    SDL_DestroyWindow(window);
+    SDL_Quit();
+    return EXIT_SUCCESS;
+}
diff --git a/sdl/render_draw_rect.c b/sdl/render_draw_rect.c
@@ -1,6 +1,4 @@
-#include <stdlib.h>
-
-#include <SDL2/SDL.h>
+#include "common.h"
 
 #define WINDOW_WIDTH 600
 
@@ -19,15 +17,20 @@ int main(void) {
     rect.y = WINDOW_WIDTH / 3;
     rect.w = WINDOW_WIDTH / 6;
     rect.h = WINDOW_WIDTH / 12;
+
     /* Make it filled. */
     /*SDL_RenderFillRect(renderer, &rect);*/
     /*SDL_RenderDrawRect(renderer, &rect);*/
+
     /* Same as the above. */
     SDL_RenderFillRect(renderer, &rect);
     SDL_RenderPresent(renderer);
+
+    common_fps_init();
     while (1) {
         if (SDL_PollEvent(&event) && event.type == SDL_QUIT)
             break;
+        common_fps_update_and_print();
     }
     SDL_DestroyRenderer(renderer);
     SDL_DestroyWindow(window);
diff --git a/sdl/two_player_discrete.c b/sdl/two_player_discrete.c
