expvintl/source-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vtf: fix cubemap loading

Browse Source
This commit is contained in:
nillerusr 2022-11-30 14:07:51 +03:00
parent d2b202836d
commit 20f5783225
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
materialsystem/cmaterial.cpp
View File

@ -1195,6 +1195,10 @@ bool CMaterial::ShouldSkipVar( KeyValues *pVar, bool *pWasConditional )
{ {
bShouldSkip = !IsX360(); bShouldSkip = !IsX360();
} }
else if ( ! stricmp( pCond, "gameconsole" ) )
{
bShouldSkip = !IsGameConsole();
}
else else
{ {
Warning( "unrecognized conditional test %s in %s\n", pVarName, GetName() ); Warning( "unrecognized conditional test %s in %s\n", pVarName, GetName() );

9
vtf/vtf.cpp
View File

@ -432,12 +432,7 @@ bool CVTFTexture::Init( int nWidth, int nHeight, int nDepth, ImageFormat fmt, in
m_nFrameCount = iFrameCount; m_nFrameCount = iFrameCount;
m_nFaceCount = (iFlags & TEXTUREFLAGS_ENVMAP) ? CUBEMAP_FACE_COUNT : 1; m_nFaceCount = (iFlags & TEXTUREFLAGS_ENVMAP) ? (CUBEMAP_FACE_COUNT-1) : 1;
if ( IsX360() && ( iFlags & TEXTUREFLAGS_ENVMAP ) )
{
// 360 has no reason to support sphere map
m_nFaceCount = CUBEMAP_FACE_COUNT-1;
}
#if defined( _X360 ) #if defined( _X360 )
m_nMipSkipCount = 0; m_nMipSkipCount = 0;
@ -1073,7 +1068,7 @@ bool CVTFTexture::UnserializeEx( CUtlBuffer &buf, bool bHeaderOnly, int nForceFl
m_nFrameCount = header.numFrames; m_nFrameCount = header.numFrames;
m_nFaceCount = (m_nFlags & TEXTUREFLAGS_ENVMAP) ? CUBEMAP_FACE_COUNT : 1; m_nFaceCount = (m_nFlags & TEXTUREFLAGS_ENVMAP) ? (CUBEMAP_FACE_COUNT-1) : 1;
// NOTE: We're going to store space for all mip levels, even if we don't // NOTE: We're going to store space for all mip levels, even if we don't
// have data on disk for them. This is for backward compatibility // have data on disk for them. This is for backward compatibility