R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Start or 'mdl/error.rmdl' fallback implementation (see description)

Browse Source 
In 'datacache/mdlcache.cpp' the function 'CMDLCache::FindMDL' attempts to find 'mdl/error.rmdl' and assigns the studiohdr and handle to the members of CMDLFallback.

In 'CMDLCache::FindUncachedMDL' we check if a model exists, if a model does not exist, we replace the studiohdr with the one of error.rmdl we stored in the CMDLFallback structure.

This does actually work (on the dedicated server it doesn't crash at all!), but on the client it crashes when trying to gather props (right before rendering), setting the ConVar* 'old_gather_props' does interesting things (check IDA around this ConVar*). setting this to 1 causes it to crash in another CMDLCache method when trying to deref something in the global cache pool.

This method is easy to rebuild. I will do this soon and attempt to return error.rmdl parts from here as well if results are null (this might actually just work).

Leaving 'old_gather_props' to 0 causes it to crash in the middle of the function which is supposed to gather the props the 'new' way.

The gather props functions are kind of daunting

NOTE: Currently only confirmed to work somewhat properly on the dedicated server for prop_static. prop_dynamic is unconfirmed. And (almost?) works on the client.
This commit is contained in:
Kawe Mazidjatari 2022-04-29 05:30:06 +02:00
parent 1ea4dd6163
commit 3cb4976c23
25 changed files with 1067 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
r5dev/common/qlimits.h Normal file
View File

@ -0,0 +1,36 @@
//====== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. =======//
//
// Purpose:
//
// $NoKeywords: $
//=============================================================================//
#ifndef QLIMITS_H
#define QLIMITS_H
#if defined( _WIN32 )
#pragma once
#endif
// DATA STRUCTURE INFO
#define MAX_NUM_ARGVS 50
// SYSTEM INFO
#define MAX_QPATH 96 // max length of a game pathname
#define MAX_OSPATH 260 // max length of a filesystem pathname
#define ON_EPSILON 0.1 // point on plane side epsilon
// Resource counts;
// Must have this value in sync(-1) with const.h and effect_dispatch_data.cpp
#define MAX_MODEL_INDEX_BITS 12 // sent as a short
#define MAX_MODELS (1<<MAX_MODEL_INDEX_BITS)
#define MAX_GENERIC_INDEX_BITS 9
#define MAX_GENERIC (1<<MAX_GENERIC_INDEX_BITS)
#define MAX_DECAL_INDEX_BITS 9
#define MAX_BASE_DECALS (1<<MAX_DECAL_INDEX_BITS)
#endif // QLIMITS_H

9
r5dev/core/init.cpp
View File

@ -27,6 +27,7 @@
#include "launcher/IApplication.h"
#include "filesystem/basefilesystem.h"
#include "filesystem/filesystem.h"
#include "datacache/mdlcache.h"
#include "ebisusdk/EbisuSDK.h"
#ifndef DEDICATED
#include "milessdk/win64_rrthreads.h"
@ -145,6 +146,8 @@ void Systems_Init()
CBaseClient_Attach();
CBaseFileSystem_Attach();
MDLCache_Attach();
#ifndef DEDICATED
CMaterialSystem_Attach();
#endif // !DEDICATED
@ -163,7 +166,7 @@ void Systems_Init()
#endif // !CLIENT_DLL && GAMEDLL_S3
CHostState_Attach();
//CModelLoader_Attach();
CModelLoader_Attach();
#if !defined(DEDICATED) && defined (GAMEDLL_S3)
CNetMessages_Attach(); // S1 and S2 require certification.
@ -253,6 +256,8 @@ void Systems_Shutdown()
CBaseClient_Detach();
CBaseFileSystem_Detach();
MDLCache_Detach();
#ifndef DEDICATED
CMaterialSystem_Detach();
#endif // !DEDICATED
@ -271,7 +276,7 @@ void Systems_Shutdown()
#endif // !CLIENT_DLL && GAMEDLL_S3
CHostState_Detach();
//CModelLoader_Detach();
CModelLoader_Detach();
#if !defined(DEDICATED) && defined (GAMEDLL_S3)
CNetMessages_Detach(); // S1 and S2 require certification.

46
r5dev/datacache/imdlcache.h Normal file
View File

@ -0,0 +1,46 @@
#ifndef IMDLCACHE_H
#define IMDLCACHE_H
#define ERROR_MODEL "mdl/error.rmdl"
#define EMPTY_MODEL "mdl/dev/empty_model.rmdl"
#define IDSTUDIOHEADER (('T'<<24)+('S'<<16)+('D'<<8)+'I')
//-----------------------------------------------------------------------------
// Reference to a loaded studiomdl
//-----------------------------------------------------------------------------
typedef unsigned short MDLHandle_t;
inline MDLHandle_t VoidPtrToMDLHandle(void* ptr)
{
return (MDLHandle_t)(int)(intptr_t)ptr;
}
inline void* MDLHandleToVirtual(MDLHandle_t hndl)
{
return (void*)(uintptr_t)hndl;
}
enum
{
MDLHANDLE_INVALID = (MDLHandle_t)~0
};
//-----------------------------------------------------------------------------
// Cache data types
//-----------------------------------------------------------------------------
enum MDLCacheDataType_t
{
MDLCACHE_NONE = -1,
// Callbacks to get called when data is loaded or unloaded for these:
MDLCACHE_STUDIOHDR = 0,
MDLCACHE_STUDIOHWDATA,
MDLCACHE_VCOLLIDE,
// Callbacks NOT called when data is loaded or unloaded for these:
MDLCACHE_ANIMBLOCK,
MDLCACHE_VIRTUALMODEL,
MDLCACHE_VERTEXES,
MDLCACHE_DECODEDANIMBLOCK
};
#endif // !IMDLCACHE_H

202
r5dev/datacache/mdlcache.cpp Normal file
View File

@ -0,0 +1,202 @@
//=====================================================================================//
//
// model loading and caching
//
// $NoKeywords: $
//=====================================================================================//
#include "core/stdafx.h"
#include "datacache/mdlcache.h"
#include "datacache/imdlcache.h"
#include "engine/sys_utils.h"
#include "rtech/rtech_utils.h"
#include "public/include/studio.h"
//-----------------------------------------------------------------------------
// Purpose: finds an MDL
// Input : *this -
// handle -
// *a3 -
// Output : a pointer to the studiohdr_t object
//-----------------------------------------------------------------------------
studiohdr_t* CMDLCache::FindMDL(CMDLCache* pMDLCache, MDLHandle_t handle, void* a3)
{
__int64 v4; // rbp
__int64 v6; // rbx
__int64* v7; // rax
studiohdr_t* result; // rax
v4 = handle;
EnterCriticalSection(reinterpret_cast<LPCRITICAL_SECTION>(&*m_MDLMutex));
v6 = *(_QWORD*)(m_MDLDict.Deref().GetPtr() + 24 * v4 + 16);
LeaveCriticalSection(reinterpret_cast<LPCRITICAL_SECTION>(&*m_MDLMutex));
if (!g_pMDLFallback->m_hErrorMDL || !g_pMDLFallback->m_hEmptyMDL)
{
studiohdr_t* pStudioHDR = **(studiohdr_t***)v6;
string svStudio = ConvertToUnixPath(string(pStudioHDR->name));
if (strcmp(svStudio.c_str(), ERROR_MODEL) == 0)
{
g_pMDLFallback->m_pErrorHDR = pStudioHDR;
g_pMDLFallback->m_hErrorMDL = handle;
}
if (strcmp(svStudio.c_str(), EMPTY_MODEL) == 0)
{
g_pMDLFallback->m_pEmptyHDR = pStudioHDR;
g_pMDLFallback->m_hEmptyMDL = handle;
}
}
if (!v6)
{
if (!g_pMDLFallback->m_hErrorMDL)
Error(eDLL_T::ENGINE, "Model with handle \"%hu\" not found and \"%s\" couldn't be loaded.\n", handle, ERROR_MODEL);
return g_pMDLFallback->m_pErrorHDR;
}
if ((*(_WORD*)(v6 + 18) & 0x600) != 0)
{
v7 = *(__int64**)v6;
if (*(_QWORD*)v6)
{
if (a3)
{
CMDLCache::FindCachedMDL(pMDLCache, (void*)v6, a3);
v7 = *(__int64**)v6;
}
LABEL_6:
result = (studiohdr_t*)*v7;
if (result)
return result;
return CMDLCache::FindUncachedMDL(pMDLCache, v4, (void*)v6, a3);
}
v7 = *(__int64**)(v6 + 8);
if (v7)
goto LABEL_6;
}
return CMDLCache::FindUncachedMDL(pMDLCache, v4, (void*)v6, a3);
}
//-----------------------------------------------------------------------------
// Purpose: finds an MDL cached
// Input : *this -
// *a2 -
// *a3 -
//-----------------------------------------------------------------------------
void CMDLCache::FindCachedMDL(CMDLCache* pMDLCache, void* a2, void* a3)
{
v_CMDLCache__FindCachedMDL(pMDLCache, a2, a3);
}
//-----------------------------------------------------------------------------
// Purpose: finds an MDL uncached
// Input : *this -
// handle -
// *a3 -
// *a4
// Output : a pointer to the studiohdr_t object
//-----------------------------------------------------------------------------
studiohdr_t* CMDLCache::FindUncachedMDL(CMDLCache* cache, MDLHandle_t handle, void* a3, void* a4)
{
const char* v8; // rdi
__int64 v9; // rax
int v10; // eax
const char* v11; // r11
int v12; // eax
const char* v13; // r11
int v14; // eax
bool v16; // zf
studiohdr_t* v17; // rdi
studiohdr_t** v18; // rax
//CThreadFastMutexSlow::WaitForLock(a3 + 0x80);
EnterCriticalSection(reinterpret_cast<LPCRITICAL_SECTION>(&*m_MDLMutex));
void* modelCache = cache->m_pModelCacheSection;
v8 = (const char*)(*(_QWORD*)((int64)modelCache + 24 * static_cast<int64>(handle) + 8));
LeaveCriticalSection(reinterpret_cast<LPCRITICAL_SECTION>(&*m_MDLMutex));
v9 = -1i64;
do
++v9;
while (v8[v9]);
if (v9 < 5 ||
(_stricmp(&v8[v9 - 5], ".rmdl") != 0) &&
(_stricmp(&v8[v9 - 5], ".rrig") != 0) &&
(_stricmp(&v8[v9 - 5], ".rpak") != 0))
{
Error(eDLL_T::ENGINE, "Attempted to load old model \"%s\"; replace with rmdl.\n", v8);
goto LABEL_ERROR;
}
g_pRTech->StringToGuid(v8);
v16 = *(_QWORD*)a3 == 0i64;
*(_BYTE*)((int64)a3 + 152) = 0;
if (v16)
{
v18 = *(studiohdr_t***)((int64)a3 + 8);
if (v18)
{
v17 = *v18;
}
else
{
LABEL_ERROR:
if (g_pMDLFallback->m_hErrorMDL)
Error(eDLL_T::ENGINE, "Model \"%s\" not found; replacing with \"%s\".\n", v8, ERROR_MODEL);
else
Error(eDLL_T::ENGINE, "Model \"%s\" not found and \"%s\" couldn't be loaded.\n", v8, ERROR_MODEL);
v17 = g_pMDLFallback->m_pErrorHDR;
}
}
else
{
v_CMDLCache__FindCachedMDL(cache, a3, a4);
v17 = **(studiohdr_t***)a3;
}
//CThreadFastMutexSlow::ReleaseWaiter(a3 + 128);
return v17;
}
studiohdr_t* CMDLCache::GetStudioHdr(CMDLCache* pMDLCache, MDLHandle_t handle)
{
__int64 v2; // rbx
__int64 v3; // rbx
__int64 v4; // rdx
studiohdr_t* result; // rax
if (!handle)
{
if (!g_pMDLFallback->m_hErrorMDL)
Error(eDLL_T::ENGINE, "Model with handle \"%hu\" not found and \"%s\" couldn't be loaded.\n", handle, ERROR_MODEL);
return g_pMDLFallback->m_pErrorHDR;
}
v2 = handle;
EnterCriticalSection(reinterpret_cast<LPCRITICAL_SECTION>(&*m_MDLMutex));
v3 = *(_QWORD*)(m_MDLDict.Deref().GetPtr() + 24 * v2 + 16);
LeaveCriticalSection(reinterpret_cast<LPCRITICAL_SECTION>(&*m_MDLMutex));
v4 = *(_QWORD*)(*(_QWORD*)(*(_QWORD*)v3 + 8i64) + 24i64);
result = (studiohdr_t*)(v4 + 16);
if (!v4)
result = nullptr;;
return result;
}
void MDLCache_Attach()
{
DetourAttach((LPVOID*)&v_CMDLCache__FindMDL, &CMDLCache::FindMDL);
DetourAttach((LPVOID*)&v_CMDLCache__FindUncachedMDL, &CMDLCache::FindUncachedMDL);
//DetourAttach((LPVOID*)&v_CMDLCache__GetStudioHdr, &CMDLCache::GetStudioHdr);
}
void MDLCache_Detach()
{
DetourDetach((LPVOID*)&v_CMDLCache__FindMDL, &CMDLCache::FindMDL);
DetourDetach((LPVOID*)&v_CMDLCache__FindUncachedMDL, &CMDLCache::FindUncachedMDL);
//DetourDetach((LPVOID*)&v_CMDLCache__GetStudioHdr, &CMDLCache::GetStudioHdr);
}

106
r5dev/datacache/mdlcache.h Normal file
View File

@ -0,0 +1,106 @@
#ifndef MDLCACHE_H
#define MDLCACHE_H
#include "public/include/studio.h"
#include "datacache/imdlcache.h"
struct CMDLFallBack
{
studiohdr_t* m_pErrorHDR{};
MDLHandle_t m_hErrorMDL{};
studiohdr_t* m_pEmptyHDR{};
MDLHandle_t m_hEmptyMDL{};
// This has to be cleared if 'common.rpak' is getting unloaded!
void Clear(void)
{
m_pEmptyHDR = nullptr;
m_hErrorMDL = NULL;
m_pEmptyHDR = nullptr;
m_hEmptyMDL = NULL;
}
};
inline CMDLFallBack* g_pMDLFallback = new CMDLFallBack();
class CMDLCache
{
public:
static studiohdr_t* FindMDL(CMDLCache* pMDLCache, MDLHandle_t handle, void* a3);
static void FindCachedMDL(CMDLCache* pMDLCache, void* a2, void* a3);
static studiohdr_t* FindUncachedMDL(CMDLCache* pMDLCache, MDLHandle_t handle, void* a3, void* a4);
static studiohdr_t* GetStudioHdr(CMDLCache* pMDLCache, MDLHandle_t handle);
CMDLCache* m_pVTable;
void* m_pStrCmp; // string compare func;
void* m_pModelCacheSection; // IDataCacheSection*
int m_nModelCacheFrameLocks; //
// TODO..
};
extern studiohdr_t* pErrorStudioHDR;
extern MDLHandle_t hErrorMDL;
inline CMemory p_CMDLCache__FindMDL;
inline auto v_CMDLCache__FindMDL = p_CMDLCache__FindMDL.RCast<studiohdr_t* (*)(CMDLCache* pCache, void* a2, void* a3)>();
inline CMemory p_CMDLCache__FindCachedMDL;
inline auto v_CMDLCache__FindCachedMDL = p_CMDLCache__FindCachedMDL.RCast<void(*)(CMDLCache* pCache, void* a2, void* a3)>();
inline CMemory p_CMDLCache__FindUncachedMDL;
inline auto v_CMDLCache__FindUncachedMDL = p_CMDLCache__FindUncachedMDL.RCast<studiohdr_t* (*)(CMDLCache* pCache, MDLHandle_t handle, void* a3, void* a4)>();
inline CMemory p_CMDLCache__GetStudioHdr;
inline auto v_CMDLCache__GetStudioHdr = p_CMDLCache__GetStudioHdr.RCast<studiohdr_t* (*)(CMDLCache* pCache, MDLHandle_t handle)>();
inline CMemory m_MDLDict;
inline LPCRITICAL_SECTION* m_MDLMutex = nullptr;
inline CMDLCache* g_MDLCache = nullptr;
void MDLCache_Attach();
void MDLCache_Detach();
///////////////////////////////////////////////////////////////////////////////
class HMDLCache : public IDetour
{
virtual void GetAdr(void) const
{
std::cout << "| FUN: CMDLCache::FindMDL : 0x" << std::hex << std::uppercase << p_CMDLCache__FindMDL.GetPtr() << std::setw(nPad) << " |" << std::endl;
std::cout << "| FUN: CMDLCache::FindCachedMDL : 0x" << std::hex << std::uppercase << p_CMDLCache__FindCachedMDL.GetPtr() << std::setw(nPad) << " |" << std::endl;
std::cout << "| FUN: CMDLCache::FindUncachedMDL : 0x" << std::hex << std::uppercase << p_CMDLCache__FindUncachedMDL.GetPtr() << std::setw(nPad) << " |" << std::endl;
std::cout << "| FUN: CMDLCache::GetStudioHdr : 0x" << std::hex << std::uppercase << p_CMDLCache__GetStudioHdr.GetPtr() << std::setw(nPad) << " |" << std::endl;
std::cout << "| VAR: m_MDLMutex : 0x" << std::hex << std::uppercase << m_MDLMutex << std::setw(nPad) << " |" << std::endl;
std::cout << "| VAR: m_MDLDict : 0x" << std::hex << std::uppercase << m_MDLDict.GetPtr() << std::setw(nPad) << " |" << std::endl;
std::cout << "| VAR: g_MDLCache : 0x" << std::hex << std::uppercase << g_MDLCache << std::setw(0) << " |" << std::endl;
std::cout << "+----------------------------------------------------------------+" << std::endl;
}
virtual void GetFun(void) const
{
p_CMDLCache__FindMDL = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x48\x89\x6C\x24\x00\x48\x89\x74\x24\x00\x57\x48\x83\xEC\x20\x48\x8B\xF1\x0F\xB7\xEA"), "xxxx?xxxx?xxxx?xxxxxxxxxxx");
v_CMDLCache__FindMDL = p_CMDLCache__FindMDL.RCast<studiohdr_t* (*)(CMDLCache*, void*, void*)>(); /*48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 57 48 83 EC 20 48 8B F1 0F B7 EA*/
p_CMDLCache__FindCachedMDL = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x4D\x85\xC0\x74\x7A\x48\x89\x6C\x24\x00"), "xxxxxxxxx?");
v_CMDLCache__FindCachedMDL = p_CMDLCache__FindCachedMDL.RCast<void(*)(CMDLCache*, void*, void*)>(); /*4D 85 C0 74 7A 48 89 6C 24 ?*/
p_CMDLCache__FindUncachedMDL = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x48\x89\x6C\x24\x00\x48\x89\x74\x24\x00\x48\x89\x7C\x24\x00\x41\x56\x48\x83\xEC\x20\x48\x8B\xE9\x0F\xB7\xFA"), "xxxx?xxxx?xxxx?xxxx?xxxxxxxxxxxx");
v_CMDLCache__FindUncachedMDL = p_CMDLCache__FindUncachedMDL.RCast<studiohdr_t* (*)(CMDLCache*, MDLHandle_t , void*, void*)>();
p_CMDLCache__GetStudioHdr = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x40\x53\x48\x83\xEC\x20\x48\x8D\x0D\x00\x00\x00\x00\x0F\xB7\xDA\xFF\x15\x00\x00\x00\x00\x48\x8B\x05\x00\x00\x00\x00\x48\x8D\x14\x5B\x48\x8D\x0D\x00\x00\x00\x00\x48\x8B\x5C\xD0\x00\xFF\x15\x00\x00\x00\x00\x48\x8B\x03\x48\x8B\x48\x08"), "xxxxxxxxx????xxxxx????xxx????xxxxxxx????xxxx?xx????xxxxxxx");;
v_CMDLCache__GetStudioHdr = p_CMDLCache__GetStudioHdr.RCast<studiohdr_t* (*)(CMDLCache* pCache, MDLHandle_t handle)>();
}
virtual void GetVar(void) const
{
m_MDLMutex = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x83\xEC\x28\xBA\x00\x00\x00\x00\x48\x8D\x0D\x00\x00\x00\x00\xFF\x15\x00\x00\x00\x00\x0F\xB6\x05\x00\x00\x00\x00"), "xxxxx????xxx????xx????xxx????")
.FindPatternSelf("48 8D 0D", CMemory::Direction::DOWN).ResolveRelativeAddressSelf(0x3, 0x7).RCast<LPCRITICAL_SECTION*>();
m_MDLDict = p_CMDLCache__FindMDL.FindPattern("48 8B 05", CMemory::Direction::DOWN).ResolveRelativeAddressSelf(0x3, 0x7);
g_MDLCache = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x8B\x0D\x00\x00\x00\x00\x44\x0F\xB7\x82\x00\x00\x00\x00\x48\x8B\x01\x48\xFF\xA0\x30\x01\x00\x00"), "xxx????xxxx????xxxxxxxxxx")
.ResolveRelativeAddressSelf(0x3, 0x7).RCast<CMDLCache*>();
}
virtual void GetCon(void) const { }
virtual void Attach(void) const { }
virtual void Detach(void) const { }
};
///////////////////////////////////////////////////////////////////////////////
REGISTER(HMDLCache);
#endif // MDLCACHE_H

69
r5dev/engine/gl_model_private.h Normal file
View File

@ -0,0 +1,69 @@
//=============================================================================//
//
// Purpose:
//
// $Workfile: $
// $Date: $
// $NoKeywords: $
//=============================================================================//
#include "vpc/keyvalues.h"
#include "mathlib/vector.h"
#include "common/qlimits.h"
#include "datacache/imdlcache.h"
#include "public/include/model_types.h"
#ifndef DEDICATED
#include "game/client/enginesprite.h"
#endif // !DEDICATED
typedef int FileNameHandle_t; // 4 bytes in r5, void* originally.
struct brushdata_t // !! UNCONFIRMED !!
{
void* pShared; // worldbrushdata_t
int firstmodelsurface;
int nummodelsurfaces;
// track the union of all lightstyles on this brush. That way we can avoid
// searching all faces if the lightstyle hasn't changed since the last update
int nLightstyleLastComputedFrame;
unsigned short nLightstyleIndex; // g_ModelLoader actually holds the allocated data here
unsigned short nLightstyleCount;
unsigned short renderHandle;
unsigned short firstnode;
};
#ifndef DEDICATED
struct spritedata_t // !! UNCONFIRMED !!
{
int numframes;
int width;
int height;
CEngineSprite* sprite;
};
#endif // !DEDICATED
struct model_t // !! CONFIRMED !!
{
FileNameHandle_t fnHandle;
char szPathName[MAX_OSPATH];
int nLoadFlags; // mark loaded/not loaded
int nServerCount; // marked at load
modtype_t type;
int flags; // MODELFLAG_???
// volume occupied by the model graphics
Vector3 mins, maxs;
float radius;
KeyValues* m_pKeyValues;
union
{
brushdata_t brush;
MDLHandle_t studio;
#ifndef DEDICATED
spritedata_t sprite;
#endif // !DEDICATED
};
};

1
r5dev/engine/host_state.cpp
View File

@ -12,6 +12,7 @@
#include "tier1/NetAdr2.h"
#include "tier2/socketcreator.h"
#include "vpc/keyvalues.h"
#include "datacache/mdlcache.h"
#ifdef DEDICATED
#include "engine/sv_rcon.h"
#else //

52
r5dev/engine/modelloader.cpp
View File

@ -8,19 +8,63 @@
#include "core/stdafx.h"
#include "engine/cmodel_bsp.h"
#include "engine/modelloader.h"
#include "datacache/mdlcache.h"
#include "engine/sys_utils.h"
uint64_t HCModelLoader__Map_LoadModelGuts(void* thisptr, void* mod)
model_t* pErrorMDL = nullptr;
//-----------------------------------------------------------------------------
// Purpose:
// Input : *loader -
// *model -
//-----------------------------------------------------------------------------
void CModelLoader::LoadModel(CModelLoader* loader, model_t* model)
{
return CModelLoader__Map_LoadModelGuts(thisptr, mod);
//if (!pErrorMDL)
//{
// if (strcmp(model->szPathName, ERROR_MODEL) == 0)
// {
// pErrorMDL = model;
// }
//}
//string svExtension = model->szPathName;
//size_t npos = svExtension.find(".");
//if (npos != string::npos)
//{
// svExtension = svExtension.substr(npos + 1);
//}
//if (strcmp(svExtension.c_str(), "rmdl") == 0 && strcmp(model->szPathName, ERROR_MODEL) != 0)
//{
// studiohdr_t* pStudioHDR = g_MDLCache->FindMDL(g_MDLCache->m_pVTable, model->studio, 0);
// if (pStudioHDR == pErrorStudioHDR)
// {
// model = pErrorMDL;
// }
//}
return CModelLoader__LoadModel(loader, model);
}
//-----------------------------------------------------------------------------
// Purpose:
// Input : *loader -
// *model -
//-----------------------------------------------------------------------------
uint64_t CModelLoader::Map_LoadModelGuts(CModelLoader* loader, model_t* model)
{
return CModelLoader__Map_LoadModelGuts(loader, model);
}
///////////////////////////////////////////////////////////////////////////////
void CModelLoader_Attach()
{
DetourAttach((LPVOID*)&CModelLoader__Map_LoadModelGuts, &HCModelLoader__Map_LoadModelGuts);
DetourAttach((LPVOID*)&CModelLoader__LoadModel, &CModelLoader::LoadModel);
DetourAttach((LPVOID*)&CModelLoader__Map_LoadModelGuts, &CModelLoader::Map_LoadModelGuts);
}
void CModelLoader_Detach()
{
DetourDetach((LPVOID*)&CModelLoader__Map_LoadModelGuts, &HCModelLoader__Map_LoadModelGuts);
DetourDetach((LPVOID*)&CModelLoader__LoadModel, &CModelLoader::LoadModel);
DetourDetach((LPVOID*)&CModelLoader__Map_LoadModelGuts, &CModelLoader::Map_LoadModelGuts);
}

78
r5dev/engine/modelloader.h
View File

@ -1,22 +1,72 @@
#pragma once
#include "engine/gl_model_private.h"
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
class IModelLoader
{
public:
enum REFERENCETYPE
{
// The name is allocated, but nothing else is in memory or being referenced
FMODELLOADER_NOTLOADEDORREFERENCED = 0,
// The model has been loaded into memory
FMODELLOADER_LOADED = (1 << 0),
// The model is being referenced by the server code
FMODELLOADER_SERVER = (1 << 1),
// The model is being referenced by the client code
FMODELLOADER_CLIENT = (1 << 2),
// The model is being referenced in the client .dll
FMODELLOADER_CLIENTDLL = (1 << 3),
// The model is being referenced by static props
FMODELLOADER_STATICPROP = (1 << 4),
// The model is a detail prop
FMODELLOADER_DETAILPROP = (1 << 5),
// The model is the simple version of the world geometry
FMODELLOADER_SIMPLEWORLD = (1 << 6),
// The model is dynamically loaded
FMODELLOADER_DYNSERVER = (1 << 7),
FMODELLOADER_DYNCLIENT = (1 << 8),
FMODELLOADER_COMBINED = (1 << 9),
FMODELLOADER_DYNAMIC = FMODELLOADER_DYNSERVER | FMODELLOADER_DYNCLIENT | FMODELLOADER_COMBINED,
FMODELLOADER_REFERENCEMASK = (FMODELLOADER_SERVER | FMODELLOADER_CLIENT | FMODELLOADER_CLIENTDLL | FMODELLOADER_STATICPROP | FMODELLOADER_DETAILPROP | FMODELLOADER_DYNAMIC | FMODELLOADER_SIMPLEWORLD),
// The model was touched by the preload method
FMODELLOADER_TOUCHED_BY_PRELOAD = (1 << 15),
// The model was loaded by the preload method, a postload fixup is required
FMODELLOADER_LOADED_BY_PRELOAD = (1 << 16),
// The model touched its materials as part of its load
FMODELLOADER_TOUCHED_MATERIALS = (1 << 17),
};
};
class CModelLoader
{
public:
static void LoadModel(CModelLoader* loader, model_t* model);
static uint64_t Map_LoadModelGuts(CModelLoader* loader, model_t* model);
};
inline CMemory p_CModelLoader__FindModel;
inline auto CModelLoader__FindModel = p_CModelLoader__FindModel.RCast<void* (*)(void* thisptr, const char* pszModelName)>();
inline auto CModelLoader__FindModel = p_CModelLoader__FindModel.RCast<void* (*)(CModelLoader* loader, const char* pszModelName)>();
inline CMemory p_CModelLoader__LoadModel;
inline auto CModelLoader__LoadModel = p_CModelLoader__LoadModel.RCast<void(*)(void* thisptr, void* mod)>();
inline auto CModelLoader__LoadModel = p_CModelLoader__LoadModel.RCast<void(*)(CModelLoader* loader, model_t* model)>();
inline CMemory p_CModelLoader__UnloadModel;
inline auto CModelLoader__UnloadModel = p_CModelLoader__UnloadModel.RCast<uint64_t(*)(void* thisptr, void* pModel)>();
inline auto CModelLoader__UnloadModel = p_CModelLoader__UnloadModel.RCast<uint64_t(*)(CModelLoader* loader, model_t* model)>();
inline CMemory p_CModelLoader__Studio_LoadModel;
inline auto CModelLoader__Studio_LoadModel = p_CModelLoader__Studio_LoadModel.RCast<void* (*)(void* thisptr)>();
inline auto CModelLoader__Studio_LoadModel = p_CModelLoader__Studio_LoadModel.RCast<void* (*)(CModelLoader* loader)>();
inline CMemory p_CModelLoader__Map_LoadModelGuts;
inline auto CModelLoader__Map_LoadModelGuts = p_CModelLoader__Map_LoadModelGuts.RCast<uint64_t(*)(void* thisptr, void* mod)>();
inline auto CModelLoader__Map_LoadModelGuts = p_CModelLoader__Map_LoadModelGuts.RCast<uint64_t(*)(CModelLoader* loader, model_t* model)>();
inline CMemory p_CModelLoader__Map_IsValid;
inline auto CModelLoader__Map_IsValid = p_CModelLoader__Map_IsValid.RCast<bool(*)(void* thisptr, const char* pszMapName)>();
inline auto CModelLoader__Map_IsValid = p_CModelLoader__Map_IsValid.RCast<bool(*)(CModelLoader* loader, const char* pszMapName)>();
inline CMemory p_GetSpriteInfo;
inline auto GetSpriteInfo = p_GetSpriteInfo.RCast<void* (*)(const char* pName, bool bIsAVI, bool bIsBIK, int& nWidth, int& nHeight, int& nFrameCount, void* a7)>();
@ -24,7 +74,7 @@ inline auto GetSpriteInfo = p_GetSpriteInfo.RCast<void* (*)(const char* pName, b
inline CMemory p_BuildSpriteLoadName;
inline auto BuildSpriteLoadName = p_BuildSpriteLoadName.RCast<void* (*)(const char* pName, char* pOut, int outLen, bool& bIsAVI, bool& bIsBIK)>();
inline void* g_pModelLoader;
inline CModelLoader* g_pModelLoader;
void CModelLoader_Attach();
void CModelLoader_Detach();
@ -66,12 +116,12 @@ class HModelLoader : public IDetour
#endif
p_BuildSpriteLoadName = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x48\x89\x6C\x24\x00\x48\x89\x74\x24\x00\x48\x89\x7C\x24\x00\x41\x56\x48\x81\xEC\x00\x00\x00\x00\x4D\x8B\xF1\x48\x8B\xF2"), "xxxx?xxxx?xxxx?xxxx?xxxxx????xxxxxx");
CModelLoader__FindModel = p_CModelLoader__FindModel.RCast<void* (*)(void*, const char*)>();
CModelLoader__LoadModel = p_CModelLoader__LoadModel.RCast<void(*)(void*, void*)>();
CModelLoader__UnloadModel = p_CModelLoader__UnloadModel.RCast<uint64_t(*)(void*, void*)>();
CModelLoader__Studio_LoadModel = p_CModelLoader__Studio_LoadModel.RCast<void* (*)(void*)>();
CModelLoader__Map_LoadModelGuts = p_CModelLoader__Map_LoadModelGuts.RCast<uint64_t(*)(void*, void*)>();
CModelLoader__Map_IsValid = p_CModelLoader__Map_IsValid.RCast<bool(*)(void*, const char*)>();
CModelLoader__FindModel = p_CModelLoader__FindModel.RCast<void* (*)(CModelLoader*, const char*)>();
CModelLoader__LoadModel = p_CModelLoader__LoadModel.RCast<void(*)(CModelLoader*, model_t*)>();
CModelLoader__UnloadModel = p_CModelLoader__UnloadModel.RCast<uint64_t(*)(CModelLoader*, model_t*)>();
CModelLoader__Studio_LoadModel = p_CModelLoader__Studio_LoadModel.RCast<void* (*)(CModelLoader*)>();
CModelLoader__Map_LoadModelGuts = p_CModelLoader__Map_LoadModelGuts.RCast<uint64_t(*)(CModelLoader*, model_t* mod)>();
CModelLoader__Map_IsValid = p_CModelLoader__Map_IsValid.RCast<bool(*)(CModelLoader*, const char*)>();
GetSpriteInfo = p_GetSpriteInfo.RCast<void* (*)(const char*, bool, bool, int&, int&, int&, void*)>();
BuildSpriteLoadName = p_BuildSpriteLoadName.RCast<void* (*)(const char*, char*, int, bool&, bool&)>();
}
@ -79,7 +129,7 @@ class HModelLoader : public IDetour
{
g_pModelLoader = g_mGameDll.FindPatternSIMD(
reinterpret_cast<rsig_t>("\x48\x89\x4C\x24\x00\x53\x55\x56\x41\x54\x41\x55\x41\x56\x41\x57\x48\x81\xEC\x00\x00\x00\x00"),
"xxxx?xxxxxxxxxxxxxx????").FindPatternSelf("48 ?? 0D", CMemory::Direction::DOWN).ResolveRelativeAddressSelf(3, 7);
"xxxx?xxxxxxxxxxxxxx????").FindPatternSelf("48 ?? 0D", CMemory::Direction::DOWN).ResolveRelativeAddressSelf(3, 7).RCast<CModelLoader*>();
}
virtual void GetCon(void) const { }
virtual void Attach(void) const { }

