From ec8554053fab02bf39c0a06052873e0e74546c3f Mon Sep 17 00:00:00 2001 From: Iipal Date: Sat, 16 Mar 2019 22:29:30 +0200 Subject: [PATCH] Global Refactoring --- Makefile | 25 +++-- includes/wolf3d.h | 22 ++-- srcs/{ => free}/wolf_free.c | 11 +- srcs/free/wolf_free.o | Bin 0 -> 3736 bytes srcs/{ => init}/wolf_init.c | 4 +- srcs/init/wolf_init.o | Bin 0 -> 6024 bytes srcs/{ => init}/wolf_init_textures.c | 4 +- srcs/init/wolf_init_textures.o | Bin 0 -> 3168 bytes srcs/main.c | 4 +- srcs/{ => raycaster}/wolf_raycaster.c | 45 +++++++- srcs/raycaster/wolf_raycaster.o | Bin 0 -> 3096 bytes srcs/raycaster/wolf_rc_rotatenmove.o | Bin 0 -> 2168 bytes srcs/{ => raycaster}/wolf_rotatenmove.c | 4 +- srcs/raycaster/wolf_rotatenmove.o | Bin 0 -> 2168 bytes .../wolf_colored.c} | 17 +-- srcs/rendering/wolf_colored.o | Bin 0 -> 1696 bytes .../wolf_fog.c} | 24 +++- srcs/rendering/wolf_fog.o | Bin 0 -> 2952 bytes .../wolf_fps_counter.c} | 6 +- srcs/rendering/wolf_fps_counter.o | Bin 0 -> 2584 bytes .../wolf_main_menu.c} | 6 +- srcs/rendering/wolf_main_menu.o | Bin 0 -> 2384 bytes .../wolf_minimap.c} | 6 +- srcs/rendering/wolf_minimap.o | Bin 0 -> 3856 bytes srcs/rendering/wolf_rendering.c | 42 +++++++ srcs/rendering/wolf_rendering.o | Bin 0 -> 2536 bytes srcs/rendering/wolf_rendering_colored.o | Bin 0 -> 1848 bytes srcs/rendering/wolf_rendering_fog.o | Bin 0 -> 2960 bytes srcs/rendering/wolf_rendering_fps_counter.o | Bin 0 -> 2592 bytes srcs/rendering/wolf_rendering_mainmenu.o | Bin 0 -> 2392 bytes srcs/rendering/wolf_rendering_minimap.o | Bin 0 -> 3872 bytes srcs/rendering/wolf_rendering_textured.o | Bin 0 -> 3296 bytes .../wolf_rendering_textured_help_fck_norme.o | Bin 0 -> 1768 bytes srcs/rendering/wolf_rendering_weapons.o | Bin 0 -> 1248 bytes .../wolf_textured.c} | 4 +- srcs/rendering/wolf_textured.o | Bin 0 -> 3288 bytes .../wolf_textured_help_fck_norme.c} | 4 +- srcs/rendering/wolf_textured_help_fck_norme.o | Bin 0 -> 1760 bytes srcs/rendering/wolf_torch.c | 42 +++++++ srcs/rendering/wolf_torch.o | Bin 0 -> 2352 bytes .../wolf_weapons.c} | 6 +- srcs/rendering/wolf_weapons.o | Bin 0 -> 1232 bytes srcs/{ => sdl}/wolf_sdl_mainmenu_loop.c | 4 +- srcs/sdl/wolf_sdl_mainmenu_loop.o | Bin 0 -> 2280 bytes srcs/{ => sdl}/wolf_sdl_optimizing_load.c | 4 +- srcs/sdl/wolf_sdl_optimizing_load.o | Bin 0 -> 2400 bytes srcs/{ => sdl}/wolf_sdl_rendering_loop.c | 6 +- srcs/sdl/wolf_sdl_rendering_loop.o | Bin 0 -> 3800 bytes ...wolf_sdl_rendering_loop_key_press_events.c | 4 +- ...wolf_sdl_rendering_loop_key_press_events.o | Bin 0 -> 2168 bytes srcs/{ => sdl}/wolf_sdl_sfx_steps.c | 4 +- srcs/sdl/wolf_sdl_sfx_steps.o | Bin 0 -> 2032 bytes srcs/wolf_map_reader.c | 4 +- srcs/wolf_rendering.c | 105 ------------------ 54 files changed, 219 insertions(+), 188 deletions(-) rename srcs/{ => free}/wolf_free.c (91%) create mode 100644 srcs/free/wolf_free.o rename srcs/{ => init}/wolf_init.c (97%) create mode 100644 srcs/init/wolf_init.o rename srcs/{ => init}/wolf_init_textures.c (96%) create mode 100644 srcs/init/wolf_init_textures.o rename srcs/{ => raycaster}/wolf_raycaster.c (61%) create mode 100644 srcs/raycaster/wolf_raycaster.o create mode 100644 srcs/raycaster/wolf_rc_rotatenmove.o rename srcs/{ => raycaster}/wolf_rotatenmove.c (94%) create mode 100644 srcs/raycaster/wolf_rotatenmove.o rename srcs/{wolf_rendering_colored.c => rendering/wolf_colored.c} (80%) create mode 100644 srcs/rendering/wolf_colored.o rename srcs/{wolf_rendering_fog.c => rendering/wolf_fog.c} (77%) create mode 100644 srcs/rendering/wolf_fog.o rename srcs/{wolf_rendering_fps_counter.c => rendering/wolf_fps_counter.c} (91%) create mode 100644 srcs/rendering/wolf_fps_counter.o rename srcs/{wolf_rendering_mainmenu.c => rendering/wolf_main_menu.c} (90%) create mode 100644 srcs/rendering/wolf_main_menu.o rename srcs/{wolf_rendering_minimap.c => rendering/wolf_minimap.c} (92%) create mode 100644 srcs/rendering/wolf_minimap.o create mode 100644 srcs/rendering/wolf_rendering.c create mode 100644 srcs/rendering/wolf_rendering.o create mode 100644 srcs/rendering/wolf_rendering_colored.o create mode 100644 srcs/rendering/wolf_rendering_fog.o create mode 100644 srcs/rendering/wolf_rendering_fps_counter.o create mode 100644 srcs/rendering/wolf_rendering_mainmenu.o create mode 100644 srcs/rendering/wolf_rendering_minimap.o create mode 100644 srcs/rendering/wolf_rendering_textured.o create mode 100644 srcs/rendering/wolf_rendering_textured_help_fck_norme.o create mode 100644 srcs/rendering/wolf_rendering_weapons.o rename srcs/{wolf_rendering_textured.c => rendering/wolf_textured.c} (97%) create mode 100644 srcs/rendering/wolf_textured.o rename srcs/{wolf_rendering_textured_help_fck_norme.c => rendering/wolf_textured_help_fck_norme.c} (94%) create mode 100644 srcs/rendering/wolf_textured_help_fck_norme.o create mode 100644 srcs/rendering/wolf_torch.c create mode 100644 srcs/rendering/wolf_torch.o rename srcs/{wolf_rendering_weapons.c => rendering/wolf_weapons.c} (86%) create mode 100644 srcs/rendering/wolf_weapons.o rename srcs/{ => sdl}/wolf_sdl_mainmenu_loop.c (95%) create mode 100644 srcs/sdl/wolf_sdl_mainmenu_loop.o rename srcs/{ => sdl}/wolf_sdl_optimizing_load.c (94%) create mode 100644 srcs/sdl/wolf_sdl_optimizing_load.o rename srcs/{ => sdl}/wolf_sdl_rendering_loop.c (95%) create mode 100644 srcs/sdl/wolf_sdl_rendering_loop.o rename srcs/{ => sdl}/wolf_sdl_rendering_loop_key_press_events.c (96%) create mode 100644 srcs/sdl/wolf_sdl_rendering_loop_key_press_events.o rename srcs/{ => sdl}/wolf_sdl_sfx_steps.c (93%) create mode 100644 srcs/sdl/wolf_sdl_sfx_steps.o delete mode 100644 srcs/wolf_rendering.c diff --git a/Makefile b/Makefile index 83d27e0..c4191ef 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: tmaluh +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/02/06 14:43:13 by tmaluh #+# #+# # -# Updated: 2019/03/15 10:58:32 by tmaluh ### ########.fr # +# Updated: 2019/03/16 22:22:38 by tmaluh ### ########.fr # # # # **************************************************************************** # @@ -26,15 +26,18 @@ endif CC = gcc -march=native CFLAGS = -Wall -Wextra -Werror -Ofast - -SRC = srcs/main.c srcs/wolf_init.c srcs/wolf_init_textures.c srcs/wolf_map_reader.c \ -srcs/wolf_sdl_optimizing_load.c srcs/wolf_sdl_mainmenu_loop.c \ -srcs/wolf_sdl_rendering_loop.c srcs/wolf_sdl_rendering_loop_key_press_events.c \ -srcs/wolf_sdl_sfx_steps.c srcs/wolf_raycaster.c srcs/wolf_rendering.c \ -srcs/wolf_rendering_mainmenu.c srcs/wolf_rendering_colored.c srcs/wolf_rendering_textured.c \ -srcs/wolf_rendering_textured_help_fck_norme.c srcs/wolf_rendering_minimap.c \ -srcs/wolf_rendering_weapons.c srcs/wolf_rendering_fps_counter.c srcs/wolf_rendering_fog.c \ -srcs/wolf_rotatenmove.c srcs/wolf_free.c +INC = -I $(CURDIR)/includes/ + +SRC = srcs/main.c srcs/wolf_map_reader.c srcs/free/wolf_free.c srcs/init/wolf_init.c srcs/init/wolf_init_textures.c \ +srcs/sdl/wolf_sdl_optimizing_load.c \ +srcs/sdl/wolf_sdl_mainmenu_loop.c srcs/sdl/wolf_sdl_rendering_loop.c \ +srcs/sdl/wolf_sdl_rendering_loop_key_press_events.c \ +srcs/sdl/wolf_sdl_sfx_steps.c srcs/raycaster/wolf_raycaster.c srcs/raycaster/wolf_rotatenmove.c \ +srcs/rendering/wolf_rendering.c srcs/rendering/wolf_main_menu.c \ +srcs/rendering/wolf_colored.c srcs/rendering/wolf_textured.c \ +srcs/rendering/wolf_textured_help_fck_norme.c srcs/rendering/wolf_minimap.c \ +srcs/rendering/wolf_weapons.c srcs/rendering/wolf_torch.c srcs/rendering/wolf_fps_counter.c \ +srcs/rendering/wolf_fog.c OBJ = $(SRC:.c=.o) @@ -53,7 +56,7 @@ all: $(NAME) $(OBJ): %.o: %.c @$(ECHO) -n ' $@: ' - @$(CC) -c $(CFLAGS) $(SDLINCLUDE) $< -o $@ + @$(CC) -c $(CFLAGS) $(SDLINCLUDE) $(INC) $< -o $@ @$(ECHO) "[$(GREEN)✓$(WHITE)]" $(LIBFT): diff --git a/includes/wolf3d.h b/includes/wolf3d.h index 774169f..2aa46f5 100644 --- a/includes/wolf3d.h +++ b/includes/wolf3d.h @@ -6,7 +6,7 @@ /* By: tmaluh +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/06 14:30:10 by tmaluh #+# #+# */ -/* Updated: 2019/03/15 11:21:30 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 22:09:11 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ @@ -241,10 +241,11 @@ bool wolf_init(t_env *env); bool wolf_init_textures(t_env *env); void wolf_setup_rc(t_env *env); +void wolf_rendering_mainmenu(t_env *env); + void wolf_rendering_fps_counter(t_env *env); void wolf_rendering_minimap(t_env *env); -Uint32 wolf_fog(float dist_to_obj, Uint32 src_color, t_fog *fog); -Uint32 wolf_fog_change(t_colors *c); +void wolf_rendering_torch(t_env *env); void wofl_rendering_loop_keys_press(t_env *env, bool *exit); void wofl_rendering_loop_keys_sfx_press(t_env *env); @@ -253,27 +254,26 @@ void wofl_rendering_loop_keys_release(t_env *env); void wolf_sdl_rendering_loop(t_env *env); void wolf_sdl_mainmenu_loop(t_env *env); -void wolf_rendering_waepons(t_env *env); +void wolf_rendering_weapons(t_env *env); -void wolf_rendering_rc(t_env *env); -void wolf_rendering_mainmenu(t_env *env); +void wolf_rendering(t_env *env); +void wolf_raycaster(t_env *env); + +Uint32 wolf_fog(float dist_to_obj, Uint32 src_color, t_fog *fog); +Uint32 wolf_fog_change(t_colors *c); +float wolf_fog_freq(int *freq, t_time *time); void wolf_render_textured_help(t_env *env, point *p, t_texhelper *h); void wolf_render_textured(t_env *env, point *p); void wolf_render_colored(t_env *env, point *p); void wolf_fill_floor_if_colored_rc(t_sdl *sdl); -void wolf_set_diststep(t_rc *rc); -void wolf_check_hit(t_rc *rc, itab map); -void wolf_dist_to_wall(t_rc *rc); - bool wolf_is_tile(t_map *map, fpoint pos); void wolf_rotate(t_rc *rc, float angle); void wolf_move(t_env *env, float dist); void wolf_playing_steps(t_sfx *sfx, bool is_boost); - void wolf_press_selector(t_env *env); void wolf_free(t_env **env); diff --git a/srcs/wolf_free.c b/srcs/free/wolf_free.c similarity index 91% rename from srcs/wolf_free.c rename to srcs/free/wolf_free.c index 3796bfc..bf7765f 100644 --- a/srcs/wolf_free.c +++ b/srcs/free/wolf_free.c @@ -6,11 +6,11 @@ /* By: tmaluh +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/06 14:43:13 by tmaluh #+# #+# */ -/* Updated: 2019/03/14 17:15:14 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 22:20:04 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" void wolf_free_map(t_map **map) { @@ -88,6 +88,13 @@ void wolf_free(t_env **env) SDL_FreeSurface((*env)->floor_and_sky->surf); _FREE((*env)->floor_and_sky, free); } + if ((*env)->walls) + { + SDL_FreeSurface((*env)->walls->data->surf); + _FREE((*env)->walls->data, free); + _FREE((*env)->walls->start, free); + _FREE((*env)->walls, free); + } _FREE((*env)->isr, free); _FREE((*env)->rc, free); _FREE((*env)->sdl->font, TTF_CloseFont); diff --git a/srcs/free/wolf_free.o b/srcs/free/wolf_free.o new file mode 100644 index 0000000000000000000000000000000000000000..bea33b6ea3c67e136cb3e433283b4dfd253c8a2e GIT binary patch literal 3736 zcmbuBO>7%Q6vxMLAf`#zPDsI05!nL-S0XDX6;&El#pycn1UWQqQbkarWaDh)s7Y+u zYwBXrR5-30EroC+SHuNzLE?sbNR>(pS0n^!gt%~MDHje1BtFc0vorDdVxZNOkY@{>C?uBUt$uK(H?c z9#a8KdWI*xo?8y~#SimYvr?|9KvS~sAhz%_-Ev$vXAH+7w0tjcd2Wy8$1#KN&sD2c z9A^8G#`Cke>>#^Kx4x~7;=}@&;?bwvug-=R@{mHZVBaR|jLx_U*?qKJ3K8olyJ`)~;A=xNtlT3`?02Bxx~#+7N*9zpLXxwpQ6kI-pj{)Y>LIH$u+G0UDs zl!x_7Veph%#U%n5==wSO0(K~yrk;gG1UK(6FpQHBs({5oKX5Fe%I<1(t?^WW`e0N){vD#P;VW^+qL?sJn zw?*6yX8S?esm57A&e)V2$z~{a3r+%TXdyMl-Ugb8iXBt0CfJ-r6#dycE>nIU=SJUn zh?FFBeMF5UUcGce9o9~2gX&Op@N{%&=%gCCXfCPLuv|Vcbb|R4(#vb#TNjD181fzO z>IiJZ1%@I#!);-_&_rrFXnk?j3Qirx$ z??Pe4A~Q4N^ZIHgZ;ofyEtW8D=B-@j+U&~uQsycn%n{~^<&;~o9q#SioOzb3_EvoZc3W=RKd literal 0 HcmV?d00001 diff --git a/srcs/wolf_init.c b/srcs/init/wolf_init.c similarity index 97% rename from srcs/wolf_init.c rename to srcs/init/wolf_init.c index 007da4f..a45f622 100644 --- a/srcs/wolf_init.c +++ b/srcs/init/wolf_init.c @@ -6,11 +6,11 @@ /* By: tmaluh +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/06 14:38:13 by tmaluh #+# #+# */ -/* Updated: 2019/03/15 10:39:52 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 21:27:05 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" void wolf_setup_rc(t_env *env) { diff --git a/srcs/init/wolf_init.o b/srcs/init/wolf_init.o new file mode 100644 index 0000000000000000000000000000000000000000..e42c37790618c64df1ade5206648ba6a67f4a62d GIT binary patch literal 6024 zcmbtYe{5S<6~2ix>Se`ox(-rWR>P_)U0c^qij^M$t)|8g~Xwt2d<2cWa8~@_@ znYz&imC{tR9+mh5p>F)a{;5C$1PBS5BE?SIG=PQ*6B43GV=#$zfEa8r(l8Xxx$j>4 z#PO3VIFWtd{mys3d+xc{_q~@dh6j2Z8yc9h2KFgd?J1P8pFCW>4v5PDYhf-H9PTf^ z?=O$^o5Q=@L)^@?@k`G;`Rto3y!aO1b8mKWZ1F7zUk-~HXpiH?yZl@HDr4tM@%Zjf z^I~{&yk+MF!7yjGuHELbwY%8k#T)%*&n~xFa96>lmC^Fe->*J?gU|i;+%{gk!+-gw z**6;agLjnY`qJuHd1S`+DvL8mkh99dlll%?gu6M*vK z@

