now it's work on windows (but only if you install clion, install mingw-64, install all sdl-libraries, copy needed sdl folders in specific mingw-64 folders), now texture draw.

dolovnyak · dolovnyak · commit c62489907d59 · 2019-08-09T08:32:45.000+03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,25 +13,41 @@ set_target_properties(Wolf3D
         RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
         )
 
-if (NOT SDL2_FOUND)
-    set(SDL2_PATH /Users/$ENV{USER}/.brew/Cellar/sdl2/2.0.9_1)
+if (APPLE)
+    if (NOT SDL2_FOUND)
+        set(SDL2_PATH /Users/$ENV{USER}/.brew/Cellar/sdl2/2.0.9_1)
+    endif()
+
+    if (NOT SDL2_IMAGE_FOUND)
+        set(SDL2_IMAGE_PATH /Users/$ENV{USER}/.brew/Cellar/sdl2_image/2.0.5)
+    endif()
+
+    if (NOT SDL2_TTF_FOUND)
+        set(SDL2_TTF_PATH /Users/$ENV{USER}/.brew/Cellar/sdl2_ttf/2.0.15)
+    endif()
 endif()
 
-if (NOT SDL2_IMAGE_FOUND)
-    set(SDL2_IMAGE_PATH /Users/$ENV{USER}/.brew/Cellar/sdl2_image/2.0.5)
-endif()
-
-if (NOT SDL2_TTF_FOUND)
-    set(SDL2_TTF_PATH /Users/$ENV{USER}/.brew/Cellar/sdl2_ttf/2.0.15)
+if (NOT APPLE)
+    set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+    set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+    find_package(Threads REQUIRED)
+    if(NOT CMAKE_THREAD_LIBS_INIT)
+        set(SDL2_THREADS_NOT_FOUND "Could NOT find Threads (Threads is required by SDL2).")
+        if(SDL2_FIND_REQUIRED)
+            message(FATAL_ERROR ${SDL2_THREADS_NOT_FOUND})
+        endif()
+    endif()
 endif()
 
 find_package(SDL2 REQUIRED)
 find_package(SDL2_image REQUIRED)
 find_package(SDL2_ttf REQUIRED)
 
 #add C flags
-set(GCC_COMPILE_FLAGS "-Wall -Werror -Wextra -O3")
-add_definitions(${GCC_COMPILE_FLAGS})
+if (APPLE)
+    set(GCC_COMPILE_FLAGS "-Wall -Werror -Wextra -O3 -D APPLE___")
+    add_definitions(${GCC_COMPILE_FLAGS})
+endif()
 
 #add custom libs
 add_subdirectory(libft)
diff --git a/include/raycast.h b/include/raycast.h
@@ -137,7 +137,7 @@ int		rc_jtoc_win_from_json(t_rc_main *m, t_jnode *n_w);
 int		rc_jtoc_sdl_log_error(const char *p, const int id);
 int		rc_jtoc_is_num(enum e_type type);
 int		rc_jtoc_get_map(t_rc_main *wlf, char *path);
-int		rc_jtoc_get_textures(t_rc_main *wlf, t_conf_json *conf, t_jnode *node);
+int		rc_jtoc_get_textures(t_rc_main *m, t_conf_json *conf, t_jnode *node);
 int		rc_jtoc_get_obj(t_rc_main *m, t_jnode *n, t_conf_json *conf);
 int		rc_jtoc_get_texture_state(int *state, t_jnode *n, int obj_id);
 int		rc_jtoc_get_wall_obj(t_object *obj, t_jnode *n, t_conf_json *conf);
diff --git a/json/config.json b/json/config.json
@@ -18,7 +18,7 @@
 				"x": 6,
 				"y": 19
 			},
