* 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)
126 lines
3.9 KiB
C++
126 lines
3.9 KiB
C++
#include "zeroerr/assert.h"
|
|
#include "zeroerr/unittest.h"
|
|
|
|
#include "common/Exception.h"
|
|
#include "data/ByteData.h"
|
|
#include "filesystem/Filesystem.h"
|
|
#include "font/Font.h"
|
|
#include "font/FontData.h"
|
|
#include "image/ImageData.h"
|
|
|
|
#include <fstream>
|
|
#include <functional>
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
namespace {
|
|
|
|
// FontAwesome private-use icon with a non-empty bitmap in the fixture.
|
|
constexpr int kIconCodepoint = 0xF000;
|
|
|
|
#include "PathBesideSource.h"
|
|
EVE_DEFINE_PATH_BESIDE_SOURCE()
|
|
|
|
std::vector<char> readBinaryFile(const std::string &path) {
|
|
std::ifstream in(path, std::ios::binary);
|
|
if (!in)
|
|
return {};
|
|
return std::vector<char>((std::istreambuf_iterator<char>(in)), std::istreambuf_iterator<char>());
|
|
}
|
|
|
|
bool expectException(const std::function<void()> &fn) {
|
|
try {
|
|
fn();
|
|
} catch (const eve::Exception &) {
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
eve::font::Font *fontModule() { return eve::font::Font::create(); }
|
|
|
|
std::unique_ptr<eve::font::FontData> loadFixture(int size = 24) {
|
|
auto raw = readBinaryFile(pathBesideThisSource("fonts/FontAwesome.ttf"));
|
|
if (raw.empty())
|
|
return nullptr;
|
|
eve::data::ByteData data(raw.data(), raw.size());
|
|
return std::unique_ptr<eve::font::FontData>(fontModule()->newFontData(&data, size));
|
|
}
|
|
|
|
} // namespace
|
|
|
|
TEST_CASE("font.create") {
|
|
auto *module = fontModule();
|
|
REQUIRE(module != nullptr);
|
|
CHECK_EQ(module->getName(), std::string("Font"));
|
|
}
|
|
|
|
TEST_CASE("font.newFontData.empty") {
|
|
auto *module = fontModule();
|
|
CHECK(expectException([&] { module->newFontData(nullptr); }));
|
|
CHECK(expectException([&] { module->newFontDataFromFile(""); }));
|
|
}
|
|
|
|
TEST_CASE("font.newFontData.garbage") {
|
|
auto *module = fontModule();
|
|
const char garbage[] = "this is not a font";
|
|
eve::data::ByteData bytes(garbage, sizeof(garbage) - 1);
|
|
CHECK(expectException([&] { module->newFontData(&bytes, 16); }));
|
|
}
|
|
|
|
TEST_CASE("font.newFontData.ttf") {
|
|
auto fd = loadFixture(24);
|
|
REQUIRE(fd.get() != nullptr);
|
|
CHECK_EQ(fd->getSize(), 24);
|
|
CHECK(fd->getAscent() > 0.f);
|
|
CHECK(fd->getLineHeight() > 0.f);
|
|
CHECK(fd->getGlyphCount() > 0);
|
|
CHECK(!fd->getFamilyName().empty());
|
|
CHECK(fd->hasGlyph(kIconCodepoint));
|
|
CHECK(!fd->hasGlyph(static_cast<int>(0x4E00))); // CJK not in fixture
|
|
CHECK(fd->getWidth("\xEF\x80\x80") > 0.f); // UTF-8 for U+F000
|
|
CHECK(fd->getGlyphAdvance(kIconCodepoint) > 0);
|
|
|
|
std::unique_ptr<eve::image::ImageData> glyph(fd->newGlyphImageData(kIconCodepoint));
|
|
REQUIRE(glyph.get() != nullptr);
|
|
CHECK(glyph->getWidth() > 0);
|
|
CHECK(glyph->getHeight() > 0);
|
|
CHECK_EQ(glyph->getFormat(), std::string("RGBA8"));
|
|
}
|
|
|
|
TEST_CASE("font.newFontDataFromFile.cached") {
|
|
auto raw = readBinaryFile(pathBesideThisSource("fonts/FontAwesome.ttf"));
|
|
REQUIRE(!raw.empty());
|
|
|
|
auto *fs = eve::filesystem::Filesystem::create();
|
|
REQUIRE(fs != nullptr);
|
|
REQUIRE(fs->setIdentity("ev_ut_font_cache", true));
|
|
REQUIRE(fs->setupWriteDirectory());
|
|
const char *name = "cached_font.ttf";
|
|
fs->write(name, raw.data(), raw.size());
|
|
|
|
auto *module = fontModule();
|
|
eve::font::FontData *a = module->newFontDataFromFile(name, 16);
|
|
eve::font::FontData *b = module->newFontDataFromFile(name, 16);
|
|
REQUIRE(a != nullptr);
|
|
CHECK(a == b); // one decoded face per (path, size)
|
|
CHECK_EQ(a->getSize(), 16);
|
|
|
|
eve::font::FontData *c = module->newFontDataFromFile(name, 24);
|
|
REQUIRE(c != nullptr);
|
|
CHECK(c != a); // different size is a different cache entry
|
|
CHECK_EQ(c->getSize(), 24);
|
|
|
|
fs->remove(name);
|
|
}
|
|
|
|
TEST_CASE("font.newFontData.invalidSize") {
|
|
auto raw = readBinaryFile(pathBesideThisSource("fonts/FontAwesome.ttf"));
|
|
REQUIRE(!raw.empty());
|
|
eve::data::ByteData data(raw.data(), raw.size());
|
|
auto *module = fontModule();
|
|
CHECK(expectException([&] { module->newFontData(&data, 0); }));
|
|
CHECK(expectException([&] { module->newFontData(&data, -8); }));
|
|
}
|