fdf we have successfully fixed distance calculation :D

Author: oguzharunb

draw_line.c

@@ -6,7 +6,7 @@
 /*   By: obastug <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/02 11:39:32 by ebabaogl          #+#    #+#             */
-/*   Updated: 2025/01/04 16:36:54 by obastug          ###   ########.fr       */
+/*   Updated: 2025/01/07 16:46:36 by obastug          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -23,34 +23,41 @@
 
 void	put_pixel(void *mlx_ptr, void *win_ptr, int x, int y, unsigned long color)
 {
-	printf("pixel sent to mlx: %d, %d\n", (WIN_WIDTH / 2) + x, (WIN_HEIGHT / 2) - y);
-	mlx_pixel_put(mlx_ptr, win_ptr, (WIN_WIDTH / 2) + x, (WIN_HEIGHT / 2) + y, color);
+	printf("pixel sent to mlx: %d, %d\n", (WIN_WIDTH / 2) + x, (WIN_HEIGHT / 2) + y);
+	mlx_pixel_put(mlx_ptr, win_ptr, (WIN_WIDTH / 2) + x, (WIN_HEIGHT / 2) - y, color);
 }
 
 void	render_and_put_pixel(t_vars *vars, int x, int y, unsigned long point)
 {
 	int final_x;
 	int	final_y;
 
-	final_x = (x - vars->anchor_x) * vars->distance;
-	final_y = (y - vars->anchor_y) * vars->distance;
-	put_pixel(vars->mlx->mlx_ptr, vars->mlx->win_ptr, final_x, final_y, get_color(point));
-	printf("anchor point: %d %d\n", vars->anchor_x, vars->anchor_y);
-	printf("coordinate: %d, %d\n", final_x, final_y);
-	printf("distance: %d\n", vars->distance);
+	final_x = (int)((x - vars->anchor_x) * (vars->distance));
+	final_y = (int)((vars->anchor_y - y) * (vars->distance));
+	if (get_z(point) > 0)
+		put_pixel(vars->mlx->mlx_ptr, vars->mlx->win_ptr, final_x, final_y, 0xFFFFFF);
+	else
+		put_pixel(vars->mlx->mlx_ptr, vars->mlx->win_ptr, final_x, final_y, 0X0);
+	printf("x,y coordinate: %d, %d\n", x, y);
+	printf("map coordinate: %d, %d\n", final_x, final_y);
 }
 
 void	render_map(t_vars *vars)
 {
 	int	i;
 	int	j;
+
 	i = 0;
+	printf("distance: %lf\n", vars->distance);
+	printf("line count: %d\n", vars->line_count);
+	printf("line len: %d\n", vars->line_len);
+	printf("anchor point: %d %d\n", vars->anchor_x, vars->anchor_y);
 	while(vars->map[i])
 	{
 		j = 0;
 		while (vars->map[i][j] != ULONG_MAX)
 		{
-			render_and_put_pixel(vars, i, j, vars->map[i][j]);
+			render_and_put_pixel(vars, j, i, vars->map[i][j]);
 			j++;
 		}
 		i++;
@@ -59,12 +66,13 @@ void	render_map(t_vars *vars)
 
 void	fdf(t_vars *vars)
 {
-	// mlx_hook(vars->mlx->mlx_ptr, ON_DESTROY, 0, close_win, vars->mlx);
-	reset_camera(vars);
+	mlx_hook(vars->mlx->mlx_ptr, ON_DESTROY, 0, close_win, vars->mlx);
 	mlx_key_hook(vars->mlx->win_ptr, key_handler, vars);
+	reset_camera(vars);
+	render_map(vars);
 	mlx_loop(vars->mlx->mlx_ptr);
 	mlx_destroy_display(vars->mlx->mlx_ptr);
-	free(vars->mlx->mlx_ptr);
+	//free(vars->mlx->mlx_ptr);
 }
 
 void	set_map_props(t_vars *vars)
@@ -83,13 +91,18 @@ void	set_map_props(t_vars *vars)
 	vars->anchor_y = i / 2;
 }
 
-int	main()
+int	main(int argc, char **argv)
 {
 	t_vars	vars;
 	t_mlx	mlx;
 	char 			*map_str;
 
-	map_str = read_file("test_maps/2x2.fdf");
+	if (argc != 2)
+	{
+		write(STDERR_FILENO, "using: fdf <map>\n", 17);
+		return (1);
+	}
+	map_str = read_file(argv[1]);
 	if (!map_str)
 		return (write(1, "file couldn't read", 18), 1);
 	vars.map = map_string_to_arr_2d(map_str);

fdf.c

@@ -6,7 +6,7 @@
 /*   By: obastug <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/02 11:39:37 by ebabaogl          #+#    #+#             */
-/*   Updated: 2025/01/04 16:03:42 by obastug          ###   ########.fr       */
+/*   Updated: 2025/01/07 12:47:31 by obastug          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -32,7 +32,7 @@ typedef struct	s_vars
 	int				s_coef;
 	int				a_coef;
 	int				d_coef;
-	int				distance;
+	double			distance;
 	int				line_count;
 	int				line_len;
 	int				anchor_x;

inc/fdf.h

@@ -6,7 +6,7 @@
 /*   By: obastug <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/02 13:34:08 by ebabaogl          #+#    #+#             */
-/*   Updated: 2025/01/04 13:52:04 by obastug          ###   ########.fr       */
+/*   Updated: 2025/01/05 14:28:04 by obastug          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

inc/window.h

@@ -0,0 +1,10 @@
+1 0 0 -1 -1 0 1 1 0 0 
+-1 0 0 0 1 0 0 0 0 0 
+-1 1 0 0 -1 1 0 0 0 1 
+1 -1 0 1 1 -1 0 0 -1 0 
+1 -1 -1 0 -1 0 0 0 -1 -1 
+-1 1 0 1 1 0 1 0 0 0 
+0 -1 -1 0 0 1 0 0 0 1 
+0 0 0 0 1 0 -1 0 0 0 
+-1 -1 0 1 -1 0 1 0 0 1 
+0 0 1 -1 0 -1 0 0 0 0 

test_maps/10-2.fdf

@@ -0,0 +1,10 @@
+-6 -67 -61 -38 9 -16 -16 32 56 16 
+27 -63 23 -56 63 10 33 -9 -55 69 
+-44 -23 -58 12 -55 0 21 -25 27 48 
+1 41 -38 57 38 -17 -50 -2 -63 7 
+32 -46 -11 30 10 13 -48 -37 66 -53 
+-54 34 51 -40 -33 52 -62 -37 -54 -9 
+-58 40 -30 -9 59 7 -66 -12 -18 41 
+-50 67 36 13 12 -2 -28 10 -60 -58 
+3 -27 -52 56 26 -52 59 -31 -48 -6 
+-59 -30 50 36 5 -11 0 60 -24 -34