MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-01-27 06:07:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed VScriptProxy not working without a renderable and added a GetVarName function

Browse Source
This commit is contained in:
Blixibon 2021-04-21 15:01:50 -05:00
parent 138a25c53c
commit b718f19d45
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sp/src/game/client/vscript_client.cpp
View File

@ -165,6 +165,8 @@ public:
void SetVarFloat( int i, float value ); void SetVarFloat( int i, float value );
void SetVarVector( int i, const Vector &value ); void SetVarVector( int i, const Vector &value );
const char *GetVarName( int i );
private: private:
IMaterialVar *m_MaterialVars[SCRIPT_MAT_PROXY_MAX_VARS]; IMaterialVar *m_MaterialVars[SCRIPT_MAT_PROXY_MAX_VARS];
@ -194,12 +196,19 @@ BEGIN_SCRIPTDESC_ROOT_NAMED( CScriptMaterialProxy, "CScriptMaterialProxy", "Mate
DEFINE_SCRIPTFUNC( SetVarInt, "Sets a material var's int value" ) DEFINE_SCRIPTFUNC( SetVarInt, "Sets a material var's int value" )
DEFINE_SCRIPTFUNC( SetVarFloat, "Sets a material var's float value" ) DEFINE_SCRIPTFUNC( SetVarFloat, "Sets a material var's float value" )
DEFINE_SCRIPTFUNC( SetVarVector, "Sets a material var's vector value" ) DEFINE_SCRIPTFUNC( SetVarVector, "Sets a material var's vector value" )
DEFINE_SCRIPTFUNC( GetVarName, "Gets a material var's name" )
END_SCRIPTDESC(); END_SCRIPTDESC();
CScriptMaterialProxy::CScriptMaterialProxy() CScriptMaterialProxy::CScriptMaterialProxy()
{ {
m_hScriptInstance = NULL; m_hScriptInstance = NULL;
m_hFuncOnBind = NULL; m_hFuncOnBind = NULL;
for (int i = 0; i < SCRIPT_MAT_PROXY_MAX_VARS; i++)
{
m_MaterialVars[i] = NULL;
}
} }
CScriptMaterialProxy::~CScriptMaterialProxy() CScriptMaterialProxy::~CScriptMaterialProxy()
@ -316,18 +325,20 @@ void CScriptMaterialProxy::TermScript()
void CScriptMaterialProxy::OnBind( void *pRenderable ) void CScriptMaterialProxy::OnBind( void *pRenderable )
{ {
if( !pRenderable )
return;
if (m_hFuncOnBind != NULL) if (m_hFuncOnBind != NULL)
{ {
IClientRenderable *pRend = ( IClientRenderable* )pRenderable; C_BaseEntity *pEnt = NULL;
C_BaseEntity *pEnt = pRend->GetIClientUnknown()->GetBaseEntity(); if (pRenderable)
if ( pEnt )
{ {
g_pScriptVM->SetValue( m_ScriptScope, "entity", pEnt->GetScriptInstance() ); IClientRenderable *pRend = (IClientRenderable*)pRenderable;
pEnt = pRend->GetIClientUnknown()->GetBaseEntity();
if ( pEnt )
{
g_pScriptVM->SetValue( m_ScriptScope, "entity", pEnt->GetScriptInstance() );
}
} }
else
if (!pEnt)
{ {
// Needs to register as a null value so the script doesn't break if it looks for an entity // Needs to register as a null value so the script doesn't break if it looks for an entity
g_pScriptVM->SetValue( m_ScriptScope, "entity", SCRIPT_VARIANT_NULL ); g_pScriptVM->SetValue( m_ScriptScope, "entity", SCRIPT_VARIANT_NULL );
@ -414,6 +425,14 @@ void CScriptMaterialProxy::SetVarVector( int i, const Vector &value )
return m_MaterialVars[i]->SetVecValue( value.Base(), 3 ); return m_MaterialVars[i]->SetVecValue( value.Base(), 3 );
} }
const char *CScriptMaterialProxy::GetVarName( int i )
{
if (!ValidateIndex( i ) || !m_MaterialVars[i])
return NULL;
return m_MaterialVars[i]->GetName();
}
EXPOSE_INTERFACE( CScriptMaterialProxy, IMaterialProxy, "VScriptProxy" IMATERIAL_PROXY_INTERFACE_VERSION ); EXPOSE_INTERFACE( CScriptMaterialProxy, IMaterialProxy, "VScriptProxy" IMATERIAL_PROXY_INTERFACE_VERSION );
bool CMaterialProxyScriptInstanceHelper::ToString( void *p, char *pBuf, int bufSize ) bool CMaterialProxyScriptInstanceHelper::ToString( void *p, char *pBuf, int bufSize )