mirror of
https://github.com/nillerusr/source-engine.git
synced 2024-12-22 06:06:50 +00:00
amd64: fix model loading issues
This commit is contained in:
nillerusr
parent
94916a20ce
commit
a0e05d885a
@ -2522,27 +2522,14 @@ BEGIN_BYTESWAP_DATADESC( studiohdr_t )
|
||||
DEFINE_FIELD( contents, FIELD_INTEGER ),
|
||||
DEFINE_FIELD( numincludemodels, FIELD_INTEGER ),
|
||||
DEFINE_INDEX( includemodelindex, FIELD_INTEGER ),
|
||||
#ifdef PLATFORM_64BITS
|
||||
DEFINE_FIELD( index_ptr_virtualModel, FIELD_INTEGER ), // void*
|
||||
#else
|
||||
DEFINE_FIELD( virtualModel, FIELD_INTEGER ), // void*
|
||||
#endif
|
||||
DEFINE_FIELD( unused_virtualModel, FIELD_INTEGER ), // void*
|
||||
DEFINE_INDEX( szanimblocknameindex, FIELD_INTEGER ),
|
||||
DEFINE_FIELD( numanimblocks, FIELD_INTEGER ),
|
||||
DEFINE_INDEX( animblockindex, FIELD_INTEGER ),
|
||||
#ifdef PLATFORM_64BITS
|
||||
DEFINE_FIELD( index_ptr_virtualModel, FIELD_INTEGER ), // void*
|
||||
#else
|
||||
DEFINE_FIELD( animblockModel, FIELD_INTEGER ), // void*
|
||||
#endif
|
||||
DEFINE_FIELD( unused_animblockModel, FIELD_INTEGER ), // void*
|
||||
DEFINE_INDEX( bonetablebynameindex, FIELD_INTEGER ),
|
||||
#ifdef PLATFORM_64BITS
|
||||
DEFINE_FIELD( index_ptr_pVertexBase, FIELD_INTEGER ), // void*
|
||||
DEFINE_FIELD( index_ptr_pVertexBase, FIELD_INTEGER ), // void*
|
||||
#else
|
||||
DEFINE_FIELD( pVertexBase, FIELD_INTEGER ), // void*
|
||||
DEFINE_FIELD( pIndexBase, FIELD_INTEGER ), // void*
|
||||
#endif
|
||||
DEFINE_FIELD( unused_pVertexBase, FIELD_INTEGER ), // void*
|
||||
DEFINE_FIELD( unused_pIndexBase, FIELD_INTEGER ), // void*
|
||||
DEFINE_FIELD( constdirectionallightdot, FIELD_CHARACTER ), // byte
|
||||
DEFINE_FIELD( rootLOD, FIELD_CHARACTER ), // byte
|
||||
DEFINE_FIELD( numAllowedRootLODs, FIELD_CHARACTER ), // byte
|
||||
@ -2918,13 +2905,8 @@ BEGIN_BYTESWAP_DATADESC( mstudiomodel_t )
|
||||
END_BYTESWAP_DATADESC()
|
||||
|
||||
BEGIN_BYTESWAP_DATADESC( mstudio_modelvertexdata_t )
|
||||
#ifdef PLATFORM_64BITS
|
||||
DEFINE_FIELD( index_ptr_pVertexData, FIELD_INTEGER ), // void*
|
||||
DEFINE_FIELD( index_ptr_pTangentData, FIELD_INTEGER ), // void*
|
||||
#else
|
||||
DEFINE_FIELD( pVertexData, FIELD_INTEGER ), // void*
|
||||
DEFINE_FIELD( pTangentData, FIELD_INTEGER ), // void*
|
||||
#endif
|
||||
END_BYTESWAP_DATADESC()
|
||||
|
||||
BEGIN_BYTESWAP_DATADESC( mstudioflexdesc_t )
|
||||
|
||||
@ -523,7 +523,7 @@ private:
|
||||
int UpdateOrCreate( studiohdr_t *pHdr, const char *pFilename, char *pX360Filename, int maxLen, const char *pPathID, bool bForce = false );
|
||||
|
||||
// Attempts to read the platform native file - on 360 it can read and swap Win32 file as a fallback
|
||||
bool ReadFileNative( char *pFileName, const char *pPath, CUtlBuffer &buf, int nMaxBytes = 0 );
|
||||
bool ReadFileNative( char *pFileName, const char *pPath, CUtlBuffer &buf, int nMaxBytes = 0, MDLCacheDataType_t type = MDLCACHE_NONE );
|
||||
|
||||
// Creates a thin cache entry (to be used for model decals) from fat vertex data
|
||||
vertexFileHeader_t * CreateThinVertexes( vertexFileHeader_t * originalData, const studiohdr_t * pStudioHdr, int * cacheLength );
|
||||
@ -1913,7 +1913,7 @@ int CMDLCache::UpdateOrCreate( studiohdr_t *pHdr, const char *pSourceName, char
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: Attempts to read a file native to the current platform
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CMDLCache::ReadFileNative( char *pFileName, const char *pPath, CUtlBuffer &buf, int nMaxBytes )
|
||||
bool CMDLCache::ReadFileNative( char *pFileName, const char *pPath, CUtlBuffer &buf, int nMaxBytes, MDLCacheDataType_t type )
|
||||
{
|
||||
bool bOk = false;
|
||||
|
||||
@ -1928,6 +1928,32 @@ bool CMDLCache::ReadFileNative( char *pFileName, const char *pPath, CUtlBuffer &
|
||||
{
|
||||
// Read the PC version
|
||||
bOk = g_pFullFileSystem->ReadFile( pFileName, pPath, buf, nMaxBytes );
|
||||
|
||||
if( bOk && type == MDLCACHE_STUDIOHDR )
|
||||
{
|
||||
studiohdr_t* pStudioHdr = ( studiohdr_t* ) buf.PeekGet();
|
||||
|
||||
if ( pStudioHdr->studiohdr2index == 0 )
|
||||
{
|
||||
// We always need this now, so make room for it in the buffer now.
|
||||
int bufferContentsEnd = buf.TellMaxPut();
|
||||
int maskBits = VALIGNOF( studiohdr2_t ) - 1;
|
||||
int offsetStudiohdr2 = ( bufferContentsEnd + maskBits ) & ~maskBits;
|
||||
int sizeIncrease = ( offsetStudiohdr2 - bufferContentsEnd ) + sizeof( studiohdr2_t );
|
||||
buf.SeekPut( CUtlBuffer::SEEK_CURRENT, sizeIncrease );
|
||||
|
||||
// Re-get the pointer after resizing, because it has probably moved.
|
||||
pStudioHdr = ( studiohdr_t* ) buf.Base();
|
||||
studiohdr2_t* pStudioHdr2 = ( studiohdr2_t* ) ( ( byte * ) pStudioHdr + offsetStudiohdr2 );
|
||||
memset( pStudioHdr2, 0, sizeof( studiohdr2_t ) );
|
||||
pStudioHdr2->flMaxEyeDeflection = 0.866f; // Matches studio.h.
|
||||
|
||||
pStudioHdr->studiohdr2index = offsetStudiohdr2;
|
||||
// Also make sure the structure knows about the extra bytes
|
||||
// we've added so they get copied around.
|
||||
pStudioHdr->length += sizeIncrease;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return bOk;
|
||||
@ -2033,7 +2059,7 @@ bool CMDLCache::ReadMDLFile( MDLHandle_t handle, const char *pMDLFileName, CUtlB
|
||||
|
||||
MEM_ALLOC_CREDIT();
|
||||
|
||||
bool bOk = ReadFileNative( pFileName, "GAME", buf );
|
||||
bool bOk = ReadFileNative( pFileName, "GAME", buf, 0, MDLCACHE_STUDIOHDR );
|
||||
if ( !bOk )
|
||||
{
|
||||
DevWarning( "Failed to load %s!\n", pMDLFileName );
|
||||
@ -2147,6 +2173,11 @@ studiohdr_t *CMDLCache::GetStudioHdr( MDLHandle_t handle )
|
||||
// Assert( m_pModelCacheSection->IsFrameLocking() );
|
||||
// Assert( m_pMeshCacheSection->IsFrameLocking() );
|
||||
|
||||
studiodata_t *pStudioData = m_MDLDict[handle];
|
||||
|
||||
if( !pStudioData )
|
||||
return NULL;
|
||||
|
||||
#if _DEBUG
|
||||
VPROF_INCREMENT_COUNTER( "GetStudioHdr", 1 );
|
||||
#endif
|
||||
|
||||
141
public/studio.h
141
public/studio.h
@ -106,6 +106,39 @@ struct mstudiodata_t
|
||||
#define STUDIO_PROC_AIMATATTACH 4
|
||||
#define STUDIO_PROC_JIGGLE 5
|
||||
|
||||
// If you want to embed a pointer into one of the structures that is serialized, use this class! It will ensure that the pointers consume the
|
||||
// right amount of space and work correctly across 32 and 64 bit. It also makes sure that there is no surprise about how large the structure
|
||||
// is when placed in the middle of another structure, and supports Intel's desired behavior on 64-bit that pointers are always 8-byte aligned.
|
||||
#pragma pack( push, 4 )
|
||||
template < class T >
|
||||
struct ALIGN4 serializedstudioptr_t
|
||||
{
|
||||
T* m_pData;
|
||||
#ifndef PLATFORM_64BITS
|
||||
int32 padding;
|
||||
#endif
|
||||
|
||||
serializedstudioptr_t()
|
||||
{
|
||||
m_pData = nullptr;
|
||||
#if _DEBUG && !defined( PLATFORM_64BITS )
|
||||
padding = 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
inline operator T*() { return m_pData; }
|
||||
inline operator const T*() const { return m_pData; }
|
||||
|
||||
inline T* operator->( ) { return m_pData; }
|
||||
inline const T* operator->( ) const { return m_pData; }
|
||||
|
||||
inline T* operator=( T* ptr ) { return m_pData = ptr; }
|
||||
|
||||
} ALIGN4_POST;
|
||||
|
||||
#pragma pack( pop )
|
||||
|
||||
|
||||
struct mstudioaxisinterpbone_t
|
||||
{
|
||||
DECLARE_BYTESWAP_DATADESC();
|
||||
@ -1292,26 +1325,14 @@ struct mstudio_modelvertexdata_t
|
||||
int GetGlobalTangentIndex( int i ) const;
|
||||
|
||||
// base of external vertex data stores
|
||||
#ifdef PLATFORM_64BITS
|
||||
int index_ptr_pVertexData;
|
||||
int index_ptr_pTangentData;
|
||||
#else
|
||||
const void *pVertexData;
|
||||
const void *pTangentData;
|
||||
#endif
|
||||
serializedstudioptr_t<const void> pVertexData;
|
||||
serializedstudioptr_t<const void> pTangentData;
|
||||
|
||||
const void *GetVertexData() const {
|
||||
#ifdef PLATFORM_64BITS
|
||||
return *(const void **)((byte *)this + index_ptr_pVertexData);
|
||||
#else
|
||||
return pVertexData;
|
||||
#endif
|
||||
}
|
||||
const void *GetTangentData() const {
|
||||
#ifdef PLATFORM_64BITS
|
||||
return *(const void **)((byte *)this + index_ptr_pTangentData);
|
||||
#else
|
||||
return pTangentData;
|
||||
#endif
|
||||
}
|
||||
};
|
||||
|
||||
@ -1431,13 +1452,8 @@ struct mstudiomodel_t
|
||||
inline mstudioeyeball_t *pEyeball( int i ) { return (mstudioeyeball_t *)(((byte *)this) + eyeballindex) + i; };
|
||||
|
||||
mstudio_modelvertexdata_t vertexdata; // sizeof(mstudio_modelvertexdata_t) == 16
|
||||
#ifdef PLATFORM_64BITS
|
||||
int unused[4]; // remove as appropriate
|
||||
const void *real_pVertexData;
|
||||
const void *real_pTangentData;
|
||||
#else
|
||||
int unused[8]; // remove as appropriate
|
||||
#endif
|
||||
|
||||
int unused[6]; // remove as appropriate
|
||||
};
|
||||
|
||||
#ifdef PLATFORM_64BITS
|
||||
@ -1514,8 +1530,8 @@ inline const mstudio_meshvertexdata_t *mstudiomesh_t::GetVertexData( void *pMode
|
||||
// returning NULL if the data has been converted to 'thin' vertices)
|
||||
this->pModel()->GetVertexData( pModelData );
|
||||
#ifdef PLATFORM_64BITS
|
||||
real_modelvertexdata = &( this->pModel()->vertexdata );
|
||||
vertexdata.index_ptr_modelvertexdata = (byte *)&real_modelvertexdata - (byte *)&vertexdata;
|
||||
real_modelvertexdata = &( this->pModel()->vertexdata );
|
||||
vertexdata.index_ptr_modelvertexdata = (byte *)&real_modelvertexdata - (byte *)&vertexdata;
|
||||
#else
|
||||
vertexdata.modelvertexdata = &( this->pModel()->vertexdata );
|
||||
#endif
|
||||
@ -1991,27 +2007,13 @@ inline const mstudio_modelvertexdata_t * mstudiomodel_t::GetVertexData( void *pM
|
||||
const vertexFileHeader_t * pVertexHdr = CacheVertexData( pModelData );
|
||||
if ( !pVertexHdr )
|
||||
{
|
||||
#ifdef PLATFORM_64BITS
|
||||
this->real_pVertexData = NULL;
|
||||
this->real_pTangentData = NULL;
|
||||
vertexdata.index_ptr_pVertexData = (byte *)&real_pVertexData - (byte *)&vertexdata;
|
||||
vertexdata.index_ptr_pTangentData = (byte *)&real_pTangentData - (byte *)&vertexdata;
|
||||
#else
|
||||
vertexdata.pVertexData = NULL;
|
||||
vertexdata.pTangentData = NULL;
|
||||
#endif
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#ifdef PLATFORM_64BITS
|
||||
this->real_pVertexData = pVertexHdr->GetVertexData();
|
||||
this->real_pTangentData = pVertexHdr->GetTangentData();
|
||||
vertexdata.index_ptr_pVertexData = (byte *)&real_pVertexData - (byte *)&vertexdata;
|
||||
vertexdata.index_ptr_pTangentData = (byte *)&real_pTangentData - (byte *)&vertexdata;
|
||||
#else
|
||||
vertexdata.pVertexData = pVertexHdr->GetVertexData();
|
||||
vertexdata.pTangentData = pVertexHdr->GetTangentData();
|
||||
#endif
|
||||
|
||||
if ( !vertexdata.GetVertexData() )
|
||||
return NULL;
|
||||
@ -2136,7 +2138,13 @@ struct studiohdr2_t
|
||||
int m_nBoneFlexDriverIndex;
|
||||
inline mstudioboneflexdriver_t *pBoneFlexDriver( int i ) const { Assert( i >= 0 && i < m_nBoneFlexDriverCount ); return (mstudioboneflexdriver_t *)(((byte *)this) + m_nBoneFlexDriverIndex) + i; }
|
||||
|
||||
int reserved[56];
|
||||
mutable serializedstudioptr_t< void > virtualModel;
|
||||
mutable serializedstudioptr_t< void > animblockModel;
|
||||
|
||||
serializedstudioptr_t< void> pVertexBase;
|
||||
serializedstudioptr_t< void> pIndexBase;
|
||||
|
||||
int reserved[48];
|
||||
};
|
||||
|
||||
struct studiohdr_t
|
||||
@ -2341,11 +2349,7 @@ struct studiohdr_t
|
||||
const studiohdr_t *FindModel( void **cache, char const *modelname ) const;
|
||||
|
||||
// implementation specific back pointer to virtual data
|
||||
#ifdef PLATFORM_64BITS
|
||||
int index_ptr_virtualModel;
|
||||
#else
|
||||
mutable void *virtualModel;
|
||||
#endif
|
||||
int unused_virtualModel;
|
||||
virtualmodel_t *GetVirtualModel( void ) const;
|
||||
|
||||
// for demand loaded animation blocks
|
||||
@ -2354,11 +2358,8 @@ struct studiohdr_t
|
||||
int numanimblocks;
|
||||
int animblockindex;
|
||||
inline mstudioanimblock_t *pAnimBlock( int i ) const { Assert( i > 0 && i < numanimblocks); return (mstudioanimblock_t *)(((byte *)this) + animblockindex) + i; };
|
||||
#ifdef PLATFORM_64BITS
|
||||
int index_ptr_animblockModel;
|
||||
#else
|
||||
mutable void *animblockModel;
|
||||
#endif
|
||||
|
||||
int unused_animblockModel;
|
||||
byte * GetAnimBlock( int i ) const;
|
||||
|
||||
int bonetablebynameindex;
|
||||
@ -2366,13 +2367,8 @@ struct studiohdr_t
|
||||
|
||||
// used by tools only that don't cache, but persist mdl's peer data
|
||||
// engine uses virtualModel to back link to cache pointers
|
||||
#ifdef PLATFORM_64BITS
|
||||
int index_ptr_pVertexBase;
|
||||
int index_ptr_pIndexBase;
|
||||
#else
|
||||
void *pVertexBase;
|
||||
void *pIndexBase;
|
||||
#endif
|
||||
int unused_pVertexBase;
|
||||
int unused_pIndexBase;
|
||||
|
||||
// if STUDIOHDR_FLAGS_CONSTANT_DIRECTIONAL_LIGHT_DOT is set,
|
||||
// this value is used to calculate directional components of lighting
|
||||
@ -2420,21 +2416,12 @@ struct studiohdr_t
|
||||
inline int BoneFlexDriverCount() const { return studiohdr2index ? pStudioHdr2()->m_nBoneFlexDriverCount : 0; }
|
||||
inline const mstudioboneflexdriver_t* BoneFlexDriver( int i ) const { Assert( i >= 0 && i < BoneFlexDriverCount() ); return studiohdr2index > 0 ? pStudioHdr2()->pBoneFlexDriver( i ) : NULL; }
|
||||
|
||||
#ifdef PLATFORM_64BITS
|
||||
void* VirtualModel() const { return *(void **)(((byte *)this) + index_ptr_virtualModel); }
|
||||
void SetVirtualModel( void* ptr ) const { *(void **)(((byte *)this) + index_ptr_virtualModel) = ptr; }
|
||||
void* VertexBase() const { return *(void **)(((byte *)this) + index_ptr_pVertexBase); }
|
||||
void SetVertexBase( void* ptr ) { *(void **)(((byte *)this) + index_ptr_pVertexBase) = ptr; }
|
||||
void* IndexBase() const { return *(void **)(((byte *)this) + index_ptr_pIndexBase); }
|
||||
void SetIndexBase( void* ptr ) { *(void **)(((byte *)this) + index_ptr_pIndexBase) = ptr; }
|
||||
#else
|
||||
void* VirtualModel() const { return virtualModel; }
|
||||
void SetVirtualModel( void* ptr ) const { virtualModel = ptr; }
|
||||
void* VertexBase() const { return pVertexBase; }
|
||||
void SetVertexBase( void* ptr ) { pVertexBase = ptr; }
|
||||
void* IndexBase() const { return pIndexBase; }
|
||||
void SetIndexBase( void* ptr ) { pIndexBase = ptr; }
|
||||
#endif
|
||||
void* VirtualModel() const { return studiohdr2index ? (void *)( pStudioHdr2()->virtualModel ) : nullptr; }
|
||||
void SetVirtualModel( void* ptr ) { Assert( studiohdr2index ); if ( studiohdr2index ) { pStudioHdr2()->virtualModel = ptr; } else { Msg("go fuck urself!\n"); } }
|
||||
void* VertexBase() const { return studiohdr2index ? (void *)( pStudioHdr2()->pVertexBase ) : nullptr; }
|
||||
void SetVertexBase( void* pVertexBase ) const { Assert( studiohdr2index ); if ( studiohdr2index ) { pStudioHdr2()->pVertexBase = pVertexBase; } }
|
||||
void* IndexBase() const { return studiohdr2index ? ( void * ) ( pStudioHdr2()->pIndexBase ) : nullptr; }
|
||||
void SetIndexBase( void* pIndexBase ) const { Assert( studiohdr2index ); if ( studiohdr2index ) { pStudioHdr2()->pIndexBase = pIndexBase; } }
|
||||
|
||||
// NOTE: No room to add stuff? Up the .mdl file format version
|
||||
// [and move all fields in studiohdr2_t into studiohdr_t and kill studiohdr2_t],
|
||||
@ -2447,17 +2434,6 @@ private:
|
||||
friend struct virtualmodel_t;
|
||||
};
|
||||
|
||||
#ifdef PLATFORM_64BITS
|
||||
struct studiohdr_shim64_index
|
||||
{
|
||||
mutable void *virtualModel;
|
||||
mutable void *animblockModel;
|
||||
void *pVertexBase;
|
||||
void *pIndexBase;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -3131,6 +3107,7 @@ inline bool Studio_ConvertStudioHdrToNewVersion( studiohdr_t *pStudioHdr )
|
||||
return true;
|
||||
|
||||
bool bResult = true;
|
||||
|
||||
if (version < 46)
|
||||
{
|
||||
// some of the anim index data is incompatible
|
||||
|
||||
Loading…
Reference in New Issue
Block a user