From d4e933162eeab241bf92902b99819cf15acdef6c Mon Sep 17 00:00:00 2001 From: fotonmoton Date: Mon, 13 Feb 2017 20:40:04 +0200 Subject: [PATCH] line function prototype --- .gitignore | 3 +++ Makefile | 4 +++- inc/fdf.h | 25 +++++++++++++++++++++ src/main.c | 65 ++++++++++++------------------------------------------ 4 files changed, 45 insertions(+), 52 deletions(-) create mode 100644 inc/fdf.h diff --git a/.gitignore b/.gitignore index 1377554..6834631 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ *.swp +.idea +CMakeLists.txt +cmake-build-debug diff --git a/Makefile b/Makefile index 0d216b9..792cffe 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,9 @@ SRC = $(addprefix $(SRCDIR), $(SRC_FILES)) OBJ = $(addprefix $(OBJDIR), $(OBJ_FILES)) -INC = -I ./inc -I $(LIBFT_FOLDER)/includes/ -I $(MLX_FOLDER) +INC = -I $(LIBFT_FOLDER)includes/ \ + -I $(MLX_FOLDER) \ + -I ./inc LIBFT = libft.a diff --git a/inc/fdf.h b/inc/fdf.h new file mode 100644 index 0000000..b2a7031 --- /dev/null +++ b/inc/fdf.h @@ -0,0 +1,25 @@ +// C/C++ File +// AUTHOR: fotonmootn +// FILE: inc/fdf.h +// ROLE: to rule them all +// CREATED: 2017-02-13 20:07:04 +// MODIFIED: 2017-02-13 20:28:14 + + +#ifndef FDF_H +# define FDF_H + +#include "libft.h" +#include "mlx.h" +#include // warning!! + +typedef struct s_point +{ + int x; + int y; + int z; +} t_point; + +void line(t_point *p1, t_point *p2, void *mlx, void *win); + +#endif diff --git a/src/main.c b/src/main.c index 8ce6d8a..8b0c175 100644 --- a/src/main.c +++ b/src/main.c @@ -3,67 +3,30 @@ // FILE: main.c // ROLE: to rule them all // CREATED: 2017-01-30 21:51:28 -// MODIFIED: 2017-01-30 23:25:14 +// MODIFIED: 2017-02-13 20:30:48 +#include "fdf.h" -#include -#include "libft.h" -#include "mlx.h" -#include - -void put_square(int side, int init_x, int init_y, void *mlx, void *mlx_w, int hex_rgb) +void line(t_point *p1, t_point *p2, void *mlx, void *win) { - //struct timespec tw = {0,10}; - //struct timespec tr; - - int temp_y; - - temp_y = init_y; - while(init_x < side) - { - init_y = temp_y; - while(init_y < side) - { - mlx_pixel_put(mlx, mlx_w, init_x, init_y, hex_rgb); - //nanosleep(&tw, &tr); - init_y++; - } - init_x++; - } + p2->x = 0; + p2->y = 0; + mlx_pixel_put(mlx, win, p1->x, p1->y, 0xFFFFFFFF); } - int main(int argc, char **argv) { void *mlx; void *mlx_window; - void *image; - int y; - int x; - //int hex; + t_point p1; + t_point p2; + p1.x = 10; + p1.y = 10; + argc = argc + 1; + argv = argv; mlx = mlx_init(); - mlx_window = mlx_new_window(mlx, 2400, 1600, "CATT!!!11"); -// y= 50; -// hex = 0xFFA6FB; -// while (y < 100) -// { -// x = 50; -// while (x < 100) -// { -// put_square(100, x, y, mlx, mlx_window, hex); -// //mlx_clear_window(mlx, mlx_window); -// printf("y = %d\n", y); -// hex += 0xFFA6FB; -// x++; -// } -// y++; -// } - y = 1600; - x = 2400; - if (argc != 2) - return (1); - image = mlx_xpm_file_to_image(mlx, argv[1], &x, &y); - mlx_put_image_to_window (mlx, mlx_window, image, 0, 0); + mlx_window = mlx_new_window(mlx, 500, 500, "fdf"); + line(&p1, &p2, mlx, mlx_window); mlx_loop(mlx); return (0); }