Remove unused bilinear mode.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2883 4a71c877-e1ca-e34f-864e-861f7616d084master
parent
6172bdd498
commit
7713623a64
|
@ -52,10 +52,6 @@ void pie_SetDefaultStates(void)//Sets all states
|
|||
//chroma keying on black
|
||||
rendStates.keyingOn = FALSE;//to force reset to true
|
||||
pie_SetColourKeyedBlack(TRUE);
|
||||
|
||||
//bilinear filtering
|
||||
rendStates.bilinearOn = FALSE;//to force reset to true
|
||||
pie_SetBilinear(TRUE);
|
||||
}
|
||||
|
||||
|
||||
|
@ -231,20 +227,6 @@ void pie_SetRendMode(REND_MODE rendMode)
|
|||
return;
|
||||
}
|
||||
|
||||
void pie_SetBilinear(BOOL bilinearOn)
|
||||
{
|
||||
if (bilinearOn != rendStates.bilinearOn)
|
||||
{
|
||||
rendStates.bilinearOn = bilinearOn;
|
||||
pieStateCount++;
|
||||
}
|
||||
}
|
||||
|
||||
BOOL pie_GetBilinear(void)
|
||||
{
|
||||
return rendStates.bilinearOn;
|
||||
}
|
||||
|
||||
static void pie_SetTexCombine(TEX_MODE texCombMode)
|
||||
{
|
||||
if (texCombMode != rendStates.texCombine)
|
||||
|
|
|
@ -124,17 +124,12 @@ typedef struct RENDER_STATE
|
|||
UDWORD fogColour;
|
||||
SDWORD texPage;
|
||||
REND_MODE rendMode;
|
||||
BOOL bilinearOn;
|
||||
BOOL keyingOn;
|
||||
COLOUR_MODE colourCombine;
|
||||
TEX_MODE texCombine;
|
||||
ALPHA_MODE alphaCombine;
|
||||
TRANSLUCENCY_MODE transMode;
|
||||
UDWORD colour;
|
||||
#ifdef STATES
|
||||
BOOL textured;
|
||||
UBYTE lightLevel;
|
||||
#endif
|
||||
}
|
||||
RENDER_STATE;
|
||||
|
||||
|
@ -173,8 +168,6 @@ extern UDWORD pie_GetFogColour(void) WZ_DECL_PURE;
|
|||
extern void pie_UpdateFogDistance(float begin, float end);
|
||||
//render states
|
||||
extern void pie_SetTexturePage(SDWORD num);
|
||||
extern void pie_SetBilinear(BOOL bilinearOn);
|
||||
extern BOOL pie_GetBilinear(void);
|
||||
extern void pie_SetColourKeyedBlack(BOOL keyingOn);
|
||||
extern void pie_SetRendMode(REND_MODE rendMode);
|
||||
extern void pie_SetColour(UDWORD val);
|
||||
|
|
|
@ -231,7 +231,6 @@ void pie_ImageFileID(IMAGEFILE *ImageFile, UWORD ID, int x, int y)
|
|||
assert(ID < ImageFile->Header.NumImages);
|
||||
Image = &ImageFile->ImageDefs[ID];
|
||||
|
||||
pie_SetBilinear(FALSE);
|
||||
pie_SetRendMode(REND_GOURAUD_TEX);
|
||||
pie_SetColour(COLOURINTENSITY);
|
||||
pie_SetColourKeyedBlack(TRUE);
|
||||
|
@ -259,7 +258,6 @@ void pie_ImageFileIDTile(IMAGEFILE *ImageFile, UWORD ID, int x, int y, int Width
|
|||
|
||||
Image = &ImageFile->ImageDefs[ID];
|
||||
|
||||
pie_SetBilinear(FALSE);
|
||||
pie_SetRendMode(REND_GOURAUD_TEX);
|
||||
pie_SetColour(COLOURINTENSITY);
|
||||
pie_SetColourKeyedBlack(TRUE);
|
||||
|
@ -378,7 +376,6 @@ void pie_RenderRadar( int x, int y )
|
|||
PIEIMAGE pieImage;
|
||||
PIERECT dest;
|
||||
|
||||
pie_SetBilinear(TRUE);
|
||||
pie_SetRendMode(REND_GOURAUD_TEX);
|
||||
pie_SetColour(COLOURINTENSITY);
|
||||
pie_SetColourKeyedBlack(TRUE);
|
||||
|
|
|
@ -346,7 +346,6 @@ static void pie_Draw3DShape2(iIMDShape *shape, int frame, PIELIGHT colour, PIELI
|
|||
pie_SetFogStatus(FALSE);
|
||||
pie_SetRendMode(REND_ADDITIVE_TEX);
|
||||
colour.byte.a = (UBYTE)pieFlagData;
|
||||
pie_SetBilinear(TRUE);
|
||||
light = FALSE;
|
||||
}
|
||||
else if (pieFlag & pie_TRANSLUCENT)
|
||||
|
@ -354,7 +353,6 @@ static void pie_Draw3DShape2(iIMDShape *shape, int frame, PIELIGHT colour, PIELI
|
|||
pie_SetFogStatus(FALSE);
|
||||
pie_SetRendMode(REND_ALPHA_TEX);
|
||||
colour.byte.a = (UBYTE)pieFlagData;
|
||||
pie_SetBilinear(FALSE);//never bilinear with constant alpha, gives black edges
|
||||
light = FALSE;
|
||||
}
|
||||
else
|
||||
|
@ -369,15 +367,6 @@ static void pie_Draw3DShape2(iIMDShape *shape, int frame, PIELIGHT colour, PIELI
|
|||
pie_SetFogStatus(TRUE);
|
||||
}
|
||||
pie_SetRendMode(REND_GOURAUD_TEX);
|
||||
//if hardware fog then alpha is set else unused in decal mode
|
||||
if (pieFlag & pie_NO_BILINEAR)
|
||||
{
|
||||
pie_SetBilinear(FALSE);
|
||||
}
|
||||
else
|
||||
{
|
||||
pie_SetBilinear(TRUE);
|
||||
}
|
||||
}
|
||||
|
||||
if (pieFlag & pie_RAISE)
|
||||
|
|
|
@ -789,7 +789,6 @@ static void drawTiles(iView *camera, iView *player)
|
|||
// Draw all the normal tiles
|
||||
pie_SetColourKeyedBlack(TRUE);
|
||||
pie_SetFogStatus(TRUE);
|
||||
pie_SetBilinear(TRUE);
|
||||
for (i = 0; i < MIN(visibleTiles.y, mapHeight); i++)
|
||||
{
|
||||
for (j = 0; j < MIN(visibleTiles.x, mapWidth); j++)
|
||||
|
@ -1208,8 +1207,6 @@ void renderProjectile(PROJECTILE *psCurr)
|
|||
psStats->weaponSubClass == WSC_SLOWROCKET || psStats->weaponSubClass == WSC_SLOWMISSILE)
|
||||
{
|
||||
pie_Draw3DShape(pIMD, 0, 0, brightness, 0, pie_ADDITIVE, 164);
|
||||
|
||||
// pie_Draw3DShape(pIMD, 0, 0, brightness, specular, pie_NO_BILINEAR, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue