Merge branch 'develop' into feature/vscript/hook-handler-prototype-1

# Conflicts:
#	sp/src/vscript/vscript_squirrel.nut

sp/src/vscript/vscript_bindings_math.cpp

@@ -102,7 +102,6 @@ void ScriptMatrixSetColumn( const Vector& vecset, int column, HSCRIPT hMat1 )
 
 	matrix3x4_t *pMat1 = ToMatrix3x4( hMat1 );
 
-	static Vector outvec;
 	MatrixSetColumn( vecset, column, *pMat1 );
 }
 
@@ -156,6 +155,49 @@ void ScriptSetScaleMatrix( float x, float y, float z, HSCRIPT hMat1 )
 	SetScaleMatrix( x, y, z, *pMat1 );
 }
 
+void ScriptMatrixScaleBy( float flScale, HSCRIPT hMat1 )
+{
+	if (!hMat1)
+		return;
+
+	matrix3x4_t *pMat1 = ToMatrix3x4( hMat1 );
+
+	MatrixScaleBy( flScale, *pMat1 );
+}
+
+void ScriptMatrixScaleByZero( HSCRIPT hMat1 )
+{
+	if (!hMat1)
+		return;
+
+	matrix3x4_t *pMat1 = ToMatrix3x4( hMat1 );
+
+	MatrixScaleByZero( *pMat1 );
+}
+
+const Vector& ScriptMatrixGetTranslation( HSCRIPT hMat1 )
+{
+	static Vector outvec;
+	outvec.Zero();
+	if (!hMat1)
+		return outvec;
+
+	matrix3x4_t *pMat1 = ToMatrix3x4( hMat1 );
+
+	MatrixGetTranslation( *pMat1, outvec );
+	return outvec;
+}
+
+void ScriptMatrixSetTranslation( const Vector& vecset, HSCRIPT hMat1 )
+{
+	if (!hMat1)
+		return;
+
+	matrix3x4_t *pMat1 = ToMatrix3x4( hMat1 );
+
+	MatrixSetTranslation( vecset, *pMat1 );
+}
+
 //=============================================================================
 //
 // Quaternion
@@ -427,7 +469,11 @@ void RegisterMathBaseBindings( IScriptVM *pVM )
 	ScriptRegisterFunctionNamed( pVM, ScriptAngleMatrix, "AngleMatrix", "Sets the angles and position of a matrix." );
 	ScriptRegisterFunctionNamed( pVM, ScriptAngleIMatrix, "AngleIMatrix", "Sets the inverted angles and position of a matrix." );
 	ScriptRegisterFunctionNamed( pVM, ScriptSetIdentityMatrix, "SetIdentityMatrix", "Turns a matrix into an identity matrix." );
-	ScriptRegisterFunctionNamed( pVM, ScriptSetScaleMatrix, "SetScaleMatrix", "Scales a matrix." );
+	ScriptRegisterFunctionNamed( pVM, ScriptSetScaleMatrix, "SetScaleMatrix", "Builds a scale matrix." );
+	ScriptRegisterFunctionNamed( pVM, ScriptMatrixScaleBy, "MatrixScaleBy", "Scales a matrix." );
+	ScriptRegisterFunctionNamed( pVM, ScriptMatrixScaleByZero, "MatrixScaleByZero", "Scales a matrix by zero." );
+	ScriptRegisterFunctionNamed( pVM, ScriptMatrixGetTranslation, "MatrixGetTranslation", "Gets a matrix's translation." );
+	ScriptRegisterFunctionNamed( pVM, ScriptMatrixSetTranslation, "MatrixSetTranslation", "Sets a matrix's translation." );
 
 	// 
 	// Quaternion

sp/src/vscript/vscript_squirrel.cpp

@@ -33,11 +33,14 @@
 
 #include "tier1/utlbuffer.h"
 #include "tier1/mapbase_con_groups.h"
+#include "tier1/convar.h"
 
 #include "vscript_squirrel.nut"
 
 #include <cstdarg>
 