58
r5dev/game/client/enginesprite.h Normal file
View File

@ -0,0 +1,58 @@
//===== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
// $NoKeywords: $
//===========================================================================//
#ifndef ENGINESPRITE_H
#define ENGINESPRITE_H
#include "public/avi/iavi.h"
#include "public/avi/ibik.h"
#include "public/include/const.h"
#include "game/client/hud.h"
typedef void* IMaterial; // HACK
//-----------------------------------------------------------------------------
// Purpose: Sprite Models
//-----------------------------------------------------------------------------
class CEngineSprite // !! UNCONFIRMED !!
{
// NOTE: don't define a constructor or destructor so that this can be allocated
// as before.
public:
int GetWidth(void) const { return m_width; }
int GetHeight(void) const { return m_height; }
int GetNumFrames(void) const { return m_numFrames; }
//IMaterial* GetMaterial(RenderMode_t nRenderMode) { return m_material[nRenderMode]; }
//IMaterial* GetMaterial(RenderMode_t nRenderMode, int nFrame);
//void SetFrame(RenderMode_t nRenderMode, int nFrame);
//bool Init(const char* name);
//void Shutdown(void);
//void UnloadMaterial();
//void SetColor(float r, float g, float b);
//int GetOrientation(void);
//void GetHUDSpriteColor(float* color);
float GetUp(void) const { return up; }
float GetDown(void) const { return down; }
float GetLeft(void) const { return left; }
float GetRight(void) const { return right; }
//void DrawFrame(RenderMode_t nRenderMode, int frame, int x, int y, const wrect_t* prcSubRect);
//void DrawFrameOfSize(RenderMode_t nRenderMode, int frame, int x, int y, int iWidth, int iHeight, const wrect_t* prcSubRect);
bool IsAVI(void) const;
bool IsBIK(void) const;
//void GetTexCoordRange(float* pMinU, float* pMinV, float* pMaxU, float* pMaxV);
private:
AVIMaterial_t m_hAVIMaterial;
BIKMaterial_t m_hBIKMaterial;
int m_width;
int m_height;
int m_numFrames;
IMaterial* m_material[kRenderModeCount];
int m_orientation;
float m_hudSpriteColor[3];
float up, down, left, right;
};
#endif // ENGINESPRITE_H

