zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 00:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix sprite shading, cleanup analyzesprites

Browse source
This commit is contained in:
nukeykt 2019-10-11 21:49:39 +09:00 committed by Christoph Oelckers
parent 54621d20d2
commit 89552466d3
1 changed files with 59 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

143
source/exhumed/src/view.cpp
View file

@ -73,121 +73,88 @@ static void analyzesprites()
int var_38 = 20; int var_38 = 20;
int var_2C = 30000; int var_2C = 30000;
spritetype *pPlayerSprite = &sprite[nPlayerSprite];
besttarget = -1; besttarget = -1;
int x = sprite[nPlayerSprite].x; int x = pPlayerSprite->x;
int y = sprite[nPlayerSprite].y; int y = pPlayerSprite->y;
int z = sprite[nPlayerSprite].z - (GetSpriteHeight(nPlayerSprite) / 2); int z = pPlayerSprite->z - (GetSpriteHeight(nPlayerSprite) / 2);
short nSector = sprite[nPlayerSprite].sectnum; short nSector = pPlayerSprite->sectnum;
int nAngle = (2048 - sprite[nPlayerSprite].ang) & kAngleMask; int nAngle = (2048 - pPlayerSprite->ang) & kAngleMask;
int edi = spritesortcnt; int nTSprite;
int nSprite = spritesortcnt - 1; tspritetype *pTSprite;
// int var_20 = var_24; // int var_20 = var_24;
while (1) for (nTSprite = spritesortcnt-1, pTSprite = &tsprite[nTSprite]; nTSprite >= 0; nTSprite--, pTSprite--)
{ {
edi--; int nSprite = pTSprite->owner;
if (edi < 0) spritetype *pSprite = &sprite[nSprite];
{
if (besttarget != -1)
{
nCreepyTimer = 450;
if (!cansee(x, y, z, nSector, sprite[besttarget].x, sprite[besttarget].y, sprite[besttarget].z - GetSpriteHeight(besttarget), sprite[besttarget].sectnum)) if (pTSprite->sectnum >= 0)
{ {
besttarget = -1; sectortype *pSector = &sector[pTSprite->sectnum];
} int nSectShade = (pSector->ceilingstat & 1) ? pSector->ceilingshade : pSector->floorshade;
int nShade = pTSprite->shade + nSectShade + 6;
pTSprite->shade = clamp(nShade, -128, 127);
} }
return; if (pSprite->statnum > 0)
}
else
{ {
int nSprite2 = tsprite[nSprite].owner; runlist_SignalRun(pSprite->lotag - 1, nTSprite | 0x90000);
if (sprite[nSprite2].statnum > 0) if ((pSprite->statnum < 150) && (pSprite->cstat & 0x101) && (nSprite != nPlayerSprite))
{ {
runlist_SignalRun(sprite[nSprite2].lotag - 1, edi | 0x90000); int xval = pSprite->x - x;
int yval = pSprite->y - y;
if ((sprite[nSprite2].statnum < 150) && (sprite[nSprite2].cstat & 0x101) && (nSprite2 != nPlayerSprite)) int vcos = Cos(nAngle);
int vsin = Sin(nAngle);
int edx = ((vcos * yval) + (xval * vsin)) >> 14;
int ebx = klabs(((vcos * xval) - (yval * vsin)) >> 14);
if (!ebx)
continue;
edx = (klabs(edx) * 32) / ebx;
if (ebx < 1000 && ebx < var_2C && edx < 10)
{ {
int xval = sprite[nSprite2].x - x; besttarget = nSprite;
int yval = sprite[nSprite2].y - y;
int var_40 = xval * Sin(nAngle + 512);
int var_44 = sintable[nAngle];
int edx = ((Sin(nAngle + 512) * yval) + (xval * var_44)) >> 14;
int eax = (var_40 - (yval * var_44)) >> 14;
if (eax < 0) {
eax = -eax;
}
int ebx = eax;
int ecx = eax;
if (eax)
{
eax = edx;
if (eax < 0) {
eax = -eax;
}
edx = (eax * 32) / ebx;
if (ebx >= 1000 || ebx >= var_2C || edx >= 10)
{
// loc_170A1
if (ecx < 30000)
{
eax = var_38 - edx;
if (eax <= 3)
{
if (ecx < var_2C)
{
if (eax < 0) {
eax = -eax;
}
if (eax < 5)
{
var_38 = edx;
var_2C = ecx;
besttarget = nSprite2;
}
}
}
else
{
var_38 = edx;
var_2C = ecx;
besttarget = nSprite2;
}
}
}
else
{
besttarget = nSprite2;
var_38 = edx; var_38 = edx;
var_2C = ebx; var_2C = ebx;
} }
else if (ebx < 30000)
{
int t = var_38 - edx;
if (t > 3 || (ebx < var_2C && klabs(t) < 5))
{
var_38 = edx;
var_2C = ebx;
besttarget = nSprite;
} }
} }
} }
} }
}
if (besttarget != -1)
{
spritetype *pTarget = &sprite[besttarget];
nSprite--; nCreepyTimer = 450;
if (!cansee(x, y, z, nSector, pTarget->x, pTarget->y, pTarget->z - GetSpriteHeight(besttarget), pTarget->sectnum))
{
besttarget = -1;
}
} }
} }