diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-02-23 18:10:27 +0100 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-02-23 18:10:27 +0100 |
| commit | a065577aeea93944fd8d582e720d7b01b89651b9 (patch) | |
| tree | a73ad46865dfcfeef885c1f4fd635a477de8855b | |
| parent | Better map colors (diff) | |
| download | 42-cub3d-a065577aeea93944fd8d582e720d7b01b89651b9.tar.gz 42-cub3d-a065577aeea93944fd8d582e720d7b01b89651b9.tar.bz2 42-cub3d-a065577aeea93944fd8d582e720d7b01b89651b9.tar.xz 42-cub3d-a065577aeea93944fd8d582e720d7b01b89651b9.tar.zst 42-cub3d-a065577aeea93944fd8d582e720d7b01b89651b9.zip | |
Preparing music
Diffstat (limited to '')
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | inc/cub3d.h | 3 | ||||
| -rw-r--r-- | src/ft_draw_circle.c | 10 | ||||
| -rw-r--r-- | src/ft_draw_map.c | 2 | ||||
| -rw-r--r-- | src/ft_init_winlx.c | 1 | ||||
| -rw-r--r-- | src/ft_music.c | 7 |
6 files changed, 17 insertions, 7 deletions
@@ -61,6 +61,7 @@ SRCS_NAME += ft_convert_keycode.c SRCS_NAME += ft_key_loop.c SRCS_NAME += ft_draw_hud.c SRCS_NAME += ft_draw_life_bar.c +SRCS_NAME += ft_music.c #--------------------------------------------------------------------------------------------------# SRCS = $(addprefix ${SRCS_DIR},${SRCS_NAME}) #--------------------------------------------------------------------------------------------------# diff --git a/inc/cub3d.h b/inc/cub3d.h index 4c4e22b..cf855b2 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -79,7 +79,7 @@ int ft_key_release(int keycode, t_cub *clist); int8_t ft_check_ext(const char *filep, const char *ext); int32_t ft_convert_keycode(const int32_t tmp_code); int ft_key_loop(t_cub *cl); -void ft_draw_circle(int32_t a, int32_t b, +void ft_draw_circle(float a, float b, int32_t color, t_cub *cl); void ft_draw_texture(t_cub *cl, int x, int y, int tex_y); int8_t ft_check_not_found(const char *path); @@ -89,5 +89,6 @@ void ft_draw_life_bar(size_t map_w, const uint16_t scale, const int8_t life, t_cub *cl); +void ft_music(t_cub *cl); # endif diff --git a/src/ft_draw_circle.c b/src/ft_draw_circle.c index be95617..570543a 100644 --- a/src/ft_draw_circle.c +++ b/src/ft_draw_circle.c @@ -16,7 +16,7 @@ #include <math.h> void - ft_draw_circle(int32_t a, int32_t b, int32_t color, t_cub *cl) + ft_draw_circle(float a, float b, int32_t color, t_cub *cl) { float scale; float i; @@ -31,10 +31,10 @@ void while (i < 360) { angle = i; - x1 = scale * cos(angle * 3.14159 / 180); - y1 = scale * sin(angle * 3.14159 / 180); - *(int*)(cl->img.ptr + (a + (int)x1) * 4 + - ((b + (int)y1) * cl->img.sizeline)) = color; + x1 = scale * cos(angle * 3.14159265358979323846 / 180); + y1 = scale * sin(angle * 3.14159265358979323846 / 180); + *(int*)(cl->img.ptr + ((int)a + (int)x1) * 4 + + (((int)b + (int)y1) * cl->img.sizeline)) = color; i += 0.1; } i = 0; diff --git a/src/ft_draw_map.c b/src/ft_draw_map.c index 4449332..a334fc1 100644 --- a/src/ft_draw_map.c +++ b/src/ft_draw_map.c @@ -24,9 +24,9 @@ static uint16_t static void ft_draw_player(t_player *plist, t_cub *clist) { + const uint16_t scale = clist->mlist->scale; const float x = plist->pos_x; const float y = plist->pos_y; - const uint16_t scale = clist->mlist->scale; ft_draw_circle( (scale / 2) + (x * (scale)), diff --git a/src/ft_init_winlx.c b/src/ft_init_winlx.c index cad5795..453988b 100644 --- a/src/ft_init_winlx.c +++ b/src/ft_init_winlx.c @@ -28,5 +28,6 @@ int clist->wlist->inited = 1; ft_printf("Created window of size %ux%u\nHost OS: %s\n", clist->wlist->x_size, clist->wlist->y_size, FT_OS); + ft_music(clist); return (0); } diff --git a/src/ft_music.c b/src/ft_music.c new file mode 100644 index 0000000..1787d36 --- /dev/null +++ b/src/ft_music.c @@ -0,0 +1,7 @@ +#include <cub3d.h> + +void + ft_music(t_cub *cl) +{ + (void)cl; +} |