Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update tf2 #86

Open
wants to merge 23 commits into
base: tf2
Choose a base branch
from
Open

update tf2 #86

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7b7c6c6
update navmesh
arthurdead Mar 29, 2021
f7ea416
more updates
arthurdead Mar 31, 2021
33fd154
remove bad asserts
arthurdead Apr 1, 2021
04c01c7
dont use std::max
arthurdead Apr 5, 2021
9a0e1fc
remove developer
arthurdead Apr 5, 2021
3f76f7e
make r_visualizetraces a ptr
arthurdead Apr 5, 2021
1abeb10
dont reference TheNavAreas
arthurdead Apr 5, 2021
4070c73
comment useless assert
arthurdead Apr 6, 2021
52029e7
make TheNavAreas a ptr
arthurdead Apr 9, 2021
b50f8a9
fix thread
arthurdead Jun 6, 2021
e6c84d6
Merge branch 'tf2'
arthurdead Dec 20, 2021
61092ca
Merge branch 'tf2'
arthurdead Aug 6, 2022
88bd4e9
make CNavArea::m_nextID, m_masterMarker, m_openList, m_openListTail p…
arthurdead Aug 11, 2022
02846c2
make g_nActivityListVersion and g_nEventListVersion pointers, update …
arthurdead Sep 15, 2022
a07b440
Merge commit 'e7516716cb79e64cede1f067bceba291cf4de362'
arthurdead Oct 13, 2022
8b91419
make s_nCurrVisTestCounter a pointer
arthurdead Oct 18, 2022
d06bd06
fix ultstring and fmtstr abi, update networkvar.h
arthurdead Nov 13, 2022
117982f
update bitbuf
arthurdead Nov 18, 2022
a21f201
rebuild tier1
arthurdead Nov 18, 2022
b5589bb
rebuild tier1 again
arthurdead Nov 19, 2022
69e6e9e
Merge commit '361122610faf6f5cd1b4d15fedd63a0eda6300f7'
arthurdead Dec 3, 2022
987b95b
remove duplicate CUtlVectorConservative
arthurdead Dec 3, 2022
aec6d4e
add Size back to utlvector, fix stackalloc/free definitions
arthurdead Dec 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
make g_nActivityListVersion and g_nEventListVersion pointers, update … 
…IVModelInfo
  • Loading branch information
@arthurdead
arthurdead committed Sep 15, 2022
commit 02846c232cf3da5542911dc95f988b1883b1bee2
8 changes: 4 additions & 4 deletions game/server/nav_area.h
View file
Original file line number Diff line number Diff line change
@@ -837,14 +837,14 @@ inline bool CNavArea::IsOpen( void ) const
//--------------------------------------------------------------------------------------------------------------
inline bool CNavArea::IsOpenListEmpty( void )
{
Assert( (m_openList && m_openList->m_prevOpen == NULL) || m_openList == NULL );
//Assert( (m_openList && m_openList->m_prevOpen == NULL) || m_openList == NULL );
return (*m_openList) ? false : true;
}

//--------------------------------------------------------------------------------------------------------------
inline CNavArea *CNavArea::PopOpenList( void )
{
Assert( (m_openList && m_openList->m_prevOpen == NULL) || m_openList == NULL );
//Assert( (m_openList && m_openList->m_prevOpen == NULL) || m_openList == NULL );

if ( *m_openList )
{
@@ -855,12 +855,12 @@ inline CNavArea *CNavArea::PopOpenList( void )
area->m_prevOpen = NULL;
area->m_nextOpen = NULL;

Assert( (m_openList && m_openList->m_prevOpen == NULL) || m_openList == NULL );
//Assert( (m_openList && m_openList->m_prevOpen == NULL) || m_openList == NULL );

return area;
}

Assert( (m_openList && m_openList->m_prevOpen == NULL) || m_openList == NULL );
//Assert( (m_openList && m_openList->m_prevOpen == NULL) || m_openList == NULL );

return NULL;
}
16 changes: 8 additions & 8 deletions game/shared/animation.cpp
View file
Original file line number Diff line number Diff line change
@@ -57,8 +57,8 @@ int ExtractBbox( CStudioHdr *pstudiohdr, int sequence, Vector& mins, Vector& max
// Output : mstudioseqdesc_t
//-----------------------------------------------------------------------------

extern int g_nActivityListVersion;
extern int g_nEventListVersion;
extern int *g_nActivityListVersion;
extern int *g_nEventListVersion;

void SetEventIndexForSequence( mstudioseqdesc_t &seqdesc )
{
@@ -112,14 +112,14 @@ void BuildAllAnimationEventIndexes( CStudioHdr *pstudiohdr )
if ( !pstudiohdr )
return;

if( pstudiohdr->GetEventListVersion() != g_nEventListVersion )
if( pstudiohdr->GetEventListVersion() != *g_nEventListVersion )
{
for ( int i = 0 ; i < pstudiohdr->GetNumSeq() ; i++ )
{
SetEventIndexForSequence( pstudiohdr->pSeqdesc( i ) );
}

pstudiohdr->SetEventListVersion( g_nEventListVersion );
pstudiohdr->SetEventListVersion( *g_nEventListVersion );
}
}

@@ -133,7 +133,7 @@ void ResetEventIndexes( CStudioHdr *pstudiohdr )
if (! pstudiohdr)
return;

pstudiohdr->SetEventListVersion( g_nEventListVersion - 1 );
pstudiohdr->SetEventListVersion( *g_nEventListVersion - 1 );
}

