Compare commits

..

No commits in common. "22a245f9d7193f9d9b8b7eac0fd9cad00716e009" and "7488d9e413ab94d7a0aed0ee5d3ab1000246a524" have entirely different histories.

2 changed files with 41 additions and 58 deletions

View File

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

97
main.c
View File

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