dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix disabled pathfinder tests

Browse source 
The disabled test are all broken one way or another. The maps used in
the tests got renamed. The pathfinder component got some performance
improvements which now require to call UpdateGrid() once before use.
Finally for the InitAttributes to be deep frozen they need to be an
object, so initialize them.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser 2025-11-01 17:23:21 +01:00
parent 296ccc78c9
commit dab6e1a37a
No known key found for this signature in database
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/simulation2/components/tests/test_Pathfinder.h
View file

@ -32,7 +32,9 @@
#include "ps/Filesystem.h"
#include "ps/Loader.h"
#include "ps/XML/Xeromyces.h"
#include "scriptinterface/Object.h"
#include "scriptinterface/ScriptInterface.h"
#include "scriptinterface/ScriptRequest.h"
#include "simulation2/Simulation2.h"
#include "simulation2/components/ICmpObstructionManager.h"
#include "simulation2/components/ICmpPathfinder.h"
@ -161,10 +163,14 @@ public:
CSimulation2 sim2{nullptr, *g_ScriptContext, &terrain, CSimulation2::DEFAULT_SCRIPTS};
sim2.ResetState();
JS::RootedValue attribs(sim2.GetScriptInterface().GetGeneralJSContext());
Script::CreateObject(ScriptRequest(sim2.GetScriptInterface()), &attribs);
sim2.SetInitAttributes(attribs);
std::unique_ptr<CMapReader> mapReader = std::make_unique<CMapReader>();
PS::Loader::BeginRegistering();
mapReader->LoadMap(L"maps/skirmishes/Median Oasis (2).pmp",
mapReader->LoadMap(L"maps/skirmishes/median_oasis_2p.pmp",
sim2.GetScriptInterface().GetContext(), JS::UndefinedHandleValue,
&terrain, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
&sim2, &sim2.GetSimContext(), -1, false);
@ -223,6 +229,7 @@ public:
CmpPtr<ICmpObstructionManager> cmpObstructionMan(sim2, SYSTEM_ENTITY);
CmpPtr<ICmpPathfinder> cmpPathfinder(sim2, SYSTEM_ENTITY);
cmpPathfinder->UpdateGrid();
std::mt19937 engine(42);
std::uniform_real_distribution<float> distribution01(0.0f, std::nextafter(1.0f, 2.0f));
@ -273,10 +280,14 @@ public:
CSimulation2 sim2{nullptr, *g_ScriptContext, &terrain, CSimulation2::DEFAULT_SCRIPTS};
sim2.ResetState();
JS::RootedValue attribs(sim2.GetScriptInterface().GetGeneralJSContext());
Script::CreateObject(ScriptRequest(sim2.GetScriptInterface()), &attribs);
sim2.SetInitAttributes(attribs);
std::unique_ptr<CMapReader> mapReader = std::make_unique<CMapReader>();
PS::Loader::BeginRegistering();
mapReader->LoadMap(L"maps/scenarios/Peloponnese.pmp",
mapReader->LoadMap(L"maps/scenarios/peloponnese.pmp",
sim2.GetScriptInterface().GetContext(), JS::UndefinedHandleValue,
&terrain, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
&sim2, &sim2.GetSimContext(), -1, false);
@ -329,10 +340,14 @@ public:
CSimulation2 sim2{nullptr, *g_ScriptContext, &terrain, CSimulation2::DEFAULT_SCRIPTS};
sim2.ResetState();
JS::RootedValue attribs(sim2.GetScriptInterface().GetGeneralJSContext());
Script::CreateObject(ScriptRequest(sim2.GetScriptInterface()), &attribs);
sim2.SetInitAttributes(attribs);
std::unique_ptr<CMapReader> mapReader = std::make_unique<CMapReader>();
PS::Loader::BeginRegistering();
mapReader->LoadMap(L"maps/scenarios/Peloponnese.pmp",
mapReader->LoadMap(L"maps/scenarios/peloponnese.pmp",
sim2.GetScriptInterface().GetContext(), JS::UndefinedHandleValue,
&terrain, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
&sim2, &sim2.GetSimContext(), -1, false);