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

create abstract class for PluginSystem, refactor Factory System

Browse Source
This commit is contained in:
Marvin D 2022-08-20 12:42:19 +02:00
parent cebc6a13b6
commit 60b2db9eaa
7 changed files with 101 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
r5dev/pluginsystem/ipluginsystem.h Normal file
View File

@ -0,0 +1,11 @@
#pragma once
struct PluginHelpWithAnything_t;
abstract_class IPluginSystem
{
public:
virtual void* HelpWithAnything(PluginHelpWithAnything_t * help) = 0;
};
constexpr auto INTERFACEVERSION_PLUGINSYSTEM = "VPluginSystem001";

59
r5dev/pluginsystem/pluginsystem.cpp
View File

@ -7,6 +7,7 @@
//=============================================================================//
#include "core/stdafx.h"
#include "vpc/interfaces.h"
#include "pluginsystem.h"
//-----------------------------------------------------------------------------
@ -32,7 +33,7 @@ void CPluginSystem::PluginSystem_Init()
}
if (addInstance)
pluginInstances.push_back(PluginInstance(path.filename().u8string(), path.u8string()));
pluginInstances.push_back(PluginInstance_t(path.filename().u8string(), path.u8string()));
}
}
}
@ -42,7 +43,7 @@ void CPluginSystem::PluginSystem_Init()
// Input : pluginInst* -
// Output : bool
//-----------------------------------------------------------------------------
bool CPluginSystem::LoadPluginInstance(PluginInstance& pluginInst)
bool CPluginSystem::LoadPluginInstance(PluginInstance_t& pluginInst)
{
if (pluginInst.m_bIsLoaded)
return false;
@ -53,16 +54,12 @@ bool CPluginSystem::LoadPluginInstance(PluginInstance& pluginInst)
pluginInst.m_hModule = CModule(pluginInst.m_svPluginName);
auto onLoadFn = pluginInst.m_hModule.GetExportedFunction("PluginInstance_OnLoad").RCast<PluginInstance::OnLoad>();
auto onLoadFn = pluginInst.m_hModule.GetExportedFunction("PluginInstance_OnLoad").RCast<PluginInstance_t::OnLoad>();
Assert(onLoadFn);
onLoadFn(pluginInst.m_hModule, g_GameDll);
auto getVersFn = pluginInst.m_hModule.GetExportedFunction("PluginInstance_GetVersion").RCast<PluginInstance::GetVersion>();
if (getVersFn)
pluginInst.m_nVersion = getVersFn();
auto getDescFn = pluginInst.m_hModule.GetExportedFunction("PluginInstance_GetDescription").RCast<PluginInstance::GetDescription>();
auto getDescFn = pluginInst.m_hModule.GetExportedFunction("PluginInstance_GetDescription").RCast<PluginInstance_t::GetDescription>();
if (getDescFn)
pluginInst.m_svDescription = getDescFn();
@ -74,14 +71,14 @@ bool CPluginSystem::LoadPluginInstance(PluginInstance& pluginInst)
// Input : pluginInst* -
// Output : bool
//-----------------------------------------------------------------------------
bool CPluginSystem::UnloadPluginInstance(PluginInstance& pluginInst)
bool CPluginSystem::UnloadPluginInstance(PluginInstance_t& pluginInst)
{
if (!pluginInst.m_bIsLoaded)
return false;
Assert(pluginInst.m_hModule.GetModuleBase());
auto onUnloadFn = pluginInst.m_hModule.GetExportedFunction("PluginInstance_OnUnload").RCast<PluginInstance::OnUnload>();
auto onUnloadFn = pluginInst.m_hModule.GetExportedFunction("PluginInstance_OnUnload").RCast<PluginInstance_t::OnUnload>();
if (onUnloadFn)
onUnloadFn(g_GameDll);
@ -98,7 +95,7 @@ bool CPluginSystem::UnloadPluginInstance(PluginInstance& pluginInst)
// Input : pluginInst* -
// Output : bool
//-----------------------------------------------------------------------------
bool CPluginSystem::ReloadPluginInstance(PluginInstance& pluginInst)
bool CPluginSystem::ReloadPluginInstance(PluginInstance_t& pluginInst)
{
return UnloadPluginInstance(pluginInst) ? LoadPluginInstance(pluginInst) : false;
}
@ -108,9 +105,47 @@ bool CPluginSystem::ReloadPluginInstance(PluginInstance& pluginInst)
// Input :
// Output : vector<CPluginSystem::PluginInstance>&
//-----------------------------------------------------------------------------
vector<CPluginSystem::PluginInstance>& CPluginSystem::GetPluginInstances()
vector<CPluginSystem::PluginInstance_t>& CPluginSystem::GetPluginInstances()
{
return pluginInstances;
}
//-----------------------------------------------------------------------------
// Purpose: get all plugin callbacks
// Input :
// Output : unordered_map<string, vector<pair<string, void*>>>&
//-----------------------------------------------------------------------------
unordered_map<string, vector<pair<string, void*>>>& CPluginSystem::GetPluginCallbacks()
{
return pluginCallbacks;
}
//-----------------------------------------------------------------------------
// Purpose: help plugins with anything
// Input : *help
// Output : void*
//-----------------------------------------------------------------------------
void* CPluginSystem::HelpWithAnything(PluginHelpWithAnything_t* help)
{
switch (help->m_nHelpID)
{
case PluginHelpWithAnything_t::ePluginHelp::PLUGIN_GET_FUNCTION:
{
break;
}
case PluginHelpWithAnything_t::ePluginHelp::PLUGIN_REGISTER_CALLBACK:
{
break;
}
case PluginHelpWithAnything_t::ePluginHelp::PLUGIN_UNREGISTER_CALLBACK:
{
break;
}
default:
break;
}
return nullptr;
}
CPluginSystem* g_pPluginSystem = new CPluginSystem();

39
r5dev/pluginsystem/pluginsystem.h
View File

@ -1,34 +1,53 @@
#pragma once
#include "ipluginsystem.h"
class CPluginSystem
struct PluginHelpWithAnything_t
{
enum class ePluginHelp : int16_t
{
PLUGIN_GET_FUNCTION = 0,
PLUGIN_REGISTER_CALLBACK,
PLUGIN_UNREGISTER_CALLBACK
};
ePluginHelp m_nHelpID;
const char* m_pszName;
void* m_pFunction;
};
class CPluginSystem : IPluginSystem
{
public:
struct PluginInstance
struct PluginInstance_t
{
PluginInstance(string svPluginName, string svPluginFullPath) : m_svPluginName(svPluginName), m_svPluginFullPath(svPluginFullPath), m_svDescription(std::string()), m_nVersion(0), m_bIsLoaded(false) {};
PluginInstance_t(string svPluginName, string svPluginFullPath) : m_svPluginName(svPluginName), m_svPluginFullPath(svPluginFullPath), m_svDescription(std::string()), m_bIsLoaded(false) {};
// Might wanna make a status code system.
typedef void(*OnLoad)(CModule, CModule);
typedef void(*OnUnload)(CModule);
typedef int16_t (*GetVersion)();
typedef int16_t(*GetVersion)();
typedef const char* (*GetDescription)();
CModule m_hModule;
string m_svPluginName;
string m_svPluginFullPath;
string m_svDescription;
int16_t m_nVersion;
bool m_bIsLoaded; // [ PIXIE ]: I don't like this and it's bad.
// I will make a module manager later which will grab all modules from the processand adds each module / removes module that passes through DLLMain.
};
void PluginSystem_Init();
bool ReloadPluginInstance(PluginInstance& pluginInst);
bool LoadPluginInstance(PluginInstance& pluginInst);
bool UnloadPluginInstance(PluginInstance& pluginInst);
vector<PluginInstance>& GetPluginInstances();
bool ReloadPluginInstance(PluginInstance_t& pluginInst);
bool LoadPluginInstance(PluginInstance_t& pluginInst);
bool UnloadPluginInstance(PluginInstance_t& pluginInst);
vector<PluginInstance_t>& GetPluginInstances();
unordered_map<string, vector<pair<string, void*>>>& GetPluginCallbacks();
virtual void* HelpWithAnything(PluginHelpWithAnything_t* help);
private:
vector<PluginInstance> pluginInstances;
vector<PluginInstance_t> pluginInstances;
unordered_map<string, vector<pair<string, void*>>> pluginCallbacks;
};
extern CPluginSystem* g_pPluginSystem;

8
r5dev/vpc/interfaces.cpp
View File

@ -15,7 +15,7 @@
void CFactory::AddFactory(const string& svFactoryName, void* pFactory)
{
size_t nVersionIndex = GetVersionIndex(svFactoryName);
FactoryInfo factoryInfo = FactoryInfo(svFactoryName, svFactoryName.substr(0, nVersionIndex),
FactoryInfo_t factoryInfo = FactoryInfo_t(svFactoryName, svFactoryName.substr(0, nVersionIndex),
svFactoryName.substr(nVersionIndex), reinterpret_cast<uintptr_t>(pFactory));
m_vFactories.push_back(factoryInfo); // Push factory info back into the vector.
@ -25,7 +25,7 @@ void CFactory::AddFactory(const string& svFactoryName, void* pFactory)
// Purpose: add a factory to the factories vector
// Input : factoryInfo -
//---------------------------------------------------------------------------------
void CFactory::AddFactory(FactoryInfo factoryInfo)
void CFactory::AddFactory(FactoryInfo_t factoryInfo)
{
m_vFactories.push_back(factoryInfo); // Push factory info back into the vector.
}
@ -61,7 +61,7 @@ void CFactory::GetFactoriesFromRegister(void)
size_t nVersionIndex = GetVersionIndex(svInterfaceName);
// Push back the interface.
AddFactory(FactoryInfo(svInterfaceName, svInterfaceName.substr(0, nVersionIndex),
AddFactory(FactoryInfo_t(svInterfaceName, svInterfaceName.substr(0, nVersionIndex),
svInterfaceName.substr(nVersionIndex), reinterpret_cast<uintptr_t>(it->m_pInterfacePtr())));
}
}
@ -74,7 +74,7 @@ void CFactory::GetFactoriesFromRegister(void)
//---------------------------------------------------------------------------------
CMemory CFactory::GetFactoryPtr(const string& svFactoryName, bool bVersionLess) const
{
for (const FactoryInfo& it : m_vFactories) // Loop through the whole vector.
for (const FactoryInfo_t& it : m_vFactories) // Loop through the whole vector.
{
if (bVersionLess)
{

12
r5dev/vpc/interfaces.h
View File

@ -59,17 +59,17 @@ struct InterfaceGlobals_t
};
//-----------------------------------------------------------------------------
struct FactoryInfo
struct FactoryInfo_t
{
CMemory m_pFactoryPtr;
string m_szFactoryFullName;
string m_szFactoryName;
string m_szFactoryVersion;
FactoryInfo() : m_szFactoryFullName(string()), m_szFactoryName(string()), m_szFactoryVersion(string()), m_pFactoryPtr(nullptr) {}
FactoryInfo(string factoryFullName, string factoryName, string factoryVersion, uintptr_t factoryPtr) :
FactoryInfo_t() : m_szFactoryFullName(string()), m_szFactoryName(string()), m_szFactoryVersion(string()), m_pFactoryPtr(nullptr) {}
FactoryInfo_t(string factoryFullName, string factoryName, string factoryVersion, uintptr_t factoryPtr) :
m_szFactoryFullName(factoryFullName), m_szFactoryName(factoryName), m_szFactoryVersion(factoryVersion), m_pFactoryPtr(factoryPtr) {}
FactoryInfo(string factoryFullName, uintptr_t factoryPtr) :
FactoryInfo_t(string factoryFullName, uintptr_t factoryPtr) :
m_szFactoryFullName(factoryFullName), m_szFactoryName(string()), m_szFactoryVersion(string()), m_pFactoryPtr(factoryPtr) {}
};
@ -80,13 +80,13 @@ class CFactory
{
public:
virtual void AddFactory(const string& svFactoryName, void* pFactory);
virtual void AddFactory(FactoryInfo factoryInfo);
virtual void AddFactory(FactoryInfo_t factoryInfo);
virtual size_t GetVersionIndex(const string& svInterfaceName) const;
virtual void GetFactoriesFromRegister(void);
virtual CMemory GetFactoryPtr(const string& svFactoryName, bool versionLess = true) const;
private:
vector<FactoryInfo> m_vFactories;
vector<FactoryInfo_t> m_vFactories;
};
extern CFactory* g_pFactory;

1
r5dev/vproj/gamesdk.vcxproj
View File

@ -261,6 +261,7 @@
<ClInclude Include="..\networksystem\pylon.h" />
<ClInclude Include="..\networksystem\serverlisting.h" />
<ClInclude Include="..\networksystem\sm_protocol.h" />
<ClInclude Include="..\pluginsystem\ipluginsystem.h" />
<ClInclude Include="..\pluginsystem\pluginsystem.h" />
<ClInclude Include="..\protoc\cl_rcon.pb.h" />
<ClInclude Include="..\protoc\sv_rcon.pb.h" />

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

@ -1835,6 +1835,9 @@
<ClInclude Include="..\pluginsystem\pluginsystem.h">
<Filter>sdk\pluginsystem</Filter>
</ClInclude>
<ClInclude Include="..\pluginsystem\ipluginsystem.h">
<Filter>sdk\pluginsystem</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">