starnakin/42_solong
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kekw

Browse Source
This commit is contained in:
Camille Chauvet 2022-12-22 17:41:31 +01:00
commit c179afd6ec
16 changed files with 272 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Makefile Normal file
View File

@ -0,0 +1,35 @@
SRC = main.c draw.c
OBJ = ${SRC:.c=.o}
NAME = so_long
LIBS = libftx/libftx.a minilibx-linux/libmlx.a
CC = gcc
FLAG = -Wall -Wextra -Werror -g
%.o: %.c
${CC} ${FLAG} -c $< -o $@
all: ${NAME}
${NAME}: ${OBJ}
make -C libftx
make -C minilibx-linux
${CC} ${OBJ} -o ${NAME} ${LIBS} -lXext -lX11
clean:
rm -f OBJ
make -C libftx clean
make -C minilibx-linux clean
fclean: clean
rm -f ${NAME}
make -C libftx fclean
make -C minilibx-linux clean
re: fclean all
.PHONY: all clean fclean re

44
draw.c Normal file
View File

@ -0,0 +1,44 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* draw.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: cchauvet <cchauvet@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/13 15:49:23 by cchauvet #+# #+# */
/* Updated: 2022/12/14 18:14:38 by cchauvet ### ########.fr */
/* */
/* ************************************************************************** */
#include "solong.h"
void ft_draw_pixel(void *window_manager, void *window, t_pixel pixel)
{
void *img;
int bozo;
img = mlx_xpm_file_to_image(window_manager, PIXEL_PATH, &bozo, &bozo);
mlx_put_image_to_window(window_manager, window, img, pixel.x, pixel.y);
}
void ft_draw_square(void *window_manager, void *window, t_square square)
{
int y;
int x;
t_pixel pixel;
pixel.color = square.color;
y = square.y;
while (y < square.size + square.y)
{
pixel.y = y;
x = square.x;
while (x < square.size + square.x)
{
pixel.x = x;
ft_draw_pixel(window_manager, window, pixel);
x++;
}
y++;
}
}

BIN
draw.o Normal file
View File

Binary file not shown.

32
libftx/Makefile Normal file
View File

@ -0,0 +1,32 @@
OBJ = ${SRC:.c=.o}
NAME = libftx.a
LIBS = libft/libft.a gnl/get_next_line.a printf/ft_printf.a
CC = clang
FLAG = -Wall -Wextra -Werror
all: ${NAME}
${NAME}: ${OBJ}
make -C libft
make -C gnl
make -C printf
ar -rcT $(NAME) $(LIBS)
clean:
make -C libft clean
make -C gnl clean
make -C printf clean
fclean: clean
rm -f ${NAME}
make -C libft fclean
make -C printf fclean
make -C gnl fclean
re: fclean all
.PHONY: all clean fclean re

1
libftx/gnl Submodule

@ -0,0 +1 @@
Subproject commit 38ce8029e589d6c70fe387ecfaa6a3219c63d3de

1
libftx/libft Submodule

@ -0,0 +1 @@
Subproject commit 7ca0dfbc542795f8ecdb007f66a3193942a593e3

BIN
libftx/libftx.a Normal file
View File

Binary file not shown.

73
libftx/libftx.h Normal file
View File