N?hVcZ$bwh@0efNou7j~_jIAA5z^@WGlmL_o6&Na*d%5|1#o-i=HzAUn4|B8I z$<2U=7rVK@ZvkG~T-6C#^zR}aGO2n@@XW*ZY``tbi%waYQX7eN3(1^}t$0dU4LQ+J zo8TOioQh{%4nD!zyCH|-?}W+)n5YY!>&6}zG5>0`@~(`{&FS%yyE?wC({0JCdTM!A z9lo)V7aA9J=Vm)M9Z*ZCXVxiaC)GcPQD$g--U9=3bIN&!T?2@P{XabeU*&~K==jwy zE6kogDUv@V!>++ThOmIs{~kBHENSz|I5$5FV>Qa{qfp9CS;!t0Y;hPBErfJcogtGVy~$W}qtApAa*t)2Sn{gFLl z@>lMU+zw>pIavMd!ebD@&4Nd+U=?YvBCynJz-g->Ev3TY;!0xe#0Z=%iz_XQZ@c#_ zx0K{&0oi#g#OHstcw0nW#ghHG(O>4XH=WNsd&80{E{nEQspn`W8Q0P|LrbJRojpv~ za+$my({cxV2fHJ_&Pc>NJlxCl3F1lRbBWl2oDtOx@7d_*H+rU1t)8%GUMh z6%Qm%MWcyyB&DVE2mC&tukZ<58JvR6e8+_OX*KF_^8~lRxZ$9X9ymHuxbM{Fn`X$_77egR`@6fJPGOgyD@b??A|B z0XfacXCr!y#f^v_O;1*7Y^Y}-(hqzF2dj0FiYAj8L7kY<^o(GHbS-LVqlxrn=Bxnv zG{fo*<@I8i5V@D17akZiB1y1!M<)4k9qValF30htVJ%z zvRb+~lQ!7VL?MEmV16=@5xoIWIXW^Vga$`@^-KyPwTf#rcp@@5D!L~!$$Ux+P36_~ge5AosMDZ_69CcaYK6o!tc!1z^+@}dn$9<0Al>b$NQ~t{Yr+o1YDD$EGn>PH{2u}HbBsji; zsd=psoQ}Ii-g>YORL4Vb%0EPK%I5^9{0V|n{QqvcnD(9?h+lUe~;i){~`HfQ*~DQ zZi3_bjtOazGH)z2)>i>UnjVS;Qu7}#|YkxMF+z=e;ht)+${uujNm&6zKh@< zxJJX{LmnZbKOnxVxO#45-rTvA5uJe6(5-e#UFljf>cyKU^G-&MDDzI_a?Gn|u!D5J z*T25oRq4iZ#zE$dWm52B0^#Y5p?Tq5VL!YT#ioIU%Gy*UuEXnx%cV{Yp~x+0AK+QD(u6EvP-XuIKqxIEqv5;k5luELQ^Z69<{ z^M8%^Lo8}`z=xU||0@)PYc;-V0}`u^Uy=ErtBF_hSMkSWJf5x84EYLzwWX%|syzix z)KcfK;ud85eg()@jjLMRMe3STuhf49+Q7y00^{j#26etE}C1xo2)5LO_$-lvR-^Z=6?aj Ih}Fjb7mR%Ha{vGU literal 0 HcmV?d00001 diff --git a/srcs/wolf_init_textures.c b/srcs/init/wolf_init_textures.c similarity index 96% rename from srcs/wolf_init_textures.c rename to srcs/init/wolf_init_textures.c index 8d28a62..2d760be 100644 --- a/srcs/wolf_init_textures.c +++ b/srcs/init/wolf_init_textures.c @@ -6,11 +6,11 @@ /* By: tmaluh +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/15 10:38:52 by tmaluh #+# #+# */ -/* Updated: 2019/03/15 12:26:51 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 21:27:13 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" static bool add_init_textures_map(t_env *env) { diff --git a/srcs/init/wolf_init_textures.o b/srcs/init/wolf_init_textures.o new file mode 100644 index 0000000000000000000000000000000000000000..fd8c1800aec177bca8d0619ecb13d4cd3678e6ee GIT binary patch literal 3168 zcmbtWO>7%Q6duQJV%pSpQ3RF>${sAVm6}cLK$R3ky|LYlQwy53k@$-o$8qFfI~&<+ zrHRCkkCX|&%Ez_ z@0&Moew_CbsnZ=U7varCUM71MM+v#(-5W=(VU+mDVWLi|=O@omRa#9xN-Z^gXNx-`MNi}^9`(rgzqQ9 z>#EWG&An(TmFwNtIFN5l6Us*Bb(z3T9->W{Sc{m`3J z>RVS)LY=zi?~Owm3-qMs7uvf{ zSS}%txuT|()0u_YbfvJ|zt3t>vC0B}DN`(__1p!$3Tx@#XSMjFvDisT9(`rzs zc6^}-al@ZebAysobCUy3FsO94!JTt+Tg=& zaI&No=hE{F^ZM>tP_hmnDZz2kvSdzA&#dIiT8pAB>hq=fm0Y?~EzhNkT4t7~gLz{+ z1Rt?#y%xHMA7!>|!%r|fY{SQyebR;(nH{s?A2OS=9(NXV`g^C!tKM0t3YAbE{pV|0$ zzOY?s!+#dm7rE}xz&XG%Gi%>U>lh{e)~ zwMDroenI2+w`Dzkhw(mO?V_B(dYK8ztVnnUa321`SpO%1{T##XFWdIM;sS{^wvF5* z$6r0PA@i z?_Xo_HX3;vH^rgxIPNOJ05N;HgDgJJiLB@Oa~S#`|HhaYR`->Ph`}&Un<`kc26D?U$dtdhWe*w6XDHQ+! literal 0 HcmV?d00001 diff --git a/srcs/main.c b/srcs/main.c index 6a9b49b..2659250 100644 --- a/srcs/main.c +++ b/srcs/main.c @@ -6,11 +6,11 @@ /* By: tmaluh +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/06 14:19:04 by tmaluh #+# #+# */ -/* Updated: 2019/03/15 10:59:26 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 21:26:51 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" static void wolf_usage(void) { diff --git a/srcs/wolf_raycaster.c b/srcs/raycaster/wolf_raycaster.c similarity index 61% rename from srcs/wolf_raycaster.c rename to srcs/raycaster/wolf_raycaster.c index d91900e..7a4517f 100644 --- a/srcs/wolf_raycaster.c +++ b/srcs/raycaster/wolf_raycaster.c @@ -6,13 +6,13 @@ /* By: tmaluh +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/13 11:13:19 by tmaluh #+# #+# */ -/* Updated: 2019/02/17 09:36:53 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 22:22:15 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" -void wolf_set_diststep(t_rc *rc) +static void add_set_diststep(t_rc *rc) { if (rc->raydir.x < 0) { @@ -36,7 +36,7 @@ void wolf_set_diststep(t_rc *rc) } } -void wolf_check_hit(t_rc *rc, itab map) +static void add_check_hit(t_rc *rc, itab map) { while (!rc->is_hit) { @@ -57,7 +57,7 @@ void wolf_check_hit(t_rc *rc, itab map) } } -void wolf_dist_to_wall(t_rc *rc) +static void add_dist_to_wall(t_rc *rc) { !rc->is_side ? (rc->pwd = (rc->map.x - rc->pos.x + (1 - rc->step.x) / 2) / rc->raydir.x) @@ -70,3 +70,38 @@ void wolf_dist_to_wall(t_rc *rc) if (rc->draw_end >= WIN_Y) rc->draw_end = WIN_Y - 1; } + +static void add_fill_floornceiling(t_sdl *sdl) +{ + point p; + + p.y = -1; + while (++(p.y) < WIN_Y && (p.x = -1)) + while (++(p.x) < WIN_X) + sdl->win_pixels[p.y * WIN_X + p.x] = + (p.y >= WIN_Y / 2) ? IRGB_FLOOR : IRGB_SKY; +} + +void wolf_raycaster(t_env *env) +{ + point p; + + p.x = -1; + if (!env->isr->is_textured) + add_fill_floornceiling(env->sdl); + while (++(p.x) < WIN_X) + { + *(env->rc) = (t_rc){{RC->pos.y, RC->pos.x}, {RC->dir.y, RC->dir.x}, + {RC->plane.y, RC->plane.x}, 0, {0, 0}, {0, 0}, {0, 0}, {0, 0}, 0, + {0, 0}, false, false, 0, 0, 0}; + RC->xcamera = 2 * p.x / (double)WIN_X - 1; + env->rc->raydir = (fpoint){RC->dir.y + RC->plane.y * RC->xcamera, + env->rc->dir.x + env->rc->plane.x * env->rc->xcamera }; + env->rc->map = (point){(int)env->rc->pos.y, (int)env->rc->pos.x}; + RC->ddist = (fpoint){_ABS(1 / RC->raydir.y), _ABS(1 / RC->raydir.x)}; + add_set_diststep(env->rc); + add_check_hit(env->rc, env->map->tab); + add_dist_to_wall(env->rc); + ISRT ? wolf_render_textured(env, &p) : wolf_render_colored(env, &p); + } +} diff --git a/srcs/raycaster/wolf_raycaster.o b/srcs/raycaster/wolf_raycaster.o new file mode 100644 index 0000000000000000000000000000000000000000..093364b1474d943bdb533654749f705ce8004156 GIT binary patch literal 3096 zcmbtWZ%k8H6u+e)%%QJ3m$Aq~w{#0C)E3a-BCdT@ebl0a;rKHqmQq5TKvK#8lMNW4 zd+AU=&M(`(`gvbqTd+^LgSupqWlMy8kT4fzTb80mOA)$rUhkFqT9PF@$-U>^-#x!` z&pq$l+x8!J9ZA#a2p1hWMAl~^kp{1SEf6v>P)Nw&@-n!R!*=0>LYF&&lM5f$ z1*OqXPlsbMA#VV;p=1a*8;dzP=>zjo}Lil5`msZ zdj8ssK_K56tdO66hvDdgbh$Q2S9U`)?8CK+K#eKK8k$@PUCF>XjT+7vpgWfhooWI4 z4Z6|*f%RQIlSQN3#GJ_m`xS8qEI89!Wv4`Mp8AzW3nrn3ro@BjMw${`sHemlRKPlu zi&Ud5nq+4_FmBW7+Q&4qH%#x>yv%H>OXz&fYi!a`DqMIq4Y=`$75bndWFN=xLL>QW zbfr^_0nvm$3xqt_f3G5({|6#*=t6KB$rF|WB~R!=UC8B`JrcPT{XE_DOoWE85v{6i_ z(K=W>B^qJ>H-UjE6c5t5Q^5(Gx#WA0ZE&D0=EUA7hqIyV*qLqXXEr6DIgKAVcQFe%YFvvR7$FPt z6tv58bgmJG_1700U?+wvc6nB<9K1w zE@bRrG~KysqU$y2c4lX0U513409P*{=&#^X68l!e`Lyyan~r_1A4=C>(t{nNrc_ud z>0~LEYEhr^g(7hGaie6>gQrxYC+gKnTGEqENf-iplDPr?!Up)}Bz(JyWDxD)UtzeG z5YJ(9Jg=*U$??3!{1`Nj_NensDKnu@iiQvi*l$nBv-%AIgQ6i?-{=~jx>Pvn={(!o zcc;K@h~Vp>bTq!UI8k3p9?O*Z?0+z_%vY(+zMpItD=n zKV;ARPcR%S6>Eg=`yMN4#9vCljW9+*8l$RnV(#i|_q&@x`+afU#z#KyS+^OpNX#v6 zznhqwySj+k*NGFer^{cOIDwC{zGB@^%%0Bnc5er8J39SdGdvK5U4FOcLoh?P-nOPz zpS#@~590s#MsR^C)KQ7>}_hm**er2j3gc=Qzf$-5Ve>!1kYKhr>5!8#FB+e^Iox0}wgQ>bDIi V38Kvv`b@>Y#o`}K;Nnor{}*Tsh7$k) literal 0 HcmV?d00001 diff --git a/srcs/raycaster/wolf_rc_rotatenmove.o b/srcs/raycaster/wolf_rc_rotatenmove.o new file mode 100644 index 0000000000000000000000000000000000000000..fb1d8234a7867cb2851a228119ca4500625918a3 GIT binary patch literal 2168 zcmbtU-D?wB6u)Wf8rRrPC9;Zw1Dlmt+OcUx-9>6jv>A6r#jiFf)N!0(u}RjvS~C{0P?!M*|Eb&4j-5WwglWQJIZI8$6yy!r$N#Y7B5%5nB3+>g-z1XQX9ltgxD)k!$! zg}obopV@ypT@oMZeh*dMYI+0ID|@5U75;*HVn?8yd$76cbhsrwgp$JNFO~)t@pnCU z`Aj1mHMMTsPQlTg!D3mvItqH(-j4a92FU-o=_ycm>}BQcwM2b~te4&yk;)Upw)C<3M0lW(aZ% zY@B!1vUC0E-n`zM&smyfWHY&c3`J+kjzo-AOnqjr)z@#h3R+#{x-+vctLMx#W0xp# z4M^G61Ov`6E*wbq&{GxP(a*qRD)I7`liwQR{V)DE@9@bNg|8ge z3>@bC-uM{hTnf^=qI5pB@!2GFAv?f=HHkijV>89K2!f=jU&tiz0()Ik-`M{liub!8 zCgQL+DPS>wL3abdUgClvd5Ibn?;GzAV@15UKdjwLxtp3>44lY;b`ie_u>bDR bF46foAMf(dsu7Iy#g9@v`~`fm{PCXv{qAjX literal 0 HcmV?d00001 diff --git a/srcs/wolf_rotatenmove.c b/srcs/raycaster/wolf_rotatenmove.c similarity index 94% rename from srcs/wolf_rotatenmove.c rename to srcs/raycaster/wolf_rotatenmove.c index 52d087b..f611ed7 100644 --- a/srcs/wolf_rotatenmove.c +++ b/srcs/raycaster/wolf_rotatenmove.c @@ -6,11 +6,11 @@ /* By: tmaluh +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/11 01:03:30 by tmaluh #+# #+# */ -/* Updated: 2019/02/27 22:43:06 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 22:05:27 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" bool wolf_is_tile(t_map *map, fpoint pos) { diff --git a/srcs/raycaster/wolf_rotatenmove.o b/srcs/raycaster/wolf_rotatenmove.o new file mode 100644 index 0000000000000000000000000000000000000000..b1d534c3b59a485e2211970e110bbbf4a5868b6a GIT binary patch literal 2168 zcmbtU-D?wB6u)V!Mvd*XL{JnQFiI@#w5j43Qc|ML_<@S6wqb=jO($4v63t8&H0_*`MBqtdnY#! z9qX>~`IuNf*2yZGU>V!HqJpDk7-j2NfEA_|ZshqwcAU@l6xGMGGM{goyLO8Cu1da5fmQwo@W3SC zHiuM@68MJe*t?}F0}!>#zHsDgmvaZU z?kl|Oqi}iDvQ;jv0&7`yxz2pPmS<%pn9xR$O|JUI?6wnsi~Pj=aGvOY2?qkJJVTHN zVB@^2mX#e!_2sgrX6l)A_KL0~nQ|-^VP$^M=rae0bVos}gB*8e3}%v9BUMg$j}q5_ z#I8RrIct>az=^JN@iJgs=#N{hT?7Pwi*(h)i~g8mjHFGiAEcRcny!2MX)RGs$3uE;QeW{$5*6HjY5i$hh zD7-fu1rFB?&B@WK?`jhmaE4LgK(d#fs`!r90FSA}%iBPH_+F6rzW8nK;gc^4PdTgw zIL!II@e#_|1k%02biVhC6S|O{5QH^}K1Gfeif +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/14 13:22:34 by tmaluh #+# #+# */ -/* Updated: 2019/02/27 22:32:52 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 22:22:34 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" static int add_choose_current_color(t_env *env) { @@ -44,14 +44,3 @@ void wolf_render_colored(t_env *env, point *p) else env->sdl->win_pixels[p->y * WIN_X + p->x] = current_color; } - -void wolf_fill_floor_if_colored_rc(t_sdl *sdl) -{ - point p; - - p.y = -1; - while (++(p.y) < WIN_Y && (p.x = -1)) - while (++(p.x) < WIN_X) - sdl->win_pixels[p.y * WIN_X + p.x] = - (p.y >= WIN_Y / 2) ? IRGB_FLOOR : IRGB_SKY; -} diff --git a/srcs/rendering/wolf_colored.o b/srcs/rendering/wolf_colored.o new file mode 100644 index 0000000000000000000000000000000000000000..fac54546207ed6f9b60f6d30a80f82e27e6e3545 GIT binary patch literal 1696 zcmbtTK~EDw6n@JVsX(^XaA<-__t2OUVJ+pNh-L>`IweI3mPCU{O1lVw(xhEu5Ds|$9z5<@& z?s``#ljUL@bl19PYqs!4`etdR&7mr8vDClD&gii!q*qqYzw$`>vbXQ=Faztwl zuwqO1k>*}5Hp0Uz74HgnK%3DWfLj~|uIT03TbtbLcrks5UoiJBv5V>#ylV~pg6}C$1o4TB z2*FZgL1rsVR^OYQ8$pSXo|~Pf4m$R6)w5)D%clg#t+FTsEsLAhwWG z6$xKMS3yms=Rh*(%FN_+K9yCD>;GpWqMqHY-FX=?7M6e2)kzQAaf5jwTLg3Vnpf{L z*UT%{$8D}H{Gy55U&|X8O cBLpAKqNn-CI4sWLaMH^rc-LUn{@HE)0|uDMCIA2c literal 0 HcmV?d00001 diff --git a/srcs/wolf_rendering_fog.c b/srcs/rendering/wolf_fog.c similarity index 77% rename from srcs/wolf_rendering_fog.c rename to srcs/rendering/wolf_fog.c index c52ba2a..f7eff03 100644 --- a/srcs/wolf_rendering_fog.c +++ b/srcs/rendering/wolf_fog.c @@ -1,16 +1,16 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* wolf_rendering_fog.c :+: :+: :+: */ +/* wolf_fog.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: tmaluh +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/16 19:10:46 by tmaluh #+# #+# */ -/* Updated: 2019/03/09 11:39:02 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 22:08:02 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" Uint32 wolf_fog_change(t_colors *c) { @@ -22,6 +22,24 @@ Uint32 wolf_fog_change(t_colors *c) return (colors[*c]); } +float wolf_fog_freq(int *freq, t_time *time) +{ + const float freqs[] = {4.2, 4.25, 4.15, 4.17, 4.22, 4.3, 4.1, 4.16}; + + if (time->res > REFRESH_TORCH_FOG_FREQ) + { + time->res = 0; + *freq = ft_rand((sizeof(freqs) / sizeof(*freqs)) - 1); + } + else + { + time->old = time->current; + time->current = SDL_GetTicks(); + time->res += (time->current - time->old) / 1000.0; + } + return (freqs[(*freq)]); +} + Uint32 wolf_fog(float dist_to_obj, Uint32 src_color, t_fog *fog) { float fog_amount; diff --git a/srcs/rendering/wolf_fog.o b/srcs/rendering/wolf_fog.o new file mode 100644 index 0000000000000000000000000000000000000000..2c83956a5f2ca6a7f0314c45daf9772fdde4cbac GIT binary patch literal 2952 zcmbtVUrd`-6u+e%6xjI6vI)uj^F5$}ZhZWy(P`rNkP4jwk}=j5Q7ok$3xA63r%ZhS zh2fgH1d~0uJ?+5E+9x7cN@!wae#R#}Gl3jZ6Pr$@QiQ`(7_a{9>CjHQ zBeacy9pitAbf;X6NOvksWi)ANG}Abu^?E$u)_T5@T!xY5M9p$JVlBeTm%YlLn(=jm4G8|KrVBd|@ektVwuOmx*5qsh+5 z?C+a5(phYDEAGuy zJ~|O)%z3)r8KWELe?@1YMwcv%c?Vek$U-<3{nMPEfJqW3`H2}`NMUjq&VfF%Jf&us zuEZRY=t|c;Av~`Z2NJ~4YfzDG>(6x2x=c5$3v}DHK^I*sbi=i{R)@!#5uBYX-6FPW zKvSb6wL3)OQL`|vl(mYX;W=N;&r5{q2Xn*ys5RLLOdziq#Cidy5^7~69DJHV1E#2OlG3$*a#0Y=c#0ZhH ziIJ$Swr|Nua`#~f7>VZ6YZyk7ubE{`BPqyCm~~Lq`}ZwoxX5^1J)s)=^EsyC`|}YQ zU%mgTogSWLxV{or70)AjKElQ~2q=d+35UGxr6&?-8HU z9dHlzl6HG@cav8+d(qP$+@quuEn)fQfW}kYfs2cBQG*w1@Q*b(o-yZt!EmfQ-T{t( zufdOM@P`b?eerSR{AyMY#EUez{W18g1{XB^mS3cWo8Cvnwgv=lE*(d z=p6#zA;034;DM_QDsE3durRE*uiF=J4|;jt|5u9;086F6c`{%qN3}(QxxSb2e&U(S z@M*=&0>&ALy@LDj`&Y{F=NPVk(K>YdGP)Xr+o(^#hcW-Fe+~FzUWeh+%DZfTSqp+K zvN_lI9%S>s#r)InAaer6-zBb_ALIWm^Vip#*N;3T;P2W2JkuTX#S3gcPqW}N#_bi*g%zm;y(fFdN_x~5gxdWyE literal 0 HcmV?d00001 diff --git a/srcs/wolf_rendering_fps_counter.c b/srcs/rendering/wolf_fps_counter.c similarity index 91% rename from srcs/wolf_rendering_fps_counter.c rename to srcs/rendering/wolf_fps_counter.c index 5096620..90fafef 100644 --- a/srcs/wolf_rendering_fps_counter.c +++ b/srcs/rendering/wolf_fps_counter.c @@ -1,16 +1,16 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* wolf_rendering_fps_counter.c :+: :+: :+: */ +/* wolf_fps_counter.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: tmaluh +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/07 14:42:44 by tmaluh #+# #+# */ -/* Updated: 2019/03/09 11:32:13 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 22:08:04 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" static void add_render_fps(SDL_Surface *text, iarr screen, bool pos) { diff --git a/srcs/rendering/wolf_fps_counter.o b/srcs/rendering/wolf_fps_counter.o new file mode 100644 index 0000000000000000000000000000000000000000..ec99eb41432b729fb0a929914c6382dca07213ac GIT binary patch literal 2584 zcmb_eL2nyX5T4B@#6Y_?#fP9Gx(5qfk*s2;hXf+96DQeJE-FbQmA0wb+G}bWd#m+U zgd7q?Fv4=J7KsDmPjEm;Js@P%nzTKk9JsU`5k>R>LPaG3mYMZ?@$1^YASQZ#Gv9nO z@9n&KPuZAB&-O_YaFO5@Xj>cwIQdvxPk3qqf}lWhDS2W^ul~IlyQ6R3AJ@0~BjnY$ zQjq{D&7IIpLa*Eje(2hacV}MXw#Xt5>)5YU*x?epH4o!PgruxsL|)+QM&X5d&Y9Z}P@gzoL)6AVcr622Bjt#WI9 zuF$wA6LumJiv4l5vc3L-p1nC=pZq9xD|iTkpMNji*0bBmTKMB?_=@g+<1r_0Z~W+f zJK#l5IFaziR=WC=w}H)F$yw0d>w6zw8FXE@xf|L~n{Do#YBYa8+i32x0{p!5kL%(( zlrA|Jr7ufp8)^h;`V z?zN@E>bN$h#nkv{Y+^JXA5)_XW=_=&r-hHi4^sqvJ&Clo0McqmI=F8za1{@J60v7J z4?vk3VM+0{z)L-Fc*k1FXRy;US?f~CF>NgiT6#K8KVvPYZI*JT zT`0XJ(jf0-3XWyaTz2fYtwO2Awk|q_Vqwk9 z*2FzMjf3P#9O9|+-sCv<#XUAaAI@}2f8iw}d70tVF^Yh{F5p1{r&~ore5yOobD2OC z!k@yy@y`fE@#Fic;Te7aXU>0-;j~Zs298e(d~u(r1zgOdVk`;ep|K}g`Q4&poC6K3 z-J%{EsI%`sOU&~k=jfOf822FHeFQK#YXnkCxSWM-HNc&LqJJZ2pu$6qVI=AL^v? z8#zQyl;?2}?tg*4U~$9|#SagolXCvo_!!1gPTtq3dcxQDzfgRAJ|~b(I`xbwUoiqJ z!=8)Vd_IPrZt)Ek&+Ek#aGTGkSo|m_u=ys7AMxP~_SPg<76->f>Vs}z7w#&<9=RKc zJ!J7G#iXe7eRG)J0jfoU18ly=9vt2$)Iapz@OX~XGXAwG#c>AmI?#UwH2m>&zW&}p c2!_}Jt&<^$zby1db&LOw?f-otmQ;WIziQ%WegFUf literal 0 HcmV?d00001 diff --git a/srcs/wolf_rendering_mainmenu.c b/srcs/rendering/wolf_main_menu.c similarity index 90% rename from srcs/wolf_rendering_mainmenu.c rename to srcs/rendering/wolf_main_menu.c index 6dafae8..f06b520 100644 --- a/srcs/wolf_rendering_mainmenu.c +++ b/srcs/rendering/wolf_main_menu.c @@ -1,16 +1,16 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* wolf_rendering_mainmenu.c :+: :+: :+: */ +/* wolf_main_menu.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: tmaluh +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/27 11:01:40 by tmaluh #+# #+# */ -/* Updated: 2019/03/07 16:11:42 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 22:08:06 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" void wolf_rendering_mainmenu(t_env *env) { diff --git a/srcs/rendering/wolf_main_menu.o b/srcs/rendering/wolf_main_menu.o new file mode 100644 index 0000000000000000000000000000000000000000..b073e340360abf815c813cbfb80acf513ceafebc GIT binary patch literal 2384 zcmb_cL2nyH6drq%*lC?O6e^G!Q6pKXjmXw^5Q-6vyo#MnV1q=HG!dn79D75e#&%_| zN!kO6o6^Wy483!K8^54JJ%HWDrMb0I4-vftM5Tltni39Hi(=l}ow2vJ4+!zBo%h~1 z-+MFf&5Tz<@{rYHAzUnEfYdyW5^}G#W(RaLKsreWnV>(s2W|&^rKgjdH1|lF{P9~S zAtCQW>1@bbktU?^F}n8qHq8ayWm#LAk(@V%x=Q;!^40Q))+TEKJJoEZ{VB{rsJ2Xz zxkdBqt9z9S+B;y+fL+@E7#0Y+w@ZIc9YwO7D~{%8Tr~G=&UySQBBWHFENm1n_uLL$ zcoHj>PZgb4zR}@R_nhmGz@i!^wCqv;-Ot)b{12S#??AnXZja{2-P>~B;qex#`8JB5 zC*4*USKJo5R&deNSX^dDs@$g8J808v(NMQgjbt}aN!jOrL0ab*ixsE=l5bJ1zf@kL zd1dRI^oev{nwG-ncX7wH4HeU^vj4Y~8(VtPa-fH} zXKf8TeS`6vtt=3mv6yLm6YL|V{^(}_*Z_Q8CSKKCN-oZYwR0O~h0Z9Wk0#`_0bVM2sfmP(82{NmUWy+4QE>Nb~}*Fp)AJo=ZjI z*o6Nv5BQo&nUH6l`8Mhht!1EddTN9bkV={G9Rp@tyK` zj$ +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/13 22:33:18 by tmaluh #+# #+# */ -/* Updated: 2019/03/07 14:36:06 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 22:08:09 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" static void add_rendering_square(t_env *env, int size, fpoint pos, int color) { diff --git a/srcs/rendering/wolf_minimap.o b/srcs/rendering/wolf_minimap.o new file mode 100644 index 0000000000000000000000000000000000000000..aa1a5bea22575d17896a3124fde0c222cabe6a03 GIT binary patch literal 3856 zcmb_dU2GHC6~6vWSVG33tcrHq#;y88BJk#~TL!ednK09gQ)f3o-2h$J8;rwxA;~sz z_)~2{y<~Sf+%^w9gf~lliBz>p+m}>|w06kgfqF#) z54Oca)g#S4_k8!9`}du5=e*$izSUwOhFHkUq+}T=Ayb=6{Z6ghN$SZK;-5PP))i6u z2iNbF^2%EOGWR1T*Pl{W`ak0Q+z+_}2gSs_K2bjJl3#Nv8_nI@{`FY8DhcmdQpzXI zOUi2VN6JQne+omD+zSg}1THg^uQ&-&?)P6;9yDK9He6rDH8a9IDxVaa1;~MY^qylH zLAwH%p&6f2ayxD>u6nQd=ar2^nh#o6m5rSXxF=ZR&ytV?GbIVr%;ZBjZA3_}*>HN5 zkcszkRY|xcPK%N-5fP?wND^i~-NiI^5>Xarl?R7}IZ-|Xr)lU_^-aRraxbXNC-PD*y=D{BD-K^M z14l^#z|mknv6A!Igb8nY#VQF|OD^$mC)1sig-cRE<>_$?4O)2`wDGjx&ePW%JRNbu z{U&0n^OVOYkEeQQht+F9Le0hG^2zJ*#$Tyra5oF82Av5&?-;n`R=8lxS%#n7XS z{SOlp6NG2)#!qz74tEJ+{}w+?JGPeq9*}PEc>=l>?*PbU_PQSbIzY8%XgyvJ(2f%1 zK-#<)Qb~r8y}}H0aSvS5`b%Hr^GqX;d4u#|KCCtew?U@(=YYQtPccA`e}4V9pX+`; zIX3H+ySFQM`ag!4TKM|xvhW`0z-7qb51UtjFvu=fY;JM&@D)to@T_uf=Mut*0FPii zIFvyH(-6|$FwX5vu?r0S0c=&kP8W0{DcpHv8CxC;MfJ)xeA8`Fep}>dXP$3b@`i5s zLN~k?NYkv8mhR|0OM&^s-*Z6qj5mGP+C}YON<4P*O!pEL%rr-PoIsXV5OAm&DUcGS zSW=)zEF3*z73fi$K;N{ov}}5G8s6?)mWH=#fu2X-iaTi_UDR#z^=r*Am|$=WG&tTNV5sK zAO9L4ZAFA*bMZQA-%|uGEEG6SYaIJk=HjbbA;gk!z-cJ4Pj^qjec$rJ+XH$*lo>I! zEXvz%iPN(E=ND7sUX5D)DOp@S`zNs$+rBy|*k!$NRdeA&SvUBzrPB3hf%#r_94fT% z{tV3)c;Ani0677fpc)8ff?CLg{pL(47)xxLp)K%waO^FHeg~hWLMB|tQ*zQ@3Yj1@ zec%m!<_o3a0TKo29xttNG=Np@wcO{@_iR|$-t@-~taytG)eRY-8q9N)b4tRz6vzs6 zzeS*jtsFfJ#QzkCKkI-x2fk|xe0R7{J!|Is+W13$?@)p5O~}E!=l%#8$}Y#lKvP2z z;n>@;gTVjhA_4$-lx&`T5N`#fwdldIe~mRl3{ym8VV+%zZMLXIi(0Y*qjKh{MHK5gW`@O>9JaWh#bj1UFtOHd0#&0%9YZ zDsY#EI4UAEqN}X?obF$~(?$)i+|M_4+^y+Sqmcvi*Oefx=h0dxCRBykNKFOS4#-y1 zJ!@P7)&pPRY-J&*M@|j~ha$s~p@FwOA>#4v>%gW3n>K9PvH31GFJkjOqD72`hmVCv zBg4my*a93G3q~U+!|=A~%UD6|Mz-|A-=_gXLRBauQ%b3bi91s-{`4_{_y87&Y#q&M%;W}H`pkM<5v{V z*x8}zz)|8Ei;fobn?`Rmd~(1O4WEe;&#{5%0P!3h8zY|45i~rZu_zE!GTMQp(8$nG zco^J=N1|a5yal_)q6485;D$4W-wY0p4h#V){|9ly9C-ERncWE(iji*xt1{=FhXK6P zPQyXhIlMHGTAf$q6uU;{ZpT58Z^MUp`HS(-@(rOgh(2AxfEM35ob!K;Z-rQ#6LZll z_x1J5YfMk0;!E~21XYVSO8E`*q|kTkwxNAsV|( o8^+pis1lEJmU9mfN$UC6kA_Lg&yRCfi{FkL28k9_u`Q4PFU>jzZ~y=R literal 0 HcmV?d00001 diff --git a/srcs/rendering/wolf_rendering.c b/srcs/rendering/wolf_rendering.c new file mode 100644 index 0000000..41e9560 --- /dev/null +++ b/srcs/rendering/wolf_rendering.c @@ -0,0 +1,42 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* wolf_rendering.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaluh +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/02/06 22:03:53 by tmaluh #+# #+# */ +/* Updated: 2019/03/16 22:17:48 by tmaluh ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "wolf3d.h" + +static void add_fps(t_fps *fps) +{ + fps->time.old = fps->time.current; + fps->time.current = SDL_GetTicks(); + fps->time.res = (fps->time.current - fps->time.old) / 1000.0; + fps->move = fps->time.res * MOVE_INC; + fps->rot = fps->time.res * ROT_INC; +} + +void wolf_rendering(t_env *env) +{ + SDL_FillRect(env->sdl->win_surface, NULL, IRGB_BLACK); + wolf_raycaster(env); + if (env->isr->is_render_fog) + { + env->fog.fog_dist = wolf_fog_freq(&env->fog.freq, &env->torch->time); + if (!env->isr->is_render_weapon) + wolf_rendering_torch(env); + } + if (env->isr->is_render_weapon) + wolf_rendering_weapons(env); + if (env->isr->is_render_minimap) + wolf_rendering_minimap(env); + add_fps(&(env->fps)); + if (env->isr->is_render_fps) + wolf_rendering_fps_counter(env); + SDL_UpdateWindowSurface(env->sdl->win); +} diff --git a/srcs/rendering/wolf_rendering.o b/srcs/rendering/wolf_rendering.o new file mode 100644 index 0000000000000000000000000000000000000000..9bf000fc84d6a541bdfce490267c275a512dff65 GIT binary patch literal 2536 zcmbuA&uR3A_Ug{=8lKTz&H^k}KI#IfQ~aif(ukQ-bOaw4VgyE|jA*WOF}tl4?*^M1_i z%|1Z_VeKc@+MQHB+wM%{XT0EzR{Qu_>)!(eY1meebw+oFg$B%g)oc&#x_A|B~p}3pAV0pG%*d z{rbkKbXGa5WYW`9nJ=cMr_ZKO&Kae&s<}R&oId4e6CDvsY;BHWja2N|!I9)9Z^#Me z9}C}pY|vL@sYmhnlLKSPE2HrOcZE^m9@-&g551Ms?2AbZ-EpD>|At9|D-Dwbc^fp~ zN>JeN1iT4K2CSZ%p#42VXotOiu>MhxN7Wx0sDm{;9C%-EEt#F>mKumA%0}?n2)+=( zYY}`cg8vx7e~I9~M{ruTYUQGBm?gumn)ei)ltO+Ak4(r#^A`)n%hg(K&d^=q(;n)Y z;~KW-n>E~ps(#<`j2p`(%{6XT&62e`zhaj)-SBhD*1clcHXekk7gr5!*)p9lu2;=! zU0V+0^0HIZtrZhv_rF2WwQRl8-7B2LL)>=w6NG%kIs|--o8*@OS-{7+Np1qN#JS`~z;1zXD_d$2Twe4j>EohukFp8IT1W z=T!1HfGlC2_NYI9yhB$M=V9H|mPm12+wUtE2qwko>C1pXx^V%3YB^8R7zaW5R`dQL+;kP9`O|1XZ*Z#)11 literal 0 HcmV?d00001 diff --git a/srcs/rendering/wolf_rendering_colored.o b/srcs/rendering/wolf_rendering_colored.o new file mode 100644 index 0000000000000000000000000000000000000000..5c9abaebfea5cd19f918bf300b9edb4dfef1bf6c GIT binary patch literal 1848 zcmbtUO>7fa5FUGtV?tUl6+#iIls&9a5Xm+PNc;-<2}9lzm;8_*T7DA8S(AvwM$X0r zq&6W&s#Z^K!>#S9M@}5L6(M9pEWs`O95_`7wGz;Z9~D825X(G!H!Pdw0%JYTyl=jl zdHe0Nr}xD6`h7mI%?G>S{mw=Kwg%qEkxCeWI#>mm6E$v-aM!g`IaQc{@WY`3&Cd=# zGtFeU@mys}>FqSoTtTAS7AF5Ui%YdH@Q{;NDC?@HtV4`4H5yCw$dpAw4y1$rT0is%%^(UanmMxqCa*g96>8LIc5;8bOLOy~!{mE%gd8Quj;i^g#p`(5vh!p=Cr#7j z=eZMZ1Zw;hHJ(1?T9MJU{4n3LfJ}sg0hLio6Ss}Pd6mWF`bVQ!1s%J0Z3N;LjcsHu`Fj*NIKYDy!Pt@s2Wn+@UW1d(#Tl6L8 zhMO_Ndwyzt8`kokt+BT^hPKVXcZxru5?#hVT#9t<#Zf6*M`%H19DyGmRY55T8q@(}csbn6LSKduX@Y z7TUqYwy8f&bhld0NOx;=RWxO6)zf61jJ#X-Jr;JmRgcLa^#jy4cdR)iGj%s@H>AWH z&3$j;l2)LkjD<8+-m2r=P=qG!k%iTiIYPJWOLV*UHGRAL2rN^srK!Fa9erSr(^PL{ z;kT_@nJPAWV~|F76DZw!RsK*CraJYZX!MaWx{h^5uV2swDrxGiD9jwnlv%fEnED9J z`B}g+NmuR5^q&1b{n`F76pKDE8p08pzP%{(`|kjjk9O^A52777gKa^bdV;5}Xt|#mRZzNW;t+>;rvld`hk` z(}_hS(Y3yNhVYWy94HV|uR}+6%sz2_wf@+(L&OLoqod4^q zGns6YO{jOj-in{??~-jo5>2G7rR7Cabz5gojp>wN5gJU5^$n-%8yhXA>T}Y7$>s`X z@Y=>2j6Z?{i01usM03TcId-r}KMM!m1lW@}0n&*>bD43bpyg1ZzXTYsmY#*N8ekFU zK)%I+b6);LYn{>+ypGhi(gFu4TxSG1AP4eYsLa&!Qnqe?PMh~e5~77)KG8y^ ze4-`tQOlXqlENGe0WDEndIdvEiWOeg)RK~{!>lJ{oxAQahMO3VtBjvp&$BWiw;r>M z7ZUmY^CY0_7_RQbNf|H7;UlcggPsQbu%iF+*#NAa;a#9n>EZ zN?G6Im);?spwsX24v=nZhqFxzo*#B!3hYy`3gE%r+=UB_GK?Sy;-&C#`~w6* z5I+bH$3I071pAM7f#csH2!i-gcsTwDK@iM?FG-Hqv%Vl+rogTLf-fj=gMuGd;J6Pw zzX@y<%#RNjD>FFG_jyc(^L-;i;JwkHs~>dGpV33y@=GHwAt+r55@EmzpEj+c!EYc_G&83rYgK=xPH&m-`a1Fs(G?^!Qz)60iIJY7->D zR;h2G2pGyyWs|^HpJ}|;xVIuaN-?s82?pX>!FBk(tz`If3|GI|dQ|H&y5eSLkQ1OV z=YNfFfLN^SFg!|mo2@S@L9k8C=Ndmu`QpD|@%X=$g1tiFx&!Qd@!zm`b-#K4xOTAk zdQ7U22#c>(U})l6C|vg|Yj*X`s@HiK4YJ-%jhUX{r}5hE?>NjeY!qW J#Gw4+%tICr+{{E-Fcbpe49ldreJaZ?)cv zkVAtAMzvh4MdHMXf4~7Daj1|{Ytr_ZLshBeh$w&Ca#rl1wQ%9wcZ|RqQm#^kfK!&+}0|aS|xcqNDqafOYq&gL+*oqt-5en ztIqp5&1KA2uB2+iKe{Pu$*^*;HW_J#q7`gg)fqTcO@)XvAlKm1ub)RzBYL-dM&UI0$<(mUDq;OiE8MxO6Y>-eD5+RuCM>( z{4n4~PT1kl`ev%~v%7$e9iP3RIhR`>ULJHDr?C^N}LqtS`cSZqv*EEriu)9ofc65CG^^z|gZwFU6427P;X4f-$Q#!n*l zjOzg?Q6o&r!CK#xJak@4$jYbvNjb7HFe@LImVI&rk%T;ij49dAVtP%Ksvqv*o_31V zwc`LJ{B;uvGj$UQ+~(?VNgy<@;FVxdu-d8wkGBm$li&%#YO2q=Q)m9?T)bEQ&T2)F zzelKpTYJQ&aRl95k3L@Ofxp=UFZRG!d*JYaxspp;Mlowx`Qm$N?74KtJX5p{OU;0q znvT(9>|bb*v(tIo)M+l+*866@*kqfh?R+7>W~6gw(N3?JdX`bL#tJMZQ|VdDFc!~P zIXz>*)3`p8Cvk|o%X^gL+!u4%0DU;qZau)mMDjAjsdHoje?!0n0#2ukg!oi{p65J) zD1<+SgX3Qih~mX}v&)q5Jvcc3MTXNl=^HpcDe%R09usgekAkrzl!r!3)Y69qTR#CR z*1kEPX=6Bb8|grAe9)p=I-qJwH5=L9x?Ng#^C>beVc zQu)aoA}7l8I0*ONL|?Nw;)vpfhtWwn|7&~{V<{)^YgAp~@AuwR{QZ26Bb#*U8Bs1V z0xLty#ce(xLQl8&I*aG^;t9CT=c6osloQx|mBo*Ea0a{YBv%Fp$3*HM-M}tfy5ETU z$k{;qK8t?~by4`bIY##Y)gsOTHrLsO!~2B#hwd95&+%^WrWA+Sf_NS1-vJG8JngTy ecMyUhwn68}5X4&+x}&6mScoOn8~+cK2yGPr literal 0 HcmV?d00001 diff --git a/srcs/rendering/wolf_rendering_mainmenu.o b/srcs/rendering/wolf_rendering_mainmenu.o new file mode 100644 index 0000000000000000000000000000000000000000..c2da94c2414ccc92e13bb7795090eed95efe6ec6 GIT binary patch literal 2392 zcmb_c(NCLI6u;#ITDC%Qy2NC}eGk=aL_XSL3^k7Q3oTsq!^8oyI7eIB4{0KJA9aj*e|D_D4)r3sJ)WC%ZfiNa%bl;~+bDdT zaJIm>;De2bcc#nKYZ z>09U357Z0lj2gVKi#x7wsE}&YyuT%#u)I>M=OEEzDITo!v4&?su%bJ!ehaGn;3zHU>6smg5aTUuP4RJW-f!A75ONi|Q#sV+J#M9b z8Z&2XYWWs5&)Y_G+Ho=-*&H$LCemw}(l^!e54%qeps?yD94CF`@IHP40@ep2Cwwr% z_vZU|&bw{uy(jj=WhzQUBHJJj(vl7UgOJPqhKEVYNDhr$BghSQBp>-s^__t)EC2wp)VUm zfl9(enN6jLl1!kZL{i3}=)6XhNFoNU0(LxM=n6cazLXJ;Tm%*-(&vM7$#4vM@PCL5 zNwCz$o8tovg`acPJABr7AF)S1PGI^jyKu|Q$DZRl{Jy=&@K+e#_`+tMYAz!)Zr!W? zFJR998t-N~kBLda4zcz5e)%-_xgL5({5*@tJ0%K#hg`o6lh_xRNCMkn@qG!AG_ddjK`dfXAcm$#2Oq#N07!|JqL5m;zMlzDIpfk#`u2#IqrIj literal 0 HcmV?d00001 diff --git a/srcs/rendering/wolf_rendering_minimap.o b/srcs/rendering/wolf_rendering_minimap.o new file mode 100644 index 0000000000000000000000000000000000000000..bdec25d7a4b285011d66c11e10485800918a5207 GIT binary patch literal 3872 zcmbVOU2qfE6~6kl3C1f^GG&ssRy+N%J)ronsTYRCYqa%>%87xf1{zfnLM95>PHmaL zsf4M5lkIX_Kk#7QG}9N)blP#-7k9=pk&G8DR2ht!PHFOD+;qlHm=1v%D%>XOIjdc1 zkyIXXXZD_ZzI)ES=icv}E1l=PKQx<6L~kbY5-DjqN=R~ZY22+2yGcFSLVR<_K)WJ{ z|KtWdVqRVwSmu5#=LS;p%D_jQk9&ldW+4(U~gywTFT?ca~Zt0MoNDJ6f> zvLvszd?ar)_@>ZR&b_bzivKb*`Ldl5`ToFl`9aHddBgE_+%v<^qwtEcS%7RfM(a7I z5v0R^8M^T)IoEW1an*ChH!p7-Qf*MXDsSvqz?fi*zleMi)Rf3iGm{VDv=KhJX2InZ zLMGnFT}A$qFfEAuM1-HlDUqM~bSKl;O$3Rbl^-19=LG2toTi~q(Sn4tI9h*HZ3jQeLS2(r>vYiy@uhx1FEAhJ3fP>CFyZIUB;x4$P^*vwY^Gu@~^9Jd`d{}J>Y=cbk%>jQOo??I=-~9UTKG*EL zQf$^E^=_B%415eewea;@CH_5-{>zZTAGWLjVUS&p*xcgk;VYQF;aU0IjwOT<0Ukkl za43TcrXi%guAJMEViy?tBM6npK@SWfDU3X_jJ+ERMe#^A?&jNq^tQm!?!3Es$rHNa z4c+jVAWgGkTD+t2Ec)jY|HuK=GoJKaa}TwCCGptqW_p*PV5T{`&kkg%1p$Ye5&bDa zj3s$`#Kh4fW}Y6k@boP!Pe*Oy%|RE__zu!a_EBqnB9^u9qjg=UzB)Js90S)Wr@$)X z52e0&wl5Vu4O?v$rZd*bOeO;dxf%;|uz3;T*gNrq)cRZz;MtXU4>*0xfULz^0ckNH z_v7CHq`io6Y%X3$t-FfAg@ppgX_aH2!d!esEreJS4mb@Z_G#A?-1jXHygeWn1c?zs z%YwA+mM|?@e{nH2?op}Lo|47Yvws$9vG1>gf?d`MS1}eYly!qITPj^&7MSl-#-TzB z@6XU|f%pBG36K+z35t$jCMbnW*l)~)g0jS>8QKc32glxG==bnhDrCZSJS8XowU7yX z^9P>LXWmd69w31i@43Y_j{32xJ*N9y`kn;~+mrs-h81s8pt>Og6rFjFa(0oQ7yVhD z?lyN=fHPOf$vV|sb`IRUmJhu-aS-cdlPc-?zulfhO*1?FwoRc zL^$?#>>%*JxrhJ&7A4)yK8Uvg(pI$K*uTXZ!G|d#5If(>~I>ckeD|Q|~LjW@neH!`0?&Z*5~++uJ*wO$WlqoI)^Kz<0JcV|3fF zgJwE+fSArWOwZTV)J{Pz>;UX*>I@;jho45m)jKB5o-OvCUt3=Pm6h5q*?(D+sI{E1 zKLZ||;n!Mo(gZ9;tmHHGCZ3!j#8UN_A91+&D$N2bRcjWazA_b47J`9SHVdh(1Oc&- zO%?caDq^efXw>j>hi_|md8F!PSBb}^+S`e%i{&*u99| z5B`sD0gj9XqLGtfeanb8FoVQfhhkCN&kgu920UrNG1+wc-I!p|@V>Xgr{e()$Muc& zRs^7-z`ND$|DdHD;#&-OMk5mOdISDQ!^`*mt(J;t5B~&;>nF8TMBI2@C+OG^$FJC2 zV`qn=!K1`A79B0fH}%nI_+-!(4WEe;*RfzUNL)w9#)xZl1Ql0kEDAK0ln$UOG%_?4 z9tQK_k!aWjZ^O>9XfSjF%y6afn}Na6;82m8VhCSm-~=bU`tr)_1`L~?e+8{F2cL%t zywh&oK$EqY4A5#dUXfEA>Xp15C!u{8KE%skkbjj2gvQXc;AATQyu4Z)i`$P94xB+G5kC&oEXe zw2oFjE$WQ!r`x^-1H_)lWzeTIe?d3Yq|ToXV-{B9-=Y1&=scr}b)@_2c(uK8?K|53 riWV@|enS<1T(g{efJhQ2palz}*lWubbzHNWf0Gt}v}jovl>7e=<9Z4* literal 0 HcmV?d00001 diff --git a/srcs/rendering/wolf_rendering_textured.o b/srcs/rendering/wolf_rendering_textured.o new file mode 100644 index 0000000000000000000000000000000000000000..60033f9ee770e517e1a3af96970c997b97f4e2a4 GIT binary patch literal 3296 zcmbtW?N3uz7(b;|JHX!J-pC~3ez-2BLaE3ST~OQF$`zYsgR)|WGAu>dcrk64IcEYB zb>7_7mv8bP?4zHTeQ1?4aZ3zhw#2w)*en@{Q$XjisNM72oorlE`eI9;rD zRe<xOX-zR1PCgb-6WPx^eW>o%Lj0>8Jv>yO028Pp;wUdaff89YspM+XI}ctBOyu z%Q2rM%F07o`CU7kaT@K(YD+oT_Dc1b30S!$qj35+I0&8gPtyC=W{c{Q=!E|-I%%Dz z_uKAhVSt5p2@X}(2kImDp){(?cP1{JE5#5zWY=SWgbPD3)1^#`oZmlz-E50c=>~AI zw#6r$dI3mpd|Hp^cvU^{zTRVy)n-|~tdyQ|D^puN>@DJmsUDJ!XU&U1*8-SsALg+y{gtiDVRK8^W`9ddBesWx2ksMQxC7~`!+ zU;Q~WG(?6^tRupi+b`4UNp2l2| z^v$X{?CF_HFVbnDGP{2>vxoXz6~2B0%ZHttvO+(%J=2=60<%h&tng$C3zeti{-<=Q z?GO4>;0Y*2B_s5L@&s&MclogF*F6Nqio*z%4&sePymZlW)vEv>u85LL+O91t)&>Z_^NS9)`1O&J82&tN`TS;zhCB2iJuw({XD+n`jIL&hWV6j=m#$K$Q zP@62m*^+cR%|eZ9(fnwgXCX(mMn5STXUa1swEoqyvYZ1N_oqR9p5+E_KO{j*$+f`q zOx|YhJWr>!><_y%LFVvw;&5cz1Avmhi$uUn^Z*|Qnnol)a;$$ofXpG5zzRVv`*pr%41AP<5G%O(jKNu0}m2%;*{dToVJC&xD(&qc8X+ zCqxf_g@zt16&iZ7t`H1X)~|sZ*T8drM3}~AO|G^tYWQmV+K&MEH8VaJR;FLh0VZo1 zUg$)6vLR2Kka|Ei<>XDPC1CsE$@hum;2Jpje6X*(BODs&3Wa+Ij&?*t$D^NxLtVBY zv3d8}ajL_q9;bJ3+MY{U)-MQl^o073W!`iT9>rsjK5ZrheiaC28E$|!eqICLf{gkOqGKxFgeaz-^l8UHN_>rC;T40&2Ux*#wO$r%l|UK7R=l-Tn#I<`Cs|lfQvRa z!IL|FW&ZPz!S`J522vsZ6jKm$jl!D8&*cHex992cPonnkPtH3YKbJnn&r#8qHLE{) z8qRrKzZVvWt>|Ug+Zq2jS7ef(o5NkOz)&3=U~+;f@;YPv@w>tK953V>O?=DzUttHv myDt>rqs{!<14P0iEf53PV;zbh^8-lKH+F4k)>qTEPeeZqqy*D%8%;v-Wks5|U zx-qB=9cMa<&>njn2g_j)*-lvl-1w&KTA%9$5Gv}=r}Y0mZMz*yZbtZCq#xL7RlO2`haTX1|4+SWm59v1=! zSZ!c!&aG~jI_zR^bIdMQ2YI}y23D4r`jE27%k}THN1yZgJV~$`=9d?0k#n^RRx$3_ zxZQwhyX%8MzBeY`f9-4zqBkKs>eK^aN|HIK(_0 zLd=4TX|mh+4Y<$?fS;vvW8{Ln9j^779*6rWD>^)nIkthRbGSu^tJ}ec>nYK~kx~wQ zBSKdhYx!~zV&P|HEOfFm7M-wyp^NP=cx@Ga9+1<9{glrP7(7Mfs$v5$pP5NUvr;-C zWv9{;QCV7$=dw~FIw{S}Mw9XBXgZTkNkZI6{F7CgNoFQU`%CmAA}2fv;}CA2mCB39NQ~HrJ!{q&wp8s0!gIdzF9fr~L_1laf#QOTW?=)aW>RX*)1TDBXDMsFn z(ROJ)Hi8iA`swg>2(0v)xjXO=6Z6kX6*q&JOu|x WVlcBT4KQa_zed5khFTJu>wg1K+UGa` literal 0 HcmV?d00001 diff --git a/srcs/rendering/wolf_rendering_weapons.o b/srcs/rendering/wolf_rendering_weapons.o new file mode 100644 index 0000000000000000000000000000000000000000..10d32b2d201a5adca129f1e5f9355b358d54cd7d GIT binary patch literal 1248 zcmbtS%}&BV5S~(0{5hcUV8lZ`35jf=#6&%q8iE*OJPtn{Vfv+1cq+nl+=?;yvTs4kNy7mQc4T%4m-*&?b4Uu(p(Y#)ic2$TQ*p zb9Bcne14_n=&2I`=%5Ut2z5M3GaVMvXv|*xgU|lrw~^UU?i0W5*c!gmwp55c-iHNEGr(2&`v^Hn2_*0PA{=!(HTDFXRkY zR}MnEdk@U#L!0qIyYJf$mo4Y=1ys|_$rrOk)%ZO`oEKiYT?CYq+|a2^Ncd#EJv`6N zq2EU>)vVx8HQB$cl89x0=?@f6O?A~k!BQuw3k1Z?>>A^dNJ!p`W>u|$0ezL0N+Nz0 zjkW|&I@*!cOFpePNnYp=?IUuqjGnYfJ@Luikz^wJS1C|T&@r=)C{6z^60hUT2qg92 DJa +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/13 15:41:02 by tmaluh #+# #+# */ -/* Updated: 2019/03/15 11:02:14 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 21:25:24 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" static void add_render_floor_init_fpos(t_env *env, t_texhelper *tx, t_floorhelper *h) diff --git a/srcs/rendering/wolf_textured.o b/srcs/rendering/wolf_textured.o new file mode 100644 index 0000000000000000000000000000000000000000..831a89bd835b89f5452ab882c9c33d04e1b2ab54 GIT binary patch literal 3288 zcmbtW|4&m_6u+faJHWo;Hb*82?}z77D%6TB(FL`wtvs<=HYh7}sKHVO8;EJU%sCU7 zsPpBme)(5rB<>H~E$%>zto+?9D@*dw1DC7@%Vo8} zDu<(ztP(lgXp>db+~BE$L^WMV$QgKOQ%{t~dsUC?pNWy_%7oWYw0llSOcfELcqNIZ ztsk3U^VHM1;El1=`@D|CxL61%ycp| zL+67x=t8K`G?uzGJWf-gyYz7gkhYsp<{Rv3@mT8K@Q8AAv&lJn2^Julm&L%aDxu)}t@~ z92giNgQwOJ;oR+)napy9vgN5?T^_GeomZcWQ=lvljk!KN>~41-b|1OcB~+fpT9C}m zsyUqLnJX_c8KE-EzoGNcpHbnf&DcJi+_W9$x%HVgd=*$#x@3o+-dN~79S=UGORay< zpF&SSC@z^{7L+Go>$)d^ZNKg#NLBi5%beU+o)dweYiqa&<;rD+GzH)5PdRA zU@QSNw!m;4l%ZUT=?W-#l}D(m$$FL4wiePe$rYBYU~7fKOcJ75&L1o`i8$Dc+b7gU zn{d7)lgY4DlUg=E+UHryac$5~OXit!-Gny3T2+>7K$F1?h|jay;O&PZXeGH8dal=P z=Fam>MyvjyMttrwe z${leXuc@s`K-UU>u5Z3GX7~a(&-2jhkw5lw_4olaC;lK zow{H&a=bGVU6wBh9_^0wp3t9k^?!uUVfE^Sz}J9abz$XYfB9|{hL0Cvi;m2_y2j7^3ce9bpx1VG<#)GrK?L1fm?`0#JZ$|`OT!^y} zG@dwOpZCQ(jscBFb=u8O(MWHH16xEKogMKG;y4zI5l6Hi8Amu4hc0EAUBnUY@9T>k z2kGPe@rVOn88xwZNB9$vLPL@6qg~OCzKHJj|L!6fz|!a602g4m_+0AT>eVp6P literal 0 HcmV?d00001 diff --git a/srcs/wolf_rendering_textured_help_fck_norme.c b/srcs/rendering/wolf_textured_help_fck_norme.c similarity index 94% rename from srcs/wolf_rendering_textured_help_fck_norme.c rename to srcs/rendering/wolf_textured_help_fck_norme.c index 43a396d..b6fab68 100644 --- a/srcs/wolf_rendering_textured_help_fck_norme.c +++ b/srcs/rendering/wolf_textured_help_fck_norme.c @@ -6,11 +6,11 @@ /* By: tmaluh +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/18 11:59:37 by tmaluh #+# #+# */ -/* Updated: 2019/03/14 17:58:35 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 21:26:30 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" void wolf_render_textured_help(t_env *env, point *p, t_texhelper *h) { diff --git a/srcs/rendering/wolf_textured_help_fck_norme.o b/srcs/rendering/wolf_textured_help_fck_norme.o new file mode 100644 index 0000000000000000000000000000000000000000..514dd8e229afd4bfe4f01d031542e72503e5b8a0 GIT binary patch literal 1760 zcmbtTUr*Ce6u+g#RhZjQ9+qH29~J|NR5oIwILXS`xEN6Wj2NS28C&NFY%^O4C<#Lp zV^fyki@^s!17Cq@h>1_AUx4@`#1~CWTnJjv-P%#Q`l6?~Ip_S&pL_4`o)$vG;RcFA zx=^SO9eX;8&>nqk2P$R&*-9QL(cXA zgmw;HVgF9~QYhkFEkjV4VLbcL6DyNQ85tGm0S|+faf~-*`>LQY9(B9cYzy+0<>BJf zLHlo2mEV*;+e&+9Qx0D2d+! zf0UUQ2W7Y_8Vm+|xsJh`lbzfZzK8d6zHaZ;ZlAA*>lhak9F9pUXfAW-ZY|kx~YI zCq&l?Z8)yYD3E*X`?MQJ`K zCZZ{E?m;vepN(d+xwOc~Q6-!cGYK(wGOHR%X75)!UebY%$0O2B_Cun+98wt1O6RyZUtmf +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/03/16 22:08:27 by tmaluh #+# #+# */ +/* Updated: 2019/03/16 22:08:51 by tmaluh ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "wolf3d.h" + +void wolf_rendering_torch(t_env *env) +{ + static int old_torch_frame; + static int torch_frame; + const fpoint torch_shift = {TORCH_SHIFT_Y, TORCH_SHIFT_X}; + point p; + point tp; + + if (old_torch_frame != FOG.freq) + { + torch_frame = ft_rand(MAX_TORCH - 1); + old_torch_frame = FOG.freq; + } + tp.y = -1; + p.y = torch_shift.y; + while (++(p.y) < WIN_Y && ++(tp.y) < env->torch->tex[torch_frame].surf->h + && (tp.x = -1) + && (p.x = torch_shift.x)) + while (++(p.x) < WIN_X + && ++(tp.x) < env->torch->tex[torch_frame].surf->w) + if (!(ft_is_one_of_n(env->torch->tex[torch_frame].pixels[ + tp.y * env->torch->tex[torch_frame].surf->w + tp.x], + 2, (long)0xff000000, (long)0x00))) + env->sdl->win_pixels[p.y * WIN_X + p.x] = + env->torch->tex[torch_frame].pixels[tp.y * env->torch->tex[ + torch_frame].surf->w + tp.x]; +} + diff --git a/srcs/rendering/wolf_torch.o b/srcs/rendering/wolf_torch.o new file mode 100644 index 0000000000000000000000000000000000000000..bee2f3210ad90385cae4d7fd04c4f39c2f2fa7a0 GIT binary patch literal 2352 zcmbVML2nyH6n^V<8dIFzZ3)6sk-7&9r6pO}j%X7K#k+Cv8bve&fW$86AsS8zQ<62oq>Hj>6%Fxf-tCAXD7Sm{FQB~FJ>BTbzXg8{&{`v zw}@VF8M>V<>tFm3)Ok(PZRwLgG5Mp~u=B^suWU^k*yaJ8y^}554R-ckqWXMmGQD6W zZWGtpJ(7xsah!>Uw#m{BH%PV93(l^DQ=X4D1~{vuzc{<2Ew#DCrIzoK{EfwEDE__5 z-MRW!G;|l&Zy={x4u~87U^4Oe6_S&dn>kP}oLLwao8RHIjgx2=C< zKk@G80gR8gKE<)^Ztq&_wVOT4$=DA~HN&I2ZR&WCx}6N!tCC*W5^wD_c2nH1df{6; zc%uK$?z>4{6sxYDnvL-~3p$Q?H zqn{$FgYbL1*F4{|qXBsQ^%5R4`9(m0L!8YpEmNGuGo1K5xQ)uDI+};Uj@@nWaPKZp zxdHw19O|aK_8AR z)K-e#Y!~_%C^J(rk7*j!qG2vqFM3f>vT|m=S|ob8o~u=jT&yp&voI4(PsE1ijy2eUHI!1XL+a#*L^t4LmoI0fBXZa!Fu55C{ETTJ;L&w?-MU$ z3=xu_d>v8hZ&s}Q1yJgi>FF}FOk*XlSjJ@wlw#h>gL0u>2gR%rM=8{;2~Y~PO2w#R zK(%HW3clL0x|J`yicy4Xl)YQ(EcX8m8L4Dz{?1DxMuhd7=iS?L$8dt2RgwizeT82B z4)w|1l6BaNh*10yiu+&g(1F9G!8CT?0~kez +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/13 15:20:40 by tmaluh #+# #+# */ -/* Updated: 2019/03/14 19:21:43 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 21:46:49 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" -void wolf_rendering_waepons(t_env *env) +void wolf_rendering_weapons(t_env *env) { if (env) { diff --git a/srcs/rendering/wolf_weapons.o b/srcs/rendering/wolf_weapons.o new file mode 100644 index 0000000000000000000000000000000000000000..4656234cfc5920c64f14d956458a0cd1e43b10f7 GIT binary patch literal 1232 zcmbtS%}&BV5S~(0{5hcUV1kEw5)#=!iHUkJH3Tuncp!Qv1r{;Vmb6VkFTR40z+-s# zC43E^KxgP~S!(sdBrxB6JKxOgPG1{0ml;h1X&RivJd!LxJ~PMG3|g=W8}I?mdi~5O zHgE4s#tEyjs$o{Drxnwz8O0Xw8CP}~@ny4wx?NF5duf3-$!mqJwcHyvBz|9>3ICs? z8ME;9otC4g-T*)c@Pl#%#Jco{I+9n*l&-yJ@VXubzv6z z-0gAy(S48y0EVbYlP^rqf@deRJHUd_kNiNQkWWHjJv+34b%Fp`*K-{1BIkM`XSk|z z5Zc`*U_Kw(j1Ss<-*&j@w45uTobH%>Axo5v?=NC{AJq;ppq%7JF4QCiC+i*JS#Ama z5o)Ps1%Il^{$-U!Ec;7;tZ-_os|E^|I!Rq4AZ}sT7>`6kaxS{7Y7GqNE3{M+@l-V0 z6Fli?M^Z2OwB96{(jVGq5le;6yMD(Zqs3z!`+D4S7e;0{&ab^UP`X6C6 BM2r9c literal 0 HcmV?d00001 diff --git a/srcs/wolf_sdl_mainmenu_loop.c b/srcs/sdl/wolf_sdl_mainmenu_loop.c similarity index 95% rename from srcs/wolf_sdl_mainmenu_loop.c rename to srcs/sdl/wolf_sdl_mainmenu_loop.c index 58f813b..5b2742f 100644 --- a/srcs/wolf_sdl_mainmenu_loop.c +++ b/srcs/sdl/wolf_sdl_mainmenu_loop.c @@ -6,11 +6,11 @@ /* By: tmaluh +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/27 11:02:25 by tmaluh #+# #+# */ -/* Updated: 2019/03/13 19:29:08 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 21:26:07 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" static void add_press_selector(t_env *env, bool *exit) { diff --git a/srcs/sdl/wolf_sdl_mainmenu_loop.o b/srcs/sdl/wolf_sdl_mainmenu_loop.o new file mode 100644 index 0000000000000000000000000000000000000000..df494809faba710cfebe8026d125783e9933ed7b GIT binary patch literal 2280 zcmbu9O>7fK6oB8x6buCKw&f6!O4);pg48T=k^=?OuJcoGssOY}&eS>d*^2A${WHywQBB7_Co}ad`kz&kS!W z88^HG1$kf!z-a!WJSP9kw?A_Y?+gtc@-oUeRdJ4wLkz%uj|m(e3yH528%5;>I%r0@1RrR3e{Vq1+b!* zJT@Oa-l$99?Dx6h;cR_NUwtO8X4>tx@fAl#^C#tl57TGv$^&|krpvt#-8a?^Z*l?W zvqIIK^v}8ihF6W>#Ibhjerw&&KI`Ra!LQGFhm&45iOYO4Mzw@ccPoZU8+S2S*|zx(>hwSU@e$V^TiR0lIhPwrC>Xro$69T`r&Jv=fpst#tYylR+Ez=uZm z0qn*tAdxO+L8>cKfA6;V72KCGWN-K*03XplO(c{rd(w%%&tvI?+T1dg817l$kx-GO z6Usy)KE0E9hbv041^#S@jmAPx65ub#pB^GH%oHXu*cyg0%eDwE99HJB2lZ>heEhW| zOJP%(kEq^_;Kw5P*$93_V=Vw{s=4ST0#*H)mHWE80@T0L)L# z=H@E4J^is&cHl^{p37P_w`3i0Yeg1RwaR&`S}dRKJDgm(=kC?tkpnUs+90|BP&-NOT%YjsOFeU=Rot_t>s*yYL=`{ z{+BdVjHe}a-$Wf53BON4@BeqI9|vgfbnd`(gCNQuf%4A))rqryAJcnL6YqXGuCsk+ zZXMN)-@*~f`J(akPEgKaY@+b`Ln1_**XR16z(m&v+(CpPzVz;pE1err9 +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/16 09:51:17 by tmaluh #+# #+# */ -/* Updated: 2019/03/13 19:24:46 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 21:26:04 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" SDL_Surface *wolf_optimize_surf_load(string bmp_path, const SDL_PixelFormat *format) diff --git a/srcs/sdl/wolf_sdl_optimizing_load.o b/srcs/sdl/wolf_sdl_optimizing_load.o new file mode 100644 index 0000000000000000000000000000000000000000..b12f647d1ff032c4f05706bc1fc9c763106e7e00 GIT binary patch literal 2400 zcmb`H&ubGw6vtoMYGZBFT09ggxF>1FE=}s8deGFg$rhrNq(wz^*(MVkOtN(|)mRUL zwc;KG@#vr6$)jFc#UB+!1TP-F_8@|S;6bSG?arj*HhWPYOy<4MeBaE=%*dAv{fDO zZEME>g7%gtO1!<59BD@g-xb0;LwGcVE0;+qXs`N}I=wwZb`)Em(5PK1gy%vy3*k#4 z{B{VxAHp9Zr}`JMC-cq``^VT?)eqP0O3ADjE2h23%hmF7xpvvC*j7<5_(K9Sv%ch% zyb;JxX3gB$v}0G(tIp1*%^b>@Gs_y>%-fZ65kTIAF8qJeM;ChO2aRqJjs4p4O@0f+ z@ya)O9DOq4-Pojlf*>049&D1&5JV#$!zTGTf@s942FdYz_KY~4gXF6|_VoP`}U(LUnhUxS+ z1;6+tGO`bT*ZieDQEdHbax6(On}~zBmH}(GFoF9(?I~MILEX3*sX< zNOS&eKHYDcGl5Mtxqfh7xxVa^m_+`lnv8zG5R3%4%#-~zj!R#ao@@nMXfFw--btD# zDe{~5kszAfe?I~^k4~%eyC)tE`M>D=C|Bmo^P^>gYa@auV*R(Gr#EE}wqQQ7;2tA_ bhJfo7C?=+Bl6~m4%6}^AUuY_QCz$^m*TG9Z literal 0 HcmV?d00001 diff --git a/srcs/wolf_sdl_rendering_loop.c b/srcs/sdl/wolf_sdl_rendering_loop.c similarity index 95% rename from srcs/wolf_sdl_rendering_loop.c rename to srcs/sdl/wolf_sdl_rendering_loop.c index f9c9d97..28a836b 100644 --- a/srcs/wolf_sdl_rendering_loop.c +++ b/srcs/sdl/wolf_sdl_rendering_loop.c @@ -6,11 +6,11 @@ /* By: tmaluh +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/15 22:59:14 by tmaluh #+# #+# */ -/* Updated: 2019/03/07 18:16:42 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 21:43:51 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" static void add_mouse_moves(t_env *env) { @@ -67,7 +67,7 @@ void wolf_sdl_rendering_loop(t_env *env) add_mouse_moves(env); } add_loop_isr(env); - wolf_rendering_rc(env); + wolf_rendering(env); } (env->isr->is_play_music) ? Mix_VolumeMusic(env->sfx->bg_volume / BG_VOL_MUTE) : 0; diff --git a/srcs/sdl/wolf_sdl_rendering_loop.o b/srcs/sdl/wolf_sdl_rendering_loop.o new file mode 100644 index 0000000000000000000000000000000000000000..167f981d72ae4380ffc20714e723671efab8b965 GIT binary patch literal 3800 zcmbuBUrbw77{E_kHaa%B9sWbvMiZ-nO|C5<;g53#%D8c$2m`}3X-c^rgqAkF7byOT zRluyN`(u3YWpDa06CZrqizXDcZ2IPdiAIw>nCMUwnNI}N`hDk~)1KY-8WX?dp7WjG z{l4#f=kL9*4-B2Q+iZl3jXX_CElvrkKUmWJRP_^y)RHkJv!|^5=GqK+BqB8uCEKH{ z+;H7SleL_5=>w>NWd~g+F|M@wJ(MSj1J!L*ZB+dRRORAQ6Zm?lFUHA^dC|{Sg~nMl zwu7p-XZxJl=RE0dlIg3;Jmb_aHQ&tdypYT99?vP+SL*Y-ll!oH8fR;+P$)oN;InB* zhwPvS6U_8Ed5)J~0uv?M?@XthL|Xd_I!dRiq04Vk>jd;OMRt6Brll#KGb=W_WyBO{vK-npFM4G{vaus={O)SLA+56rEKyv)g%fl+*Sewmt+OmoTrX*D2+=htAlX&iGeo+c zu){JXic|FKXCz+d=!r!3`y-K`PC=c6dVS{bo$%>f@0jm-AYI|cuQ+D`rOAHZ7+`!Tgqi?I8^Pt0^99z;78cIAMK#@ z*1A^ggSBqQFSeRmS8uIz;Gq3|LkkFJlerWt2t}&Mok9@^ilgF5CvZ67OjZyFM5-hX zLU(N0D+k$M#t=A2wFN(5!E4HR1107Cx*0cT`Y7X0T9=CBR4vc*3Chd!Y^Qu5IaCTk zwJye8CXP)9G51Q~mL;T4n18y)z$W0S6l2i1&d!=e?7HY}dRq8*D4D`zqm z7z&QWqtSsybzY~fK~*1)FKFtR9@16AFBvcCvG}4&hG$d3iFkA&rVcM?vtimERkdQ9 zrdmuBf<(+&2j|pf4Mq}GLmKvCVUS3wnr8i4i=={v31&1Bg0ziR}yF@O<10&!2FcqMSttf*kK8&fh}_f>#ipLe6o&prHNz@NoVqLJ)KO9Rt%icwKRO zegx3|0f8UIiwgw%#k0okn+1N4z&jW>=QA$Y*9!JQflC5EFT@e^c}uVtX!^7>n1dewn=e+_yBJk%0 zepKL-0vG#zSKwm)-wFJf5XTKV3chA0v`u7fIi`oEpw^Q{J;OCPCm~r^Q#z5SLwbnF zQ*bKeWE>lESkvKR&TRU(gikYcs8&f{)OS^`!UANU-C!HfW>9o ziM5RX4~%Ix|F8Z&)_+|wqM>+LK>pvuU*lL&c#Ypj%*pKE$^7|v(FcXMd3^?0C4WEj zH-B?@o7a=f-;2Qo8Dah{0z;M0AFrnbCYrv+{6&U3_v3ttvAfO&ur%{mxFM_gxH(RO zQfdFdZ!Z +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/07 11:26:54 by tmaluh #+# #+# */ -/* Updated: 2019/03/13 15:24:56 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 21:25:41 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" void wofl_rendering_loop_keys_press(t_env *env, bool *exit) { diff --git a/srcs/sdl/wolf_sdl_rendering_loop_key_press_events.o b/srcs/sdl/wolf_sdl_rendering_loop_key_press_events.o new file mode 100644 index 0000000000000000000000000000000000000000..3fd5f9e5e67aec820ed7b7ac1aa69ce956e44686 GIT binary patch literal 2168 zcmb`I&ui3B5XUFGZ8zO5ZYzRfg+>u+(T4uGs8~r`wZY$3#UDL{bT?_m?rz<@*i}&r z@n8vJ6_0{{fj2?LlN5Rs{{qFEvL`PRQK&P?duIY-gCU=1#>JjG!CG-vhE*~mxnWw z7nsOS$5f;DD~g#_N@i|z@Yr=ECrnuLGzSY_s4MS5;Y@XdpD_DBzqCS zl5MNW`g81d_!F?}B)u6*&n}bXheOHPL6UlVC^g#}3c%7!_9A6P4FH?tbuY-vBdrig z^r8OoH!ef{mCbdfxGdD4#^)KR&%@a0=zgVp?Bw|#Wv@D@_A3K@{rma`1_qVxajU54 zCX0CQKo7ts+ANxMa~z~vyVTj1kr(kmD#*6c4K$e!=J5S34QLMPnihB?S=}s zqW=@0K{AE&6pnNW!&gFRf(sokCb-Z6ROd#CnUgrOYBWv@51TMmX4M#|MSQkEopc;f z3zbp{1p&2OVU~)=z1Lx8;VP(MxHWCqRkMVh{~uE@4gF-vlcXUd+Y#S9&XZ@N6B(UO z4X?Pp;zxE1homjlk@;NkU7ROR{$!#qUl!&NK8;(@6jKTz{PhlK%8o5bK5hw4Y>cS`u)m p@D0;n39U`8r@Tq+5y2K-{~1kUCiD}i1D%HJ`K#)Z2;^gO{V#FWJdgkY literal 0 HcmV?d00001 diff --git a/srcs/wolf_sdl_sfx_steps.c b/srcs/sdl/wolf_sdl_sfx_steps.c similarity index 93% rename from srcs/wolf_sdl_sfx_steps.c rename to srcs/sdl/wolf_sdl_sfx_steps.c index 9937c59..37c086c 100644 --- a/srcs/wolf_sdl_sfx_steps.c +++ b/srcs/sdl/wolf_sdl_sfx_steps.c @@ -6,11 +6,11 @@ /* By: tmaluh +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/06 23:17:49 by tmaluh #+# #+# */ -/* Updated: 2019/03/09 11:31:59 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 21:25:32 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" void wolf_playing_steps(t_sfx *sfx, bool is_boost) { diff --git a/srcs/sdl/wolf_sdl_sfx_steps.o b/srcs/sdl/wolf_sdl_sfx_steps.o new file mode 100644 index 0000000000000000000000000000000000000000..bd12479ad31423aecae53c57eba02d13d1d2aa49 GIT binary patch literal 2032 zcmbW1&1(}u6u@7SYGXf=w1|imx(AUeX3R&iX~mGT+61gx+DL^K!Zz8M(0r8aR#Pt) z+Dq}`!HfTZcoIE&E3`qugW$=lo&+xzR7xw<_ck->xY=HOVRqj8y^ooFGn>aZCMVo3 z7YK1d91bl(0bX|;>Iq9tKri&bOk*!_jO^6LKB{+OiS^&hUI81sm)}1~uU@kfmZNVE zP*P8fq41}TkKYJ#*E=;vmj9VmYHlmf{DbR6K%^+Glg9*SD)KFuuPaU@EY-~1m zXE(RM>|NYM&rFOw=$==Hx4#yjTU80g=C-irtE3j+`t>qi?Oz*%q^gc7L&@8BFDNk< zWnm=}3Xg^&k*G2>t>=`KW;S^+a)I`9k{&3oN7LY{2V4U^o!+O|uye@HS{{HmG>`iN zYi@VC%jdn>?Vj>^x$mfndfov$2Tp#E@Xa=)1Yw~F=56cV+dRVsQZT`cQ4 zn7KZgN$O_0m|Zklop9qmPT=@MS0CjJ-yiWViJzA^^=iKvesGm@Vm=(A&N$~(M~nP++Jr*;(pXc{0pg0x5O2R)7mXz#!A`L7JwOMtvMHjR?|xwGxfR&ET@?oum!^a zR;!Z1vW7VfEL$y?^$G@5s;18HYYZBumR-as%GC>*d`&Cst;POdQ81P6zWs(JkdcUc z)wJ60)&M%FhY1nD=X?B9{LF1STUtll@6(*qITN>kxjWo%pD0$AOK4Edqw?+Xb~}u@ z#QJf_@{=1qGDMx;l|;;O)G0qiP!_&WP-du$^~Ic&m>e1u0Wx%mo#*VIyN4{q^Ao7c zBKj}bEGkat7ve7{&WX;Caz(!2w2XaiM6kryU*$7>Grc(M`Sf34KRZP5gBLB3Aqg+n TB7LYi<)`@m^R39HV$c5zR`>hB literal 0 HcmV?d00001 diff --git a/srcs/wolf_map_reader.c b/srcs/wolf_map_reader.c index 7805463..f291a80 100644 --- a/srcs/wolf_map_reader.c +++ b/srcs/wolf_map_reader.c @@ -6,11 +6,11 @@ /* By: tmaluh +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/06 17:18:56 by tmaluh #+# #+# */ -/* Updated: 2019/03/09 11:31:01 by tmaluh ### ########.fr */ +/* Updated: 2019/03/16 21:27:25 by tmaluh ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../includes/wolf3d.h" +#include "wolf3d.h" static bool add_save_map(string line, iarr map_line, iarr colors_line, int map_x) diff --git a/srcs/wolf_rendering.c b/srcs/wolf_rendering.c deleted file mode 100644 index 7933924..0000000 --- a/srcs/wolf_rendering.c +++ /dev/null @@ -1,105 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* wolf_rendering.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: tmaluh +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2019/02/06 22:03:53 by tmaluh #+# #+# */ -/* Updated: 2019/03/13 15:26:13 by tmaluh ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "../includes/wolf3d.h" - -static float add_fog_freq(int *freq, t_time *time) -{ - const float freqs[] = {4.2, 4.25, 4.15, 4.17, 4.22, 4.3, 4.1, 4.16}; - - if (time->res > REFRESH_TORCH_FOG_FREQ) - { - time->res = 0; - *freq = ft_rand((sizeof(freqs) / sizeof(*freqs)) - 1); - } - else - { - time->old = time->current; - time->current = SDL_GetTicks(); - time->res += (time->current - time->old) / 1000.0; - } - return (freqs[(*freq)]); -} - -static void add_rendering_torch(t_env *env) -{ - static int old_torch_frame; - static int torch_frame; - const fpoint torch_shift = {TORCH_SHIFT_Y, TORCH_SHIFT_X}; - point p; - point tp; - - if (old_torch_frame != FOG.freq) - { - torch_frame = ft_rand(MAX_TORCH - 1); - old_torch_frame = FOG.freq; - } - tp.y = -1; - p.y = torch_shift.y; - while (++(p.y) < WIN_Y && ++(tp.y) < env->torch->tex[torch_frame].surf->h - && (tp.x = -1) - && (p.x = torch_shift.x)) - while (++(p.x) < WIN_X - && ++(tp.x) < env->torch->tex[torch_frame].surf->w) - if (!(ft_is_one_of_n(env->torch->tex[torch_frame].pixels[ - tp.y * env->torch->tex[torch_frame].surf->w + tp.x], - 2, (long)0xff000000, (long)0x00))) - env->sdl->win_pixels[p.y * WIN_X + p.x] = - env->torch->tex[torch_frame].pixels[tp.y * env->torch->tex[ - torch_frame].surf->w + tp.x]; -} - -static void add_rendering_bonus(t_env *env) -{ - env->isr->is_render_minimap ? wolf_rendering_minimap(env) : 0; - (env->isr->is_render_fog && !env->isr->is_render_weapon) ? - add_rendering_torch(env) : 0; - env->isr->is_render_weapon ? wolf_rendering_waepons(env) : 0; -} - -static void add_fps(t_fps *fps) -{ - fps->time.old = fps->time.current; - fps->time.current = SDL_GetTicks(); - fps->time.res = (fps->time.current - fps->time.old) / 1000.0; - fps->move = fps->time.res * MOVE_INC; - fps->rot = fps->time.res * ROT_INC; -} - -void wolf_rendering_rc(t_env *env) -{ - point p; - - p.x = -1; - SDL_FillRect(env->sdl->win_surface, NULL, IRGB_BLACK); - (ISRF) ? (FOG.fog_dist = add_fog_freq(&FOG.freq, &(env->torch->time))) : 0; - (!env->isr->is_textured) ? wolf_fill_floor_if_colored_rc(env->sdl) : 0; - while (++(p.x) < WIN_X) - { - *(env->rc) = (t_rc){{RC->pos.y, RC->pos.x}, {RC->dir.y, RC->dir.x}, - {RC->plane.y, RC->plane.x}, 0, {0, 0}, {0, 0}, {0, 0}, {0, 0}, 0, - {0, 0}, false, false, 0, 0, 0}; - RC->xcamera = 2 * p.x / (double)WIN_X - 1; - env->rc->raydir = (fpoint){RC->dir.y + RC->plane.y * RC->xcamera, - env->rc->dir.x + env->rc->plane.x * env->rc->xcamera }; - env->rc->map = (point){(int)env->rc->pos.y, (int)env->rc->pos.x}; - RC->ddist = (fpoint){_ABS(1 / RC->raydir.y), _ABS(1 / RC->raydir.x)}; - wolf_set_diststep(env->rc); - wolf_check_hit(env->rc, env->map->tab); - wolf_dist_to_wall(env->rc); - ISRT ? wolf_render_textured(env, &p) : wolf_render_colored(env, &p); - } - add_rendering_bonus(env); - add_fps(&(env->fps)); - env->isr->is_render_fps ? wolf_rendering_fps_counter(env) : 0; - SDL_UpdateWindowSurface(env->sdl->win); -}