mirror of
https://github.com/ZDoom/gzdoom-last-svn.git
synced 2025-06-02 02:01:19 +00:00
- fixed some uninitialized variables in the texture data.
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@548 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
parent
c18adf80b9
commit
8bc4df43d0
3 changed files with 17 additions and 1 deletions
|
@ -56,6 +56,21 @@ public:
|
||||||
hShader = hVertProg = hFragProg = NULL;
|
hShader = hVertProg = hFragProg = NULL;
|
||||||
currentfogenabled = currenttexturemode = 0;
|
currentfogenabled = currenttexturemode = 0;
|
||||||
currentlightfactor = currentlightdist = 0.0f;
|
currentlightfactor = currentlightdist = 0.0f;
|
||||||
|
currentfogdensity = -1;
|
||||||
|
currentfogcolor = 0;
|
||||||
|
|
||||||
|
timer_index = -1;
|
||||||
|
desaturation_index = -1;
|
||||||
|
fogenabled_index = -1;
|
||||||
|
texturemode_index = -1;
|
||||||
|
camerapos_index = -1;
|
||||||
|
lightparms_index = -1;
|
||||||
|
colormapstart_index = -1;
|
||||||
|
colormaprange_index = -1;
|
||||||
|
lightrange_index = -1;
|
||||||
|
fogcolor_index = -1;
|
||||||
|
lights_index = -1;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
~FShader();
|
~FShader();
|
||||||
|
|
|
@ -538,6 +538,7 @@ FMaterial::FMaterial(FTexture * tx, bool forceexpand)
|
||||||
tx->UseType == FTexture::TEX_Decal ||
|
tx->UseType == FTexture::TEX_Decal ||
|
||||||
forceexpand;
|
forceexpand;
|
||||||
|
|
||||||
|
mShaderIndex = 0;
|
||||||
// TODO: apply custom shader object here
|
// TODO: apply custom shader object here
|
||||||
/* if (tx->CustomShaderDefinition)
|
/* if (tx->CustomShaderDefinition)
|
||||||
{
|
{
|
||||||
|
@ -569,7 +570,6 @@ FMaterial::FMaterial(FTexture * tx, bool forceexpand)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else mShaderIndex = 0;
|
|
||||||
|
|
||||||
if (!expanded)
|
if (!expanded)
|
||||||
{
|
{
|
||||||
|
|
|
@ -231,6 +231,7 @@ FTexture::MiscGLInfo::MiscGLInfo() throw()
|
||||||
areacount = 0;
|
areacount = 0;
|
||||||
mIsTransparent = -1;
|
mIsTransparent = -1;
|
||||||
shaderspeed = 1.f;
|
shaderspeed = 1.f;
|
||||||
|
shaderindex = 0;
|
||||||
|
|
||||||
Material = NULL;
|
Material = NULL;
|
||||||
SystemTexture = NULL;
|
SystemTexture = NULL;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue