Skip to content

Commit b70f643

Browse files
author
redone
committed
refactoring code
1 parent bbfe99c commit b70f643

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

includes/cray.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ struct s_vector
6161

6262
struct s_line
6363
{
64-
int height;
65-
int start;
66-
int end;
64+
long height;
65+
long start;
66+
long end;
6767
};
6868

6969
struct s_player
@@ -102,8 +102,8 @@ struct s_map_info
102102
struct s_dda
103103
{
104104
double iter;
105-
t_vector side_distance;
106-
t_vector delta_distance;
105+
t_vector distance;
106+
t_vector scaling_factor;
107107
int step_x;
108108
int step_y;
109109
};

srcs/raycasting.c

+14-14
Original file line numberDiff line numberDiff line change
@@ -9,51 +9,51 @@ void position_direction(t_seer *pSeer, t_camera *pCamera, int xPixel)
99
* pSeer->dda.iter;
1010
pCamera->map_x = (int)pSeer->player.position.x;
1111
pCamera->map_y = (int)pSeer->player.position.y;
12-
pSeer->dda.delta_distance.x = sqrt(1 + (pCamera->direction.y * pCamera->direction.y) / (pCamera->direction.x * pCamera->direction.x));
13-
pSeer->dda.delta_distance.y = sqrt(1 + (pCamera->direction.x * pCamera->direction.x) / (pCamera->direction.y * pCamera->direction.y));
12+
pSeer->dda.scaling_factor.x = sqrt(1 + (pCamera->direction.y * pCamera->direction.y) / (pCamera->direction.x * pCamera->direction.x));
13+
pSeer->dda.scaling_factor.y = sqrt(1 + (pCamera->direction.x * pCamera->direction.x) / (pCamera->direction.y * pCamera->direction.y));
1414
}
1515

1616
void calculate_offsets(t_seer *pSeer, t_camera *pCamera)
1717
{
1818
if (pCamera->direction.x < 0)
1919
{
2020
pSeer->dda.step_x = -1;
21-
pSeer->dda.side_distance.x = (pSeer->player.position.x - pCamera->map_x)
22-
* pSeer->dda.delta_distance.x;
21+
pSeer->dda.distance.x = (pSeer->player.position.x - pCamera->map_x)
22+
* pSeer->dda.scaling_factor.x;
2323
}
2424
else
2525
{
2626
pSeer->dda.step_x = 1;
27-
pSeer->dda.side_distance.x = (pCamera->map_x + 1.0
28-
- pSeer->player.position.x) * pSeer->dda.delta_distance.x;
27+
pSeer->dda.distance.x = (pCamera->map_x + 1.0
28+
- pSeer->player.position.x) * pSeer->dda.scaling_factor.x;
2929
}
3030
if (pCamera->direction.y < 0)
3131
{
3232
pSeer->dda.step_y = -1;
33-
pSeer->dda.side_distance.y = (pSeer->player.position.y - pCamera->map_y)
34-
* pSeer->dda.delta_distance.y;
33+
pSeer->dda.distance.y = (pSeer->player.position.y - pCamera->map_y)
34+
* pSeer->dda.scaling_factor.y;
3535
}
3636
else
3737
{
3838
pSeer->dda.step_y = 1;
39-
pSeer->dda.side_distance.y = (pCamera->map_y + 1.0
40-
- pSeer->player.position.y) * pSeer->dda.delta_distance.y;
39+
pSeer->dda.distance.y = (pCamera->map_y + 1.0
40+
- pSeer->player.position.y) * pSeer->dda.scaling_factor.y;
4141
}
4242
}
4343

4444
void dda(t_seer *pSeer, t_camera *pCamera, int *side)
4545
{
4646
while (true)
4747
{
48-
if (pSeer->dda.side_distance.x < pSeer->dda.side_distance.y)
48+
if (pSeer->dda.distance.x < pSeer->dda.distance.y)
4949
{
50-
pSeer->dda.side_distance.x += pSeer->dda.delta_distance.x;
50+
pSeer->dda.distance.x += pSeer->dda.scaling_factor.x;
5151
pCamera->map_x += pSeer->dda.step_x;
5252
*side = HORIZONTAL;
5353
}
5454
else
5555
{
56-
pSeer->dda.side_distance.y += pSeer->dda.delta_distance.y;
56+
pSeer->dda.distance.y += pSeer->dda.scaling_factor.y;
5757
pCamera->map_y += pSeer->dda.step_y;
5858
*side = VERTICAL;
5959
}
@@ -70,7 +70,7 @@ void vertline(t_seer *pSeer, t_camera *pCamera, int side)
7070
pCamera->wall_distance = fabs((pCamera->map_y - pSeer->player.position.y + (1 - pSeer->dda.step_y) / 2) / pCamera->direction.y);
7171
if (pCamera->wall_distance == 0)
7272
pCamera->wall_distance = 0.0001;
73-
pSeer->vertline.height = (int)(SCREEN_HEIGHT / pCamera->wall_distance);
73+
pSeer->vertline.height = SCREEN_HEIGHT / pCamera->wall_distance;
7474
pSeer->vertline.start = -pSeer->vertline.height / 2 + SCREEN_HEIGHT / 2;
7575
if (pSeer->vertline.start < 0)
7676
pSeer->vertline.start = 0;

0 commit comments

Comments
 (0)