precalculate linedef angles
so we dont have to recalc it runtime the map is static and linedefs shouldnt be able to be moved so this should be fine
This commit is contained in:
1 parent
b93a5c5305
commit
dff8f549da
5 files changed
+16
-11
No files matched your search
+4
-4
@@ -2708,7 +2708,7 @@ static void P_HitCameraSlideLine(line_t *ld, camera_t *thiscam)
|
||||
}
|
||||
|
||||
side = P_PointOnLineSide(thiscam->x, thiscam->y, ld);
|
||||
lineangle = R_PointToAngle2(0, 0, ld->dx, ld->dy);
|
||||
lineangle = ld->angle;
|
||||
|
||||
if (side == 1)
|
||||
lineangle += ANGLE_180;
|
||||
@@ -2755,7 +2755,7 @@ static void P_HitSlideLine(line_t *ld)
|
||||
|
||||
side = P_PointOnLineSide(slidemo->x, slidemo->y, ld);
|
||||
|
||||
lineangle = R_PointToAngle2(0, 0, ld->dx, ld->dy);
|
||||
lineangle = ld->angle;
|
||||
|
||||
if (side == 1)
|
||||
lineangle += ANGLE_180;
|
||||
@@ -2788,7 +2788,7 @@ static void P_PlayerHitBounceLine(line_t *ld)
|
||||
fixed_t movelen;
|
||||
|
||||
side = P_PointOnLineSide(slidemo->x, slidemo->y, ld);
|
||||
lineangle = R_PointToAngle2(0, 0, ld->dx, ld->dy)-ANGLE_90;
|
||||
lineangle = ld->angle-ANGLE_90;
|
||||
|
||||
if (side == 1)
|
||||
lineangle += ANGLE_180;
|
||||
@@ -2826,7 +2826,7 @@ static void P_HitBounceLine(line_t *ld)
|
||||
return;
|
||||
}
|
||||
|
||||
lineangle = R_PointToAngle2(0, 0, ld->dx, ld->dy);
|
||||
lineangle = ld->angle;
|
||||
|
||||
if (lineangle >= ANGLE_180)
|
||||
lineangle -= ANGLE_180;
|
||||
|
||||
+4
-2
@@ -998,7 +998,7 @@ static void Polyobj_pushThing(polyobj_t *po, line_t *line, mobj_t *mo)
|
||||
vertex_t closest;
|
||||
|
||||
// calculate angle of line and subtract 90 degrees to get normal
|
||||
lineangle = R_PointToAngle2(0, 0, line->dx, line->dy) - ANGLE_90;
|
||||
lineangle = line->angle - ANGLE_90;
|
||||
lineangle >>= ANGLETOFINESHIFT;
|
||||
momx = FixedMul(po->thrust, FINECOSINE(lineangle));
|
||||
momy = FixedMul(po->thrust, FINESINE(lineangle));
|
||||
@@ -1274,6 +1274,8 @@ static void Polyobj_rotateLine(line_t *ld)
|
||||
ld->dx = v2->x - v1->x;
|
||||
ld->dy = v2->y - v1->y;
|
||||
|
||||
ld->angle = R_PointToAngle2(0, 0, ld->dx, ld->dy);
|
||||
|
||||
// determine slopetype
|
||||
ld->slopetype = !ld->dx ? ST_VERTICAL : !ld->dy ? ST_HORIZONTAL :
|
||||
FixedDiv(ld->dy, ld->dx) > 0 ? ST_POSITIVE : ST_NEGATIVE;
|
||||
@@ -2875,7 +2877,7 @@ INT32 EV_DoPolyObjFlag(line_t *pfdata)
|
||||
th->polyObjNum = pfdata->tag;
|
||||
th->distance = 0;
|
||||
th->speed = P_AproxDistance(pfdata->dx, pfdata->dy)>>FRACBITS;
|
||||
th->angle = R_PointToAngle2(pfdata->v1->x, pfdata->v1->y, pfdata->v2->x, pfdata->v2->y)>>ANGLETOFINESHIFT;
|
||||
th->angle = pfdata->angle >> ANGLETOFINESHIFT;
|
||||
th->momx = sides[pfdata->sidenum[0]].textureoffset>>FRACBITS;
|
||||
|
||||
// save current positions
|
||||
|
||||
@@ -1147,6 +1147,8 @@ static void P_SetupLines(void)
|
||||
ld->dx = v2->x - v1->x;
|
||||
ld->dy = v2->y - v1->y;
|
||||
|
||||
ld->angle = R_PointToAngle2(0, 0, ld->dx, ld->dy);
|
||||
|
||||
ld->alpha = FRACUNIT;
|
||||
ld->blendmode = 0;
|
||||
|
||||
|
||||
+5
-5
@@ -974,7 +974,7 @@ static boolean PolyDoor(line_t *line)
|
||||
case 480: // Polyobj_DoorSlide
|
||||
pdd.doorType = POLY_DOOR_SLIDE;
|
||||
pdd.speed = sides[line->sidenum[0]].textureoffset / 8;
|
||||
pdd.angle = R_PointToAngle2(line->v1->x, line->v1->y, line->v2->x, line->v2->y); // angle of motion
|
||||
pdd.angle = line->angle; // angle of motion
|
||||
pdd.distance = sides[line->sidenum[0]].rowoffset;
|
||||
|
||||
if (line->sidenum[1] != 0xffff)
|
||||
@@ -1010,7 +1010,7 @@ static boolean PolyMove(line_t *line)
|
||||
|
||||
pmd.polyObjNum = line->tag;
|
||||
pmd.speed = sides[line->sidenum[0]].textureoffset / 8;
|
||||
pmd.angle = R_PointToAngle2(line->v1->x, line->v1->y, line->v2->x, line->v2->y);
|
||||
pmd.angle = line->angle;
|
||||
pmd.distance = sides[line->sidenum[0]].rowoffset;
|
||||
|
||||
pmd.overRide = (line->special == 483); // Polyobj_OR_Move
|
||||
@@ -3523,7 +3523,7 @@ DoneSection2:
|
||||
angle_t lineangle;
|
||||
fixed_t linespeed;
|
||||
|
||||
lineangle = R_PointToAngle2(lines[i].v1->x, lines[i].v1->y, lines[i].v2->x, lines[i].v2->y);
|
||||
lineangle = lines[i].angle;
|
||||
linespeed = P_AproxDistance(lines[i].v2->x-lines[i].v1->x, lines[i].v2->y-lines[i].v1->y);
|
||||
|
||||
player->mo->angle = lineangle;
|
||||
@@ -5469,7 +5469,7 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
|
||||
case 5: // Change camera info
|
||||
sec = sides[*lines[i].sidenum].sector - sectors;
|
||||
for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
|
||||
P_AddCameraScanner(§ors[sec], §ors[s], R_PointToAngle2(lines[i].v2->x, lines[i].v2->y, lines[i].v1->x, lines[i].v1->y));
|
||||
P_AddCameraScanner(§ors[sec], §ors[s], lines[i].angle);
|
||||
break;
|
||||
|
||||
#ifdef PARANOIA
|
||||
@@ -5480,7 +5480,7 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
|
||||
case 7: // Flat alignment - redone by toast
|
||||
if ((lines[i].flags & (ML_NOSONIC|ML_NOTAILS)) != (ML_NOSONIC|ML_NOTAILS)) // If you can do something...
|
||||
{
|
||||
angle_t flatangle = InvAngle(R_PointToAngle2(lines[i].v1->x, lines[i].v1->y, lines[i].v2->x, lines[i].v2->y));
|
||||
angle_t flatangle = InvAngle(lines[i].angle);
|
||||
fixed_t xoffs;
|
||||
fixed_t yoffs;
|
||||
|
||||
|
||||
@@ -427,6 +427,7 @@ typedef struct line_s
|
||||
vertex_t *v2;
|
||||
|
||||
fixed_t dx, dy; // Precalculated v2 - v1 for side checking.
|
||||
angle_t angle; // Precalculated angle between dx and dy
|
||||
|
||||
// Animation related.
|
||||
INT16 flags;
|
||||
|
||||
Reference in new issue
Block a user