//-----------------------------------------------------------------------------
@@ -193,7 +193,7 @@ void IndexModelSequences( CStudioHdr *pstudiohdr )
SetEventIndexForSequence( pstudiohdr->pSeqdesc( i ) );
}

pstudiohdr->SetActivityListVersion( g_nActivityListVersion );
pstudiohdr->SetActivityListVersion( *g_nActivityListVersion );
}

//-----------------------------------------------------------------------------
@@ -206,7 +206,7 @@ void ResetActivityIndexes( CStudioHdr *pstudiohdr )
if (! pstudiohdr)
return;

pstudiohdr->SetActivityListVersion( g_nActivityListVersion - 1 );
pstudiohdr->SetActivityListVersion( *g_nActivityListVersion - 1 );
}

void VerifySequenceIndex( CStudioHdr *pstudiohdr )
@@ -216,7 +216,7 @@ void VerifySequenceIndex( CStudioHdr *pstudiohdr )
return;
}

if( pstudiohdr->GetActivityListVersion( ) != g_nActivityListVersion )
if( pstudiohdr->GetActivityListVersion( ) != *g_nActivityListVersion )
{
// this model's sequences have not yet been indexed by activity
IndexModelSequences( pstudiohdr );
51 changes: 40 additions & 11 deletions public/engine/ivmodelinfo.h
View file
Original file line number Diff line number Diff line change
@@ -33,29 +33,33 @@ class CPhysCollide;
typedef unsigned short MDLHandle_t;
class CUtlBuffer;
class IClientRenderable;

class IModelLoadCallback;

//-----------------------------------------------------------------------------
// Model info interface
//-----------------------------------------------------------------------------

// change this when the new version is incompatable with the old
#define VMODELINFO_CLIENT_INTERFACE_VERSION "VModelInfoClient004"
#define VMODELINFO_SERVER_INTERFACE_VERSION "VModelInfoServer002"
#define VMODELINFO_CLIENT_INTERFACE_VERSION "VModelInfoClient006"
#define VMODELINFO_SERVER_INTERFACE_VERSION_3 "VModelInfoServer003"
#define VMODELINFO_SERVER_INTERFACE_VERSION "VModelInfoServer004"

class IVModelInfo
abstract_class IVModelInfo
{
public:
virtual ~IVModelInfo( void ) { }

virtual const model_t *GetModel( int modelindex ) const = 0;
// Returns index of model by name
// Returns model_t* pointer for a model given a precached or dynamic model index.
virtual const model_t *GetModel( int modelindex ) = 0;

// Returns index of model by name for precached or known dynamic models.
// Does not adjust reference count for dynamic models.
virtual int GetModelIndex( const char *name ) const = 0;

// Returns name of model
virtual const char *GetModelName( const model_t *model ) const = 0;
virtual vcollide_t *GetVCollide( const model_t *model ) const = 0;
virtual vcollide_t *GetVCollide( int modelindex ) const = 0;
virtual vcollide_t *GetVCollide( const model_t *model ) = 0;
virtual vcollide_t *GetVCollide( int modelindex ) = 0;
virtual void GetModelBounds( const model_t *model, Vector& mins, Vector& maxs ) const = 0;
virtual void GetModelRenderBounds( const model_t *model, Vector& mins, Vector& maxs ) const = 0;
virtual int GetModelFrameCount( const model_t *model ) const = 0;
@@ -64,7 +68,7 @@ class IVModelInfo
virtual bool ModelHasMaterialProxy( const model_t *model ) const = 0;
virtual bool IsTranslucent( model_t const* model ) const = 0;
virtual bool IsTranslucentTwoPass( const model_t *model ) const = 0;
virtual void RecomputeTranslucency( const model_t *model, int nSkin, int nBody, void /*IClientRenderable*/ *pClientRenderable ) = 0;
virtual void RecomputeTranslucency( const model_t *model, int nSkin, int nBody, void /*IClientRenderable*/ *pClientRenderable, float fInstanceAlphaModulate=1.0f) = 0;
virtual int GetModelMaterialCount( const model_t* model ) const = 0;
virtual void GetModelMaterials( const model_t *model, int count, IMaterial** ppMaterial ) = 0;
virtual bool IsModelVertexLit( const model_t *model ) const = 0;
@@ -84,7 +88,7 @@ class IVModelInfo
virtual void GetIlluminationPoint( const model_t *model, IClientRenderable *pRenderable, Vector const& origin,
QAngle const& angles, Vector* pLightingCenter ) = 0;

virtual int GetModelContents( int modelIndex ) const = 0;
virtual int GetModelContents( int modelIndex ) = 0;
virtual studiohdr_t *GetStudiomodel( const model_t *mod ) = 0;
virtual int GetModelSpriteWidth( const model_t *model ) const = 0;
virtual int GetModelSpriteHeight( const model_t *model ) const = 0;
@@ -109,14 +113,39 @@ class IVModelInfo

virtual bool IsUsingFBTexture( const model_t *model, int nSkin, int nBody, void /*IClientRenderable*/ *pClientRenderable ) const = 0;

virtual const model_t *FindOrLoadModel( const char *name ) const = 0;
// Obsolete methods. These are left in to maintain binary compatibility with clients using the IVModelInfo old version.
virtual const model_t *FindOrLoadModel( const char *name ) { Warning( "IVModelInfo::FindOrLoadModel is now obsolte.\n" ); return NULL; }
virtual void InitDynamicModels( ) { Warning( "IVModelInfo::InitDynamicModels is now obsolte.\n" ); }
virtual void ShutdownDynamicModels( ) { Warning( "IVModelInfo::ShutdownDynamicModels is now obsolte.\n" ); }
virtual void AddDynamicModel( const char *name, int nModelIndex = -1 ) { Warning( "IVModelInfo::AddDynamicModel is now obsolte.\n" ); }
virtual void ReferenceModel( int modelindex ) { Warning( "IVModelInfo::ReferenceModel is now obsolte.\n" ); }
virtual void UnreferenceModel( int modelindex ) { Warning( "IVModelInfo::UnreferenceModel is now obsolte.\n" ); }
virtual void CleanupDynamicModels( bool bForce = false ) { Warning( "IVModelInfo::CleanupDynamicModels is now obsolte.\n" ); }

virtual MDLHandle_t GetCacheHandle( const model_t *model ) const = 0;

// Returns planes of non-nodraw brush model surfaces
virtual int GetBrushModelPlaneCount( const model_t *model ) const = 0;
virtual void GetBrushModelPlane( const model_t *model, int nIndex, cplane_t &plane, Vector *pOrigin ) const = 0;
virtual int GetSurfacepropsForVirtualTerrain( int index ) = 0;

// Poked by engine host system
virtual void OnLevelChange() = 0;

virtual int GetModelClientSideIndex( const char *name ) const = 0;

// Returns index of model by name, dynamically registered if not already known.
virtual int RegisterDynamicModel( const char *name, bool bClientSide ) = 0;

virtual bool IsDynamicModelLoading( int modelIndex ) = 0;

virtual void AddRefDynamicModel( int modelIndex ) = 0;
virtual void ReleaseDynamicModel( int modelIndex ) = 0;

// Registers callback for when dynamic model has finished loading.
// Automatically adds reference, pair with ReleaseDynamicModel.
virtual bool RegisterModelLoadCallback( int modelindex, IModelLoadCallback* pCallback, bool bCallImmediatelyIfLoaded = true ) = 0;
virtual void UnregisterModelLoadCallback( int modelindex, IModelLoadCallback* pCallback ) = 0;
};