celisej567/source-engine
1
0
Fork 0
mirror of https://github.com/celisej567/source-engine.git synced 2026-01-04 18:09:53 +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

16
studiorender/r_studiodecal.cpp
View File

@@ -115,7 +115,7 @@ StudioDecalHandle_t CStudioRender::CreateDecalList( studiohwdata_t *pHardwareDat
// NOTE: This function is called directly without queueing
m_DecalMutex.Lock();
int handle = m_DecalList.AddToTail();
intp handle = m_DecalList.AddToTail();
m_DecalMutex.Unlock();
m_DecalList[handle].m_pHardwareData = pHardwareData;
@@ -137,7 +137,7 @@ void CStudioRender::DestroyDecalList( StudioDecalHandle_t hDecal )
RemoveDecalListFromLRU( hDecal );
int h = (int)hDecal;
intp h = (intp)hDecal;
// Clean up
for (int i = 0; i < m_DecalList[h].m_nLods; i++ )
{
@@ -1130,7 +1130,7 @@ void CStudioRender::AddDecal( StudioDecalHandle_t hDecal, const StudioRenderCont
return;
// For each lod, build the decal list
int h = (int)hDecal;
intp h = (intp)hDecal;
DecalModelList_t& list = m_DecalList[h];
if ( list.m_pHardwareData->m_NumStudioMeshes == 0 )
@@ -1215,7 +1215,7 @@ void CStudioRender::AddDecal( StudioDecalHandle_t hDecal, const StudioRenderCont
{
DecalId_t nRetireID = m_DecalLRU[ m_DecalLRU.Head() ].m_nDecalId;
StudioDecalHandle_t hRetire = m_DecalLRU[ m_DecalLRU.Head() ].m_hDecalHandle;
DecalModelList_t &modelList = m_DecalList[(int)hRetire];
DecalModelList_t &modelList = m_DecalList[(intp)hRetire];
RetireDecal( modelList, nRetireID, modelList.m_pHardwareData->m_RootLOD, modelList.m_pHardwareData->m_NumLODs );
}
}
@@ -1229,7 +1229,7 @@ void CStudioRender::AddDecal( StudioDecalHandle_t hDecal, const StudioRenderCont
{
DecalId_t nRetireID = m_DecalLRU[ m_DecalLRU.Head() ].m_nDecalId;
StudioDecalHandle_t hRetire = m_DecalLRU[ m_DecalLRU.Head() ].m_hDecalHandle;
DecalModelList_t &modelList = m_DecalList[(int)hRetire];
DecalModelList_t &modelList = m_DecalList[(intp)hRetire];
RetireDecal( modelList, nRetireID, modelList.m_pHardwareData->m_RootLOD, modelList.m_pHardwareData->m_NumLODs );
}
@@ -1238,7 +1238,7 @@ void CStudioRender::AddDecal( StudioDecalHandle_t hDecal, const StudioRenderCont
DecalHistory_t *pDecalHistory = &pHistoryList->Element( pHistoryList->Head() );
DecalId_t nRetireID = pDecalHistory->m_nId;
StudioDecalHandle_t hRetire = hDecal;
RetireDecal( m_DecalList[(int)hRetire], nRetireID, nRootLOD, nFinalLOD );
RetireDecal( m_DecalList[(intp)hRetire], nRetireID, nRootLOD, nFinalLOD );
}
// Search all LODs for an overflow condition and retire those also
@@ -1902,7 +1902,7 @@ void CStudioRender::DrawDecal( const DrawModelInfo_t &drawInfo, int lod, int bod
// FIXME: Body stuff isn't hooked in at all for decals
// Get the decal list for this lod
const DecalModelList_t& list = m_DecalList[(int)handle];
const DecalModelList_t& list = m_DecalList[(intp)handle];
m_pStudioHdr = drawInfo.m_pStudioHdr;
// Add this fix after I fix the other problem.
@@ -1975,7 +1975,7 @@ void CStudioRender::DrawStaticPropDecals( const DrawModelInfo_t &drawInfo, const
pRenderContext->MatrixMode( MATERIAL_MODEL );
pRenderContext->LoadMatrix( modelToWorld );
const DecalModelList_t& list = m_DecalList[(int)handle];
const DecalModelList_t& list = m_DecalList[(intp)handle];
// Gotta do this for all LODs
// Draw each set of decals using a particular material
unsigned short mat = list.m_pLod[drawInfo.m_Lod].m_FirstMaterial;

1
studiorender/r_studiodraw.cpp
View File

@@ -15,7 +15,6 @@
#include "optimize.h"
#include "mathlib/mathlib.h"
#include "mathlib/vector.h"
#include <malloc.h>
#include "mathlib/vmatrix.h"
#include "studiorendercontext.h"
#include "tier2/tier2.h"

6
studiorender/studiorendercontext.cpp
View File

@@ -763,7 +763,9 @@ void CStudioRenderContext::R_StudioBuildMeshGroup( const char *pModelName, bool
for (i = 0; i < pStripGroup->numIndices; ++i)
{
meshBuilder.Index( *pStripGroup->pIndex(i) );
unsigned short index;
memcpy( &index, pStripGroup->pIndex(i), sizeof(index) );
meshBuilder.Index( index );
meshBuilder.AdvanceIndex();
}
@@ -1317,7 +1319,7 @@ void CStudioRenderContext::R_StudioDestroyStaticMeshes( int numStudioMeshes, stu
if ( *ppStudioMeshes )
{
delete *ppStudioMeshes;
delete[] *ppStudioMeshes;
*ppStudioMeshes = 0;
}
}