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

Remove LoadScripts from CSimualation2

Browse Source 
`LoadScripts` and `LoadDefaultScripts` have to be called imediately
after the `CSimulation2` constructor.

By doing the necesarry work in the constructor and removing
`LoadScripts` and `LoadDefaultScripts` the interface of `CSimulation2`
is simplified.
This commit is contained in:
phosit
2025-11-21 18:57:53 +01:00
parent 0b83e24065
commit ba2351611c
13 changed files with 61 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/tests/test_LOSTexture.h
+3 -3
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
@@ -36,7 +36,7 @@ class TestLOSTexture : public CxxTest::TestSuite
public:
void test_basic()
{
CSimulation2 sim{nullptr, *g_ScriptContext, nullptr};
CSimulation2 sim{nullptr, *g_ScriptContext, nullptr, {}};
CLOSTexture tex(sim);
const ssize_t size = 8;
@@ -75,7 +75,7 @@ public:
void DISABLED_test_perf()
{
CSimulation2 sim{nullptr, *g_ScriptContext, nullptr};
CSimulation2 sim{nullptr, *g_ScriptContext, nullptr, {}};
CLOSTexture tex(sim);
const ssize_t size = 257;
source/graphics/tests/test_Model.h
+3 -3
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
@@ -200,7 +200,7 @@ public:
TestLogger logger;
CMaterial material{};
CSimulation2 simulation{nullptr, *g_ScriptContext, nullptr};
CSimulation2 simulation{nullptr, *g_ScriptContext, nullptr, {}};
CTerrain terrain;
terrain.Initialize(4, nullptr);
@@ -266,7 +266,7 @@ public:
CSkeletonAnimManager skeletonAnimationManager{colladaManager};
CUnitManager unitManager;
CSimulation2 simulation{&unitManager, *g_ScriptContext, nullptr};
CSimulation2 simulation{&unitManager, *g_ScriptContext, nullptr, {}};
CObjectManager objectManager{
meshManager, skeletonAnimationManager, simulation};
unitManager.SetObjectManager(objectManager);