19
r5dev/game/client/hud.h Normal file
View File

@ -0,0 +1,19 @@
//====== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. =======//
//
// Purpose: CHud handles the message, calculation, and drawing the HUD
//
// $NoKeywords: $
//=============================================================================//
#ifndef HUD_H
#define HUD_H
// basic rectangle struct used for drawing
typedef struct wrect_s
{
int left;
int right;
int top;
int bottom;
} wrect_t;
#endif // HUD_H

24
r5dev/game/client/spritemodel.cpp Normal file
View File

@ -0,0 +1,24 @@
//===== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
// $NoKeywords: $
//===========================================================================//
#include "core/stdafx.h"
#include "game/client/enginesprite.h"
//-----------------------------------------------------------------------------
// Is the sprite an AVI?
//-----------------------------------------------------------------------------
bool CEngineSprite::IsAVI(void) const
{
return (m_hAVIMaterial != AVIMATERIAL_INVALID);
}
//-----------------------------------------------------------------------------
// Is the sprite an BIK?
//-----------------------------------------------------------------------------
bool CEngineSprite::IsBIK(void) const
{
return (m_hBIKMaterial != BIKMATERIAL_INVALID);
}

29
r5dev/public/avi/iavi.h Normal file
View File

@ -0,0 +1,29 @@
//===== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
// $NoKeywords: $
//===========================================================================//
#ifndef IAVI_H
#define IAVI_H
//-----------------------------------------------------------------------------
// Handle to an AVI
//-----------------------------------------------------------------------------
typedef unsigned short AVIHandle_t;
enum
{
AVIHANDLE_INVALID = (AVIHandle_t)~0
};
//-----------------------------------------------------------------------------
// Handle to an AVI material
//-----------------------------------------------------------------------------
typedef unsigned short AVIMaterial_t;
enum
{
AVIMATERIAL_INVALID = (AVIMaterial_t)~0
};
#endif // IAVI_H

