Merge pull request #32 from Haliris/made_textures

Made textures and door animation frames.
Haliris · Sep 3, 2024 · d812326 · d812326
2 parents 53280c5 + 81f97fb
commit d812326
Show file tree

Hide file tree

Showing 44 changed files with 2,346 additions and 5,196 deletions.
diff --git a/assets/animations/made_door_frames01.xpm b/assets/animations/made_door_frames01.xpm
diff --git a/assets/animations/made_door_frames02.xpm b/assets/animations/made_door_frames02.xpm
diff --git a/assets/animations/made_door_frames03.xpm b/assets/animations/made_door_frames03.xpm
diff --git a/assets/animations/made_door_frames04.xpm b/assets/animations/made_door_frames04.xpm
diff --git a/assets/dummy.xpm → assets/bad/dummy.xpm b/assets/dummy.xpm → assets/bad/dummy.xpm
diff --git a/assets/debug/debug_door.xpm b/assets/debug/debug_door.xpm
diff --git a/assets/debug/debug_e.xpm b/assets/debug/debug_e.xpm
diff --git a/assets/debug/debug_n.xpm b/assets/debug/debug_n.xpm
diff --git a/assets/debug/debug_s.xpm b/assets/debug/debug_s.xpm
diff --git a/assets/debug/debug_w.xpm b/assets/debug/debug_w.xpm
diff --git a/assets/kat.xpm b/assets/kat.xpm
diff --git a/assets/made_door.xpm b/assets/made_door.xpm
diff --git a/assets/made_door_empty.xpm b/assets/made_door_empty.xpm
diff --git a/assets/made_wall_e.xpm b/assets/made_wall_e.xpm
diff --git a/assets/made_wall_n.xpm b/assets/made_wall_n.xpm
diff --git a/assets/made_wall_s.xpm b/assets/made_wall_s.xpm
diff --git a/assets/made_wall_w.xpm b/assets/made_wall_w.xpm
diff --git a/assets/okan.xpm b/assets/okan.xpm
diff --git a/assets/references/42_logo.png b/assets/references/42_logo.png
diff --git a/assets/references/animations/made_door_frames_final_0002.png b/assets/references/animations/made_door_frames_final_0002.png
diff --git a/assets/references/animations/made_door_frames_final_0003.png b/assets/references/animations/made_door_frames_final_0003.png
diff --git a/assets/references/animations/made_door_frames_final_0004.png b/assets/references/animations/made_door_frames_final_0004.png
diff --git a/assets/references/animations/made_door_frames_final_0005.png b/assets/references/animations/made_door_frames_final_0005.png
diff --git a/assets/references/debug_door.png b/assets/references/debug_door.png
diff --git a/assets/references/debug_e.png b/assets/references/debug_e.png
diff --git a/assets/references/debug_n.png b/assets/references/debug_n.png
diff --git a/assets/references/debug_s.png b/assets/references/debug_s.png
diff --git a/assets/references/debug_w.png b/assets/references/debug_w.png
diff --git a/assets/references/door_fram_ref.jpg b/assets/references/door_fram_ref.jpg
diff --git a/assets/references/door_frame2.png b/assets/references/door_frame2.png
diff --git a/assets/references/door_handle_ref.jpg b/assets/references/door_handle_ref.jpg
diff --git a/assets/references/door_handle_ref.png b/assets/references/door_handle_ref.png
diff --git a/assets/references/made_door.png b/assets/references/made_door.png
diff --git a/assets/references/made_door_empty.png b/assets/references/made_door_empty.png
diff --git a/assets/references/made_wall_e.png b/assets/references/made_wall_e.png
diff --git a/assets/references/made_wall_s.png b/assets/references/made_wall_s.png
diff --git a/assets/references/made_wall_w.png b/assets/references/made_wall_w.png
diff --git a/assets/references/made_window.png b/assets/references/made_window.png
diff --git a/assets/yohurteb.xpm b/assets/yohurteb.xpm
diff --git a/includes/cub3d.h b/includes/cub3d.h
@@ -6,7 +6,7 @@
 /*   By: jteissie <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/15 00:19:44 by tsuchen           #+#    #+#             */
-/*   Updated: 2024/09/02 17:23:45 by jteissie         ###   ########.fr       */
+/*   Updated: 2024/09/02 18:48:43 by jteissie         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

diff --git a/maps/debug.cub b/maps/debug.cub
@@ -0,0 +1,14 @@
+NO ./assets/debug/debug_n.xpm
+SO ./assets/debug/debug_s.xpm
+WE ./assets/debug/debug_w.xpm
+EA ./assets/debug/debug_e.xpm
+D ./assets/debug/debug_door.xpm
+
+F 220,100,0
+C 225,30,0
+
+111111111
+100000101
+1000N0D01
+100000101
+111111111
diff --git a/maps/subject_test.cub b/maps/subject_test.cub
@@ -1,15 +1,15 @@
-NO ./assets/okan.xpm
-SO ./assets/yohurteb.xpm
-WE ./assets/yohurteb.xpm
-EA ./assets/okan.xpm
-D ./assets/kat.xpm
+NO ./assets/made_wall_n.xpm
+SO ./assets/made_wall_s.xpm
+WE ./assets/made_wall_w.xpm
+EA ./assets/made_wall_e.xpm
+D ./assets/made_door.xpm
 
-F 220,100,0
-C 225,30,0
+F 64,64,64
+C 182,182,182
 
 1111111111111111111111111
 1000000000110000000000001
-1011000001110000000000001
+101100000111000000000                                          0001
 1001000000000000000000001
 1111111110110000011100001000000011
 100000000011000001110111111111111

diff --git a/maps/wall_test.cub b/maps/wall_test.cub
diff --git a/srcs/game_init.c b/srcs/game_init.c
@@ -6,7 +6,7 @@
 /*   By: jteissie <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/27 17:03:43 by jteissie          #+#    #+#             */
-/*   Updated: 2024/09/02 17:25:27 by jteissie         ###   ########.fr       */
+/*   Updated: 2024/09/03 14:31:12 by jteissie         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */