From c41dc29885a0fac1ebb57a3d90d1e9ccf6e44211 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 9 Dec 2022 14:24:36 +0100 Subject: [PATCH] - eliminated half of the remaining tileWidth and tileHeight calls. --- source/games/blood/src/aiunicult.cpp | 8 ++++---- source/games/blood/src/animatesprite.cpp | 7 ++++--- source/games/blood/src/blood.cpp | 2 +- source/games/blood/src/nnexts.cpp | 12 ++++++------ source/games/exhumed/src/2d.cpp | 21 +++++++++++++-------- source/games/exhumed/src/d_menu.cpp | 2 +- source/games/exhumed/src/exhumed.cpp | 24 +++++++++++++++--------- source/games/exhumed/src/exhumed.h | 5 +++-- source/games/exhumed/src/gameloop.cpp | 2 +- source/games/exhumed/src/ramses.cpp | 9 +++++---- source/games/exhumed/src/spider.cpp | 3 ++- source/games/exhumed/src/view.cpp | 3 ++- 12 files changed, 57 insertions(+), 41 deletions(-) diff --git a/source/games/blood/src/aiunicult.cpp b/source/games/blood/src/aiunicult.cpp index cd339fe5c..a384b2926 100644 --- a/source/games/blood/src/aiunicult.cpp +++ b/source/games/blood/src/aiunicult.cpp @@ -1692,7 +1692,7 @@ static double getRangeAttackDist(DBloodActor* actor, double minDist, double maxD int dist = 0; int seqId = actor->xspr.data2; int mul = 550; - int picnum = actor->spr.picnum; + auto texid = actor->spr.spritetexture(); if (yscale > 0) { @@ -1701,11 +1701,11 @@ static double getRangeAttackDist(DBloodActor* actor, double minDist, double maxD Seq* pSeq = getSequence(seqId); if (pSeq) { - picnum = seqGetTile(&pSeq->frames[0]); + texid = seqGetTexture(&pSeq->frames[0]); } } - - dist = tileHeight(picnum) << 8; + auto tex = TexMan.GetGameTexture(texid); + dist = int(tex->GetDisplayHeight() * 256); if (yscale < 64) dist -= (64 - yscale) * mul; else if (yscale > 64) dist += (yscale - 64) * (mul / 3); } diff --git a/source/games/blood/src/animatesprite.cpp b/source/games/blood/src/animatesprite.cpp index 24f79ed6b..1071c84eb 100644 --- a/source/games/blood/src/animatesprite.cpp +++ b/source/games/blood/src/animatesprite.cpp @@ -119,6 +119,7 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF auto pTSprite = tsprites.get(nTSprite); auto owneractor = static_cast(pTSprite->ownerActor); if (gDetail < effectDetail[nViewEffect]) return NULL; + auto pTTex = TexMan.GetGameTexture(pTSprite->spritetexture()); switch (nViewEffect) { case kViewEffectSpotProgress: { @@ -289,7 +290,7 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF pNSprite->pos.Z = pTSprite->pos.Z; pNSprite->picnum = 908; pNSprite->statnum = kStatDecoration; - s = (tileWidth(pTSprite->picnum) * pTSprite->scale.X) / 64.; + s = (pTTex->GetDisplayWidth() * pTSprite->scale.X) / 64.; pNSprite->scale = DVector2(s, s); break; } @@ -340,7 +341,7 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF pNSprite->pos.Z = top; pNSprite->picnum = 2101; pNSprite->shade = -128; - s = (tileWidth(pTSprite->picnum) * pTSprite->scale.X) / 32.; + s = (pTTex->GetDisplayWidth() * pTSprite->scale.X) / 32.; pNSprite->scale = DVector2(s, s); break; } @@ -355,7 +356,7 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF pNSprite->pos.Z = bottom; pNSprite->picnum = 2101; pNSprite->shade = -128; - s = (tileWidth(pTSprite->picnum) * pTSprite->scale.X) / 32.; + s = (pTTex->GetDisplayWidth() * pTSprite->scale.X) / 32.; pNSprite->scale = DVector2(s, s); break; } diff --git a/source/games/blood/src/blood.cpp b/source/games/blood/src/blood.cpp index f99d5af4a..f48322745 100644 --- a/source/games/blood/src/blood.cpp +++ b/source/games/blood/src/blood.cpp @@ -692,7 +692,7 @@ ReservedSpace GameInterface::GetReservedScreenSpace(int viewsize) int top = 0; if (gGameOptions.nGameType > 0 && gGameOptions.nGameType <= 3) { - top = (tileHeight(2229) * ((gNetPlayers + 3) / 4)); + top = (tileHeight(kSBPlayerSlot) * ((gNetPlayers + 3) / 4)); } return { top, 25 }; } diff --git a/source/games/blood/src/nnexts.cpp b/source/games/blood/src/nnexts.cpp index cee1f5589..b54a79c5c 100644 --- a/source/games/blood/src/nnexts.cpp +++ b/source/games/blood/src/nnexts.cpp @@ -1423,7 +1423,7 @@ int getSpriteMassBySize(DBloodActor* actor) return cached->mass; } - int picnum = actor->spr.picnum; + auto texid = actor->spr.spritetexture(); int massDiv = 30; int addMul = 2; int subMul = 2; @@ -1433,15 +1433,15 @@ int getSpriteMassBySize(DBloodActor* actor) auto pSeq = getSequence(seqId); if (pSeq) { - picnum = seqGetTile(&pSeq->frames[0]); + texid = seqGetTexture(&pSeq->frames[0]); } - else - picnum = actor->spr.picnum; } + auto tex = TexMan.GetGameTexture(texid); + if (!tex) return 0; clipDist = max(actor->clipdist, 0.25); - int x = tileWidth(picnum); - int y = tileHeight(picnum); + int x = (int)tex->GetDisplayWidth(); + int y = (int)tex->GetDisplayHeight(); int xscale = int(actor->spr.scale.X * 64); int yscale = int(actor->spr.scale.Y * 64); diff --git a/source/games/exhumed/src/2d.cpp b/source/games/exhumed/src/2d.cpp index 6beb9fd6c..ae58fba32 100644 --- a/source/games/exhumed/src/2d.cpp +++ b/source/games/exhumed/src/2d.cpp @@ -60,13 +60,17 @@ void DrawAbs(int tile, double x, double y, int shade = 0) DrawTexture(twod, tileGetTexture(tile), x, y, DTA_FullscreenScale, FSMode_Fit320x200, DTA_TopLeft, true, DTA_Color, shadeToLight(shade), TAG_DONE); } -void DrawRel(int tile, double x, double y, int shade) +void DrawRel(FGameTexture* tex, double x, double y, int shade = 0) { // This is slightly different than what the backend does here, but critical for some graphics. - auto tex = tileGetTexture(tile); int offx = (int(tex->GetDisplayWidth()) >> 1) + int(tex->GetDisplayLeftOffset()); int offy = (int(tex->GetDisplayHeight()) >> 1) + int(tex->GetDisplayTopOffset()); - DrawAbs(tile, x - offx, y - offy, shade); + DrawTexture(twod, tex, x - offx, y - offy, DTA_FullscreenScale, FSMode_Fit320x200, DTA_TopLeft, true, DTA_Color, shadeToLight(shade), TAG_DONE); +} + +void DrawRel(int tile, double x, double y, int shade) +{ + DrawRel(tileGetTexture(tile), x, y, shade); } //--------------------------------------------------------------------------- @@ -102,9 +106,10 @@ enum void menu_DoPlasma() { - auto nLogoTile = GameLogo(); - int lw = tileWidth(nLogoTile); - int lh = tileHeight(nLogoTile); + auto nLogoTexid = GameLogo(); + auto pLogoTex = TexMan.GetGameTexture(nLogoTexid); + int lw = (int)pLogoTex->GetDisplayWidth(); + int lh = (int)pLogoTex->GetDisplayHeight(); int ptile = nPlasmaTile; int pclock = I_GetBuildTime(); @@ -233,7 +238,7 @@ void menu_DoPlasma() r_ebx += 2; } - auto logopix = GetRawPixels(tileGetTextureID(nLogoTile)); + auto logopix = GetRawPixels(nLogoTexid); for (int j = 0; j < 5; j++) { @@ -303,7 +308,7 @@ void menu_DoPlasma() } } DrawAbs(ptile, 0, 0); - DrawRel(nLogoTile, 160, 40); + DrawRel(pLogoTex, 160, 40); // draw the fire urn/lamp thingies int dword_9AB5F = (pclock / 16) & 3; diff --git a/source/games/exhumed/src/d_menu.cpp b/source/games/exhumed/src/d_menu.cpp index 4dc258228..dafc16dc9 100644 --- a/source/games/exhumed/src/d_menu.cpp +++ b/source/games/exhumed/src/d_menu.cpp @@ -93,7 +93,7 @@ using namespace Exhumed; DEFINE_ACTION_FUNCTION(_ListMenuItemExhumedLogo, Draw) { auto nLogoTile = GameLogo(); - DrawRel(nLogoTile, 160, 40); + DrawRel(TexMan.GetGameTexture(nLogoTile), 160, 40); return 0; } diff --git a/source/games/exhumed/src/exhumed.cpp b/source/games/exhumed/src/exhumed.cpp index 35833de9b..5a4bc1586 100644 --- a/source/games/exhumed/src/exhumed.cpp +++ b/source/games/exhumed/src/exhumed.cpp @@ -117,7 +117,7 @@ void GameInterface::loadPalette() LoadPaletteLookups(); } -void CopyTileToBitmap(int nSrcTile, int nDestTile, int xPos, int yPos); +void CopyTileToBitmap(FTextureID nSrcTile, FTextureID nDestTile, int xPos, int yPos); // void TestSaveLoad(); void LoadStatus(); @@ -252,9 +252,11 @@ void DrawClock() while (nVal) { int v2 = nVal & 0xF; + auto texid = tileGetTextureID(v2 + kClockSymbol1); + auto tex = TexMan.GetGameTexture(texid); int yPos = 32 - tileHeight(v2 + kClockSymbol1) / 2; - CopyTileToBitmap(v2 + kClockSymbol1, kTile3603, ebp - tileWidth(v2 + kClockSymbol1) / 2, yPos); + CopyTileToBitmap(texid, tileGetTextureID(kTile3603), ebp - tex->GetTexelWidth() / 2, yPos); ebp -= 15; @@ -622,20 +624,24 @@ void DeleteActor(DExhumedActor* actor) // //--------------------------------------------------------------------------- -void CopyTileToBitmap(int nSrcTile, int nDestTile, int xPos, int yPos) +void CopyTileToBitmap(FTextureID nSrcTile, FTextureID nDestTile, int xPos, int yPos) { - int nOffs = tileHeight(nDestTile) * xPos; + auto pSrcTex = TexMan.GetGameTexture(nSrcTile); + auto pDestTex = TexMan.GetGameTexture(nDestTile); + int nOffs = pDestTex->GetTexelHeight() * xPos; - auto pixels = GetWritablePixels(tileGetTextureID(nDestTile)); + auto pixels = GetWritablePixels(nDestTile); + if (!pixels) return; uint8_t *pDest = pixels + nOffs + yPos; uint8_t *pDestB = pDest; - int destYSize = tileHeight(nDestTile); - int srcYSize = tileHeight(nSrcTile); + int destYSize = pDestTex->GetTexelHeight(); + int srcYSize = pSrcTex->GetTexelHeight(); - const uint8_t *pSrc = GetRawPixels(tileGetTextureID(nSrcTile)); + const uint8_t *pSrc = GetRawPixels(nSrcTile); + if (!pSrc) return; - for (int x = 0; x < tileWidth(nSrcTile); x++) + for (int x = 0; x < pSrcTex->GetTexelWidth(); x++) { pDest += destYSize; diff --git a/source/games/exhumed/src/exhumed.h b/source/games/exhumed/src/exhumed.h index a7495f851..eb9325140 100644 --- a/source/games/exhumed/src/exhumed.h +++ b/source/games/exhumed/src/exhumed.h @@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "names.h" #include "exhumedactor.h" #include "serialize_obj.h" +#include "texturemanager.h" BEGIN_PS_NS @@ -142,9 +143,9 @@ extern bool bDoFlashes; extern int bVanilla; -inline int GameLogo() +inline FTextureID GameLogo() { - return (g_gameType & GAMEFLAG_EXHUMED) ? kExhumedLogo : kPowerslaveLogo; + return TexMan.CheckForTexture((g_gameType & GAMEFLAG_EXHUMED) ? "ExhumedLogo" : "PowerslaveLogo", ETextureType::Any); } extern double g_frameDelay; diff --git a/source/games/exhumed/src/gameloop.cpp b/source/games/exhumed/src/gameloop.cpp index 86c917f1c..4984f0bd5 100644 --- a/source/games/exhumed/src/gameloop.cpp +++ b/source/games/exhumed/src/gameloop.cpp @@ -117,7 +117,7 @@ void GameInterface::DrawBackground() DrawRel(kSkullHead, 160, 100, 0); DrawRel(kSkullJaw, 161, 130, 0); - DrawRel(nLogoTile, 160, 40, 0); + DrawRel(TexMan.GetGameTexture(nLogoTile), 160, 40, 0); // draw the fire urn/lamp thingies DrawRel(kTile3512 + dword_9AB5F, 50, 150, 0); diff --git a/source/games/exhumed/src/ramses.cpp b/source/games/exhumed/src/ramses.cpp index 4ef381373..a274620f1 100644 --- a/source/games/exhumed/src/ramses.cpp +++ b/source/games/exhumed/src/ramses.cpp @@ -258,10 +258,11 @@ void DoSpiritHead() if (nMouthTile != 0) { - int srctile = nMouthTile + 598; - auto src = GetRawPixels(tileGetTextureID(srctile)); - int sizx = tileWidth(srctile); - int sizy = tileHeight(srctile); + FTextureID srctile = tileGetTextureID(nMouthTile + 598); + auto src = GetRawPixels(srctile); + auto tex = TexMan.GetGameTexture(srctile); + int sizx = tex->GetTexelWidth(); + int sizy = tex->GetTexelHeight(); int workptr = 212 * (97 - sizx / 2) + 159 - sizy; int srcptr = 0; while (sizx > 0) diff --git a/source/games/exhumed/src/spider.cpp b/source/games/exhumed/src/spider.cpp index 9de5256c4..12cbea0ea 100644 --- a/source/games/exhumed/src/spider.cpp +++ b/source/games/exhumed/src/spider.cpp @@ -185,7 +185,8 @@ void AISpider::Tick(RunListEvent* ev) if (spp->spr.cstat & CSTAT_SPRITE_YFLIP) { spp->vel.Z = 0; - spp->spr.pos.Z = pSector->ceilingz + (tileHeight(spp->spr.picnum) / 8.); // was << 5 in Build coordinates + auto tex = TexMan.GetGameTexture(spp->spr.spritetexture()); + spp->spr.pos.Z = pSector->ceilingz + (tex->GetDisplayHeight() / 8.); // was << 5 in Build coordinates if (pSector->ceilingstat & CSTAT_SECTOR_SKY) { diff --git a/source/games/exhumed/src/view.cpp b/source/games/exhumed/src/view.cpp index 7f2e572f5..71b00ee42 100644 --- a/source/games/exhumed/src/view.cpp +++ b/source/games/exhumed/src/view.cpp @@ -105,7 +105,8 @@ static void analyzesprites(tspriteArray& tsprites, const DVector3& view, double if ((pTSprite->picnum == kTorch1 || pTSprite->picnum == kTorch2) && (pTSprite->cstat & CSTAT_SPRITE_YCENTER) == 0) { pTSprite->cstat |= CSTAT_SPRITE_YCENTER; - double nTileY = (tileHeight(pTSprite->picnum) * pTSprite->scale.Y) * 0.5; + auto tex = TexMan.GetGameTexture(pTSprite->spritetexture()); + double nTileY = (tex->GetDisplayHeight() * pTSprite->scale.Y) * 0.5; pTSprite->pos.Z -= nTileY; }