29
r5dev/public/avi/ibik.h Normal file
View File

@ -0,0 +1,29 @@
//===== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
// $NoKeywords: $
//===========================================================================//
#ifndef IBIK_H
#define IBIK_H
//-----------------------------------------------------------------------------
// Handle to an BINK
//-----------------------------------------------------------------------------
typedef unsigned short BIKHandle_t;
enum
{
BIKHANDLE_INVALID = (BIKHandle_t)~0
};
//-----------------------------------------------------------------------------
// Handle to an BINK material
//-----------------------------------------------------------------------------
typedef unsigned short BIKMaterial_t;
enum
{
BIKMATERIAL_INVALID = (BIKMaterial_t)~0
};
#endif // IBIK_H

28
r5dev/public/include/const.h Normal file
View File

@ -0,0 +1,28 @@
//===== Copyright (c) 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
// $NoKeywords: $
//
//=============================================================================//
#ifndef CONST_H
#define CONST_H
enum RenderMode_t
{
kRenderNormal = 0, // src
kRenderTransColor, // c*a+dest*(1-a)
kRenderTransTexture, // src*a+dest*(1-a)
kRenderGlow, // src*a+dest -- No Z buffer checks -- Fixed size in screen space
kRenderTransAlpha, // src*srca+dest*(1-srca)
kRenderTransAdd, // src*a+dest
kRenderEnvironmental, // not drawn, used for environmental effects
kRenderTransAddFrameBlend, // use a fractional frame value to blend between animation frames
kRenderTransAlphaAdd, // src + dest*(1-a)
kRenderWorldGlow, // Same as kRenderGlow but not fixed size in screen space
kRenderNone, // Don't render.
kRenderModeCount, // must be last
};
#endif

