celisej567/source-engine
1
0
Fork 0
mirror of https://github.com/celisej567/source-engine.git synced 2025-12-31 21:48:22 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into windows

Browse Source
This commit is contained in:
HappyDOGE
2022-07-27 12:58:56 +03:00
parent edbe1baceb a53fff833f
commit 90cd6e0e15
3089 changed files with 38642 additions and 844823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
utils/common/bsplib.cpp
View File

@@ -3400,10 +3400,10 @@ public:
int LeafCount() const;
// Enumerates the leaves along a ray, box, etc.
bool EnumerateLeavesAtPoint( Vector const& pt, ISpatialLeafEnumerator* pEnum, int context );
bool EnumerateLeavesInBox( Vector const& mins, Vector const& maxs, ISpatialLeafEnumerator* pEnum, int context );
bool EnumerateLeavesInSphere( Vector const& center, float radius, ISpatialLeafEnumerator* pEnum, int context );
bool EnumerateLeavesAlongRay( Ray_t const& ray, ISpatialLeafEnumerator* pEnum, int context );
bool EnumerateLeavesAtPoint( Vector const& pt, ISpatialLeafEnumerator* pEnum, intp context );
bool EnumerateLeavesInBox( Vector const& mins, Vector const& maxs, ISpatialLeafEnumerator* pEnum, intp context );
bool EnumerateLeavesInSphere( Vector const& center, float radius, ISpatialLeafEnumerator* pEnum, intp context );
bool EnumerateLeavesAlongRay( Ray_t const& ray, ISpatialLeafEnumerator* pEnum, intp context );
};
@@ -3422,7 +3422,7 @@ int CToolBSPTree::LeafCount() const
//-----------------------------------------------------------------------------
bool CToolBSPTree::EnumerateLeavesAtPoint( Vector const& pt,
ISpatialLeafEnumerator* pEnum, int context )
ISpatialLeafEnumerator* pEnum, intp context )
{
int node = 0;
while( node >= 0 )
@@ -3449,7 +3449,7 @@ bool CToolBSPTree::EnumerateLeavesAtPoint( Vector const& pt,
//-----------------------------------------------------------------------------
static bool EnumerateLeavesInBox_R( int node, Vector const& mins,
Vector const& maxs, ISpatialLeafEnumerator* pEnum, int context )
Vector const& maxs, ISpatialLeafEnumerator* pEnum, intp context )
{
Vector cornermin, cornermax;
@@ -3496,7 +3496,7 @@ static bool EnumerateLeavesInBox_R( int node, Vector const& mins,
}
bool CToolBSPTree::EnumerateLeavesInBox( Vector const& mins, Vector const& maxs,
ISpatialLeafEnumerator* pEnum, int context )
ISpatialLeafEnumerator* pEnum, intp context )
{
return EnumerateLeavesInBox_R( 0, mins, maxs, pEnum, context );
}
@@ -3506,7 +3506,7 @@ bool CToolBSPTree::EnumerateLeavesInBox( Vector const& mins, Vector const& maxs,
//-----------------------------------------------------------------------------
static bool EnumerateLeavesInSphere_R( int node, Vector const& origin,
float radius, ISpatialLeafEnumerator* pEnum, int context )
float radius, ISpatialLeafEnumerator* pEnum, intp context )
{
while( node >= 0 )
{
@@ -3537,7 +3537,7 @@ static bool EnumerateLeavesInSphere_R( int node, Vector const& origin,
return pEnum->EnumerateLeaf( - node - 1, context );
}
bool CToolBSPTree::EnumerateLeavesInSphere( Vector const& center, float radius, ISpatialLeafEnumerator* pEnum, int context )
bool CToolBSPTree::EnumerateLeavesInSphere( Vector const& center, float radius, ISpatialLeafEnumerator* pEnum, intp context )
{
return EnumerateLeavesInSphere_R( 0, center, radius, pEnum, context );
}
@@ -3548,7 +3548,7 @@ bool CToolBSPTree::EnumerateLeavesInSphere( Vector const& center, float radius,
//-----------------------------------------------------------------------------
static bool EnumerateLeavesAlongRay_R( int node, Ray_t const& ray,
Vector const& start, Vector const& end, ISpatialLeafEnumerator* pEnum, int context )
Vector const& start, Vector const& end, ISpatialLeafEnumerator* pEnum, intp context )
{
float front,back;
@@ -3611,7 +3611,7 @@ static bool EnumerateLeavesAlongRay_R( int node, Ray_t const& ray,
return pEnum->EnumerateLeaf( - node - 1, context );
}
bool CToolBSPTree::EnumerateLeavesAlongRay( Ray_t const& ray, ISpatialLeafEnumerator* pEnum, int context )
bool CToolBSPTree::EnumerateLeavesAlongRay( Ray_t const& ray, ISpatialLeafEnumerator* pEnum, intp context )
{
if (!ray.m_IsSwept)
{
@@ -3650,7 +3650,7 @@ ISpatialQuery* ToolBSPTree()
// FIXME: Do we want this in the IBSPTree interface?
static bool EnumerateNodesAlongRay_R( int node, Ray_t const& ray, float start, float end,
IBSPNodeEnumerator* pEnum, int context )
IBSPNodeEnumerator* pEnum, intp context )
{
float front, back;
float startDotN, deltaDotN;
@@ -3719,7 +3719,7 @@ static bool EnumerateNodesAlongRay_R( int node, Ray_t const& ray, float start, f
}
bool EnumerateNodesAlongRay( Ray_t const& ray, IBSPNodeEnumerator* pEnum, int context )
bool EnumerateNodesAlongRay( Ray_t const& ray, IBSPNodeEnumerator* pEnum, intp context )
{
Vector end;
VectorAdd( ray.m_Start, ray.m_Delta, end );

6
utils/common/bsplib.h
View File

@@ -361,16 +361,16 @@ class IBSPNodeEnumerator
{
public:
// call back with a node and a context
virtual bool EnumerateNode( int node, Ray_t const& ray, float f, int context ) = 0;
virtual bool EnumerateNode( int node, Ray_t const& ray, float f, intp context ) = 0;
// call back with a leaf and a context
virtual bool EnumerateLeaf( int leaf, Ray_t const& ray, float start, float end, int context ) = 0;
virtual bool EnumerateLeaf( int leaf, Ray_t const& ray, float start, float end, intp context ) = 0;
};
//-----------------------------------------------------------------------------
// Enumerates nodes + leafs in front to back order...
//-----------------------------------------------------------------------------
bool EnumerateNodesAlongRay( Ray_t const& ray, IBSPNodeEnumerator* pEnum, int context );
bool EnumerateNodesAlongRay( Ray_t const& ray, IBSPNodeEnumerator* pEnum, intp context );
//-----------------------------------------------------------------------------

1
utils/hlfaceposer/hlfaceposer.vpc
View File

@@ -320,7 +320,6 @@ $Project "hlfaceposer"
$File "$SRCDIR\public\networkvar.h"
$File "$SRCDIR\game\shared\npcevent.h"
$File "$SRCDIR\public\optimize.h"
$File "$SRCDIR\public\phonemeextractor\phonemeextractor.h"
$File "$SRCDIR\public\phyfile.h"
$File "..\common\physdll.h"
$File "..\hlmv\physmesh.h"

2
utils/studiomdl/perfstats.cpp
View File

@@ -53,7 +53,7 @@ Cache model's specified dynamic data
vertexFileHeader_t *CStudioDataCache::CacheVertexData( studiohdr_t *pStudioHdr )
{
// minimal implementation - return persisted data
return (vertexFileHeader_t*)pStudioHdr->pVertexBase;
return (vertexFileHeader_t*)pStudioHdr->VertexBase();
}
static void UpdateStudioRenderConfig( void )

4
utils/vbsp/vbsp.vpc
View File

@@ -36,12 +36,10 @@ $Project "Vbsp"
$File "detail.cpp"
$File "detailObjects.cpp"
$File "$SRCDIR\public\disp_common.cpp"
$File "disp_ivp.cpp"
$File "$SRCDIR\public\disp_powerinfo.cpp"
$File "disp_vbsp.cpp"
$File "faces.cpp"
$File "glfile.cpp"
$File "ivp.cpp"
$File "leakfile.cpp"
$File "$SRCDIR\public\loadcmdline.cpp"
$File "$SRCDIR\public\lumpfiles.cpp"
@@ -110,13 +108,11 @@ $Project "Vbsp"
$File "$SRCDIR\public\builddisp.h"
$File "$SRCDIR\public\ChunkFile.h"
$File "..\common\cmdlib.h"
$File "disp_ivp.h"
$File "$SRCDIR\public\filesystem.h"
$File "$SRCDIR\public\filesystem_helpers.h"
$File "..\common\FileSystem_Tools.h"
$File "$SRCDIR\public\GameBSPFile.h"
$File "$SRCDIR\public\tier1\interface.h"
$File "ivp.h"
$File "..\common\map_shared.h"
$File "..\common\pacifier.h"
$File "..\common\polylib.h"

2
utils/vrad/leaf_ambient_lighting.cpp
View File

@@ -463,7 +463,7 @@ float AABBDistance( const Vector &mins0, const Vector &maxs0, const Vector &mins
class CLeafList : public ISpatialLeafEnumerator
{
public:
virtual bool EnumerateLeaf( int leaf, int context )
virtual bool EnumerateLeaf( int leaf, intp context )
{
m_list.AddToTail(leaf);
return true;

4
utils/vrad/vraddetailprops.cpp
View File

@@ -361,7 +361,7 @@ public:
CLightSurface(int iThread) : m_pSurface(0), m_HitFrac(1.0f), m_bHasLuxel(false), m_iThread(iThread) {}
// call back with a node and a context
bool EnumerateNode( int node, Ray_t const& ray, float f, int context )
bool EnumerateNode( int node, Ray_t const& ray, float f, intp context )
{
dface_t* pSkySurface = 0;
@@ -410,7 +410,7 @@ public:
}
// call back with a leaf and a context
virtual bool EnumerateLeaf( int leaf, Ray_t const& ray, float start, float end, int context )
virtual bool EnumerateLeaf( int leaf, Ray_t const& ray, float start, float end, intp context )
{
bool hit = false;
dleaf_t* pLeaf = &dleafs[leaf];

34
utils/vrad/vraddisps.cpp
View File

@@ -41,10 +41,10 @@ public:
}
// ISpatialLeafEnumerator
bool EnumerateLeaf( int ndxLeaf, int context );
bool EnumerateLeaf( int ndxLeaf, intp context );
// IBSPTreeDataEnumerator
bool FASTCALL EnumerateElement( int userId, int context );
bool FASTCALL EnumerateElement( int userId, intp context );
public:
@@ -61,10 +61,10 @@ class CBSPDispRayEnumerator : public ISpatialLeafEnumerator, public IBSPTreeData
{
public:
// ISpatialLeafEnumerator
bool EnumerateLeaf( int ndxLeaf, int context );
bool EnumerateLeaf( int ndxLeaf, intp context );
// IBSPTreeDataEnumerator
bool FASTCALL EnumerateElement( int userId, int context );
bool FASTCALL EnumerateElement( int userId, intp context );
};
//=============================================================================
@@ -127,12 +127,12 @@ public:
//
// Enumeration Methods
//
bool DispRay_EnumerateLeaf( int ndxLeaf, int context );
bool DispRay_EnumerateElement( int userId, int context );
bool DispRay_EnumerateLeaf( int ndxLeaf, intp context );
bool DispRay_EnumerateElement( int userId, intp context );
bool DispRayDistance_EnumerateElement( int userId, CBSPDispRayDistanceEnumerator* pEnum );
bool DispFaceList_EnumerateLeaf( int ndxLeaf, int context );
bool DispFaceList_EnumerateElement( int userId, int context );
bool DispFaceList_EnumerateLeaf( int ndxLeaf, intp context );
bool DispFaceList_EnumerateElement( int userId, intp context );
private:
@@ -215,13 +215,13 @@ IVRadDispMgr *StaticDispMgr( void )
// Displacement/Face List
//
// ISpatialLeafEnumerator
bool CBSPDispFaceListEnumerator::EnumerateLeaf( int ndxLeaf, int context )
bool CBSPDispFaceListEnumerator::EnumerateLeaf( int ndxLeaf, intp context )
{
return s_DispMgr.DispFaceList_EnumerateLeaf( ndxLeaf, context );
}
// IBSPTreeDataEnumerator
bool FASTCALL CBSPDispFaceListEnumerator::EnumerateElement( int userId, int context )
bool FASTCALL CBSPDispFaceListEnumerator::EnumerateElement( int userId, intp context )
{
return s_DispMgr.DispFaceList_EnumerateElement( userId, context );
}
@@ -231,12 +231,12 @@ bool FASTCALL CBSPDispFaceListEnumerator::EnumerateElement( int userId, int cont
//
// RayEnumerator
//
bool CBSPDispRayEnumerator::EnumerateLeaf( int ndxLeaf, int context )
bool CBSPDispRayEnumerator::EnumerateLeaf( int ndxLeaf, intp context )
{
return s_DispMgr.DispRay_EnumerateLeaf( ndxLeaf, context );
}
bool FASTCALL CBSPDispRayEnumerator::EnumerateElement( int userId, int context )
bool FASTCALL CBSPDispRayEnumerator::EnumerateElement( int userId, intp context )
{
return s_DispMgr.DispRay_EnumerateElement( userId, context );
}
@@ -252,7 +252,7 @@ public:
CBSPDispRayDistanceEnumerator() : m_Distance(1.0f), m_pSurface(0) {}
// IBSPTreeDataEnumerator
bool FASTCALL EnumerateElement( int userId, int context )
bool FASTCALL EnumerateElement( int userId, intp context )
{
return s_DispMgr.DispRayDistance_EnumerateElement( userId, this );
}
@@ -669,7 +669,7 @@ void CVRadDispMgr::GetDispSurf( int ndxFace, CVRADDispColl **ppDispTree )
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
bool CVRadDispMgr::DispRay_EnumerateLeaf( int ndxLeaf, int context )
bool CVRadDispMgr::DispRay_EnumerateLeaf( int ndxLeaf, intp context )
{
return m_pBSPTreeData->EnumerateElementsInLeaf( ndxLeaf, &m_EnumDispRay, context );
}
@@ -677,7 +677,7 @@ bool CVRadDispMgr::DispRay_EnumerateLeaf( int ndxLeaf, int context )
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
bool CVRadDispMgr::DispRay_EnumerateElement( int userId, int context )
bool CVRadDispMgr::DispRay_EnumerateElement( int userId, intp context )
{
DispCollTree_t &dispTree = m_DispTrees[userId];
EnumContext_t *pCtx = ( EnumContext_t* )context;
@@ -766,7 +766,7 @@ float CVRadDispMgr::ClipRayToDisp( Ray_t const &ray, int dispinfo )
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
bool CVRadDispMgr::DispFaceList_EnumerateLeaf( int ndxLeaf, int context )
bool CVRadDispMgr::DispFaceList_EnumerateLeaf( int ndxLeaf, intp context )
{
//
// add the faces found in this leaf to the face list
@@ -799,7 +799,7 @@ bool CVRadDispMgr::DispFaceList_EnumerateLeaf( int ndxLeaf, int context )
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
bool CVRadDispMgr::DispFaceList_EnumerateElement( int userId, int context )
bool CVRadDispMgr::DispFaceList_EnumerateElement( int userId, intp context )
{
DispCollTree_t &dispTree = m_DispTrees[userId];
CVRADDispColl *pDispTree = dispTree.m_pDispTree;