H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2024-12-22 22:27:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vtf: fix cubemap loading for vtf versions less than 7.5

Browse Source
This commit is contained in:
nillerusr 2023-01-02 16:39:44 +03:00
parent 7ca36e7b43
commit f63849bb34
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtf/vtf.cpp
View File

@ -432,7 +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) : 1; m_nFaceCount = (iFlags & TEXTUREFLAGS_ENVMAP) ? CUBEMAP_FACE_COUNT : 1;
#if defined( _X360 ) #if defined( _X360 )
m_nMipSkipCount = 0; m_nMipSkipCount = 0;
@ -601,7 +601,7 @@ void CVTFTexture::ImageFileInfo( int nFrame, int nFace, int nMipLevel, int *pSta
int nFacesToRead = m_nFaceCount; int nFacesToRead = m_nFaceCount;
if ( IsCubeMap() ) if ( IsCubeMap() )
{ {
if ((m_nVersion[0] == 7) && (m_nVersion[1] < 1)) if ((m_nVersion[0] == 7) && (m_nVersion[1] < 1 || m_nVersion[1] > 4))
{ {
nFacesToRead = 6; nFacesToRead = 6;
if (nFace == CUBEMAP_FACE_SPHEREMAP) if (nFace == CUBEMAP_FACE_SPHEREMAP)
@ -1068,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) : 1; m_nFaceCount = (m_nFlags & TEXTUREFLAGS_ENVMAP) ? CUBEMAP_FACE_COUNT : 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