-			"path": "../textures/1375.png"
+			"path": "./textures/1375.png"
 		},
 		{
 			"type": "single",
diff --git a/sdl2-cmake-modules/FindSDL2.cmake b/sdl2-cmake-modules/FindSDL2.cmake
@@ -232,24 +232,27 @@ if(NOT SDL2_BUILDING_LIBRARY)
 endif()
 
 # SDL2 may require threads on your system.
-# The Apple build may not need an explicit flag because one of the
+# The  thbuild may not need an explicit flag because one of the
 # frameworks may already provide it.
 # But for non-OSX systems, I will use the CMake Threads package.
-if(NOT APPLE)
-  find_package(Threads QUIET)
-  if(NOT CMAKE_THREAD_LIBS_INIT)
-    set(SDL2_THREADS_NOT_FOUND "Could NOT find Threads (Threads is required by SDL2).")
-    if(SDL2_FIND_REQUIRED)
-      message(FATAL_ERROR ${SDL2_THREADS_NOT_FOUND})
-    else()
-        if(NOT SDL2_FIND_QUIETLY)
-          message(STATUS ${SDL2_THREADS_NOT_FOUND})
-        endif()
-      return()
-    endif()
-    unset(SDL2_THREADS_NOT_FOUND)
-  endif()
-endif()
+
+#if(NOT APPLE)
+#  set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+#  set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+#  find_package(Threads REQUIRED)
+#  if(NOT CMAKE_THREAD_LIBS_INIT)
+#    set(SDL2_THREADS_NOT_FOUND "Could NOT find Threads (Threads is required by SDL2).")
+#    if(SDL2_FIND_REQUIRED)
+#      message(FATAL_ERROR ${SDL2_THREADS_NOT_FOUND})
+#    else()
+#        if(NOT SDL2_FIND_QUIETLY)
+#          message(STATUS ${SDL2_THREADS_NOT_FOUND})
+#        endif()
+#      return()
+#    endif()
+#    unset(SDL2_THREADS_NOT_FOUND)
+#  endif()
+#endif()
 
 # MinGW needs an additional link flag, -mwindows
 # It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -mwindows
diff --git a/src/main.c b/src/main.c
@@ -1,16 +1,32 @@
 # define STB_IMAGE_IMPLEMENTATION
 #include "raycast.h"
 
+#ifdef APPLE___
 int		main(void)
 {
-	t_rc_main	*m;
-	SDL_Thread	*thread;
+    t_rc_main	*m;
+    SDL_Thread	*thread;
 
-	m = rc_main_init();
-	rc_jtoc_main_from_json(m, "./json/config.json");
-	m->sdl->mutex = SDL_CreateMutex();
-	thread = SDL_CreateThread(physics, "physics", (void *)m);
-	SDL_DetachThread(thread);
-	main_loop(m);
-	return (0);
-}
+    m = rc_main_init();
+    rc_jtoc_main_from_json(m, "./json/config.json");
+    m->sdl->mutex = SDL_CreateMutex();
+    thread = SDL_CreateThread(physics, "physics", (void *)m);
+    SDL_DetachThread(thread);
+    main_loop(m);
+    return (0);
+}
+#else
+int		SDL_main(int argc, char *argv[])
+{
+    t_rc_main	*m;
+    SDL_Thread	*thread;
+
+    m = rc_main_init();
+    rc_jtoc_main_from_json(m, "./json/config.json");
+    m->sdl->mutex = SDL_CreateMutex();
+    thread = SDL_CreateThread(physics, "physics", (void *)m);
+    SDL_DetachThread(thread);
+    main_loop(m);
+    return (0);
+}
+#endif
diff --git a/src/main_loop.c b/src/main_loop.c
@@ -13,7 +13,7 @@ void	draw_texture(t_rc_main *m, t_sdl *sdl)
 	int		**tmp_arr;
 
 	y = 0;