60
r5dev/public/include/model_types.h Normal file
View File

@ -0,0 +1,60 @@
//===== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
// $Workfile: $
// $Date: $
// $NoKeywords: $
//===========================================================================//
#if !defined( MODEL_TYPES_H )
#define MODEL_TYPES_H
#ifdef _WIN32
#pragma once
#endif
#define STUDIO_NONE 0x00000000
#define STUDIO_RENDER 0x00000001
#define STUDIO_VIEWXFORMATTACHMENTS 0x00000002
#define STUDIO_DRAWTRANSLUCENTSUBMODELS 0x00000004
#define STUDIO_TWOPASS 0x00000008
#define STUDIO_STATIC_LIGHTING 0x00000010
#define STUDIO_WIREFRAME 0x00000020
#define STUDIO_ITEM_BLINK 0x00000040
#define STUDIO_NOSHADOWS 0x00000080
#define STUDIO_WIREFRAME_VCOLLIDE 0x00000100
#define STUDIO_NOLIGHTING_OR_CUBEMAP 0x00000200
#define STUDIO_SKIP_FLEXES 0x00000400
#define STUDIO_DONOTMODIFYSTENCILSTATE 0x00000800 // TERROR
// not a studio flag, but used to signify that the draw call should cause a depth imposter to be drawn as well.
#define STUDIO_DEPTH_ONLY 0x01000000
// Not a studio flag, but used to flag model to render using special settings for AO pre-pass
#define STUDIO_AOPREPASSTEXURE 0x02000000
// Not a studio flag, but used to flag model to keep the shadow state it starts with
#define STUDIO_KEEP_SHADOWS 0x04000000
// Not a studio flag, but used to flag model as using shadow depth material override
#define STUDIO_SSAODEPTHTEXTURE 0x08000000
// Not a studio flag, but used to flag model as a non-sorting brush model
#define STUDIO_TRANSPARENCY 0x80000000
// Not a studio flag, but used to flag model as using shadow depth material override
#define STUDIO_SHADOWDEPTHTEXTURE 0x40000000
// Not a studio flag, but used to flag model as doing custom rendering into shadow texture
#define STUDIO_SHADOWTEXTURE 0x20000000
#define STUDIO_SKIP_DECALS 0x10000000
enum modtype_t
{
mod_bad = 0,
mod_brush,
mod_sprite,
mod_studio
};
#endif // MODEL_TYPES_H

