mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-22 05:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Script* classes to Script namespace

Browse Source 
- Rename ScriptEngine, ScriptContext, ScriptInterface, ScriptRequest to
  Script::Engine, Script::Context, Script::Interface, Script::Request
- Remove 'Script' prefix from filenames:
  ScriptContext.* → Context.*
  ScriptInterface.* → Interface.*
  ScriptRequest.* → Request.*
  ScriptEngine.* → Engine.*
  ScriptConversions.* → Conversions.*
  ScriptExceptions.* → Exceptions.*
  ScriptForward.* → ForwardDeclarations.*
  ScriptStats.* → Stats.*
- Update all includes, forward declarations, and friend classes
- Use namespace Script { ... } in .cpp definitions to avoid repetitive
  Script:: prefix (keeping global callbacks outside)
- Rename internal implementation structs:
  ScriptInterface_impl → Interface_impl
  ScriptFunction → Function
- Update copyright year to 2026 in all touched files
- Suppress pre-existing cppcheck warnings (uninitvar, nullPointer, unknown
  macro) by adding them to suppressions-list.txt (these are not caused
  by this refactor)

Fixes #7516
This commit is contained in:
vyordan
2026-06-02 15:06:50 -06:00
committed by phosit
parent 310c4bf028
commit ec8b420abc
220 changed files with 2224 additions and 2153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/scripting/EngineScriptConversions.cpp
+24 -24
View File
@@ -27,10 +27,10 @@
#include "ps/CLogger.h"
#include "ps/CStr.h"
#include "scriptinterface/Object.h"
#include "scriptinterface/ScriptConversions.h"
#include "scriptinterface/ScriptExceptions.h"
#include "scriptinterface/ScriptInterface.h"
#include "scriptinterface/ScriptRequest.h"
#include "scriptinterface/Conversions.h"
#include "scriptinterface/Exceptions.h"
#include "scriptinterface/Interface.h"
#include "scriptinterface/Request.h"
#include "simulation2/helpers/CinemaPath.h"
#include "simulation2/helpers/Grid.h"
#include "simulation2/system/Component.h"
@@ -51,9 +51,9 @@
#include <optional>
#define FAIL(msg) STMT(LOGERROR(msg); return false)
#define FAIL_VOID(msg) STMT(ScriptException::Raise(rq, msg); return)
#define FAIL_VOID(msg) STMT(Script::Exception::Raise(rq, msg); return)
template<> void Script::ToJSVal<IComponent*>(const ScriptRequest&, JS::MutableHandleValue ret,
template<> void Script::ToJSVal<IComponent*>(const Script::Request&, JS::MutableHandleValue ret,
IComponent* const& val)
{
if (val == NULL)
@@ -74,12 +74,12 @@ template<> void Script::ToJSVal<IComponent*>(const ScriptRequest&, JS::MutableHa
ret.set(instance);
}
template<> void Script::ToJSVal<CParamNode>(const ScriptRequest& rq, JS::MutableHandleValue ret, CParamNode const& val)
template<> void Script::ToJSVal<CParamNode>(const Script::Request& rq, JS::MutableHandleValue ret, CParamNode const& val)
{
val.ToJSVal(rq, true, ret);
}
template<> void Script::ToJSVal<const CParamNode*>(const ScriptRequest& rq, JS::MutableHandleValue ret, const CParamNode* const& val)
template<> void Script::ToJSVal<const CParamNode*>(const Script::Request& rq, JS::MutableHandleValue ret, const CParamNode* const& val)
{
if (val)
ToJSVal(rq, ret, *val);
@@ -87,7 +87,7 @@ template<> void Script::ToJSVal<const CParamNode*>(const ScriptRequest& rq, JS:
ret.setUndefined();
}
template<> bool Script::FromJSVal<CColor>(const ScriptRequest& rq, JS::HandleValue v, CColor& out)
template<> bool Script::FromJSVal<CColor>(const Script::Request& rq, JS::HandleValue v, CColor& out)
{
if (!v.isObject())
FAIL("CColor has to be an object");
@@ -110,7 +110,7 @@ template<> bool Script::FromJSVal<CColor>(const ScriptRequest& rq, JS::HandleVa
return true;
}
template<> void Script::ToJSVal<CColor>(const ScriptRequest& rq, JS::MutableHandleValue ret, CColor const& val)
template<> void Script::ToJSVal<CColor>(const Script::Request& rq, JS::MutableHandleValue ret, CColor const& val)
{
Script::CreateObject(
rq,
@@ -121,7 +121,7 @@ template<> void Script::ToJSVal<CColor>(const ScriptRequest& rq, JS::MutableHan
"a", val.a);
}
template<> bool Script::FromJSVal<fixed>(const ScriptRequest& rq, JS::HandleValue v, fixed& out)
template<> bool Script::FromJSVal<fixed>(const Script::Request& rq, JS::HandleValue v, fixed& out)
{
double ret;
if (!JS::ToNumber(rq.cx, v, &ret))
@@ -132,12 +132,12 @@ template<> bool Script::FromJSVal<fixed>(const ScriptRequest& rq, JS::HandleVal
return true;
}
template<> void Script::ToJSVal<fixed>(const ScriptRequest&, JS::MutableHandleValue ret, const fixed& val)
template<> void Script::ToJSVal<fixed>(const Script::Request&, JS::MutableHandleValue ret, const fixed& val)
{
ret.set(JS::NumberValue(val.ToDouble()));
}
template<> bool Script::FromJSVal<CFixedVector3D>(const ScriptRequest& rq, JS::HandleValue v, CFixedVector3D& out)
template<> bool Script::FromJSVal<CFixedVector3D>(const Script::Request& rq, JS::HandleValue v, CFixedVector3D& out)
{
if (!v.isObject())
return false; // TODO: report type error
@@ -157,11 +157,11 @@ template<> bool Script::FromJSVal<CFixedVector3D>(const ScriptRequest& rq, JS::
return true;
}
template<> void Script::ToJSVal<CFixedVector3D>(const ScriptRequest& rq, JS::MutableHandleValue ret, const CFixedVector3D& val)
template<> void Script::ToJSVal<CFixedVector3D>(const Script::Request& rq, JS::MutableHandleValue ret, const CFixedVector3D& val)
{
JS::RootedObject global(rq.cx, rq.glob);
JS::RootedValue valueVector3D(rq.cx);
if (!ScriptInterface::GetGlobalProperty(rq, "Vector3D", &valueVector3D))
if (!Script::Interface::GetGlobalProperty(rq, "Vector3D", &valueVector3D))
FAIL_VOID("Failed to get Vector3D constructor");
JS::RootedValueArray<3> args(rq.cx);
@@ -176,7 +176,7 @@ template<> void Script::ToJSVal<CFixedVector3D>(const ScriptRequest& rq, JS::Mu
ret.setObject(*objVec);
}
template<> bool Script::FromJSVal<CFixedVector2D>(const ScriptRequest& rq, JS::HandleValue v, CFixedVector2D& out)
template<> bool Script::FromJSVal<CFixedVector2D>(const Script::Request& rq, JS::HandleValue v, CFixedVector2D& out)
{
if (!v.isObject())
return false; // TODO: report type error
@@ -193,11 +193,11 @@ template<> bool Script::FromJSVal<CFixedVector2D>(const ScriptRequest& rq, JS::
return true;
}
template<> void Script::ToJSVal<CFixedVector2D>(const ScriptRequest& rq, JS::MutableHandleValue ret, const CFixedVector2D& val)
template<> void Script::ToJSVal<CFixedVector2D>(const Script::Request& rq, JS::MutableHandleValue ret, const CFixedVector2D& val)
{
JS::RootedObject global(rq.cx, rq.glob);
JS::RootedValue valueVector2D(rq.cx);
if (!ScriptInterface::GetGlobalProperty(rq, "Vector2D", &valueVector2D))
if (!Script::Interface::GetGlobalProperty(rq, "Vector2D", &valueVector2D))
FAIL_VOID("Failed to get Vector2D constructor");
JS::RootedValueArray<2> args(rq.cx);
@@ -211,7 +211,7 @@ template<> void Script::ToJSVal<CFixedVector2D>(const ScriptRequest& rq, JS::Mu
ret.setObject(*objVec);
}
template<> bool Script::FromJSVal<std::optional<CFixedVector2D>>(const ScriptRequest& rq, JS::HandleValue v, std::optional<CFixedVector2D>& out)
template<> bool Script::FromJSVal<std::optional<CFixedVector2D>>(const Script::Request& rq, JS::HandleValue v, std::optional<CFixedVector2D>& out)
{
if (v.isNullOrUndefined())
{
@@ -227,7 +227,7 @@ template<> bool Script::FromJSVal<std::optional<CFixedVector2D>>(const ScriptReq
return true;
}
template<> void Script::ToJSVal<std::optional<CFixedVector2D>>(const ScriptRequest& rq, JS::MutableHandleValue ret, const std::optional<CFixedVector2D>& val)
template<> void Script::ToJSVal<std::optional<CFixedVector2D>>(const Script::Request& rq, JS::MutableHandleValue ret, const std::optional<CFixedVector2D>& val)
{
if (!val.has_value())
ret.setNull();
@@ -235,7 +235,7 @@ template<> void Script::ToJSVal<std::optional<CFixedVector2D>>(const ScriptReque
ToJSVal(rq, ret, val.value());
}
template<> void Script::ToJSVal<Grid<u8> >(const ScriptRequest& rq, JS::MutableHandleValue ret, const Grid<u8>& val)
template<> void Script::ToJSVal<Grid<u8> >(const Script::Request& rq, JS::MutableHandleValue ret, const Grid<u8>& val)
{
u32 length = (u32)(val.m_W * val.m_H);
u32 nbytes = (u32)(length * sizeof(u8));
@@ -256,7 +256,7 @@ template<> void Script::ToJSVal<Grid<u8> >(const ScriptRequest& rq, JS::Mutable
"data", data);
}
template<> void Script::ToJSVal<Grid<u16> >(const ScriptRequest& rq, JS::MutableHandleValue ret, const Grid<u16>& val)
template<> void Script::ToJSVal<Grid<u16> >(const Script::Request& rq, JS::MutableHandleValue ret, const Grid<u16>& val)
{
u32 length = (u32)(val.m_W * val.m_H);
u32 nbytes = (u32)(length * sizeof(u16));
@@ -277,7 +277,7 @@ template<> void Script::ToJSVal<Grid<u16> >(const ScriptRequest& rq, JS::Mutabl
"data", data);
}
template<> bool Script::FromJSVal<TNSpline>(const ScriptRequest& rq, JS::HandleValue v, TNSpline& out)
template<> bool Script::FromJSVal<TNSpline>(const Script::Request& rq, JS::HandleValue v, TNSpline& out)
{
if (!v.isObject())
FAIL("Argument must be an object");
@@ -314,7 +314,7 @@ template<> bool Script::FromJSVal<TNSpline>(const ScriptRequest& rq, JS::Handle
return true;
}
template<> bool Script::FromJSVal<CCinemaPath>(const ScriptRequest& rq, JS::HandleValue v, CCinemaPath& out)
template<> bool Script::FromJSVal<CCinemaPath>(const Script::Request& rq, JS::HandleValue v, CCinemaPath& out)
{
if (!v.isObject())
FAIL("Argument must be an object");