nemo
/
voleur
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: nemo:c43558413c92d6e54fe2729c8e0f31a8c01b4a33
Branches Tags
nemo:master
..
compare: nemo:7124b9b6f892d5c1c230f6170efa1b2d3f86be93
Branches Tags
nemo:master

No commits in common. "c43558413c92d6e54fe2729c8e0f31a8c01b4a33" and "7124b9b6f892d5c1c230f6170efa1b2d3f86be93" have entirely different histories.
c43558413c ... 7124b9b6f8

6 changed files with 52 additions and 127 deletions
Show Stats Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
SRC=main.c ninja.c keys.c
SRC=main.c ninja.c
EXE=voleur
CC=gcc

42
keys.c
View File

@ -1,42 +0,0 @@
#include "keys.h"
#include "stdio.h"
int keys[KC_COUNT] = {
[KC_SHOOT] = MOUSE_BUTTON_LEFT,
[KC_CROUCH] = KEY_LEFT_SHIFT,
[KC_FREECAM] = KEY_F,
};
int key_down(KeyControl key)
{
// NOTE: mouse button id's are less than 6, keyboard id's are over 32
if (keys[key] <= 6)
return IsMouseButtonDown(keys[key]);
else
return IsKeyDown(keys[key]);
}
int key_pressed(KeyControl key)
{
// NOTE: mouse button id's are less than 6, keyboard id's are over 32
if (keys[key] <= 6)
return IsMouseButtonPressed(keys[key]);
else
return IsKeyPressed(keys[key]);
}
void change_layout_azerty()
{
keys[KC_UP] = KEY_S;
keys[KC_DOWN] = KEY_W;
keys[KC_LEFT] = KEY_A;
keys[KC_RIGHT] = KEY_D;
}
void change_layout_qwerty()
{
keys[KC_UP] = KEY_W;
keys[KC_DOWN] = KEY_S;
keys[KC_LEFT] = KEY_A;
keys[KC_RIGHT] = KEY_D;
}

25
keys.h
View File

@ -1,25 +0,0 @@
#ifndef KEYS_H
#define KEYS_H
#include "raylib.h"
typedef enum KeyControl {
KC_UP = 0,
KC_DOWN,
KC_LEFT,
KC_RIGHT,
KC_SHOOT,
KC_FREECAM,
KC_CROUCH,
KC_COUNT,
} KeyControl;
void change_layout_azerty();
void change_layout_qwerty();
int key_down(KeyControl key);
int key_pressed(KeyControl key);
#endif // KEYS_H

68
main.c
View File