70
r5dev/public/include/studio.h Normal file
View File

@ -0,0 +1,70 @@
#ifndef STUDIO_H
#define STUDIO_H
#include "mathlib/vector.h"
#pragma pack(push, 1)
struct studiohdr_t
{
int id; // 'IDST'
int version; // R5 = '6'
int checksum;
int tableIndex; // Offset
char name[0x40];
int length; // size of data
Vector3 eyeposition; // ideal eye position
Vector3 illumposition; // illumination center
Vector3 hull_min; // ideal movement hull size
Vector3 hull_max;
Vector3 view_bbmin; // clipping bounding box
Vector3 view_bbmax;
int flags;
int numbones; // bones
int boneindex;
int numbonecontrollers;
int bonecontrollerindex;
int numhitboxsets;
int hitboxsetindex;
int numlocalanim; // animations/poses
int localanimindex; // animation descriptions
int numlocalseq; // sequences
int localseqindex;
int activitylistversion; // initialization flag - have the sequences been indexed ?
int eventsindexed;
int numtextures;
int textureindex;
int numcdtextures;
int cdtextureindex;
int numskinref; // Total number of references (submeshes)
int numskinfamilies; // Total skins per reference
int skinindex; // Offset to data
int numbodyparts;
int bodypartindex;
int numlocalattachments;
int localattachmentindex;
uint8_t Unknown2[0x14];
int submeshLodsIndex;
uint8_t Unknown3[0x64];
int boneRemapInfoIndex;
int boneRemapCount;
};
#pragma pack(pop)
#endif // STUDIO_H

1
r5dev/public/include/utility.h
View File

@ -16,6 +16,7 @@ void HexDump(const char* szHeader, const char* szLogger, const void* pData, int
string CreateDirectories(string svFilePath);
string ConvertToWinPath(const string& svInput);
string ConvertToUnixPath(const string& svInput);
string Base64Encode(const string& svInput);
string Base64Decode(const string& svInput);

19
r5dev/public/utility.cpp
View File

@ -267,6 +267,25 @@ string ConvertToWinPath(const string& svInput)
return results = szFilePath;
}
///////////////////////////////////////////////////////////////////////////////
// For converting filepaths to unix filepaths.
string ConvertToUnixPath(const string& svInput)
{
char szFilePath[MAX_PATH] = { 0 };
string results;
sprintf_s(szFilePath, MAX_PATH, "%s", svInput.c_str());
// Flip forward slashes in filepath to windows-style backslash
for (int i = 0; i < strlen(szFilePath); i++)
{
if (szFilePath[i] == '\\')
{
szFilePath[i] = '/';
}
}
return results = szFilePath;
}
///////////////////////////////////////////////////////////////////////////////
// For encoding data in base64.
string Base64Encode(const string& svInput)

13
r5dev/vproj/clientsdk.vcxproj
View File

