diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | map/map_four.cub | 2 | ||||
| -rw-r--r-- | src/ft_draw_verline.c | 31 | ||||
| -rw-r--r-- | src/ft_init_winlx.c | 2 |
4 files changed, 34 insertions, 3 deletions
@@ -100,7 +100,7 @@ ifdef ASAN endif #--------------------------------------------------------------------------------------------------# ifdef OPTI - ifeq (${USER}, salaaad) + ifeq (${USER}, salad) CFLAGS += -march=broadwell else ifeq (${USER}, jozan) CFLAGS += -march=ivybridge diff --git a/map/map_four.cub b/map/map_four.cub index c7563a9..67d3c2d 100644 --- a/map/map_four.cub +++ b/map/map_four.cub @@ -18,7 +18,7 @@ F 24,170,25 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 -1 E 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 +1 S 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 diff --git a/src/ft_draw_verline.c b/src/ft_draw_verline.c index 1a1b2fe..7edac71 100644 --- a/src/ft_draw_verline.c +++ b/src/ft_draw_verline.c @@ -37,6 +37,36 @@ static void } } +/* #include <libft.h> */ +/* static void */ +/* ft_draw_ceil_tex(t_cub *cl, int x, int y) */ +/* { */ +/* int16_t i; */ +/* int32_t d; */ +/* int32_t tex_y; */ + +/* i = 0; */ +/* while (i < y) */ +/* { */ +/* d = i * 256 - cl->wlist->y_size * 128 + cl->rlist.line_h * 128; */ +/* d = (d <= 0) ? (-d) : (d); */ +/* ft_printf("%d\n", d); */ +/* tex_y = ((d * cl->tlist[1].img_h) / cl->rlist.line_h) / 256; */ +/* (tex_y <= 0) ? (tex_y = 1) : 0; */ +/* cl->img.ptr[x * 4 + (cl->img.sizeline * i)] = */ +/* (int8_t)cl->tlist[1].ptr[cl->tlist[1].tex_x * 4 + 4 * */ +/* cl->tlist[1].img_h * tex_y]; */ +/* cl->img.ptr[x * 4 + (cl->img.sizeline * i) + 1] = */ +/* (int8_t)cl->tlist[1].ptr[cl->tlist[1].tex_x * 4 + 4 * */ +/* cl->tlist[1].img_h * tex_y + 1]; */ +/* cl->img.ptr[x * 4 + (cl->img.sizeline * i) + 2] = */ +/* (int8_t)cl->tlist[1].ptr[cl->tlist[1].tex_x * 4 + 4 * */ +/* cl->tlist[1].img_h * tex_y + 2]; */ +/* cl->img.ptr[x * 4 + cl->wlist->x_size * i + 3] = (char)0; */ +/* i++; */ +/* } */ +/* } */ + int8_t ft_draw_verline(t_cub *cl, int32_t x, int32_t y, int32_t y2) { @@ -47,6 +77,7 @@ int8_t (y2 < 0) ? (y2 = 0) : 0; ft_draw_ceil(cl, y, x); (cl->rlist.line_h <= 0) ? (cl->rlist.line_h = 1) : 0; + /* ft_draw_ceil_tex(cl, y, x); */ while (y <= y2) { d = y * 256 - cl->wlist->y_size * 128 + cl->rlist.line_h * 128; diff --git a/src/ft_init_winlx.c b/src/ft_init_winlx.c index 453988b..b41dc4a 100644 --- a/src/ft_init_winlx.c +++ b/src/ft_init_winlx.c @@ -28,6 +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); + /* ft_music(clist); */ return (0); } |