zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-20 10:32:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified all clipmove input.

Browse source
This commit is contained in:
Christoph Oelckers 2022-10-25 19:42:36 +02:00
parent 85182ae49a
commit 14cff92624
3 changed files with 21 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
source/build/src/clip.cpp
View file

@ -77,27 +77,25 @@ static inline int32_t cliptrace(MoveClipper& clip, const DVector2& pos, DVector2
//
// clipmove
//
CollisionBase clipmove_(vec3_t * const ipos, int * const sectnum, int32_t ixvect, int32_t iyvect,
int32_t const walldist, int32_t const ceildist, int32_t const flordist, uint32_t const cliptype, int clipmoveboxtracenum, bool precise)
CollisionBase clipmove_(DVector3& inpos, sectortype** const sect, const DVector2& invect,
double const walldist, double const ceildist, double const flordist, uint32_t const cliptype, int clipmoveboxtracenum, bool precise)
{
if ((ixvect|iyvect) == 0 || *sectnum < 0)
if (invect.isZero() || *sect == nullptr)
return {};
int const initialsectnum = *sectnum;
//Extra walldist for sprites on sector lines
MoveClipper clip(&sector[initialsectnum]);
MoveClipper clip(*sect);
clip.moveDelta = { (ixvect >> 14) * inttoworld, (iyvect >> 14) * inttoworld }; // beware of excess precision here!
clip.moveDelta = invect;
clip.wallflags = EWallFlags::FromInt(cliptype & 65535);
clip.ceilingdist = ceildist * zinttoworld;
clip.floordist = flordist * zinttoworld;
clip.walldist = walldist * inttoworld;
clip.pos = { ipos->X * inttoworld, ipos->Y * inttoworld, ipos->Z * zinttoworld };
clip.ceilingdist = ceildist;
clip.floordist = flordist;
clip.walldist = walldist;
clip.pos = inpos;
clip.dest = clip.pos + clip.moveDelta;
clip.center = (clip.pos.XY() + clip.dest) * 0.5;
clip.movedist = clip.moveDelta.Length() + clip.walldist + 0.5 + MAXCLIPDIST * inttoworld;
clip.movedist = clip.moveDelta.Length() + walldist + 0.5 + MAXCLIPDIST * inttoworld;
clip.precise = precise;
clip.rect.min = { clip.center.X - clip.movedist, clip.center.Y - clip.movedist };
clip.rect.max = { clip.center.X + clip.movedist, clip.center.Y + clip.movedist };
@ -111,12 +109,11 @@ CollisionBase clipmove_(vec3_t * const ipos, int * const sectnum, int32_t ixvect
DVector2 fgoal = clip.dest;
DVector2 fpos = clip.pos;
DVector2 fvect = clip.moveDelta;
DVector2 fvect = invect;
auto copypos = [&]()
{
ipos->X = fpos.X * worldtoint;
ipos->Y = fpos.Y * worldtoint;
inpos.XY() = fpos;
};
@ -124,7 +121,7 @@ CollisionBase clipmove_(vec3_t * const ipos, int * const sectnum, int32_t ixvect
{
if (clip.precise && !fvect.isZero())
{
PushAway(clip, fpos, &sector[*sectnum]);
PushAway(clip, fpos, *sect);
}
auto fvec = fgoal;
@ -143,13 +140,11 @@ CollisionBase clipmove_(vec3_t * const ipos, int * const sectnum, int32_t ixvect
double dot2 = clip.clipobjects[i].line.delta().dot(clip.moveDelta);
if ((dot1 < -inttoworld * 0.5) != (dot2 < -inttoworld * 0.5))
if ((dot1 < 0) != (dot2 < 0))
{
if (!clip.precise)
{
auto sectp = &sector[*sectnum];
updatesector(fpos, &sectp);
*sectnum = sectp ? ::sectnum(sectp) : -1;
updatesector(fpos, sect);
}
copypos();
return clipReturn;
@ -171,9 +166,7 @@ CollisionBase clipmove_(vec3_t * const ipos, int * const sectnum, int32_t ixvect
if (clip.precise)
{
DVector3 v(fvec, 0);
sectortype* sect = &sector[*sectnum];
updatesector(v, &sect, clip.movedist);
*sectnum = ::sectnum(sect);
updatesector(v, sect, clip.movedist);
}
fpos = fvec;

10
source/core/coreactor.h
View file

@ -435,17 +435,13 @@ void InitSpriteLists();
void SetActorZ(DCoreActor* actor, const DVector3& newpos);
void SetActor(DCoreActor* actor, const DVector3& newpos);
CollisionBase clipmove_(vec3_t* const pos, int* const sectnum, int32_t xvect, int32_t yvect, int32_t const walldist, int32_t const ceildist,
int32_t const flordist, uint32_t const cliptype, int clipmoveboxtracenum, bool precise);
CollisionBase clipmove_(DVector3& inpos, sectortype** const sect, const DVector2& vect, double const walldist, double const ceildist,
double const flordist, uint32_t const cliptype, int clipmoveboxtracenum, bool precise);
inline int clipmove(DVector3& pos, sectortype** const sect, const DVector2& mvec,
double const walldist, double const ceildist, double const flordist, unsigned const cliptype, CollisionBase& result, int clipmoveboxtracenum = 3, bool precise = false)
{
auto vect = vec3_t(int(pos.X * worldtoint), int(pos.Y * worldtoint), int(pos.Z * zworldtoint));
int sectno = *sect ? sector.IndexOf(*sect) : -1;
result = clipmove_(&vect, &sectno, FloatToFixed<18>(mvec.X), FloatToFixed<18>(mvec.Y), int(walldist * worldtoint), int(ceildist * zworldtoint), int(flordist * zworldtoint), cliptype, clipmoveboxtracenum, precise);
pos = { vect.X * inttoworld, vect.Y * inttoworld, vect.Z * zinttoworld };
*sect = sectno == -1 ? nullptr : &sector[sectno];
result = clipmove_(pos, sect, mvec, walldist, ceildist, flordist, cliptype, clipmoveboxtracenum, precise);
return result.type;
}

4
source/core/gamefuncs.cpp
View file

@ -1690,8 +1690,8 @@ void keepaway(MoveClipper& clip, DVector2& pos, ClipObject& clipo)
const double ox = Sgn(normal.X) * inttoworld, oy = Sgn(normal.Y) * inttoworld;
bool first = (abs(normal.Y) <= abs(normal.X));
pos.X = int(pos.X * worldtoint) * inttoworld;
pos.Y = int(pos.Y * worldtoint) * inttoworld;
//pos.X = int(pos.X * worldtoint) * inttoworld;
//pos.Y = int(pos.Y * worldtoint) * inttoworld;
do
{