@ -0,0 +1,73 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* libftx.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/09/26 14:47:54 by cchauvet #+# #+# */
/* Updated: 2022/12/14 16:05:13 by cchauvet ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef LIBFTX_H
# define LIBFTX_H
# include <stdlib.h>
# include <unistd.h>
int ft_printf(const char *format, ...);
char *get_next_line(int fd);
int ft_atoi(const char *nptr);
void ft_bzero(void *s, size_t n);
void *ft_calloc(size_t nmemb, size_t size);
int ft_isalnum(int c);
int ft_isalpha(int c);
int ft_isascii(int c);
int ft_isdigit(int c);
int ft_isprint(int c);
void *ft_memchr(const void *s, int c, size_t n);
int ft_memcmp(const void *s1, const void *s2, size_t n);
void *ft_memcpy(void *dest, const void *src, size_t n);
void *ft_memmove(void *dest, const void *src, size_t n);
void *ft_memset(void *s, int c, size_t n);
char *ft_strchr(const char *s, int c);
char *ft_strdup(const char *s);
size_t ft_strlcat(char *dst, const char *src, size_t size);
size_t ft_strlcpy(char *dst, const char *src, size_t size);
size_t ft_strlen(const char *s);
int ft_strncmp(const char *s1, const char *s2, size_t n);
char *ft_strnstr(const char *big, const char *little, size_t len);
char *ft_strrchr(const char *s, int c);
int ft_tolower(int c);
int ft_toupper(int c);
char *ft_substr(char const *s, unsigned int start, size_t len);
char *ft_strjoin(char const *s1, char const *s2);
char *ft_strtrim(char const *s1, char const *set);
char **ft_split(char const *s, char c);
char *ft_itoa(int n);
char *ft_strmapi(char const *s, char (*f)(unsigned int, char));
void ft_striteri(char *s, void (*f)(unsigned int, char*));
void ft_putchar_fd(char c, int fd);
void ft_putstr_fd(char *s, int fd);
void ft_putendl_fd(char *s, int fd);
void ft_putnbr_fd(int n, int fd);
typedef struct s_list
{
void *content;
struct s_list *next;
} t_list;
t_list *ft_lstnew(void *content);
void ft_lstadd_front(t_list **lst, t_list *nouveau);
int ft_lstsize(t_list *lst);
t_list *ft_lstlast(t_list *lst);
void ft_lstadd_back(t_list **lst, t_list *nouveau);
void ft_lstdelone(t_list *lst, void (*del)(void *));
void ft_lstclear(t_list **lst, void (*del)(void *));
void ft_lstiter(t_list *lst, void (*f)(void *));
t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *));
#endif

1
libftx/printf Submodule

@ -0,0 +1 @@
Subproject commit 898be1619f6f91d11e1ed7ea0b8fe4f70c42a70f

29
main.c Normal file
View File

@ -0,0 +1,29 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* main.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: cchauvet <cchauvet@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/12 17:20:17 by cchauvet #+# #+# */
/* Updated: 2022/12/14 18:15:00 by cchauvet ### ########.fr */
/* */
/* ************************************************************************** */
#include "solong.h"
int main(void)
{
void *window_manager;
void *window;
t_square square;
window_manager = mlx_init();
window = mlx_new_window(window_manager, 500, 500, "Hello world!");
square.x = 10;
square.y = 10;
square.size = 400;
square.color = ft_strdup("blue");
ft_draw_square(window_manager, window, square);
mlx_loop(window_manager);
}

BIN
main.o Normal file
View File

Binary file not shown.

5
map Normal file
View File

@ -0,0 +1,5 @@
######
# #
# #
# #
######

1
minilibx-linux Submodule

@ -0,0 +1 @@
Subproject commit 7dc53a411a7d4ae286c60c6229bd1e395b0efb82

BIN
so_long Executable file
View File

Binary file not shown.

42
solong.h Normal file
View File

@ -0,0 +1,42 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* solong.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: cchauvet <cchauvet@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/12 17:18:30 by cchauvet #+# #+# */
/* Updated: 2022/12/14 17:56:34 by cchauvet ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef SOLONG_H
# define SOLONG_H
# include "minilibx-linux/mlx.h"
# include "libftx/libftx.h"
# define PIXEL_PATH "./textures/pixel.xpm"
typedef struct s_data {
void *img;
char *addr;
int bits_per_pixel;
int line_length;
int endian;
} t_data;
typedef struct s_square {
int x;
int y;
int size;
char *color;
} t_square;
typedef struct s_pixel {
int x;
int y;
char *color;
} t_pixel;
void ft_draw_square(void *window_manager, void *window, t_square square);
#endif

8
textures/pixel.xpm Normal file
View File

@ -0,0 +1,8 @@
/* XPM */
static char *_ca03a9095ee4203bcb3ca312dbb1520h08f8qZJS8cIAZS2[] = {
/* columns rows colors chars-per-pixel */
"1 1 1 1 ",
" c red",
/* pixels */
" "
};