gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Introduce C++ templates replacements for DEFINE_INTERFACE_X and RegisterFunction macros

Browse Source 
The new methods:
- aren't included in ScriptInterface.h directly, lightening that header
- don't use boost CPP
- don't need argument types or number or constness to be specified
- can work with object methods somewhat transparently
- support optional cmptPrivate (allowing removal of many UNUSED macro)
- support optional const ScriptRequest&, which is safer.

This first diff changes only some of the JSI files & the component
manager. Further diffs will update other files and finally delete the
current code.

Differential Revision: https://code.wildfiregames.com/D2818
This was SVN commit r24969.
This commit is contained in:
wraitii
2021-03-01 20:52:24 +00:00
parent 9ed3b88d25
commit f3aedf88a6
17 changed files with 562 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ps/scripting/JSInterface_Mod.cpp
+15 -16
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2018 Wildfire Games.
/* Copyright (C) 2021 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,11 +20,14 @@
#include "JSInterface_Mod.h"
#include "ps/Mod.h"
#include "scriptinterface/FunctionWrapper.h"
#include "scriptinterface/ScriptInterface.h"
extern void RestartEngine();
JS::Value JSI_Mod::GetEngineInfo(ScriptInterface::CmptPrivate* pCmptPrivate)
namespace
{
JS::Value GetEngineInfo(ScriptInterface::CmptPrivate* pCmptPrivate)
{
return Mod::GetEngineInfo(*(pCmptPrivate->pScriptInterface));
}
@@ -39,25 +42,21 @@ JS::Value JSI_Mod::GetEngineInfo(ScriptInterface::CmptPrivate* pCmptPrivate)
* @return JS object with available mods as the keys of the modname.json
* properties.
*/
JS::Value JSI_Mod::GetAvailableMods(ScriptInterface::CmptPrivate* pCmptPrivate)
JS::Value GetAvailableMods(ScriptInterface::CmptPrivate* pCmptPrivate)
{
return Mod::GetAvailableMods(*(pCmptPrivate->pScriptInterface));
}
void JSI_Mod::RestartEngine(ScriptInterface::CmptPrivate* UNUSED(pCmptPrivate))
{
::RestartEngine();
}
void JSI_Mod::SetMods(ScriptInterface::CmptPrivate* UNUSED(pCmptPrivate), const std::vector<CStr>& mods)
void SetMods(const std::vector<CStr>& mods)
{
g_modsLoaded = mods;
}
void JSI_Mod::RegisterScriptFunctions(const ScriptInterface& scriptInterface)
{
scriptInterface.RegisterFunction<JS::Value, &GetEngineInfo>("GetEngineInfo");
scriptInterface.RegisterFunction<JS::Value, &JSI_Mod::GetAvailableMods>("GetAvailableMods");
scriptInterface.RegisterFunction<void, &JSI_Mod::RestartEngine>("RestartEngine");
scriptInterface.RegisterFunction<void, std::vector<CStr>, &JSI_Mod::SetMods>("SetMods");
}
void JSI_Mod::RegisterScriptFunctions(const ScriptRequest& rq)
{
ScriptFunction::Register<&GetEngineInfo>(rq, "GetEngineInfo");
ScriptFunction::Register<&GetAvailableMods>(rq, "GetAvailableMods");
ScriptFunction::Register<&RestartEngine>(rq, "RestartEngine");
ScriptFunction::Register<&SetMods>(rq, "SetMods");
}