+extern ConVar developer;
+
 struct WriteStateMap
 {
 	CUtlMap<void*, int> cache;
@@ -65,8 +68,16 @@ struct WriteStateMap
 struct ReadStateMap
 {
 	CUtlMap<int, HSQOBJECT> cache;
+#ifdef _DEBUG
+	CUtlMap<int, bool> allocated;
+#endif
 	HSQUIRRELVM vm_;
-	ReadStateMap(HSQUIRRELVM vm) : cache(DefLessFunc(int)), vm_(vm)
+	ReadStateMap(HSQUIRRELVM vm) : 
+		cache(DefLessFunc(int)),
+#ifdef _DEBUG
+		allocated(DefLessFunc(int)), 
+#endif
+		vm_(vm)
 	{}
 
 	~ReadStateMap()
@@ -83,6 +94,16 @@ struct ReadStateMap
 		int marker = pBuffer->GetInt();
 
 		auto idx = cache.Find(marker);
+
+#ifdef _DEBUG
+		auto allocatedIdx = allocated.Find(marker);
+		bool hasSeen = allocatedIdx != allocated.InvalidIndex();
+		if (!hasSeen)
+		{
+			allocated.Insert(marker, true);
+		}
+#endif
+
 		if (idx != cache.InvalidIndex())
 		{
 			sq_pushobject(vm, cache[idx]);
@@ -90,6 +111,9 @@ struct ReadStateMap
 		}
 		else
 		{
+#ifdef _DEBUG
+			Assert(!hasSeen);
+#endif
 			*outmarker = marker;
 			return false;
 		}
@@ -253,7 +277,7 @@ public:
 	HSQOBJECT regexpClass_;
 };
 
-SQUserPointer TYPETAG_VECTOR = "VectorTypeTag";
+static char TYPETAG_VECTOR[] = "VectorTypeTag";
 
 namespace SQVector
 {
@@ -476,11 +500,29 @@ namespace SQVector
 			return sq_throwerror(vm, "Expected (Vector)");
 		}
 
-		v1->Negate();
+		sq_getclass(vm, 1);
+		sq_createinstance(vm, -1);
+		SQUserPointer p;
+		sq_getinstanceup(vm, -1, &p, 0);
+		new(p) Vector(-v1->x, -v1->y, -v1->z);
+		sq_remove(vm, -2);
 
 		return 1;
 	}
 
+	SQInteger weakref(HSQUIRRELVM vm)
+	{
+		sq_weakref(vm, 1);
+		return 1;
+	}
+
+	SQInteger getclass(HSQUIRRELVM vm)
+	{
+		sq_getclass(vm, 1);
+		sq_push(vm, -1);
+		return 1;
+	}
+
 	// multi purpose - copy from input vector, or init with 3 float input
 	SQInteger Set(HSQUIRRELVM vm)
 	{
@@ -835,11 +877,10 @@ namespace SQVector
 
 		float x = 0.0f, y = 0.0f, z = 0.0f;
 
-		if ( sscanf( szInput, "%f %f %f", &x, &y, &z ) < 3 ) // UTIL_StringToVector
+		if ( sscanf( szInput, "%f %f %f", &x, &y, &z ) < 3 )
 		{
-			// Don't throw, return null while invalidating the input vector.
+			// Return null while invalidating the input vector.
 			// This allows the user to easily check for input errors without halting.
-			//return sq_throwerror(vm, "invalid KV string");
 
 			sq_pushnull(vm);
 			*v1 = vec3_invalid;
@@ -971,6 +1012,8 @@ namespace SQVector
 		{_SC("_mul"), _multiply, 2, _SC("..")},
 		{_SC("_div"), _divide, 2, _SC("..")},
 		{_SC("_unm"), _unm, 1, _SC(".")},
+		{_SC("weakref"), weakref, 1, _SC(".")},
+		{_SC("getclass"), getclass, 1, _SC(".")},
 		{_SC("Set"), Set, -2, _SC("..nn")},
 		{_SC("Add"), Add, 2, _SC("..")},
 		{_SC("Subtract"), Subtract, 2, _SC("..")},
@@ -1101,7 +1144,7 @@ void PushVariant(HSQUIRRELVM vm, const ScriptVariant_t& value)
 		sq_createinstance(vm, -1);
 		SQUserPointer p;
 		sq_getinstanceup(vm, -1, &p, 0);
-		new(p) Vector(value);
+		new(p) Vector(static_cast<const Vector&>(value));
 		sq_remove(vm, -2);
 		break;
 	}
@@ -1375,6 +1418,9 @@ SQInteger function_stub(HSQUIRRELVM vm)
 
 	PushVariant(vm, retval);
 
+	if (retval.m_type == FIELD_VECTOR)
+		delete retval.m_pVector;
+
 	return pFunc->m_desc.m_ReturnType != FIELD_VOID;
 }
 
