diff --git a/includes/Cub3D.h b/includes/Cub3D.h index b0a205d..ed71008 100644 --- a/includes/Cub3D.h +++ b/includes/Cub3D.h @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/02/13 16:30:59 by apommier #+# #+# */ -/* Updated: 2022/05/19 14:19:57 by apommier ### ########.fr */ +/* Updated: 2022/05/20 14:04:12 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -38,10 +38,10 @@ typedef struct ray_info{ typedef struct all_wall_texture{ - int *north; - int *east; - int *west; - int *south; + unsigned char *north; + unsigned char *east; + unsigned char *west; + unsigned char *south; } sprite; typedef struct map_information{ @@ -68,22 +68,27 @@ typedef struct s_data { void *mlx; void *mlx_win; void *mlx_test; + int bits_per_pixel; + int size_line; + int endian; + char *buffer; void *mlx_win_test; char **double_map; map_info map; player player; } t_data; -int *get_texture(int type); -int get_color(char one, char two, char three); -double reset_angle(double angle); -double deg_to_rad(double angle); -void draw_ray(t_data *img); -void print_ray(t_data *img); -int key_press(int code, t_data *img); -int quit_game(t_data *img); -void ft_error(char *error_msg); -void print_player(player player, t_data *img); -void print_map(map_info map, t_data *img); +void set_back(t_data *img); +unsigned char *get_texture(int type); +int get_color(char one, char two, char three); +double reset_angle(double angle); +double deg_to_rad(double angle); +void draw_ray(t_data *img); +void print_ray(t_data *img); +int key_press(int code, t_data *img); +int quit_game(t_data *img); +void ft_error(char *error_msg); +void print_player(player player, t_data *img); +void print_map(map_info map, t_data *img); #endif \ No newline at end of file diff --git a/sprite/brick_wall.ppm b/sprite/brick_wall.ppm index b9e93c0..82ec94c 100644 --- a/sprite/brick_wall.ppm +++ b/sprite/brick_wall.ppm @@ -12287,4 +12287,4 @@ 152 185 162 -149 +149 \ No newline at end of file diff --git a/srcs/cast_ray.c b/srcs/cast_ray.c index da5a4f1..358874f 100644 --- a/srcs/cast_ray.c +++ b/srcs/cast_ray.c @@ -1,13 +1,13 @@ /* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* cast_ray.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: apommier +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2022/05/04 18:08:14 by apommier #+# #+# */ -/* Updated: 2022/05/19 19:04:22 by apommier ### ########.fr */ -/* */ +/* */ +/* ::: :::::::: */ +/* cast_ray.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: apommier +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2022/05/04 18:08:14 by apommier #+# #+# */ +/* Updated: 2022/05/20 15:48:23 by apommier ### ########.fr */ +/* */ /* ************************************************************************** */ #include "../includes/Cub3D.h" @@ -30,16 +30,20 @@ void print_ray2(t_data *img, double vx, double vy, double dist) } } -int get_color(char one, char two, char three) +int get_color(char R, char G, char B) { int color = 0; + //printf("R= %d G= %d B= %d\n", R, G, B); color = color << 8; - color += one; + color += R; + //printf("color= %d\n", color); color = color << 8; - color += two; + color += G; + //printf("color= %d\n", color); color = color << 8; - color += three; + color += B; + //printf("color= %d\n", color); return (color); } @@ -65,6 +69,47 @@ int get_dark_red() return (red); } +void set_pixel(t_data *img, int color, int x, int y) +{ + int pixel; + //int R; + //int G; + //int B; + + //printf("color in set = %d\n", color); + + /*color = color >> 24; + printf("color= %d\n", color); + //color += R; + color = color >> 16; + printf("color= %d\n", color); + //color += G; + color = color >> 8; + printf("color= %d\n", color); + //color += B;*/ + + + //printf("1= %d 2= %d 3= %d 4= %d\n", (color >> 24) & 0xFF, (color >> 16) & 0xFF, (color >> 8) & 0xFF, (color) & 0xFF); + if (y < 0 || y > 520 || x < 0 || x > 960) + return ; + pixel = (y * img->size_line) + (x * 4); + //printf("x= %d y= %d pixel value= %d tabsize = %d\n", x, y, pixel, 512 * 960 * 4); + if (img->endian == 1) // Most significant (Alpha) byte first + { + img->buffer[pixel + 0] = 0; + img->buffer[pixel + 1] = (color >> 16) & 0xFF; + img->buffer[pixel + 2] = (color >> 8) & 0xFF; + img->buffer[pixel + 3] = (color) & 0xFF; + } + else if (img->endian == 0) // Least significant (Blue) byte first + { + img->buffer[pixel + 0] = (color) & 0xFF; + img->buffer[pixel + 1] = (color >> 8) & 0xFF; + img->buffer[pixel + 2] = (color >> 16) & 0xFF; + img->buffer[pixel + 3] = 0; + } +} + void draw_ray3d(t_data *img, ray ray) { double line_height; @@ -73,110 +118,44 @@ void draw_ray3d(t_data *img, ray ray) double y = 0; int mx = 0; int my = 0; - //int pixel; int color; int texture_size = 64; - //char *wall; - //wall = get_texture(1); - /*for(y=0;y180) - // tx=31-tx; - // } - // else - // { - // tx=(int)(ry/2.0)%32; - // if(ra>90 && ra<270) - // tx=31-tx; - // } - - - //pixel = ((int)ty * 32 + (int)tx) * 3 + (hmt * 32 * 32 * 3); - //int copy = ray.ty; - - //i = 0; line_height = img->map.size * 960 / ray.dist; - //if (line_height > 512) - // line_height = 512; line_offset = 256 - line_height / 2; double gap = 1; - //double old_y = 0; double myy = 0; - //printf("mp= %f modulo texture_size= %d\n", ray.mp, ((int)ray.mp / 4) % texture_size); - - //while (x < 8) - //{ y = 0; my = 0; myy = 0; - //double step = 1.0 * texHeight / lineHeight; gap = (texture_size / line_height); - //old_y = 0; - //ray.ty = ; mx = ((int)ray.mp) % texture_size; - //int texX = int(wallX * double(texWidth)); - //if(side == 0 && rayDirX > 0) texX = texWidth - texX - 1; - //if(side == 1 && rayDirY < 0) texX = texWidth - texX - 1; while (y < line_height) { - //if (y > old_y + (16 / line_height)/*(line_height / 16)*/) - //{ - // gap++; - // old_y = y; - //} - //(x * 16 + y)* 3 + 1; - //mp= x du mur - - //my = gap; myy += gap; my = (int)myy;//gap; - //mx = ((int)ray.mp) % 16; - //ray.pixel = ((((int)ray.mp) % 16) * 16 + gap /*+ x*/) * 3 + 1 ; - ray.pixel = ((my) * texture_size + mx)* 3 - 1; + ray.pixel = ((my) * texture_size + mx)* 3 + 1; x = -1; - //printf("x= %d y= %f pixel= %d\n", ray.index /** 2 + 530 + x*/, y, ray.pixel); - color = get_color(img->map.texture.north[ray.pixel], img->map.texture.north[ray.pixel + 1], img->map.texture.north[ray.pixel + 2]); + if (ray.pixel > 12186) + color = 0; + else + color = get_color(img->map.texture.north[ray.pixel], img->map.texture.north[ray.pixel + 1], img->map.texture.north[ray.pixel + 2]); while (++x < 4) { if (ray.wall_type) - mlx_pixel_put(img->mlx, img->mlx_win, ray.index * 4 + x, y + line_offset , color); + { + //mlx_pixel_put(img->mlx, img->mlx_win, ray.index * 4 + x, y + line_offset , color); + set_pixel(img, color, ray.index * 4 + x, y + line_offset); + } else - mlx_pixel_put(img->mlx, img->mlx_win, ray.index * 4 + x, y + line_offset , (color >> 1) & 8355711); + { + //mlx_pixel_put(img->mlx, img->mlx_win, ray.index * 4 + x, y + line_offset , (color >> 1) & 8355711); + set_pixel(img, (color >> 1) & 8355711, ray.index * 4 + x, y + line_offset); + } } - //printf("pixel=%d ", ray.pixel); - //if (ray.wall_type) - //int l = 0; - //while (l < 8) - //{ - //x = -1; - //while (++x < 8) - - //l++; - //} - //else - // mlx_pixel_put(img->mlx, img->mlx_win, ray.index * 8 + 530 + x, y + line_offset , color); y++; } x++; - //} - //printf("\n"); - //ray.tx++; - } void draw_ray(t_data *img) @@ -197,34 +176,42 @@ void draw_ray(t_data *img) int my = 0; int mx = 0; int mp = 0; + + void *new_img; + int bits_per_pixel = 0; + int size_line = 0; + int endian = 0; + + + new_img = mlx_new_image(img->mlx, 960, 512); + if (!new_img) + { + printf("no img\n"); + exit(1); + } + //printf("newimg= %p\n", new_img); + img->buffer = mlx_get_data_addr(new_img, &bits_per_pixel, &size_line, &endian); + //img->buffer// = (char*)new_img; + //printf("buffer= %p\n", img->buffer); + //printf("buffer in string= %s\n", (char *)img->buffer); + //printf("bits= %d line_size= %d endian = %d\n", bits_per_pixel, size_line, endian); + //mlx_destroy_image(img->mlx, new_img); + img->bits_per_pixel = bits_per_pixel; + img->size_line = size_line; + img->endian = endian; + set_back(img); + (void)dist_f; - //printf("---NEW RAY----\n\n"); - //printf("\nENTER DRAW RAY\n"); - //while (++k < ft_strlen(img->map.simple_map)) - // printf("%d--- %c\n", k, img->map.simple_map[k]); - //printf("map = -%s-\n", img->map.simple_map); count = 0; ray_angle = reset_angle(img->player.angle + 30); - //ray_angle = reset_angle(img->player.angle); while (++nb_ray < 240) { - - //if (nb_ray) - // ray_angle -= 30; count = 0; dist_v = -1; dist_h = -1; - //printf("------RAY N0 %d-------\n", nb_ray); - //printf("player_angle= %f ray_angle= %f\n", img->player.angle, ray_angle); //----------start vertical ray---------- aTan = tan(deg_to_rad(ray_angle)); - //if (aTan != tan(deg_to_rad(ray_angle - 0.25))) - //double test = 0.1111111111111; - //printf("test= %f\n", test); - //printf("ray_angle = %f\n", ray_angle); - //printf("in atan= %f\n", deg_to_rad(ray_angle)); - //printf("atan= %f\n", aTan); if (cos(deg_to_rad(ray_angle)) > 0.001)//looking left { ray_x = (((int)img->player.x>>6)<<6) + 64; @@ -245,26 +232,19 @@ void draw_ray(t_data *img) ray_y = img->player.y; count = 8; } - //if (next_x > 0) - // printf("for hroizon looking left\n"); - //else - // printf("for hroizon looking right\n"); - //printf("\nray_y= %f ray_x= %f\n", ray_y, ray_x); - //printf("next_y= %f next_x= %f\n", next_y, next_x); - //printf("BASE p_y= %f p_x= %f\n", img->player.y, img->player.x); while (count < 8) { //printf("count = %d\n", count); mx = (int)(ray_x)>>6; my = (int)(ray_y)>>6; mp = my * img->map.x + mx; - //printf("mx=%d my=%d mp= %d\n", mx, my, mp); + //printf("mx=%d my=%d mp= %d\n", mx, my, mp); if (mp > 0 && mp < img->map.x * img->map.y && img->map.simple_map[mp] == '1')//hit wall { count = 8; //printf("vertical wall\n"); dist_v = cos(deg_to_rad(ray_angle)) * (ray_x-img->player.x) - sin(deg_to_rad(ray_angle)) * (ray_y-img->player.y); - } + } else { ray_x += next_x; @@ -301,29 +281,21 @@ void draw_ray(t_data *img) while (count < 8) { - //printf("ray_y= %f ray_x= %f\n", ray_y, ray_x); mx = (int)(ray_x)>>6; my = (int)(ray_y)>>6; - mp = my * img->map.x + mx; - //printf("mx=%d my=%d mp= %d\n", mx, my, mp); + mp = my * img->map.x + mx; if (mp > 0 && mp < img->map.x * img->map.y && img->map.simple_map[mp] == '1')//hit { count = 8; - //printf ("horizontal wall\n"); - //printf("case: x= %d, y= %d mp= %d\n", mx, my, mp); dist_h = cos(deg_to_rad(ray_angle)) * (ray_x - img->player.x) - sin(deg_to_rad(ray_angle)) * (ray_y - img->player.y); - } + } else { ray_x += next_x; ray_y += next_y; count += 1; - } //check next horizontal + } //check next horizontal } - //printf("dist_h= %f dist_v= %f\n", dist_h, dist_v); - //vx = cos(deg_to_rad(ray_angle)); - //vy = -sin(deg_to_rad(ray_angle)); - //printf("vx= %f vy= %f\n rx= %f ry= %f", vx, vy, ray_x, ray_y); int wall_type; ray ray_info; @@ -347,35 +319,15 @@ void draw_ray(t_data *img) } else dist_f = 0; - - double tx; - //double ty_off = 0; - //double ty_step = 32.0/dist_f; - //double ty = ; - /*if(dist_f > 640) - { - ty_off = (dist_f - 320) / 2.0; - dist_f = 320; - } */ - //ty = ty_off * 16.0 / dist_f; ;//+hmt*32; - //tx = (int) (ray_y / 2.0) % 16; - tx=(int)(ray_x/2.0) % 32; if(ray_angle>180){ tx=31-tx;} - //if(ray_angle > 180) - // tx = 15 - tx; - //ray_info.pixel = ((int)ty * 16 + (int)tx) * 3 + 3; - //printf("nb_ray= %d\n", nb_ray); ray_info.ty = ray_y; ray_info.tx = ray_x; - //ray_info.mp = ray_info.mp / 2; ray_info.index = nb_ray; ray_info.wall_type = wall_type; int ca = reset_angle(img->player.angle - ray_angle); //fisheye dist_f = dist_f * cos(deg_to_rad(ca)); ray_info.dist = dist_f; //fisheye draw_ray3d(img, ray_info); - //ray_angle -= 0.5; - //printf("entre ray_angle = %f\n", ray_angle); ray_angle = reset_angle(ray_angle - 0.25); - //printf("after ray_angle = %f\n", ray_angle); } + mlx_put_image_to_window(img->mlx, img->mlx_win, new_img, 0, 0); } \ No newline at end of file diff --git a/srcs/get_texture_array.c b/srcs/get_texture_array.c index 62ad4a4..84a726c 100644 --- a/srcs/get_texture_array.c +++ b/srcs/get_texture_array.c @@ -6,16 +6,16 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/05/06 16:10:11 by apommier #+# #+# */ -/* Updated: 2022/05/19 19:11:07 by apommier ### ########.fr */ +/* Updated: 2022/05/20 14:11:29 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ #include "../includes/Cub3D.h" -int *get_texture(int type) +unsigned char *get_texture(int type) { int fd; - int *ret; + unsigned char *ret; int count; char *swap = 0; @@ -30,20 +30,29 @@ int *get_texture(int type) swap = get_next_line(fd); } close(fd); - ret = ft_calloc(sizeof(int), count + 1); + printf("count= %d\n", count); + ret = ft_calloc(sizeof(char), count); fd = open("./sprite/brick_wall.ppm", O_RDONLY); if (!ret) return (0); - ret[count] = -1; + //ret[count] = -1; count = 0; while (swap || !count) { if (swap) free(swap); swap = get_next_line(fd); - ret[count] = (int)ft_atoi(swap); + if (!count) + { + free(swap); + swap = get_next_line(fd); + } + //printf("c= %d ", (unsigned char)ft_atoi(swap)); + if (swap) + ret[count] = (unsigned char)ft_atoi(swap); + //if (swap) + // printf("c= %d ", ret[count]); count++; - } close(fd); return (ret); diff --git a/srcs/main.c b/srcs/main.c index 2c8698a..c07444a 100644 --- a/srcs/main.c +++ b/srcs/main.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/02/13 16:42:55 by apommier #+# #+# */ -/* Updated: 2022/05/19 19:09:32 by apommier ### ########.fr */ +/* Updated: 2022/05/20 15:57:10 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -23,56 +23,6 @@ void print_ray(t_data *img) } } -/*map_info set_map(char **argv) //simple local allocation -{ - map_info map; - char ret_map[]= - { - '1','1','1','1','1','1','1','1', - '1','0','1','0','0','0','0','1', - '1','0','1','0','0','0','0','1', - '1','0','0','0','0','0','0','1', - '1','0','0','0','0','0','0','1', - '1','0','1','0','0','1','0','1', - '1','0','0','0','0','1','0','1', - '1','1','1','1','1','1','1','1', - }; - map.simple_map = ret_map; - map.x = 8; - map.y = 8; - map.size = map.x * map.y; - return (map); -}*/ - -/*map_info set_map(char **argv) -{ - char **map_tab; - char *map; - char *del; - char *swap; - int fd; - - map = 0; - fd = open(argv[1], O_RDONLY); - if (fd == -1) - ft_error("Error: Open call fail"); - swap = get_next_line(fd); - while (swap) - { - del = map; - map = ft_strjoin(map, swap); - free(swap); - swap = get_next_line(fd); - free(del); - } - close(fd); - map_tab = ft_split(map, '\n'); - free(map); - if (!map_tab) - ft_error("Error: Map file is empty"); - return (map_tab); -}*/ - map_info set_map(char **argv) { //char **map_tab; @@ -102,10 +52,6 @@ map_info set_map(char **argv) ret_map.x = 8; ret_map.y = 8; ret_map.size = ret_map.x * ret_map.y; - //map_tab = ft_split(map, '\n'); - //free(map); - //if (!map_tab) - // ft_error("Error: Map file is empty"); return (ret_map); } @@ -135,7 +81,6 @@ void print_map(map_info map, t_data *img) int x = 0; int y = 0; - //printf("map= -%s-\n", map.simple_map); while (i < map.size) { j = -1; @@ -148,22 +93,6 @@ void print_map(map_info map, t_data *img) } y++; } - - /*i = 0; - j = 0; - while (map[j]) - { - x = 0; - i = 0; - while (map[j][i]) - { - print_case(map[j][i], img, (j * 64), (i * 64)); - i++; - x++; - } - j++; - y++; - }*/ } void print_line(t_data *img, double x, double y) @@ -192,6 +121,12 @@ int main(int argc, char **argv) sprite texture; texture.north = get_texture(1); + //int index= -1; + /*while (texture.north[++index] != -1) + { + printf("element= %d\n", texture.north[index]); + } + printf("end element= %d\n", texture.north[index]);*/ if (argc != 2) ft_error("Error: bad number of arguments, only need a map"); img.mlx = mlx_init(); diff --git a/srcs/test.c b/srcs/test.c new file mode 100644 index 0000000..2c04a59 --- /dev/null +++ b/srcs/test.c @@ -0,0 +1,44 @@ +#include "../includes/Cub3D.h" + +int main() +{ + void *mlx = mlx_init(); + void *win = mlx_new_window(mlx, 640, 360, "Tutorial Window - Create Image"); + + void *image = mlx_new_image(mlx, 640, 360); + + // The following code goes here. + int pixel_bits; + int line_bytes; + int endian; + + char *buffer = mlx_get_data_addr(image, &pixel_bits, &line_bytes, &endian); + + int color = 0xABCDEF; + +if (pixel_bits != 32) + color = mlx_get_color_value(mlx, color); + +for(int y = 0; y < 360; ++y) +for(int x = 0; x < 640; ++x) +{ + int pixel = (y * line_bytes) + (x * 4); + + if (endian == 1) // Most significant (Alpha) byte first + { + buffer[pixel + 0] = (color >> 24); + buffer[pixel + 1] = (color >> 16) & 0xFF; + buffer[pixel + 2] = (color >> 8) & 0xFF; + buffer[pixel + 3] = (color) & 0xFF; + } + else if (endian == 0) // Least significant (Blue) byte first + { + buffer[pixel + 0] = (color) & 0xFF; + buffer[pixel + 1] = (color >> 8) & 0xFF; + buffer[pixel + 2] = (color >> 16) & 0xFF; + buffer[pixel + 3] = (color >> 24); + } +} +mlx_put_image_to_window(mlx, win, image, 0, 0); + mlx_loop(mlx); +} \ No newline at end of file diff --git a/srcs/utils.c b/srcs/utils.c index 91a6d23..77d503c 100644 --- a/srcs/utils.c +++ b/srcs/utils.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/02/13 23:37:02 by apommier #+# #+# */ -/* Updated: 2022/05/19 15:32:21 by apommier ### ########.fr */ +/* Updated: 2022/05/20 16:00:24 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -48,16 +48,6 @@ void ft_error(char *error_msg) int is_good(t_data *img, int type) { - //printf("touche= %c\n", type); - //printf("vx= %d vy= %d\n", img->player.vx, img->player.vy); - //printf("player: x= %d y= %d\n", img->player.x, img->player.y); - -// - /*if(key=='a'){ pa+=5; pa=FixAng(pa); pdx=cos(deg_to_rad(pa)); pdy=-sin(deg_to_rad(pa));} - if(key=='d'){ pa-=5; pa=FixAng(pa); pdx=cos(deg_to_rad(pa)); pdy=-sin(deg_to_rad(pa));} - if(key=='w'){ img->player.x+=pdx*5; img->player.y+=pdy*5;} - if(key=='s'){ img->player.x-=pdx*5; img->player.y-=pdy*5;}*/ -// if (type == 'w') { img->player.x += img->player.vx * 5; @@ -98,26 +88,75 @@ int is_good(t_data *img, int type) return (1); } -void print_back(t_data *img) +void set_back(t_data *img) { - int x = 0; - int y = 0; + //int x = 0; + //int y = 0; + //int *buffer; + //int color; - while (x < 1024) + //color = get_color(128, 128, 128); + //printf("test= %d\n", img->buffer[0]); + //img->buffer; + + + /*for(int y = 0; y < 512; ++y) + for(int x = 0; x < 960; ++x) + { + int pixel = (y * img->size_line) + (x * 4); + + if (endian == 1) // Most significant (Alpha) byte first + { + buffer[pixel + 0] = (color >> 24); + buffer[pixel + 1] = (color >> 16) & 0xFF; + buffer[pixel + 2] = (color >> 8) & 0xFF; + buffer[pixel + 3] = (color) & 0xFF; + } + //else if (endian == 0) // Least significant (Blue) byte first + //{ + img->buffer[pixel + 0] = (color) & 0xFF; + img->buffer[pixel + 1] = (color >> 8) & 0xFF; + img->buffer[pixel + 2] = (color >> 16) & 0xFF; + img->buffer[pixel + 3] = (color >> 24); + //} + }*/ + int x = 0; + while (x < 512 * 960 * 4) + { + if (x > 512 * 960 * 2) + { + img->buffer[x + 0] = 128; + img->buffer[x + 1] = 128; + img->buffer[x + 2] = 128; + img->buffer[x + 3] = 128; + } + else + { + img->buffer[x + 0] = 255; + img->buffer[x + 1] = 191; + img->buffer[x + 2] = 0; + img->buffer[x + 3] = 0; + } + x += 4; + } + + /*while (x < 960) { y = 0; while (y < 512) { mlx_pixel_put(img->mlx, img->mlx_win, x , y, get_color(128, 128, 128)); + //img->buffer[1] = color; //mlx_pixel_put(img->mlx, img->mlx_win, x , y - 160, get_color(0, 255, 255)); y++; } x++; - } + }*/ } int key_press(int code, t_data *img) { + printf("touche "); if (code == 65307) quit_game(img); else @@ -128,37 +167,10 @@ int key_press(int code, t_data *img) //mlx_clear_window(img->mlx, img->mlx_win); //print_map(img->map, img); //print_player(img->player, img); - print_back(img); + //set_back(img); draw_ray(img); //print_ray(img); } } - - - - // int y = 0; - // int x = 0; - // int pixel = 0; - // int color; - //printf("pixel=%d ", ray.pixel); - /*while (x < 16) - { - y = 0; - while (y < 16) - { - //printf("test\n"); - pixel = (x * 16 + y)* 3 + 1; - color = get_color(img->map.texture.north[pixel], img->map.texture.north[pixel + 1], img->map.texture.north[pixel + 2]); - mlx_pixel_put(img->mlx, img->mlx_win, x, y, color); - y++; - } - x++; - }*/ - - - - - - return (1); -} +} \ No newline at end of file