-	tmp_arr = (int **)m->objs[0].data;
+	tmp_arr = ((t_wall *)m->objs[1].data)->state1->texture_north;
 	while (y < 64)
 	{
 		x = 0;
diff --git a/src/rc_jtoc/rc_jtoc_get_textures.c b/src/rc_jtoc/rc_jtoc_get_textures.c
@@ -4,7 +4,7 @@
 
 #include "raycast.h"
 
-static int	**texture_load(int y, int x, unsigned char *img_data, t_rc_main *wlf)
+static int	**texture_load(int y, int x, unsigned char *img_data, t_rc_main *m)
 {
 	int y_tx;
 	int x_tx;
@@ -14,17 +14,17 @@ static int	**texture_load(int y, int x, unsigned char *img_data, t_rc_main *wlf)
 
 	y_d = 0;
 	y_tx = (y >= 64 ? y - 64 : y);
-	if (!(arr = (int **)ft_memalloc(sizeof(int *) * wlf->textures.w)))
+	if (!(arr = (int **)ft_memalloc(sizeof(int *) * m->textures.w)))
 		exit(39);
 	while (y_tx <= y)
 	{
-		if (!(arr[y_d] = (int *)ft_memalloc(sizeof(int) * wlf->textures.h)))
+		if (!(arr[y_d] = (int *)ft_memalloc(sizeof(int) * m->textures.h)))
 			exit(36);
 		x_d = 0;
 		x_tx = x - 64;
 		while (x_tx < x)
 		{
-			arr[y_d][x_d] = *((int*)img_data + (x_tx + y_tx * wlf->textures.w));
+			arr[y_d][x_d] = *((int*)img_data + (x_tx + y_tx * m->textures.w));
 			x_d++;
 			x_tx++;
 		}
@@ -34,25 +34,25 @@ static int	**texture_load(int y, int x, unsigned char *img_data, t_rc_main *wlf)
 	return (arr);
 }
 
-static int	get_textures_from_texture_pack(t_rc_main *wlf, t_conf_json *conf, char *path)
+static int	get_textures_from_texture_pack(t_rc_main *m, t_conf_json *conf, char *path)
 {
 	int				y;
 	int				x;
-	unsigned char	*img_data;
+	unsigned char	*img_data = 0;
 	int				**arr;
 	t_list			*tmp;
 
-	img_data = stbi_load(path, &wlf->textures.w,
-						 &wlf->textures.h, &wlf->textures.bpp, 4);
+	img_data = stbi_load(path, &m->textures.w,
+                         &m->textures.h, &m->textures.bpp, 4);
 	y = 0;
-	while (++y < (wlf->textures.h / 64 + 1))
+	while (++y < (m->textures.h / 64 + 1))
 	{
 		x = 0;
-		while (++x < (wlf->textures.w / 64) + 1)
+		while (++x < (m->textures.w / 64) + 1)
 		{
 			tmp = ft_lstnew(NULL, 0);
-			x = (x * 64 ==  wlf->textures.w * 64 ? 0 : x * 64);
-			arr = texture_load(y * 64, x, img_data, wlf);
+			x = (x * 64 == m->textures.w * 64 ? 0 : x * 64);
+			arr = texture_load(y * 64, x, img_data, m);
 			tmp->content = (void **)arr;
 			tmp->content_size = ++(conf->index);
 			ft_lstadd(&conf->textures, tmp);
@@ -64,7 +64,7 @@ static int	get_textures_from_texture_pack(t_rc_main *wlf, t_conf_json *conf, cha
 	return (FUNCTION_SUCCESS);
 }
 
-int	rc_jtoc_get_textures(t_rc_main *wlf, t_conf_json *conf, t_jnode *node)
+int	rc_jtoc_get_textures(t_rc_main *m, t_conf_json *conf, t_jnode *node)
 {
 	t_jnode *tmp;
 	char	*path;
@@ -81,7 +81,7 @@ int	rc_jtoc_get_textures(t_rc_main *wlf, t_conf_json *conf, t_jnode *node)
 		if (!(tmp = jtoc_node_get_by_path(node, "type")) || tmp->type != string)
 			return (rc_jtoc_sdl_log_error("TEXTURE TYPE ERROR", -1));
 		if (!(ft_strcmp(jtoc_get_string(tmp), "pack")))
-			get_textures_from_texture_pack(wlf, conf, path);
+			get_textures_from_texture_pack(m, conf, path);
 		else if (!(ft_strcmp(jtoc_get_string(tmp), "single")))
 			; //TODO
 		else
diff --git a/src/rc_jtoc/rc_jtoc_get_wall_obj.c b/src/rc_jtoc/rc_jtoc_get_wall_obj.c
@@ -51,11 +51,11 @@ static int	fill_cur_wall_texture_state(t_wts *cur_state, t_conf_json *conf, t_jn
 	tmp_arr = (int **)cur_lst->content;
 	if (pos == 1)
 		cur_state->texture_north = tmp_arr;
-	if (pos == 2)
+	else if (pos == 2)
 		cur_state->texture_south = tmp_arr;
-	if (pos == 3)
+	else if (pos == 3)
 		cur_state->texture_west = tmp_arr;
-	if (pos == 4)
+	else if (pos == 4)
 		cur_state->texture_east = tmp_arr;
 	return (FUNCTION_SUCCESS);
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"x": 6,`
`19`	`19`	`"y": 19`
`20`	`20`	`},`
`21`		`- "path": "../textures/1375.png"`
	`21`	`+ "path": "./textures/1375.png"`
`22`	`22`	`},`
`23`	`23`	`{`
`24`	`24`	`"type": "single",`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ void draw_texture(t_rc_main m, t_sdl sdl)`
`13`	`13`	`int **tmp_arr;`
`14`	`14`
`15`	`15`	`y = 0;`
`16`		`- tmp_arr = (int **)m->objs[0].data;`
	`16`	`+ tmp_arr = ((t_wall *)m->objs[1].data)->state1->texture_north;`
`17`	`17`	`while (y < 64)`
`18`	`18`	`{`
`19`	`19`	`x = 0;`