1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify item blitting

Browse Source 
fZBlit was always set to true
bItemOutline was either always true or false depending on the branch
This commit is contained in:
Asdow
2023-09-27 22:48:40 +03:00
parent 195dc57e96
commit bbbfdb8bd5
1 changed files with 11 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/renderworld.cpp
+11 -36
View File
@@ -3332,8 +3332,6 @@ void RenderTiles(UINT32 uiFlags, INT32 iStartPointX_M, INT32 iStartPointY_M, INT
BOOLEAN fConvertTo16 = FALSE; BOOLEAN fConvertTo16 = FALSE;
UINT32 cnt; UINT32 cnt;
static UINT8 ubLevelNodeStartIndex[NUM_RENDER_FX_TYPES]; static UINT8 ubLevelNodeStartIndex[NUM_RENDER_FX_TYPES];
BOOLEAN bItemOutline;
UINT16 usOutlineColor = 0;
static INT32 iTileMapPos[500]; static INT32 iTileMapPos[500];
INT32 uiMapPosIndex; INT32 uiMapPosIndex;
@@ -4364,19 +4362,12 @@ void RenderTiles(UINT32 uiFlags, INT32 iStartPointX_M, INT32 iStartPointY_M, INT
} }
else if ((uiLevelNodeFlags & LEVELNODE_ITEM) && !(uiFlags & TILES_DIRTY)) else if ((uiLevelNodeFlags & LEVELNODE_ITEM) && !(uiFlags & TILES_DIRTY))
{ {
BOOLEAN fZBlit = FALSE; BOOLEAN bItemOutline = TRUE;
UINT16 usOutlineColor = gusNormalItemOutlineColor;
if (uiRowFlags == TILES_STATIC_ONROOF || uiRowFlags == TILES_DYNAMIC_ONROOF) if (uiRowFlags == TILES_STATIC_ONROOF || uiRowFlags == TILES_DYNAMIC_ONROOF)
{ {
usOutlineColor = gusYellowItemOutlineColor; usOutlineColor = gusYellowItemOutlineColor;
bItemOutline = TRUE;
fZBlit = TRUE;
}
else
{
usOutlineColor = gusNormalItemOutlineColor;
bItemOutline = TRUE;
fZBlit = TRUE;
} }
if (gGameSettings.fOptions[TOPTION_GLOW_ITEMS]) if (gGameSettings.fOptions[TOPTION_GLOW_ITEMS])
@@ -4384,66 +4375,47 @@ void RenderTiles(UINT32 uiFlags, INT32 iStartPointX_M, INT32 iStartPointY_M, INT
if (uiRowFlags == TILES_STATIC_ONROOF || uiRowFlags == TILES_DYNAMIC_ONROOF) if (uiRowFlags == TILES_STATIC_ONROOF || uiRowFlags == TILES_DYNAMIC_ONROOF)
{ {
usOutlineColor = us16BPPItemCycleYellowColors[gsCurrentItemGlowFrame]; usOutlineColor = us16BPPItemCycleYellowColors[gsCurrentItemGlowFrame];
bItemOutline = TRUE;
} }
else else
{ {
if (gTacticalStatus.uiFlags & RED_ITEM_GLOW_ON) if (gTacticalStatus.uiFlags & RED_ITEM_GLOW_ON)
{ {
usOutlineColor = us16BPPItemCycleRedColors[gsCurrentItemGlowFrame]; usOutlineColor = us16BPPItemCycleRedColors[gsCurrentItemGlowFrame];
bItemOutline = TRUE;
} }
else else
{ {
usOutlineColor = us16BPPItemCycleWhiteColors[gsCurrentItemGlowFrame]; usOutlineColor = us16BPPItemCycleWhiteColors[gsCurrentItemGlowFrame];
bItemOutline = TRUE;
} }
} }
} }
bBlitClipVal = BltIsClippedOrOffScreen(hVObject, sXPos, sYPos, usImageIndex, &gClippingRect); bBlitClipVal = BltIsClippedOrOffScreen(hVObject, sXPos, sYPos, usImageIndex, &gClippingRect);
if (bBlitClipVal == FALSE) if (bBlitClipVal == FALSE)
{ {
if (fZBlit) if (fObscuredBlitter)
{ {
if (fObscuredBlitter) Blt8BPPDataTo16BPPBufferOutlineZPixelateObscured((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline);
{
Blt8BPPDataTo16BPPBufferOutlineZPixelateObscured((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline);
}
else
{
Blt8BPPDataTo16BPPBufferOutlineZ((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline);
}
} }
else else
{ {
Blt8BPPDataTo16BPPBufferOutline((UINT16*)pDestBuf, uiDestPitchBYTES, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline); Blt8BPPDataTo16BPPBufferOutlineZ((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline);
} }
} }
else if (bBlitClipVal == TRUE) else if (bBlitClipVal == TRUE)
{ {
if (fZBlit) if (fObscuredBlitter)
{ {
if (fObscuredBlitter) Blt8BPPDataTo16BPPBufferOutlineZPixelateObscuredClip((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline, &gClippingRect);
{
Blt8BPPDataTo16BPPBufferOutlineZPixelateObscuredClip((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline, &gClippingRect);
}
else
{
Blt8BPPDataTo16BPPBufferOutlineZClip((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline, &gClippingRect);
}
} }
else else
{ {
Blt8BPPDataTo16BPPBufferOutlineClip((UINT16*)pDestBuf, uiDestPitchBYTES, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline, &gClippingRect); Blt8BPPDataTo16BPPBufferOutlineZClip((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline, &gClippingRect);
} }
} }
} }
// ATE: Check here for a lot of conditions! // ATE: Check here for a lot of conditions!
else if ((uiLevelNodeFlags & LEVELNODE_PHYSICSOBJECT) && !(uiFlags & TILES_DIRTY)) else if ((uiLevelNodeFlags & LEVELNODE_PHYSICSOBJECT) && !(uiFlags & TILES_DIRTY))
{ {
bItemOutline = FALSE;
bBlitClipVal = BltIsClippedOrOffScreen(hVObject, sXPos, sYPos, usImageIndex, &gClippingRect); bBlitClipVal = BltIsClippedOrOffScreen(hVObject, sXPos, sYPos, usImageIndex, &gClippingRect);
@@ -4460,6 +4432,9 @@ void RenderTiles(UINT32 uiFlags, INT32 iStartPointX_M, INT32 iStartPointY_M, INT
} }
else else
{ {
BOOLEAN bItemOutline = FALSE;
UINT16 usOutlineColor = 0; // Not used as bItemOutline == false but needs to be fed to the function calls
if (bBlitClipVal == FALSE) if (bBlitClipVal == FALSE)
{ {
Blt8BPPDataTo16BPPBufferOutlineZNB((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline); Blt8BPPDataTo16BPPBufferOutlineZNB((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline);