teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-20 08:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- deal with clipdist in nnexts

Browse source
This commit is contained in:
Christoph Oelckers 2022-10-04 19:35:00 +02:00
parent 9f19a1315b
commit 30112e1289
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/games/blood/src/aiunicult.cpp
View file

@ -2304,7 +2304,8 @@ bool genDudePrepare(DBloodActor* actor, int propId)
case kGenDudePropertyMass: { case kGenDudePropertyMass: {
// to ensure mass gets updated, let's clear all cache // to ensure mass gets updated, let's clear all cache
SPRITEMASS* pMass = &actor->spriteMass; SPRITEMASS* pMass = &actor->spriteMass;
pMass->seqId = pMass->picnum = pMass->xrepeat = pMass->yrepeat = pMass->clipdist = 0; pMass->seqId = pMass->picnum = pMass->xrepeat = pMass->yrepeat = 0;
pMass->clipDist = 0;
pMass->mass = pMass->airVel = pMass->fraction = 0; pMass->mass = pMass->airVel = pMass->fraction = 0;
getSpriteMassBySize(actor); getSpriteMassBySize(actor);
if (propId) break; if (propId) break;

14
source/games/blood/src/nnexts.cpp
View file

@ -1403,7 +1403,9 @@ void sfxPlayVectorSound(DBloodActor* actor, int vectorId)
int getSpriteMassBySize(DBloodActor* actor) int getSpriteMassBySize(DBloodActor* actor)
{ {
int mass = 0; int seqId = -1; int clipDist = actor->native_clipdist(); int mass = 0;
int seqId = -1;
double clipDist = actor->clipdist;
if (!actor->hasX()) if (!actor->hasX())
{ {
I_Error("getSpriteMassBySize: actor->spr.hasX == false"); I_Error("getSpriteMassBySize: actor->spr.hasX == false");
@ -1431,7 +1433,7 @@ int getSpriteMassBySize(DBloodActor* actor)
SPRITEMASS* cached = &actor->spriteMass; SPRITEMASS* cached = &actor->spriteMass;
if (((seqId >= 0 && seqId == cached->seqId) || actor->spr.picnum == cached->picnum) && actor->spr.xrepeat == cached->xrepeat && if (((seqId >= 0 && seqId == cached->seqId) || actor->spr.picnum == cached->picnum) && actor->spr.xrepeat == cached->xrepeat &&
actor->spr.yrepeat == cached->yrepeat && clipDist == cached->clipdist) actor->spr.yrepeat == cached->yrepeat && clipDist == cached->clipDist)
{ {
return cached->mass; return cached->mass;
} }
@ -1452,7 +1454,7 @@ int getSpriteMassBySize(DBloodActor* actor)
picnum = actor->spr.picnum; picnum = actor->spr.picnum;
} }
clipDist = ClipLow(actor->native_clipdist(), 1); clipDist = max(actor->clipdist, 0.25);
int x = tileWidth(picnum); int x = tileWidth(picnum);
int y = tileHeight(picnum); int y = tileHeight(picnum);
int xrepeat = actor->spr.xrepeat; int xrepeat = actor->spr.xrepeat;
@ -1477,7 +1479,7 @@ int getSpriteMassBySize(DBloodActor* actor)
case 14: massDiv = 23; break; // lava case 14: massDiv = 23; break; // lava
} }
mass = ((x + y) * (clipDist / 2)) / massDiv; mass = ((x + y) * int(clipDist * 2)) / massDiv;
if (xrepeat > 64) mass += ((xrepeat - 64) * addMul); if (xrepeat > 64) mass += ((xrepeat - 64) * addMul);
else if (xrepeat < 64 && mass > 0) else if (xrepeat < 64 && mass > 0)
@ -1515,7 +1517,7 @@ int getSpriteMassBySize(DBloodActor* actor)
cached->yrepeat = actor->spr.yrepeat; cached->yrepeat = actor->spr.yrepeat;
cached->picnum = actor->spr.picnum; cached->picnum = actor->spr.picnum;
cached->seqId = seqId; cached->seqId = seqId;
cached->clipdist = actor->native_clipdist(); cached->clipDist = actor->clipdist;
return cached->mass; return cached->mass;
} }
@ -9349,7 +9351,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, SPRITEMASS& w, SPR
("picnum", w.picnum, &nul.picnum) ("picnum", w.picnum, &nul.picnum)
("xrepeat", w.xrepeat, &nul.xrepeat) ("xrepeat", w.xrepeat, &nul.xrepeat)
("yrepeat", w.yrepeat, &nul.yrepeat) ("yrepeat", w.yrepeat, &nul.yrepeat)
("clipdist", w.clipdist) ("clipdist", w.clipDist)
("mass", w.mass) ("mass", w.mass)
("airvel", w.airVel) ("airvel", w.airVel)
("fraction", w.fraction) ("fraction", w.fraction)

4
source/games/blood/src/nnexts.h
View file

@ -196,9 +196,9 @@ struct SPRITEMASS { // sprite mass info for getSpriteMassBySize();
int16_t picnum; // mainly needs for moving debris int16_t picnum; // mainly needs for moving debris
int16_t xrepeat; int16_t xrepeat;
int16_t yrepeat; int16_t yrepeat;
int16_t clipdist; // mass multiplier
int mass;
int16_t airVel; // mainly needs for moving debris int16_t airVel; // mainly needs for moving debris
double clipDist; // mass multiplier
int mass;
int fraction; // mainly needs for moving debris int fraction; // mainly needs for moving debris
}; };