@ -3,7 +3,6 @@
#include "raylib.h"
#include "raymath.h"
#include "keys.h"
#include "ninja.h"
#define SCREEN_MIDDLE ((Vector2) {window_size.x/2, window_size.y/2})
@ -15,6 +14,33 @@ typedef struct Map {
const Rectangle box;
} Map;
typedef enum KeyControl {
KC_UP = 0,
KC_DOWN,
KC_LEFT,
KC_RIGHT,
KC_SHOOT,
KC_FREECAM,
KC_CROUCH,
KC_COUNT,
} KeyControl;
void change_layout_azerty(int *keys)
{
keys[KC_UP] = KEY_S;
keys[KC_DOWN] = KEY_W;
keys[KC_LEFT] = KEY_A;
keys[KC_RIGHT] = KEY_D;
}
void change_layout_qwerty(int *keys)
{
keys[KC_UP] = KEY_W;
keys[KC_DOWN] = KEY_S;
keys[KC_LEFT] = KEY_A;
keys[KC_RIGHT] = KEY_D;
}
Vector2 shake(int force)
{
Vector2 s;
@ -67,7 +93,11 @@ int main(void)
},
};
change_layout_azerty();
int keys[KC_COUNT] = {0};
keys[KC_SHOOT] = MOUSE_BUTTON_LEFT;
keys[KC_CROUCH] = KEY_LEFT_SHIFT;
keys[KC_FREECAM] = KEY_F;
change_layout_azerty(keys);
load_ninja();
@ -78,27 +108,26 @@ int main(void)
camera.offset = SCREEN_MIDDLE;
}
if (ninja_dash_time() <= EPSILON) {
float movement_speed = 10.0f * DT * 50;
if ((key_down(KC_UP) || key_down(KC_DOWN)) && (key_down(KC_LEFT) || key_down(KC_RIGHT)))
movement_speed = sqrtf(movement_speed) * 2;
if (key_down(KC_CROUCH))
movement_speed /= 2.0f;
float movement_speed = 10.0f * DT * 50;
if ((IsKeyDown(keys[KC_UP]) || IsKeyDown(keys[KC_DOWN])) && (IsKeyDown(keys[KC_LEFT]) || IsKeyDown(keys[KC_RIGHT])))
movement_speed = sqrtf(movement_speed) * 2;
if (IsKeyDown(keys[KC_CROUCH]))
movement_speed /= 2.0f;
if (key_down(KC_LEFT))
camera.target.x -= movement_speed ;
if (key_down(KC_RIGHT))
camera.target.x += movement_speed ;
if (key_down(KC_DOWN))
camera.target.y -= movement_speed ;
if (key_down(KC_UP))
camera.target.y += movement_speed ;
}
if (IsKeyDown(keys[KC_LEFT]))
camera.target.x -= movement_speed ;
if (IsKeyDown(keys[KC_RIGHT]))
camera.target.x += movement_speed ;
if (IsKeyDown(keys[KC_DOWN]))
camera.target.y -= movement_speed ;
if (IsKeyDown(keys[KC_UP]))
camera.target.y += movement_speed ;
camera_bound(&camera, map.box, ninja_radius());
// NOTE: si on doit faire un screen shake, l'appliquer a cet variable
Vector2 cam_shake = {0};
if (IsMouseButtonDown(keys[KC_SHOOT]))
cam_shake = shake(12);
BeginDrawing();
{
@ -111,12 +140,11 @@ int main(void)
DrawTexture(map.texture, map.box.x, map.box.y, WHITE);
}
EndMode2D();
draw_ninja(Vector2Add(SCREEN_MIDDLE, cam_shake), &camera);
draw_ninja(Vector2Add(SCREEN_MIDDLE, cam_shake));
}
EndDrawing();
}
CloseWindow();
return 0;
}

38
ninja.c
View File

@ -2,12 +2,8 @@
#include "raymath.h"
#include "stdio.h"
#include "keys.h"
Texture ninja_texture;
float dash_time = 0;
void load_ninja()
{
ninja_texture = LoadTexture("data/ninja.png");
@ -18,40 +14,10 @@ float ninja_radius()
return fmax(ninja_texture.width, ninja_texture.height)/2;
}
Vector2 ninja_dash(Vector2 pos, Vector2 to, float sec)
void draw_ninja(Vector2 pos)
{
static Vector2 target = {0};
Vector2 dash = {0};
if (sec <= EPSILON)
return dash;
if (key_pressed(KC_SHOOT)) {
dash_time = sec;
Vector2 diff = Vector2Subtract(to, pos);
Vector2 scale = Vector2Normalize(diff);
int dist = 200;
scale.x *= dist;
scale.y *= dist;
target = Vector2Add(pos, scale);
}
if (dash_time > 0) {
float dt = GetFrameTime();
dash_time -= dt;
dash.x = Lerp(pos.x, target.x, dt/sec) - pos.x;
dash.y = Lerp(pos.y, target.y, dt/sec) - pos.y;
}
return dash;
}
float ninja_dash_time()
{
return dash_time;
}
void draw_ninja(Vector2 pos, Camera2D *cam)
{
Vector2 dash = ninja_dash(GetScreenToWorld2D(pos, *cam), GetScreenToWorld2D(GetMousePosition(), *cam), 0.12);
cam->target = Vector2Add(cam->target, dash);
Texture n = ninja_texture;
// DrawTexture(n, pos.x - n.width/2, pos.y - n.height/2, WHITE);
Rectangle source = {0, 0, n.width, n.height};
Rectangle dest = {pos.x, pos.y, n.width, n.height};

4
ninja.h
View File

@ -5,8 +5,6 @@ void load_ninja();
float ninja_radius();
void draw_ninja(Vector2 pos, Camera2D *cam);
float ninja_dash_time();
void draw_ninja(Vector2 truc);
#endif // NINJA_H