mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-24 16:31:39 +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/graphics/scripting/JSInterface_GameView.cpp
+20 -20
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -30,7 +30,7 @@
#include "ps/World.h"
#include "scriptinterface/FunctionWrapper.h"
#include "scriptinterface/Object.h"
#include "scriptinterface/ScriptRequest.h"
#include "scriptinterface/Request.h"
#include "simulation2/helpers/Position.h"
#include "simulation2/system/Entity.h"
@@ -69,10 +69,10 @@ IMPLEMENT_BOOLEAN_SCRIPT_SETTING(ConstrainCamera);
#define REGISTER_BOOLEAN_SCRIPT_SETTING(NAME) \
ScriptFunction::Register<&Get##NAME##Enabled>(rq, "GameView_Get" #NAME "Enabled"); \
ScriptFunction::Register<&Set##NAME##Enabled>(rq, "GameView_Set" #NAME "Enabled");
Script::Function::Register<&Get##NAME##Enabled>(rq, "GameView_Get" #NAME "Enabled"); \
Script::Function::Register<&Set##NAME##Enabled>(rq, "GameView_Set" #NAME "Enabled");
void RegisterScriptFunctions_Settings(const ScriptRequest& rq)
void RegisterScriptFunctions_Settings(const Script::Request& rq)
{
REGISTER_BOOLEAN_SCRIPT_SETTING(Culling);
REGISTER_BOOLEAN_SCRIPT_SETTING(LockCullCamera);
@@ -81,7 +81,7 @@ void RegisterScriptFunctions_Settings(const ScriptRequest& rq)
#undef REGISTER_BOOLEAN_SCRIPT_SETTING
JS::Value GetCameraRotation(const ScriptRequest& rq)
JS::Value GetCameraRotation(const Script::Request& rq)
{
if (!g_Game || !g_Game->GetView())
return JS::UndefinedValue();
@@ -99,7 +99,7 @@ JS::Value GetCameraZoom()
return JS::NumberValue(g_Game->GetView()->GetCameraZoom());
}
JS::Value GetCameraPivot(const ScriptRequest& rq)
JS::Value GetCameraPivot(const Script::Request& rq)
{
if (!g_Game || !g_Game->GetView())
return JS::UndefinedValue();
@@ -110,7 +110,7 @@ JS::Value GetCameraPivot(const ScriptRequest& rq)
return pivotValue;
}
JS::Value GetCameraPosition(const ScriptRequest& rq)
JS::Value GetCameraPosition(const Script::Request& rq)
{
if (!g_Game || !g_Game->GetView())
return JS::UndefinedValue();
@@ -200,20 +200,20 @@ CFixedVector3D GetTerrainAtScreenPoint(int x, int y)
return CFixedVector3D(fixed::FromFloat(pos.X), fixed::FromFloat(pos.Y), fixed::FromFloat(pos.Z));
}
void RegisterScriptFunctions(const ScriptRequest& rq)
void RegisterScriptFunctions(const Script::Request& rq)
{
RegisterScriptFunctions_Settings(rq);
ScriptFunction::Register<&GetCameraRotation>(rq, "GetCameraRotation");
ScriptFunction::Register<&GetCameraZoom>(rq, "GetCameraZoom");
ScriptFunction::Register<&GetCameraPivot>(rq, "GetCameraPivot");
ScriptFunction::Register<&GetCameraPosition>(rq, "GetCameraPosition");
ScriptFunction::Register<&CameraMoveTo>(rq, "CameraMoveTo");
ScriptFunction::Register<&SetCameraTarget>(rq, "SetCameraTarget");
ScriptFunction::Register<&SetCameraData>(rq, "SetCameraData");
ScriptFunction::Register<&CameraFollow>(rq, "CameraFollow");
ScriptFunction::Register<&CameraFollowFPS>(rq, "CameraFollowFPS");
ScriptFunction::Register<&GetFollowedEntity>(rq, "GetFollowedEntity");
ScriptFunction::Register<&GetTerrainAtScreenPoint>(rq, "GetTerrainAtScreenPoint");
Script::Function::Register<&GetCameraRotation>(rq, "GetCameraRotation");
Script::Function::Register<&GetCameraZoom>(rq, "GetCameraZoom");
Script::Function::Register<&GetCameraPivot>(rq, "GetCameraPivot");
Script::Function::Register<&GetCameraPosition>(rq, "GetCameraPosition");
Script::Function::Register<&CameraMoveTo>(rq, "CameraMoveTo");
Script::Function::Register<&SetCameraTarget>(rq, "SetCameraTarget");
Script::Function::Register<&SetCameraData>(rq, "SetCameraData");
Script::Function::Register<&CameraFollow>(rq, "CameraFollow");
Script::Function::Register<&CameraFollowFPS>(rq, "CameraFollowFPS");
Script::Function::Register<&GetFollowedEntity>(rq, "GetFollowedEntity");
Script::Function::Register<&GetTerrainAtScreenPoint>(rq, "GetTerrainAtScreenPoint");
}
}