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

- refactored Blood's tile property arrays to texture IDs.

Browse source 
The data structure here can be optimized later when the other games get to the same point, but this allows to rid Blood of all references to wallpicnunm, floorpicnum and ceilingpicnum except one place in the precacher.
This commit is contained in:
Christoph Oelckers 2022-12-06 12:07:24 +01:00
parent 483617d3e1
commit a6db974a62
11 changed files with 87 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/core/maptypes.h
View file

@ -454,12 +454,6 @@ struct sectortype
// same for SW
bool hasU() const { return u_defined; }
// Refactoring helper to remove all places that will need the tile num from future searches
int legacyTileNum(int which) const
{
return which? ceilingpicnum : floorpicnum;
}
};
//=============================================================================

18
source/games/blood/src/actor.cpp
View file

@ -3942,7 +3942,7 @@ static void actImpactMissile(DBloodActor* missileActor, int hitCode)
actDamageSprite(missileOwner, actorHit, kDamageBullet, nDamage);
}
if (surfType[actorHit->spr.picnum] == kSurfFlesh)
if (tprops[actorHit->spr.spritetexture()].surfType == kSurfFlesh)
{
missileActor->spr.picnum = 2123;
missileActor->SetTarget(actorHit);
@ -4108,7 +4108,7 @@ static void actTouchFloor(DBloodActor* actor, sectortype* pSector)
actDamageSprite(actor, actor, nDamageType, Scale(4, nDamage, 120) << 4);
}
if (tileGetSurfType(pSector->floorpicnum) == kSurfLava)
if (tprops[pSector->floortexture()].surfType == kSurfLava)
{
actDamageSprite(actor, actor, kDamageBurn, 16);
sfxPlay3DSound(actor, 352, 5, 2);
@ -6630,7 +6630,7 @@ void actFireVector(DBloodActor* shooter, double offset, double zoffset, DVector3
if (pSector->ceilingstat & CSTAT_SECTOR_SKY)
nSurf = kSurfNone;
else
nSurf = surfType[pSector->ceilingpicnum];
nSurf = tprops[pSector->ceilingtexture()].surfType;
break;
}
case 2:
@ -6638,17 +6638,17 @@ void actFireVector(DBloodActor* shooter, double offset, double zoffset, DVector3
if (pSector->floorstat & CSTAT_SECTOR_SKY)
nSurf = kSurfNone;
else
nSurf = surfType[pSector->floorpicnum];
nSurf = tprops[pSector->floortexture()].surfType;
break;
}
case 0:
{
auto pWall = gHitInfo.hitWall;
nSurf = surfType[pWall->wallpicnum];
nSurf = tprops[pWall->walltexture()].surfType;
if (actCanSplatWall(pWall))
{
auto ppos = gHitInfo.hitpos - dv;
int nnSurf = surfType[pWall->wallpicnum];
int nnSurf = tprops[pWall->walltexture()].surfType;
assert(nnSurf < kSurfMax);
if (pVectorData->surfHit[nnSurf].fx1 >= 0)
{
@ -6666,7 +6666,7 @@ void actFireVector(DBloodActor* shooter, double offset, double zoffset, DVector3
case 4:
{
auto pWall = gHitInfo.hitWall;
nSurf = surfType[pWall->overpicnum];
nSurf = tprops[pWall->overtexture()].surfType;
if (pWall->hasX())
{
if (pWall->xw().triggerVector)
@ -6677,7 +6677,7 @@ void actFireVector(DBloodActor* shooter, double offset, double zoffset, DVector3
case 3:
{
auto actor = gHitInfo.actor();
nSurf = surfType[actor->spr.picnum];
nSurf = tprops[actor->spr.spritetexture()].surfType;
pos -= 7 * dv;
int shift = 4;
if (vectorType == kVectorTine && !actor->IsPlayerActor()) shift = 3;
@ -6741,7 +6741,7 @@ void actFireVector(DBloodActor* shooter, double offset, double zoffset, DVector3
if (actCanSplatWall(pWall))
{
auto ppos = gHitInfo.hitpos - dv;
int nnSurf = surfType[pWall->wallpicnum];
int nnSurf = tprops[pWall->walltexture()].surfType;
const VECTORDATA* pVectorData1 = &gVectorData[19];
FX_ID t2 = pVectorData1->surfHit[nnSurf].fx2;
FX_ID t3 = pVectorData1->surfHit[nnSurf].fx3;

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

@ -1574,7 +1574,7 @@ static void scaleDamage(DBloodActor* actor)
}
// take surface type into account
int surfType = tileGetSurfType(actor->spr.picnum);
int surfType = tprops[actor->spr.spritetexture()].surfType;
switch (surfType)
{
case 1: // stone

10
source/games/blood/src/animatesprite.cpp
View file

@ -630,14 +630,14 @@ void viewProcessSprites(tspriteArray& tsprites, const DVector3& cPos, DAngle cA,
break;
// Can be overridden by def script
if (r_voxels && tiletovox[pTSprite->picnum] == -1 && voxelIndex[pTSprite->picnum] != -1 && !(owneractor->sprext.renderflags & SPREXT_NOTMD))
if (r_voxels && tiletovox[pTSprite->picnum] == -1 && tprops[pTSprite->spritetexture()].voxelIndex != -1 && !(owneractor->sprext.renderflags & SPREXT_NOTMD))
{
if ((pTSprite->flags & kHitagRespawn) == 0)
{
pTSprite->cstat |= CSTAT_SPRITE_ALIGNMENT_SLAB;
pTSprite->cstat &= ~(CSTAT_SPRITE_XFLIP | CSTAT_SPRITE_YFLIP);
pTSprite->yoffset += tileTopOffset(pTSprite->picnum);
pTSprite->picnum = voxelIndex[pTSprite->picnum];
pTSprite->picnum = tprops[pTSprite->spritetexture()].voxelIndex;
if ((picanm[nTile].extra & 7) == 7)
{
pTSprite->Angles.Yaw = myclock.Normalized360();
@ -694,13 +694,13 @@ void viewProcessSprites(tspriteArray& tsprites, const DVector3& cPos, DAngle cA,
if ((pSector->ceilingstat & CSTAT_SECTOR_SKY) && (pSector->floorstat & CSTAT_SECTOR_NO_CEILINGSHADE) == 0)
{
nShade += tileShade[pSector->ceilingpicnum] + pSector->ceilingshade;
nShade += tprops[pSector->ceilingtexture()].tileShade + pSector->ceilingshade;
}
else
{
nShade += tileShade[pSector->floorpicnum] + pSector->floorshade;
nShade += tprops[pSector->floortexture()].tileShade + pSector->floorshade;
}
nShade += tileShade[pTSprite->picnum];
nShade += tprops[pTSprite->spritetexture()].tileShade;
pTSprite->shade = ClipRange(nShade, -128, 127);
if ((pTSprite->flags & kHitagRespawn) && pTSprite->ownerActor->spr.intowner == 3 && owneractor->hasX()) // Where does this 3 come from? Nothing sets it.
{

4
source/games/blood/src/db.cpp
View file

@ -402,8 +402,8 @@ void dbLoadMap(const char* pPath, DVector3& pos, short* pAngle, sectortype** cur
pWall->nextwall = LittleShort(load.nextwall);
pWall->nextsector = LittleShort(load.nextsector);
pWall->cstat = EWallFlags::FromInt(LittleShort(load.cstat));
pWall->wallpicnum = EWallFlags::FromInt(LittleShort(load.picnum));
pWall->overpicnum = LittleShort(load.overpicnum);
pWall->setwalltexture(tileGetTextureID(LittleShort(load.picnum)));
pWall->setovertexture(tileGetTextureID(LittleShort(load.overpicnum)));
pWall->type = LittleShort(load.type);
pWall->hitag = LittleShort(load.hitag);
pWall->extra = LittleShort(load.extra);

33
source/games/blood/src/misc.h
View file

@ -90,8 +90,6 @@ enum SurfaceType {
kSurfMax
};
extern uint8_t surfType[MAXTILES];
extern int8_t tileShade[MAXTILES];
extern short voxelIndex[MAXTILES];
extern int nPrecacheCount;
@ -99,7 +97,36 @@ inline FTextureID mirrortile;
void tilePrecacheTile(int nTile, int nType, int palette);
int tileGetSurfType(int hit);
int tileGetSurfType(CollisionBase& hit);
struct TextureAttr
{
uint8_t surfType = kSurfNone;
int8_t tileShade = 0;
int16_t voxelIndex = -1;
};
class FTextureAttrArray
{
TextureAttr defaultattr;
public:
TArray<TextureAttr> Types;
TextureAttr operator [](FTextureID tex) const
{
if ((unsigned)tex.GetIndex() >= Types.Size()) return defaultattr;
return Types[tex.GetIndex()];
}
void Set(int index, const TextureAttr& value)
{
if ((unsigned)index >= Types.Size())
{
Types.Resize(index + 1);
}
Types[index] = value;
}
};
inline FTextureAttrArray tprops;
END_BLD_NS

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

@ -1446,7 +1446,7 @@ int getSpriteMassBySize(DBloodActor* actor)
int yscale = int(actor->spr.scale.Y * 64);
// take surface type into account
switch (tileGetSurfType(actor->spr.picnum))
switch (tprops[actor->spr.spritetexture()].surfType)
{
case 1: massDiv = 16; break; // stone
case 2: massDiv = 18; break; // metal
@ -3945,8 +3945,8 @@ bool condCheckMixed(DBloodActor* aCond, const EVENT& event, int cmpOp, bool PUSH
walltype* pObj = eob.wall();
switch (cond)
{
case 24: return condCmp(surfType[pObj->wallpicnum], arg1, arg2, cmpOp);
case 25: return condCmp(pObj->wallpicnum, arg1, arg2, cmpOp);
case 24: return condCmp(tprops[pObj->walltexture()].surfType, arg1, arg2, cmpOp);
case 25: return condCmp(legacyTileNum(pObj->walltexture()), arg1, arg2, cmpOp);
case 26: return condCmp(pObj->pal, arg1, arg2, cmpOp);
case 27: return condCmp(pObj->shade, arg1, arg2, cmpOp);
case 28: return (arg3) ? condCmp((pObj->cstat & EWallFlags::FromInt(arg3)), arg1, arg2, cmpOp) : (pObj->cstat & EWallFlags::FromInt(arg1));
@ -3963,7 +3963,7 @@ bool condCheckMixed(DBloodActor* aCond, const EVENT& event, int cmpOp, bool PUSH
if (!actor) break;
switch (cond)
{
case 24: return condCmp(surfType[actor->spr.picnum], arg1, arg2, cmpOp);
case 24: return condCmp(tprops[actor->spr.spritetexture()].surfType, arg1, arg2, cmpOp);
case 25: return condCmp(actor->spr.picnum, arg1, arg2, cmpOp);
case 26: return condCmp(actor->spr.pal, arg1, arg2, cmpOp);
case 27: return condCmp(actor->spr.shade, arg1, arg2, cmpOp);
@ -3983,17 +3983,17 @@ bool condCheckMixed(DBloodActor* aCond, const EVENT& event, int cmpOp, bool PUSH
case 24:
switch (arg3)
{
default: return (condCmp(surfType[pObj->legacyTileNum(sectortype::floor)], arg1, arg2, cmpOp) || condCmp(surfType[pObj->legacyTileNum(sectortype::ceiling)], arg1, arg2, cmpOp));
case 1: return condCmp(surfType[pObj->legacyTileNum(sectortype::floor)], arg1, arg2, cmpOp);
case 2: return condCmp(surfType[pObj->legacyTileNum(sectortype::ceiling)], arg1, arg2, cmpOp);
default: return (condCmp(tprops[pObj->floortexture()].surfType, arg1, arg2, cmpOp) || condCmp(tprops[pObj->ceilingtexture()].surfType, arg1, arg2, cmpOp));
case 1: return condCmp(tprops[pObj->floortexture()].surfType, arg1, arg2, cmpOp);
case 2: return condCmp(tprops[pObj->ceilingtexture()].surfType, arg1, arg2, cmpOp);
}
break;
case 25:
switch (arg3)
{
default: return (condCmp(pObj->legacyTileNum(sectortype::floor), arg1, arg2, cmpOp) || condCmp(pObj->legacyTileNum(sectortype::ceiling), arg1, arg2, cmpOp));
case 1: return condCmp(pObj->legacyTileNum(sectortype::floor), arg1, arg2, cmpOp);
case 2: return condCmp(pObj->legacyTileNum(sectortype::ceiling), arg1, arg2, cmpOp);
default: return (condCmp(legacyTileNum(pObj->floortexture()), arg1, arg2, cmpOp) || condCmp(legacyTileNum(pObj->ceilingtexture()), arg1, arg2, cmpOp));
case 1: return condCmp(legacyTileNum(pObj->floortexture()), arg1, arg2, cmpOp);
case 2: return condCmp(legacyTileNum(pObj->ceilingtexture()), arg1, arg2, cmpOp);
}
break;
case 26:

6
source/games/blood/src/sectorfx.cpp
View file

@ -320,9 +320,9 @@ void DoSectorPanning(void)
psx = MulScale(psx, pXWall->busy, 16);
psy = MulScale(psy, pXWall->busy, 16);
}
int nTile = pWall->wallpicnum;
int px = (psx << 2) / tileWidth(nTile);
int py = (psy << 2) / tileHeight(nTile);
auto nTex = TexMan.GetGameTexture(pWall->walltexture());
int px = (psx << 2) / int(nTex->GetDisplayWidth());
int py = (psy << 2) / int(nTex->GetDisplayHeight());
pWall->addxpan(px * (1.f / 256));
pWall->addypan(py * (1.f / 256));

12
source/games/blood/src/seq.cpp
View file

@ -128,7 +128,7 @@ void seqPrecacheId(int id, int palette)
void UpdateCeiling(sectortype* pSector, SEQFRAME* pFrame)
{
pSector->ceilingpicnum = seqGetTile(pFrame);
pSector->setceilingtexture(seqGetTexture(pFrame));
pSector->ceilingshade = pFrame->shade;
if (pFrame->palette)
pSector->ceilingpal = pFrame->palette;
@ -142,7 +142,7 @@ void UpdateCeiling(sectortype* pSector, SEQFRAME* pFrame)
void UpdateFloor(sectortype* pSector, SEQFRAME* pFrame)
{
pSector->floorpicnum = seqGetTile(pFrame);
pSector->setfloortexture(seqGetTexture(pFrame));
pSector->floorshade = pFrame->shade;
if (pFrame->palette)
pSector->floorpal = pFrame->palette;
@ -157,7 +157,7 @@ void UpdateFloor(sectortype* pSector, SEQFRAME* pFrame)
void UpdateWall(walltype* pWall, SEQFRAME* pFrame)
{
assert(pWall->hasX());
pWall->wallpicnum = seqGetTile(pFrame);
pWall->setwalltexture(seqGetTexture(pFrame));
if (pFrame->palette)
pWall->pal = pFrame->palette;
if (pFrame->transparent)
@ -188,7 +188,9 @@ void UpdateMasked(walltype* pWall, SEQFRAME* pFrame)
{
assert(pWall->hasX());
walltype* pWallNext = pWall->nextWall();
pWall->overpicnum = pWallNext->overpicnum = seqGetTile(pFrame);
auto texid = seqGetTexture(pFrame);
pWall->setovertexture(texid);
pWallNext->setovertexture(texid);
if (pFrame->palette)
pWall->pal = pWallNext->pal = pFrame->palette;
if (pFrame->transparent)
@ -356,7 +358,7 @@ void SEQINST::Update()
if (!VanillaMode() && pSequence->frames[frameIndex].surfaceSound && actor->vel.Z == 0 && actor->vel.X != 0) {
if (actor->sector()->upperLink) break; // don't play surface sound for stacked sectors
int surf = tileGetSurfType(actor->sector()->floorpicnum);
int surf = tprops[actor->sector()->floortexture()].surfType;
if (!surf) break;
static int surfSfxMove[15][4] = {
/* {snd1, snd2, gameVolume, myVolume} */

5
source/games/blood/src/seq.h
View file

@ -91,6 +91,11 @@ inline int seqGetTile(SEQFRAME* pFrame)
return pFrame->tile + (pFrame->tile2 << 12);
}
inline FTextureID seqGetTexture(SEQFRAME* pFrame)
{
return tileGetTextureID(pFrame->tile + (pFrame->tile2 << 12));
}
int seqRegisterClient(void(*pClient)(int, int));
void seqPrecacheId(int id, int palette);
SEQINST* GetInstance(int a1, EventObject& a2);

34
source/games/blood/src/tile.cpp
View file

@ -34,19 +34,11 @@ BEGIN_BLD_NS
int nTileFiles = 0;
uint8_t surfType[kMaxTiles];
int8_t tileShade[kMaxTiles];
// these arrays get partially filled by .def, so they need to remain global.
static uint8_t surfType[kMaxTiles];
static int8_t tileShade[kMaxTiles];
short voxelIndex[kMaxTiles];
struct TextureProps
{
uint8_t surfType;
int8_t tileShade;
int16_t voxelIndex;
};
TArray<TextureProps> tprops;
#define x(a, b) registerName(#a, b);
static void SetTileNames()
{
@ -106,6 +98,15 @@ void GameInterface::SetupSpecialTextures()
TileFiles.tileMakeWritable(2342);
TileFiles.lock(); // from this point on the tile<->texture associations may not change anymore.
mirrortile = tileGetTextureID(504);
for (int i = 0; i < MAXTILES; i++)
{
auto tex = tileGetTexture(i);
if (tex)
{
TextureAttr a = { surfType[i], tileShade[i], voxelIndex[i] };
tprops.Set(tex->GetID().GetIndex(), a);
}
}
}
//---------------------------------------------------------------------------
@ -114,11 +115,6 @@ void GameInterface::SetupSpecialTextures()
//
//---------------------------------------------------------------------------
int tileGetSurfType(int hit)
{
return surfType[hit];
}
int tileGetSurfType(CollisionBase& hit)
{
switch (hit.type)
@ -126,11 +122,11 @@ int tileGetSurfType(CollisionBase& hit)
default:
return 0;
case kHitSector:
return surfType[hit.hitSector->floorpicnum];
return tprops[hit.hitSector->floortexture()].surfType;
case kHitWall:
return surfType[hit.hitWall->wallpicnum];
return tprops[hit.hitWall->walltexture()].surfType;
case kHitSprite:
return surfType[hit.hitActor->spr.picnum];
return tprops[hit.hitActor->spr.spritetexture()].surfType;
}
}