keyboard layout control

Makefile

@@ -1,5 +1,5 @@
 all:
-	gcc -Wall -Wextra main.c -o voleur -lraylib
+	gcc -Wall -Wextra -ggdb main.c -o voleur -lraylib
 
 release:
 	gcc -Wall -Wextra -O3 -DRELEASE main.c -o voleur -lraylib

main.c

@@ -1,32 +1,37 @@
 #include <stdio.h>
-
 #include "raylib.h"
 
+#define SCREEN_MIDDLE ((Vector2) {window_size.x/2, window_size.y/2})
+
 typedef struct Player {
-    Vector2 screen;
     float radius;
     Vector2 coord;
 } Player;
 
 typedef struct Map {
     const Texture texture;
-    const Vector2 screen;
     const Rectangle box;
 } Map;
 
+Camera2D shake(Camera2D cam, int force)
+{
+    cam.offset.x += GetRandomValue(-force/2, force/2);
+    cam.offset.y += GetRandomValue(-force/2, force/2);
+    return cam;
+}
+
 int main(void)
 {
     Vector2 window_size = { 800.0f, 600.0f };
 
     Camera2D camera = {
         .target = {0},
-        .offset = (Vector2) {window_size.x/2, window_size.y/2},
+        .offset = SCREEN_MIDDLE,
         .rotation = 0.0f,
         .zoom = 1.0f,
     };
 
     Player player = {
-        .screen = (Vector2) {window_size.x/2, window_size.y/2},
         .radius = 25.0f,
     };
 
@@ -36,67 +41,79 @@ int main(void)
 
     Map map = {
         .texture = LoadTexture("data/map2.png"),
-        .screen = {-map.texture.width/2, -map.texture.height/2},
         .box = (Rectangle) {
-            .x = map.screen.x, .y = map.screen.y,
+            .x = -map.texture.width/2, .y = -map.texture.height/2,
             .width = map.texture.width, .height = map.texture.height,
         },
     };
 
+    int keyboard_layout_azerty = 1;
+
     while (!WindowShouldClose()) {
+        float DT = GetFrameTime();
         if (IsWindowResized()) {
             window_size = (Vector2) {GetScreenWidth(), GetScreenHeight()};
-            camera.offset = (Vector2) {window_size.x/2, window_size.y/2};
+            camera.offset = SCREEN_MIDDLE;
-            player.screen = (Vector2) {window_size.x/2, window_size.y/2};
         }
 
-        float movement_speed = 10.0f;
+        float movement_speed = 10.0f * DT * 50;
         if ((IsKeyDown(KEY_LEFT) || IsKeyDown(KEY_RIGHT)) && (IsKeyDown(KEY_UP) || IsKeyDown(KEY_DOWN)))
-            movement_speed = 6.324f;
+            movement_speed = 6.324f * DT * 50;
         if (IsKeyDown(KEY_LEFT_SHIFT))
             movement_speed /= 2.0f;
 
-        if (IsKeyDown(KEY_LEFT))
+        if (keyboard_layout_azerty) {
-            camera.target.x -= movement_speed ;
+            if (IsKeyDown(KEY_A))
-        if (IsKeyDown(KEY_RIGHT))
+                camera.target.x -= movement_speed ;
-            camera.target.x += movement_speed ;
+            if (IsKeyDown(KEY_D))
-        if (IsKeyDown(KEY_UP))
+                camera.target.x += movement_speed ;
-            camera.target.y -= movement_speed ;
+            if (IsKeyDown(KEY_W))
-        if (IsKeyDown(KEY_DOWN))
+                camera.target.y -= movement_speed ;
-            camera.target.y += movement_speed ;
+            if (IsKeyDown(KEY_S))
+                camera.target.y += movement_speed ;
+        } else {
+            if (IsKeyDown(KEY_Q))
+                camera.target.x -= movement_speed ;
+            if (IsKeyDown(KEY_D))
+                camera.target.x += movement_speed ;
+            if (IsKeyDown(KEY_Z))
+                camera.target.y -= movement_speed ;
+            if (IsKeyDown(KEY_S))
+                camera.target.y += movement_speed ;
+        }
 
-        if (IsKeyDown(KEY_A))
+        if (IsKeyReleased(KEY_F))
-            camera.rotation++;
+            camera.target = player.coord;
-        if (IsKeyDown(KEY_D))
+        if (!IsKeyDown(KEY_F)) {
-            camera.rotation--;
+            player.coord = GetScreenToWorld2D(SCREEN_MIDDLE, camera);
-        if (IsKeyDown(KEY_W))
-            player.radius++;
-        if (IsKeyDown(KEY_S))
-            player.radius--;
 
-        player.coord = GetScreenToWorld2D(player.screen, camera);
+            if (player.coord.x - player.radius < map.box.x)
+                camera.target.x = map.box.x + player.radius;
+            else if (player.coord.x + player.radius > map.box.x + map.box.width)
+                camera.target.x = map.box.x + map.box.width - player.radius;
 
-        if (player.coord.x - player.radius < map.box.x)
+            if (player.coord.y - player.radius < map.box.y)
-            camera.target.x = map.box.x + player.radius;
+                camera.target.y = map.box.y + player.radius;
-        else if (player.coord.x + player.radius > map.box.x + map.box.width)
+            else if (player.coord.y + player.radius > map.box.y + map.box.height)
-            camera.target.x = map.box.x + map.box.width - player.radius;
+                camera.target.y = map.box.y + map.box.height - player.radius;
 
-        if (player.coord.y - player.radius < map.box.y)
+            player.coord = GetScreenToWorld2D(SCREEN_MIDDLE, camera);
-            camera.target.y = map.box.y + player.radius;
+        }
-        else if (player.coord.y + player.radius > map.box.y + map.box.height)
+
-            camera.target.y = map.box.y + map.box.height - player.radius;
+        Camera2D effect_camera = camera;
+        if (IsKeyDown(KEY_SPACE))
+            effect_camera = shake(camera, 12);
 
         BeginDrawing();
         {
             ClearBackground(LIME);
 
-            BeginMode2D(camera);
+            BeginMode2D(effect_camera);
             {
-                DrawTexture(map.texture, map.screen.x, map.screen.y, WHITE);
+                DrawTexture(map.texture, map.box.x, map.box.y, WHITE);
+                DrawCircle(player.coord.x, player.coord.y, player.radius, RED);
             }
             EndMode2D();
-
-            DrawCircle(player.screen.x, player.screen.y, player.radius, RED);
         }
         EndDrawing();
     }