mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-11 15:21:51 +00:00
- removed the static members from FMaterial.
Their functionality has been moved to more appropriate places already and they were essentially unused.
This commit is contained in:
parent
20184e1e99
commit
313ec62a5c
2 changed files with 0 additions and 19 deletions
|
@ -133,8 +133,6 @@ void IHardwareTexture::Resize(int swidth, int sheight, int width, int height, un
|
||||||
// Constructor
|
// Constructor
|
||||||
//
|
//
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
TArray<FMaterial *> FMaterial::mMaterials;
|
|
||||||
int FMaterial::mMaxBound;
|
|
||||||
|
|
||||||
FMaterial::FMaterial(FTexture * tx, bool expanded)
|
FMaterial::FMaterial(FTexture * tx, bool expanded)
|
||||||
{
|
{
|
||||||
|
@ -227,8 +225,6 @@ FMaterial::FMaterial(FTexture * tx, bool expanded)
|
||||||
SetSpriteRect();
|
SetSpriteRect();
|
||||||
|
|
||||||
mTextureLayers.ShrinkToFit();
|
mTextureLayers.ShrinkToFit();
|
||||||
mMaxBound = -1;
|
|
||||||
mMaterials.Push(this);
|
|
||||||
tx->Material[expanded] = this;
|
tx->Material[expanded] = this;
|
||||||
if (tx->isHardwareCanvas()) tx->bTranslucent = 0;
|
if (tx->isHardwareCanvas()) tx->bTranslucent = 0;
|
||||||
}
|
}
|
||||||
|
@ -241,15 +237,6 @@ FMaterial::FMaterial(FTexture * tx, bool expanded)
|
||||||
|
|
||||||
FMaterial::~FMaterial()
|
FMaterial::~FMaterial()
|
||||||
{
|
{
|
||||||
for(unsigned i=0;i<mMaterials.Size();i++)
|
|
||||||
{
|
|
||||||
if (mMaterials[i]==this)
|
|
||||||
{
|
|
||||||
mMaterials.Delete(i);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -33,12 +33,6 @@ enum
|
||||||
|
|
||||||
class FMaterial
|
class FMaterial
|
||||||
{
|
{
|
||||||
// This array is needed because not all textures are managed by the texture manager
|
|
||||||
// but some code needs to discard all hardware dependent data attached to any created texture.
|
|
||||||
// Font characters are not, for example.
|
|
||||||
static TArray<FMaterial *> mMaterials;
|
|
||||||
static int mMaxBound;
|
|
||||||
|
|
||||||
TArray<FTexture*> mTextureLayers;
|
TArray<FTexture*> mTextureLayers;
|
||||||
int mShaderIndex;
|
int mShaderIndex;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue