aboutsummaryrefslogtreecommitdiff
path: root/state.c
diff options
context:
space:
mode:
Diffstat (limited to 'state.c')
-rw-r--r--state.c133
1 files changed, 83 insertions, 50 deletions
diff --git a/state.c b/state.c
index eb9b3eb..139904b 100644
--- a/state.c
+++ b/state.c
@@ -6,61 +6,53 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/11/19 16:39:57 by cacharle #+# #+# */
-/* Updated: 2020/01/10 11:44:24 by cacharle ### ########.fr */
+/* Updated: 2020/01/11 10:24:53 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
#include "cub3d.h"
-t_state *state_new(void *mlx_ptr, void *window_ptr, t_parsing *parsing)
-{
- t_state *state;
-
- if ((state = (t_state*)malloc(sizeof(t_state))) == NULL)
- return (NULL);
- if ((state->north_texture = load_texture(parsing->north_texture_path)) == NULL)
- return (NULL);
- if ((state->south_texture = load_texture(parsing->south_texture_path)) == NULL)
- return (NULL);
- if ((state->west_texture = load_texture(parsing->west_texture_path)) == NULL)
- return (NULL);
- if ((state->east_texture = load_texture(parsing->east_texture_path)) == NULL)
- return (NULL);
+/*
+** Initialize the state attributes that weren't already filled by the parsing
+*/
- state->window_img.id = mlx_new_image(mlx_ptr, parsing->resolution_width, parsing->resolution_height);
- state->window_img.width = parsing->resolution_width;
- state->window_img.height = parsing->resolution_height;
- state->window_img.data = mlx_get_data_addr(state->window_img.id,
- &state->window_img.depth, &state->window_img.size_line, &state->window_img.endian);
+t_state *state_new(t_state *state)
+{
+ int i;
state->running = TRUE;
- state->mlx_ptr = mlx_ptr;
- state->window_ptr = window_ptr;
- state->window_width = parsing->resolution_width;
- state->window_height = parsing->resolution_height;
- state->map = parsing->map;
- state->map_width = parsing->map_width;
- state->map_height = parsing->map_height;
- state->ceilling_color = parsing->ceilling_color;
- state->floor_color = parsing->floor_color;
-
- state_new_player(state, parsing);
-
+ if ((state->mlx_ptr = mlx_init()) == NULL)
+ return (state_destroy(state));
+ if ((state->window_ptr = mlx_new_window(state->mlx_ptr,
+ state->window.width, state->window.height, WINDOW_TITLE)) == NULL)
+ return (state_destroy(state));
+ i = -1;
+ while (++i < TEXTURES_NUM)
+ {
+ load_texture(state->mlx_ptr, &state->textures[i], state->textures_path[i]);
+ if (state->textures[i].id == NULL)
+ return (state_destroy(state));
+ }
+ if ((state->window.id = mlx_new_image(state->mlx_ptr,
+ state->window.width, state->window.height)) == NULL)
+ return (state_destroy(state));
+ state->window.data = mlx_get_data_addr(state->window.id,
+ &state->window.depth, &state->window.size_line, &state->window.endian);
+ state_init_player(state);
return (state);
}
-void state_new_player(t_state *state, t_parsing *parsing)
+void state_init_player(t_state *state)
{
int i;
int j;
i = -1;
- while (++i < parsing->map_height)
+ while (++i < state->map_height)
{
j = -1;
- while (++j < parsing->map_width)
- if (parsing->map[i][j] & (CELL_LOOK_NORTH | CELL_LOOK_SOUTH
- | CELL_LOOK_WEST | CELL_LOOK_EAST)
+ while (++j < state->map_width)
+ if (helper_is_player_cell(state->map[i][j]))
{
state->pos.x = (double)j + 0.5;
state->pos.y = (double)i + 0.5;
@@ -69,27 +61,68 @@ void state_new_player(t_state *state, t_parsing *parsing)
}
}
/* need to be normalized */
- state->dir.x = 0.0;
- state->dir.y = 0.0;
- if (parsing->map[(int)state.y][(int)state.x] & CELL_LOOK_NORTH)
+ if (state->map[(int)state->pos.y][(int)state->pos.x] == CELL_LOOK_NORTH)
state->dir.y = 1.0;
- else if (parsing->map[(int)state.y][(int)state.x] & CELL_LOOK_SOUTH)
+ else if (state->map[(int)state->pos.y][(int)state->pos.x] == CELL_LOOK_SOUTH)
state->dir.y = -1.0;
- else if (parsing->map[(int)state.y][(int)state.x] & CELL_LOOK_WEST)
+ else if (state->map[(int)state->pos.y][(int)state->pos.x] == CELL_LOOK_WEST)
state->dir.x = -1.0;
- else if (parsing->map[(int)state.y][(int)state.x] & CELL_LOOK_EAST)
+ else if (state->map[(int)state->pos.y][(int)state->pos.x] == CELL_LOOK_EAST)
state->dir.x = 1.0;
-
state->plane.x = 0.0;
state->plane.y = 0.66;
}
-void state_destroy(t_state *state)
+t_state *state_new_empty(void)
{
- mlx_destroy_window(state->mlx_ptr, state->window_ptr);
- free(state->north_texture);
- free(state->south_texture);
- free(state->west_texture);
- free(state->east_texture);
+ int i;
+ t_state *state;
+
+ if ((state = (t_state*)malloc(sizeof(t_state))) == NULL)
+ return (NULL);
+ state->mlx_ptr = NULL;
+ state->window_ptr = NULL;
+ i = -1;
+ while (++i < TEXTURES_NUM)
+ {
+ state->textures_path[i] = NULL;
+ state->textures[i].id = NULL;
+ }
+ state->dir.x = 0.0;
+ state->dir.y = 0.0;
+ state->map = NULL;
+ state->ceilling_color.hexcode = 0x0;
+ state->floor_color.hexcode = 0x0;
+ return (state);
+}
+
+void *state_destroy(t_state *state)
+{
+ int i;
+
+ if (state == NULL)
+ return (NULL);
+ i = -1;
+ while (++i < TEXTURES_NUM)
+ {
+ free(state->textures_path[i]);
+ mlx_destroy_image(state->mlx_ptr, state->textures[i].id);
+ }
+ if (state->mlx_ptr && state->window_ptr)
+ mlx_destroy_window(state->mlx_ptr, state->window_ptr);
+ if (state->map != NULL)
+ while (state->map_height-- > 0 && state->map[state->map_height] != NULL)
+ free(state->map[state->map_height]);
+ free(state->map);
free(state);
+ return (NULL);
+}
+
+void load_texture(void *mlx_ptr, t_image *image, char *path)
+{
+ if ((image->id = mlx_xpm_file_to_image(
+ mlx_ptr, path, &image->width, &image->height)) == NULL)
+ return ;
+ image->data = mlx_get_data_addr(image->id, &image->depth,
+ &image->size_line, &image->endian);
}
generated by cgit (git 2.34.1) at 2026-05-16 06:29:58 +0000