* chore(ci): add clang-format gate, CODEOWNERS and agent collaboration rules * refactor(modules): clear remaining back-edges and split the largest TUs Three known dependency back-edges are gone (module_depgraph.py KNOWN_BACK_EDGES is now empty; --check passes with 0 violations, 0 cycles): - window -> graphics: window queries the new IWindowSurfaceHost capability (common/WindowSurfaceHost.h) instead of holding a Graphics pointer; Window::setGraphics was removed and all call sites updated. - window -> image: Window::setIcon was replaced by setIconRGBA(const uint8_t*, w, h); the window no longer decodes ImageData. - scene -> graphics: pickScreenAt / collectFrustumIdsAt implementations moved to graphics/ScenePicking.cpp (graphics -> scene is a legal downward edge); scene now depends only on spatial. TU splits (pure moves, verified identical method sets and brace balance): - vulkan/Graphics.cpp (5118 lines) -> Graphics.cpp (lifecycle), GraphicsPipeline, Graphics2D, Graphics3D, GraphicsMesh + shared GraphicsInternal.h. - scene/Scene.cpp -> Scene.cpp (script layer / host lifecycle / serialization) + SceneNodes.cpp + shared SceneInternal.h. Verified with a real build (MSVC 19.51, prebuilt third-party): full build green; window.* and Scene.* suites pass, including scene picking/culling and GPU cases. * refactor(graphics): narrow Graphics interfaces and clear public-header leaks Step 4 — interface segregation: - New lean interfaces: IGraphics2D, IGraphics3D, IResourceFactory, IPostFX (pure virtuals, forward-declared types only; graphics/Color.h extracted from Canvas.h so modules that only need the color type stop pulling Canvas.h). - Graphics now implements all four facets; consumers can depend on the narrow interface they use instead of the 129-method god class. - Migrated voxel (VoxelWorld::drawVisible -> IGraphics3D*) and model3d (ModelRenderer::buildRenderable(s) -> IResourceFactory&). - Graphics.h slims from 24 sub-header includes to a handful of small type headers + forward declarations; the destructor moved out-of-line so unique_ptr effect members are destroyed where types are complete. Step 5 — header leaks (module_depgraph.py '*' marks: 14 -> 7): - map/TileLayer.h, particles/ParticleEmitter.h, avatar/AvatarInstance.h, animation/SpineAnim.h, map/TileSystem.h, model3d/ModelData.h, model3d/ModelRenderer.h, audio/Audio.h + Source.h, image/ImageData.h + Image.h, dialogue/Dialogue.h, procgen Palette/OutputSpec/TextureRecipe/ PbrMaterial -> forward declarations, includes moved to .cpp. - voxel/VoxelWorld.h: terrain sampler Pimpl'd (unique_ptr + out-of-line destructor), removing the procgen header dependency. - gpgpu/vulkan backend headers stop pulling graphics/vulkan/Graphics.h. - Remaining '*' marks are deliberate: tiny POD/enum headers (GridConfig, MapObject, BlendMode, Color), an internal backend header (GraphicsInternal.h -> filesystem), and lean interface references. Verified with a full clean build (MSVC) and tests: window/Scene/voxel/ RenderSystem/Quad/shader/TextureSampler/resourceLifetime pass; broad suite only shows the pre-existing PHYSFS-init filesystem-environment failures. * feat(resources): revive ResourceManager as unified IAssetReloader-backed cache * fix(resources): leak ResourceManager singleton to avoid exit-time teardown crashes Cached CPU resources may own third-party handles (FreeType faces, Assimp scenes, image decode handlers) whose libraries are torn down at process exit in an unspecified TU order; destroying cached entries from the singleton destructor can segfault at exit (seen on CI Windows in model3d.materialApi.objMtl). Keep the singleton alive until OS reclaim; explicit unload()/clear() still release entries during the run. * refactor(devtools): consume business modules through capability interfaces DevTools / cmdline no longer include business-module headers, so trimming scene / physics / procgen / particles / audio / ui / graphics no longer requires disabling devtools, and devtools can be switched off with -DEVENGINE_MODULE_DEVTOOLS=OFF. New capability interfaces in common/: - ISceneQuery (scene) - host/node inspection + mutation + transform sync - IRenderCapture (graphics) - render status, PNG capture, camera control, visible-entity snapshot, entity-ID mask, G-buffer PNGs - IPhysicsQuery (physics) - 2D world lifecycle + ray casts - IProcgenQuery (procgen) - recipe listing, map/mesh generation - IParticlesQuery (particles) - emitter status + one-shot emit - IAudioQuery (audio) - volume / stop-all - IEditorHost (ui) - declarative editor host (used by cmdline too) Providers register in their module constructors. DevTools rewires McpServer (render/scene/procgen/physics/particles/audio/host tools), SceneInspect (now delegates to ISceneQuery + IRenderCapture) and RenderVision (uses IRenderCapture::capturePngDataUrl); cmdline/Mcp.cpp uses IEditorHost. manifest: devtools DEPS graphics scene physics procgen particles audio ui image event filesystem -> event; cmdline DEPS filesystem ui -> filesystem. Verified: full build green; devtools.mcp.* tests pass; broad suite shows only the pre-existing PHYSFS-init filesystem-environment failures. * style: apply clang-format to changed lines after dev merge * fix(webgpu): include RenderControl/TextureSampler explicitly after Graphics.h slimming * fix(webgpu): provide newFont/print stubs to satisfy IGraphics2D/IResourceFactory vtables * fix(common): make ProcgenQuery.h self-sufficient (cstdint/utility for GCC)
207 lines
6.3 KiB
C++
207 lines
6.3 KiB
C++
#include "zeroerr/assert.h"
|
|
#include "zeroerr/unittest.h"
|
|
|
|
#include "common/Capability.h"
|
|
#include "common/Resource.h"
|
|
|
|
#include <map>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
namespace {
|
|
|
|
/** Payload = a per-path generation counter observed at load time. */
|
|
class TestResource : public eve::Resource {
|
|
public:
|
|
TestResource() : eve::Resource("") {}
|
|
|
|
void adopt(eve::Resource &replacement) override {
|
|
auto &other = static_cast<TestResource &>(replacement);
|
|
std::swap(value, other.value);
|
|
}
|
|
|
|
int value = 0;
|
|
};
|
|
|
|
/** Fake asset provider: claims "*.dat" and serves a fresh generation each load. */
|
|
class TestProvider : public eve::caps::IAssetReloader {
|
|
public:
|
|
const char *reloadKind() const override { return "test"; }
|
|
|
|
bool handlesPath(const std::string &normPath) const override {
|
|
const std::string path = eve::ResourceManager::pathOfKey(normPath);
|
|
return path.size() >= 4 && path.compare(path.size() - 4, 4, ".dat") == 0;
|
|
}
|
|
|
|
eve::Resource *load(const std::string &key) override {
|
|
if (!handlesPath(key)) return nullptr;
|
|
auto *r = new TestResource();
|
|
r->value = ++generation[key];
|
|
return r;
|
|
}
|
|
|
|
static std::map<std::string, int> generation;
|
|
};
|
|
|
|
std::map<std::string, int> TestProvider::generation;
|
|
|
|
/** Every case starts from an empty cache + empty capability registry. */
|
|
struct Reset {
|
|
Reset() {
|
|
eve::ResourceManager::getInstance().clear();
|
|
eve::cap::detail::clearAllRaw();
|
|
}
|
|
~Reset() {
|
|
eve::ResourceManager::getInstance().clear();
|
|
eve::cap::detail::clearAllRaw();
|
|
}
|
|
Reset(const Reset &) = delete;
|
|
Reset &operator=(const Reset &) = delete;
|
|
};
|
|
|
|
TestProvider &provider() {
|
|
static TestProvider p;
|
|
eve::cap::addListener<eve::caps::IAssetReloader>(&p, eve::caps::IAssetReloader::kCache);
|
|
TestProvider::generation.clear();
|
|
return p;
|
|
}
|
|
|
|
eve::Resource *get(const std::string &key) {
|
|
return eve::ResourceManager::getInstance().get(key);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
TEST_CASE("resource.normalizePath") {
|
|
CHECK_EQ(eve::ResourceManager::normalizePath("./a/b.nut"), std::string("a/b.nut"));
|
|
CHECK_EQ(eve::ResourceManager::normalizePath("a\\b.json"), std::string("a/b.json"));
|
|
CHECK_EQ(eve::ResourceManager::normalizePath("x/"), std::string("x"));
|
|
}
|
|
|
|
TEST_CASE("resource.makeKeyAndPathOfKey") {
|
|
CHECK_EQ(eve::ResourceManager::makeKey("a/b.png"), std::string("a/b.png"));
|
|
CHECK_EQ(eve::ResourceManager::makeKey("a\\b.png", "size=16"), std::string("a/b.png?size=16"));
|
|
CHECK_EQ(eve::ResourceManager::pathOfKey("a/b.png?size=16"), std::string("a/b.png"));
|
|
CHECK_EQ(eve::ResourceManager::pathOfKey("./a/b.png?size=16"), std::string("a/b.png"));
|
|
}
|
|
|
|
TEST_CASE("resource.getUnknownKeyIsNull") {
|
|
Reset reset;
|
|
provider();
|
|
CHECK(get("no_such_kind.zzz") == nullptr);
|
|
CHECK_EQ(eve::ResourceManager::getInstance().count(), 0u);
|
|
}
|
|
|
|
TEST_CASE("resource.getCachesSameInstance") {
|
|
Reset reset;
|
|
provider();
|
|
|
|
eve::Resource *a = get("a.dat");
|
|
eve::Resource *b = get("a.dat");
|
|
REQUIRE(a != nullptr);
|
|
CHECK(a == b);
|
|
CHECK_EQ(static_cast<TestResource *>(a)->value, 1);
|
|
CHECK_EQ(TestProvider::generation.size(), 1u);
|
|
CHECK_EQ(eve::ResourceManager::getInstance().count(), 1u);
|
|
}
|
|
|
|
TEST_CASE("resource.paramsAreDistinctEntries") {
|
|
Reset reset;
|
|
provider();
|
|
|
|
eve::Resource *a = get("a.dat?size=16");
|
|
eve::Resource *b = get("a.dat?size=32");
|
|
REQUIRE(a != nullptr);
|
|
REQUIRE(b != nullptr);
|
|
CHECK(a != b);
|
|
CHECK_EQ(eve::ResourceManager::getInstance().count(), 2u);
|
|
}
|
|
|
|
TEST_CASE("resource.unloadDropsEntryButKeepsHoldersAlive") {
|
|
Reset reset;
|
|
provider();
|
|
|
|
eve::Resource *a = get("a.dat");
|
|
REQUIRE(a != nullptr);
|
|
eve::ref<eve::Resource> holder(a); // an external holder keeps it alive
|
|
eve::ResourceManager::getInstance().unload("a.dat");
|
|
CHECK_EQ(eve::ResourceManager::getInstance().count(), 0u);
|
|
// The holder's ref keeps the object alive and usable.
|
|
CHECK_EQ(static_cast<TestResource *>(a)->value, 1);
|
|
|
|
// A later get() loads a fresh instance.
|
|
eve::Resource *b = get("a.dat");
|
|
REQUIRE(b != nullptr);
|
|
CHECK(b != a);
|
|
CHECK_EQ(static_cast<TestResource *>(b)->value, 2);
|
|
}
|
|
|
|
TEST_CASE("resource.unloadPathMatchesAnyParams") {
|
|
Reset reset;
|
|
provider();
|
|
|
|
REQUIRE(get("a.dat?size=16") != nullptr);
|
|
REQUIRE(get("a.dat?size=32") != nullptr);
|
|
REQUIRE(get("b.dat") != nullptr);
|
|
eve::ResourceManager::getInstance().unloadPath("a.dat");
|
|
CHECK_EQ(eve::ResourceManager::getInstance().count(), 1u);
|
|
}
|
|
|
|
TEST_CASE("resource.reloadRefreshesInPlace") {
|
|
Reset reset;
|
|
provider();
|
|
|
|
eve::Resource *a = get("a.dat");
|
|
REQUIRE(a != nullptr);
|
|
TestResource *ptr = static_cast<TestResource *>(a);
|
|
CHECK_EQ(ptr->value, 1);
|
|
|
|
CHECK(eve::ResourceManager::getInstance().reload("a.dat"));
|
|
CHECK(a == ptr); // identity stays stable
|
|
CHECK_EQ(ptr->value, 2); // fresh payload adopted
|
|
CHECK_EQ(eve::ResourceManager::getInstance().count(), 1u);
|
|
}
|
|
|
|
TEST_CASE("resource.reloadWithoutCachedEntryIsNoop") {
|
|
Reset reset;
|
|
provider();
|
|
|
|
CHECK(!eve::ResourceManager::getInstance().handlesPath("a.dat"));
|
|
CHECK(!eve::ResourceManager::getInstance().reload("a.dat"));
|
|
}
|
|
|
|
TEST_CASE("resource.reloadTriggersDependents") {
|
|
Reset reset;
|
|
provider();
|
|
|
|
eve::Resource *a = get("a.dat");
|
|
eve::Resource *b = get("b.dat");
|
|
REQUIRE(a != nullptr);
|
|
REQUIRE(b != nullptr);
|
|
b->addDependency(eve::ref<eve::Resource>(a));
|
|
CHECK_EQ(static_cast<TestResource *>(a)->value, 1);
|
|
CHECK_EQ(static_cast<TestResource *>(b)->value, 1);
|
|
|
|
CHECK(eve::ResourceManager::getInstance().reload("a.dat"));
|
|
CHECK_EQ(static_cast<TestResource *>(a)->value, 2);
|
|
// The dependent entry refreshed transitively, in place.
|
|
CHECK_EQ(static_cast<TestResource *>(b)->value, 2);
|
|
CHECK_EQ(eve::ResourceManager::getInstance().count(), 2u);
|
|
}
|
|
|
|
TEST_CASE("resource.reloadDependencyCycleIsSafe") {
|
|
Reset reset;
|
|
provider();
|
|
|
|
eve::Resource *a = get("a.dat");
|
|
eve::Resource *b = get("b.dat");
|
|
REQUIRE(a != nullptr);
|
|
REQUIRE(b != nullptr);
|
|
a->addDependency(eve::ref<eve::Resource>(b));
|
|
b->addDependency(eve::ref<eve::Resource>(a));
|
|
|
|
CHECK(eve::ResourceManager::getInstance().reload("a.dat"));
|
|
CHECK_EQ(static_cast<TestResource *>(a)->value, 2);
|
|
CHECK_EQ(static_cast<TestResource *>(b)->value, 2);
|
|
}
|