@@ -1632,6 +1678,19 @@ SQInteger IsValid_stub(HSQUIRRELVM vm)
 	return 1;
 }
 
+SQInteger weakref_stub(HSQUIRRELVM vm)
+{
+	sq_weakref(vm, 1);
+	return 1;
+}
+
+SQInteger getclass_stub(HSQUIRRELVM vm)
+{
+	sq_getclass(vm, 1);
+	sq_push(vm, -1);
+	return 1;
+}
+
 struct SquirrelSafeCheck
 {
 	SquirrelSafeCheck(HSQUIRRELVM vm, int outputCount = 0) :
@@ -1709,6 +1768,9 @@ const char * ScriptDataTypeToName(ScriptDataType_t datatype)
 
 void RegisterDocumentation(HSQUIRRELVM vm, const ScriptFuncDescriptor_t& pFuncDesc, ScriptClassDesc_t* pClassDesc = nullptr)
 {
+	if ( !developer.GetInt() )
+		return;
+
 	SquirrelSafeCheck safeCheck(vm);
 
 	if (pFuncDesc.m_pszDescription && pFuncDesc.m_pszDescription[0] == SCRIPT_HIDE[0])
@@ -1748,6 +1810,9 @@ void RegisterDocumentation(HSQUIRRELVM vm, const ScriptFuncDescriptor_t& pFuncDe
 
 void RegisterClassDocumentation(HSQUIRRELVM vm, const ScriptClassDesc_t* pClassDesc)
 {
+	if ( !developer.GetInt() )
+		return;
+
 	SquirrelSafeCheck safeCheck(vm);
 
 	const char *name = pClassDesc->m_pszScriptName;
@@ -1780,6 +1845,9 @@ void RegisterClassDocumentation(HSQUIRRELVM vm, const ScriptClassDesc_t* pClassD
 
 void RegisterEnumDocumentation(HSQUIRRELVM vm, const ScriptEnumDesc_t* pClassDesc)
 {
+	if ( !developer.GetInt() )
+		return;
+
 	SquirrelSafeCheck safeCheck(vm);
 
 	if (pClassDesc->m_pszDescription && pClassDesc->m_pszDescription[0] == SCRIPT_HIDE[0])
@@ -1797,6 +1865,9 @@ void RegisterEnumDocumentation(HSQUIRRELVM vm, const ScriptEnumDesc_t* pClassDes
 
 void RegisterConstantDocumentation( HSQUIRRELVM vm, const ScriptConstantBinding_t* pConstDesc, const char *pszAsString, ScriptEnumDesc_t* pEnumDesc = nullptr )
 {
+	if ( !developer.GetInt() )
+		return;
+
 	SquirrelSafeCheck safeCheck(vm);
 
 	if (pConstDesc->m_pszDescription && pConstDesc->m_pszDescription[0] == SCRIPT_HIDE[0])
@@ -1825,6 +1896,9 @@ void RegisterConstantDocumentation( HSQUIRRELVM vm, const ScriptConstantBinding_
 
 void RegisterHookDocumentation(HSQUIRRELVM vm, const ScriptHook_t* pHook, const ScriptFuncDescriptor_t& pFuncDesc, ScriptClassDesc_t* pClassDesc = nullptr)
 {
+	if ( !developer.GetInt() )
+		return;
+
 	SquirrelSafeCheck safeCheck(vm);
 
 	if (pFuncDesc.m_pszDescription && pFuncDesc.m_pszDescription[0] == SCRIPT_HIDE[0])
@@ -1867,6 +1941,9 @@ void RegisterHookDocumentation(HSQUIRRELVM vm, const ScriptHook_t* pHook, const
 
 void RegisterMemberDocumentation(HSQUIRRELVM vm, const ScriptMemberDesc_t& pDesc, ScriptClassDesc_t* pClassDesc = nullptr)
 {
+	if ( !developer.GetInt() )
+		return;
+
 	SquirrelSafeCheck safeCheck(vm);
 
 	if (pDesc.m_pszDescription && pDesc.m_pszDescription[0] == SCRIPT_HIDE[0])
@@ -1894,6 +1971,12 @@ void RegisterMemberDocumentation(HSQUIRRELVM vm, const ScriptMemberDesc_t& pDesc
 	CallDocumentationRegisterFunction( 3 );
 }
 
+SQInteger GetDeveloperLevel(HSQUIRRELVM vm)
+{
+	sq_pushinteger( vm, developer.GetInt() );
+	return 1;
+}
+
 
 bool SquirrelVM::Init()
 {
@@ -1961,6 +2044,11 @@ bool SquirrelVM::Init()
 			sq_pop(vm_, 1);
 		}
 
+		sq_pushstring( vm_, "developer", -1 );
+		sq_newclosure( vm_, &GetDeveloperLevel, 0 );
+		//sq_setnativeclosurename( vm_, -1, "developer" );
+		sq_newslot( vm_, -3, SQFalse );
+
 		sq_pop(vm_, 1);
 	}
 
@@ -2478,6 +2566,14 @@ bool SquirrelVM::RegisterClass(ScriptClassDesc_t* pClassDesc)
 	sq_newclosure(vm_, IsValid_stub, 0);
 	sq_newslot(vm_, -3, SQFalse);
 
+	sq_pushstring(vm_, "weakref", -1);
+	sq_newclosure(vm_, weakref_stub, 0);
+	sq_newslot(vm_, -3, SQFalse);
+
+	sq_pushstring(vm_, "getclass", -1);
+	sq_newclosure(vm_, getclass_stub, 0);
+	sq_newslot(vm_, -3, SQFalse);
+
 
 	for (int i = 0; i < pClassDesc->m_FunctionBindings.Count(); ++i)
 	{
@@ -3515,6 +3611,7 @@ void SquirrelVM::WriteState(CUtlBuffer* pBuffer)
 	int count = sq_getsize(vm_, 1);
 	sq_pushnull(vm_);
 	pBuffer->PutInt(count);
+
 	while (SQ_SUCCEEDED(sq_next(vm_, -2)))
 	{
 		WriteObject(pBuffer, writeState, -2);
@@ -3648,6 +3745,9 @@ void SquirrelVM::ReadObject(CUtlBuffer* pBuffer, ReadStateMap& readState)
 				break;
 			}
 
+			vm_->Push(ret);
+			readState.StoreTopInCache(marker);
+
 			int noutervalues = _closure(ret)->_function->_noutervalues;
 			for (int i = 0; i < noutervalues; ++i)
 			{
@@ -3669,9 +3769,6 @@ void SquirrelVM::ReadObject(CUtlBuffer* pBuffer, ReadStateMap& readState)
 				_closure(ret)->_defaultparams[i] = obj;
 				sq_poptop(vm_);
 			}
-
-			vm_->Push(ret);
-			readState.StoreTopInCache(marker);
 		}
 
 		ReadObject(pBuffer, readState);
@@ -3943,16 +4040,17 @@ void SquirrelVM::ReadObject(CUtlBuffer* pBuffer, ReadStateMap& readState)
 			break;
 		}
 
+		SQOuter* outer = SQOuter::Create(_ss(vm_), nullptr);
+		vm_->Push(outer);
+		readState.StoreTopInCache(marker);
+
 		ReadObject(pBuffer, readState);
 		HSQOBJECT inner;
 		sq_resetobject(&inner);
 		sq_getstackobj(vm_, -1, &inner);
-		SQOuter* outer = SQOuter::Create(_ss(vm_), nullptr);
 		outer->_value = inner;
 		outer->_valptr = &(outer->_value);
 		sq_poptop(vm_);
-		vm_->Push(outer);
-		readState.StoreTopInCache(marker);
 
 		break;
 	}

sp/src/vscript/vscript_squirrel.nut

@@ -122,6 +122,8 @@ class CSimpleCallChainer
 	chain = null;
 }
 
+local developer = (delete developer)()
+
 //---------------------------------------------------------
 // Hook handler
 //---------------------------------------------------------
@@ -234,12 +236,22 @@ Hooks <-
 //---------------------------------------------------------
 __Documentation <- {}
 
-local DocumentedFuncs   = {}
-local DocumentedClasses = {}
-local DocumentedEnums   = {}
-local DocumentedConsts  = {}
-local DocumentedHooks   = {}
-local DocumentedMembers = {}
+local DocumentedFuncs
+local DocumentedClasses
+local DocumentedEnums
+local DocumentedConsts
+local DocumentedHooks
+local DocumentedMembers
+
+if (developer)
+{
+	DocumentedFuncs   = {}
+	DocumentedClasses = {}
+	DocumentedEnums   = {}
+	DocumentedConsts  = {}
+	DocumentedHooks   = {}
+	DocumentedMembers = {}
+}
 
 local function AddAliasedToTable(name, signature, description, table)
 {
@@ -259,6 +271,9 @@ local function AddAliasedToTable(name, signature, description, table)
 
 function __Documentation::RegisterHelp(name, signature, description)
 {
+	if ( !developer )
+		return
+
 	if (description.len() && description[0] == '#')
 	{
 		AddAliasedToTable(name, signature, description, DocumentedFuncs)
@@ -271,16 +286,25 @@ function __Documentation::RegisterHelp(name, signature, description)
 
 function __Documentation::RegisterClassHelp(name, baseclass, description)
 {
+	if ( !developer )
+		return
+
 	DocumentedClasses[name] <- [baseclass, description];
 }
 
 function __Documentation::RegisterEnumHelp(name, num_elements, description)
 {
+	if ( !developer )
+		return
+
 	DocumentedEnums[name] <- [num_elements, description];
 }
 
 function __Documentation::RegisterConstHelp(name, signature, description)
 {
+	if ( !developer )
+		return
+
 	if (description.len() && description[0] == '#')
 	{
 		AddAliasedToTable(name, signature, description, DocumentedConsts)
@@ -293,11 +317,17 @@ function __Documentation::RegisterConstHelp(name, signature, description)
 
 function __Documentation::RegisterHookHelp(name, signature, description)
 {
+	if ( !developer )
+		return
+
 	DocumentedHooks[name] <- [signature, description];
 }
 
 function __Documentation::RegisterMemberHelp(name, signature, description)
 {
+	if ( !developer )
+		return
+
 	DocumentedMembers[name] <- [signature, description];
 }
 
@@ -427,6 +457,12 @@ local function PrintMatchesInDocList(pattern, list, printfunc)
 
 function __Documentation::PrintHelp(pattern = "*")
 {
+	if ( !developer )
+	{
+		printdocl("Documentation is not enabled. To enable documentation, restart the server with the 'developer' cvar set to 1 or higher.");
+		return
+	}
+
 	local patternLower = pattern.tolower();
 
 	// Have a specific order