@ -24,6 +24,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\core\termutil.cpp" />
<ClCompile Include="..\datacache\mdlcache.cpp" />
<ClCompile Include="..\ebisusdk\EbisuSDK.cpp" />
<ClCompile Include="..\engine\baseclient.cpp" />
<ClCompile Include="..\engine\baseclientstate.cpp" />
@ -45,6 +46,7 @@
<ClCompile Include="..\filesystem\filesystem.cpp" />
<ClCompile Include="..\gameui\IConsole.cpp" />
<ClCompile Include="..\gameui\IBrowser.cpp" />
<ClCompile Include="..\game\client\spritemodel.cpp" />
<ClCompile Include="..\inputsystem\inputsystem.cpp" />
<ClCompile Include="..\launcher\IApplication.cpp" />
<ClCompile Include="..\launcher\launcher.cpp" />
@ -119,6 +121,7 @@
<ClInclude Include="..\common\opcodes.h" />
<ClInclude Include="..\common\protocol.h" />
<ClInclude Include="..\common\pseudodefs.h" />
<ClInclude Include="..\common\qlimits.h" />
<ClInclude Include="..\common\sdkdefs.h" />
<ClInclude Include="..\common\x86defs.h" />
<ClInclude Include="..\core\assert.h" />
@ -127,6 +130,8 @@
<ClInclude Include="..\core\r5dev.h" />
<ClInclude Include="..\core\stdafx.h" />
<ClInclude Include="..\core\termutil.h" />
<ClInclude Include="..\datacache\imdlcache.h" />
<ClInclude Include="..\datacache\mdlcache.h" />
<ClInclude Include="..\ebisusdk\EbisuSDK.h" />
<ClInclude Include="..\engine\baseclient.h" />
<ClInclude Include="..\engine\baseclientstate.h" />
@ -136,6 +141,7 @@
<ClInclude Include="..\engine\common.h" />
<ClInclude Include="..\engine\debugoverlay.h" />
<ClInclude Include="..\engine\gl_matsysiface.h" />
<ClInclude Include="..\engine\gl_model_private.h" />
<ClInclude Include="..\engine\gl_screen.h" />
<ClInclude Include="..\engine\host.h" />
<ClInclude Include="..\engine\host_cmd.h" />
@ -153,6 +159,8 @@
<ClInclude Include="..\gameui\IConsole.h" />
<ClInclude Include="..\gameui\IBrowser.h" />
<ClInclude Include="..\game\client\c_baseentity.h" />
<ClInclude Include="..\game\client\enginesprite.h" />
<ClInclude Include="..\game\client\hud.h" />
<ClInclude Include="..\inputsystem\ButtonCode.h" />
<ClInclude Include="..\inputsystem\inputsystem.h" />
<ClInclude Include="..\launcher\IApplication.h" />
@ -175,6 +183,9 @@
<ClInclude Include="..\networksystem\sm_protocol.h" />
<ClInclude Include="..\protoc\cl_rcon.pb.h" />
<ClInclude Include="..\protoc\sv_rcon.pb.h" />
<ClInclude Include="..\public\avi\iavi.h" />
<ClInclude Include="..\public\avi\ibik.h" />
<ClInclude Include="..\public\include\const.h" />
<ClInclude Include="..\public\include\edict.h" />
<ClInclude Include="..\public\include\globalvars_base.h" />
<ClInclude Include="..\public\include\inetchannel.h" />
@ -183,8 +194,10 @@
<ClInclude Include="..\public\include\binstream.h" />
<ClInclude Include="..\public\include\httplib.h" />
<ClInclude Include="..\public\include\json.hpp" />
<ClInclude Include="..\public\include\model_types.h" />
<ClInclude Include="..\public\include\module.h" />
<ClInclude Include="..\public\include\stb_image.h" />
<ClInclude Include="..\public\include\studio.h" />
<ClInclude Include="..\public\include\utility.h" />
<ClInclude Include="..\core\resource.h" />
<ClInclude Include="..\rtech\rtech_utils.h" />

45
r5dev/vproj/clientsdk.vcxproj.filters
View File

@ -169,6 +169,12 @@
<Filter Include="sdk\vstdlib">
<UniqueIdentifier>{fd290792-d36d-400c-9f4d-366a9ce57427}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\datacache">
<UniqueIdentifier>{99b7722c-1c10-431d-b86d-bc4d03655aee}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\public\avi">
<UniqueIdentifier>{05663bd0-2f29-41e4-acd3-4e3580f16549}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\client\cdll_engine_int.cpp">
@ -429,6 +435,12 @@
<ClCompile Include="..\common\netmessages.cpp">
<Filter>sdk\common</Filter>
</ClCompile>
<ClCompile Include="..\datacache\mdlcache.cpp">
<Filter>sdk\datacache</Filter>
</ClCompile>
<ClCompile Include="..\game\client\spritemodel.cpp">
<Filter>sdk\game\client</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\client\cdll_engine_int.h">
@ -1211,6 +1223,39 @@
<ClInclude Include="..\windows\resource.h">
<Filter>windows</Filter>
</ClInclude>
<ClInclude Include="..\public\include\studio.h">
<Filter>sdk\public\include</Filter>
</ClInclude>
<ClInclude Include="..\engine\gl_model_private.h">
<Filter>sdk\engine</Filter>
</ClInclude>
<ClInclude Include="..\common\qlimits.h">
<Filter>sdk\common</Filter>
</ClInclude>
<ClInclude Include="..\public\include\model_types.h">
<Filter>sdk\public\include</Filter>
</ClInclude>
<ClInclude Include="..\game\client\enginesprite.h">
<Filter>sdk\game\client</Filter>
</ClInclude>
<ClInclude Include="..\datacache\imdlcache.h">
<Filter>sdk\datacache</Filter>
</ClInclude>
<ClInclude Include="..\datacache\mdlcache.h">
<Filter>sdk\datacache</Filter>
</ClInclude>
<ClInclude Include="..\game\client\hud.h">
<Filter>sdk\game\client</Filter>
</ClInclude>
<ClInclude Include="..\public\avi\iavi.h">
<Filter>sdk\public\avi</Filter>
</ClInclude>
<ClInclude Include="..\public\avi\ibik.h">
<Filter>sdk\public\avi</Filter>
</ClInclude>
<ClInclude Include="..\public\include\const.h">
<Filter>sdk\public\include</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">

8
r5dev/vproj/dedicated.vcxproj
View File

@ -131,6 +131,7 @@
<ClInclude Include="..\common\opcodes.h" />
<ClInclude Include="..\common\protocol.h" />
<ClInclude Include="..\common\pseudodefs.h" />
<ClInclude Include="..\common\qlimits.h" />
<ClInclude Include="..\common\sdkdefs.h" />
<ClInclude Include="..\common\x86defs.h" />
<ClInclude Include="..\core\assert.h" />
@ -139,6 +140,8 @@
<ClInclude Include="..\core\r5dev.h" />
<ClInclude Include="..\core\stdafx.h" />
<ClInclude Include="..\core\termutil.h" />
<ClInclude Include="..\datacache\imdlcache.h" />
<ClInclude Include="..\datacache\mdlcache.h" />
<ClInclude Include="..\ebisusdk\EbisuSDK.h" />
<ClInclude Include="..\engine\baseclient.h" />
<ClInclude Include="..\engine\baseserver.h" />
@ -146,6 +149,7 @@
<ClInclude Include="..\engine\cmodel_bsp.h" />
<ClInclude Include="..\engine\common.h" />
<ClInclude Include="..\engine\gl_matsysiface.h" />
<ClInclude Include="..\engine\gl_model_private.h" />
<ClInclude Include="..\engine\host.h" />
<ClInclude Include="..\engine\host_cmd.h" />
<ClInclude Include="..\engine\host_state.h" />
@ -187,6 +191,7 @@
<ClInclude Include="..\networksystem\sm_protocol.h" />
<ClInclude Include="..\protoc\cl_rcon.pb.h" />
<ClInclude Include="..\protoc\sv_rcon.pb.h" />
<ClInclude Include="..\public\include\const.h" />
<ClInclude Include="..\public\include\edict.h" />
<ClInclude Include="..\public\include\globalvars_base.h" />
<ClInclude Include="..\public\include\inetchannel.h" />
@ -195,7 +200,9 @@
<ClInclude Include="..\public\include\binstream.h" />
<ClInclude Include="..\public\include\httplib.h" />
<ClInclude Include="..\public\include\json.hpp" />
<ClInclude Include="..\public\include\model_types.h" />
<ClInclude Include="..\public\include\module.h" />
<ClInclude Include="..\public\include\studio.h" />
<ClInclude Include="..\public\include\utility.h" />
<ClInclude Include="..\rtech\rtech_utils.h" />
<ClInclude Include="..\rtech\rtech_game.h" />
@ -375,6 +382,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\core\termutil.cpp" />
<ClCompile Include="..\datacache\mdlcache.cpp" />
<ClCompile Include="..\ebisusdk\EbisuSDK.cpp" />
<ClCompile Include="..\engine\baseclient.cpp" />
<ClCompile Include="..\engine\baseserver.cpp" />

27
r5dev/vproj/dedicated.vcxproj.filters
View File

