zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed the static members from FMaterial.

Browse source 
Their functionality has been moved to more appropriate places already and they were essentially unused.
This commit is contained in:
Christoph Oelckers 2018-12-29 12:58:12 +01:00
parent 20184e1e99
commit 313ec62a5c
2 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/hwrenderer/textures/hw_material.cpp
View file

@ -133,8 +133,6 @@ void IHardwareTexture::Resize(int swidth, int sheight, int width, int height, un
// Constructor
//
//===========================================================================
TArray<FMaterial *> FMaterial::mMaterials;
int FMaterial::mMaxBound;
FMaterial::FMaterial(FTexture * tx, bool expanded)
{
@ -227,8 +225,6 @@ FMaterial::FMaterial(FTexture * tx, bool expanded)
SetSpriteRect();
mTextureLayers.ShrinkToFit();
mMaxBound = -1;
mMaterials.Push(this);
tx->Material[expanded] = this;
if (tx->isHardwareCanvas()) tx->bTranslucent = 0;
}
@ -241,15 +237,6 @@ FMaterial::FMaterial(FTexture * tx, bool expanded)
FMaterial::~FMaterial()
{
for(unsigned i=0;i<mMaterials.Size();i++)
{
if (mMaterials[i]==this)
{
mMaterials.Delete(i);
break;
}
}
}
//===========================================================================

6
src/hwrenderer/textures/hw_material.h
View file

@ -33,12 +33,6 @@ enum
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;
int mShaderIndex;