@ -145,6 +145,9 @@
<Filter Include="sdk\rtech\rui">
<UniqueIdentifier>{cc54d9ba-f73a-48af-af6a-3b2064710e61}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\datacache">
<UniqueIdentifier>{4573ce75-0337-41b1-a43e-e9c17773b127}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\common\opcodes.h">
@ -873,6 +876,27 @@
<ClInclude Include="..\rtech\rui\rui.h">
<Filter>sdk\rtech\rui</Filter>
</ClInclude>
<ClInclude Include="..\public\include\studio.h">
<Filter>sdk\public\include</Filter>
</ClInclude>
<ClInclude Include="..\engine\gl_model_private.h">
<Filter>sdk\engine</Filter>
</ClInclude>
<ClInclude Include="..\common\qlimits.h">
<Filter>sdk\common</Filter>
</ClInclude>
<ClInclude Include="..\public\include\model_types.h">
<Filter>sdk\public\include</Filter>
</ClInclude>
<ClInclude Include="..\datacache\imdlcache.h">
<Filter>sdk\datacache</Filter>
</ClInclude>
<ClInclude Include="..\datacache\mdlcache.h">
<Filter>sdk\datacache</Filter>
</ClInclude>
<ClInclude Include="..\public\include\const.h">
<Filter>sdk\public\include</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\common\opcodes.cpp">
@ -1103,6 +1127,9 @@
<ClCompile Include="..\tier0\jobthread.cpp">
<Filter>sdk\tier0</Filter>
</ClCompile>
<ClCompile Include="..\datacache\mdlcache.cpp">
<Filter>sdk\datacache</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\Dedicated.def" />

13
r5dev/vproj/gamesdk.vcxproj
View File

@ -24,6 +24,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\core\termutil.cpp" />
<ClCompile Include="..\datacache\mdlcache.cpp" />
<ClCompile Include="..\ebisusdk\EbisuSDK.cpp" />
<ClCompile Include="..\engine\baseclient.cpp" />
<ClCompile Include="..\engine\baseclientstate.cpp" />
@ -47,6 +48,7 @@
<ClCompile Include="..\filesystem\filesystem.cpp" />
<ClCompile Include="..\gameui\IConsole.cpp" />
<ClCompile Include="..\gameui\IBrowser.cpp" />
<ClCompile Include="..\game\client\spritemodel.cpp" />
<ClCompile Include="..\game\server\ai_network.cpp" />
<ClCompile Include="..\game\server\ai_networkmanager.cpp" />
<ClCompile Include="..\game\server\ai_utility.cpp" />
@ -127,6 +129,7 @@
<ClInclude Include="..\common\opcodes.h" />
<ClInclude Include="..\common\protocol.h" />
<ClInclude Include="..\common\pseudodefs.h" />
<ClInclude Include="..\common\qlimits.h" />
<ClInclude Include="..\common\sdkdefs.h" />
<ClInclude Include="..\common\x86defs.h" />
<ClInclude Include="..\core\assert.h" />
@ -135,6 +138,8 @@
<ClInclude Include="..\core\r5dev.h" />
<ClInclude Include="..\core\stdafx.h" />
<ClInclude Include="..\core\termutil.h" />
<ClInclude Include="..\datacache\imdlcache.h" />
<ClInclude Include="..\datacache\mdlcache.h" />
<ClInclude Include="..\ebisusdk\EbisuSDK.h" />
<ClInclude Include="..\engine\baseclient.h" />
<ClInclude Include="..\engine\baseclientstate.h" />
@ -145,6 +150,7 @@
<ClInclude Include="..\engine\common.h" />
<ClInclude Include="..\engine\debugoverlay.h" />
<ClInclude Include="..\engine\gl_matsysiface.h" />
<ClInclude Include="..\engine\gl_model_private.h" />
<ClInclude Include="..\engine\gl_screen.h" />
<ClInclude Include="..\engine\host.h" />
<ClInclude Include="..\engine\host_cmd.h" />
@ -163,6 +169,8 @@
<ClInclude Include="..\gameui\IConsole.h" />
<ClInclude Include="..\gameui\IBrowser.h" />
<ClInclude Include="..\game\client\c_baseentity.h" />
<ClInclude Include="..\game\client\enginesprite.h" />
<ClInclude Include="..\game\client\hud.h" />
<ClInclude Include="..\game\server\ai_network.h" />
<ClInclude Include="..\game\server\ai_networkmanager.h" />
<ClInclude Include="..\game\server\ai_node.h" />
@ -192,6 +200,9 @@
<ClInclude Include="..\networksystem\sm_protocol.h" />
<ClInclude Include="..\protoc\cl_rcon.pb.h" />
<ClInclude Include="..\protoc\sv_rcon.pb.h" />
<ClInclude Include="..\public\avi\iavi.h" />
<ClInclude Include="..\public\avi\ibik.h" />
<ClInclude Include="..\public\include\const.h" />
<ClInclude Include="..\public\include\edict.h" />
<ClInclude Include="..\public\include\globalvars_base.h" />
<ClInclude Include="..\public\include\inetchannel.h" />
@ -200,8 +211,10 @@
<ClInclude Include="..\public\include\binstream.h" />
<ClInclude Include="..\public\include\httplib.h" />
<ClInclude Include="..\public\include\json.hpp" />
<ClInclude Include="..\public\include\model_types.h" />
<ClInclude Include="..\public\include\module.h" />
<ClInclude Include="..\public\include\stb_image.h" />
<ClInclude Include="..\public\include\studio.h" />
<ClInclude Include="..\public\include\utility.h" />
<ClInclude Include="..\core\resource.h" />
<ClInclude Include="..\rtech\rtech_utils.h" />

45
r5dev/vproj/gamesdk.vcxproj.filters
View File

@ -175,6 +175,12 @@
<Filter Include="sdk\vstdlib">
<UniqueIdentifier>{48abe326-8ad7-43fa-875d-2e73c7c64106}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\datacache">
<UniqueIdentifier>{42f3eba8-1c16-4a48-b9c7-209eb4e0eb36}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\public\avi">
<UniqueIdentifier>{67444ecb-b115-4231-a33b-aab424f785fc}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\client\vengineclient_impl.cpp">
@ -459,6 +465,12 @@
<ClCompile Include="..\common\netmessages.cpp">
<Filter>sdk\common</Filter>
</ClCompile>
<ClCompile Include="..\datacache\mdlcache.cpp">
<Filter>sdk\datacache</Filter>
</ClCompile>
<ClCompile Include="..\game\client\spritemodel.cpp">
<Filter>sdk\game\client</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\client\cdll_engine_int.h">
@ -1271,6 +1283,39 @@
<ClInclude Include="..\windows\resource.h">
<Filter>windows</Filter>
</ClInclude>
<ClInclude Include="..\datacache\mdlcache.h">
<Filter>sdk\datacache</Filter>
</ClInclude>
<ClInclude Include="..\public\include\studio.h">
<Filter>sdk\public\include</Filter>
</ClInclude>
<ClInclude Include="..\engine\gl_model_private.h">
<Filter>sdk\engine</Filter>
</ClInclude>
<ClInclude Include="..\common\qlimits.h">
<Filter>sdk\common</Filter>
</ClInclude>
<ClInclude Include="..\public\include\model_types.h">
<Filter>sdk\public\include</Filter>
</ClInclude>
<ClInclude Include="..\datacache\imdlcache.h">
<Filter>sdk\datacache</Filter>
</ClInclude>
<ClInclude Include="..\game\client\enginesprite.h">
<Filter>sdk\game\client</Filter>
</ClInclude>
<ClInclude Include="..\public\include\const.h">
<Filter>sdk\public\include</Filter>
</ClInclude>
<ClInclude Include="..\public\avi\ibik.h">
<Filter>sdk\public\avi</Filter>
</ClInclude>
<ClInclude Include="..\public\avi\iavi.h">
<Filter>sdk\public\avi</Filter>
</ClInclude>
<ClInclude Include="..\game\client\hud.h">
<Filter>sdk\game\client</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">