refactor(modules): clear remaining back-edges and split the largest TUs (#127)
* 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)
This commit is contained in:
1 parent
095df92fca
commit
34d1fdb63b
206 files changed
+11022
-7198
No files matched your search
+31
-16
@@ -1,9 +1,30 @@
|
||||
#include <cstdlib>
|
||||
#include <cstdlib>
|
||||
#include <vector>
|
||||
|
||||
#include "zeroerr/assert.h"
|
||||
#include "zeroerr/unittest.h"
|
||||
|
||||
#include "graphics/AmbientOcclusion.h"
|
||||
#include "graphics/AntiAliasing.h"
|
||||
#include "graphics/Canvas.h"
|
||||
#include "graphics/DrawItem2D.h"
|
||||
#include "graphics/Font.h"
|
||||
#include "graphics/GBuffer.h"
|
||||
#include "graphics/GlobalIllumination.h"
|
||||
#include "graphics/Graphics.h"
|
||||
#include "graphics/Grass.h"
|
||||
#include "graphics/Light.h"
|
||||
#include "graphics/Material.h"
|
||||
#include "graphics/Mesh.h"
|
||||
#include "graphics/Outline.h"
|
||||
#include "graphics/Quad.h"
|
||||
#include "graphics/RenderControl.h"
|
||||
#include "graphics/ScreenSpaceReflection.h"
|
||||
#include "graphics/Shader.h"
|
||||
#include "graphics/Texture.h"
|
||||
#include "graphics/Volumetric.h"
|
||||
#include "graphics/Water.h"
|
||||
#include "graphics/Waterfall.h"
|
||||
#include "image/ImageData.h"
|
||||
#include "window/Window.h"
|
||||
|
||||
@@ -16,7 +37,6 @@ void openWindow(eve::window::Window*& win, eve::graphics::Graphics*& gfx, int w
|
||||
gfx = eve::graphics::Graphics::create();
|
||||
REQUIRE(win != nullptr);
|
||||
REQUIRE(gfx != nullptr);
|
||||
win->setGraphics(gfx);
|
||||
WindowSettings s;
|
||||
s.width = static_cast<uint16_t>(w);
|
||||
s.height = static_cast<uint16_t>(h);
|
||||
@@ -173,7 +193,6 @@ TEST_CASE("window.zeroSizeUsesDesktopDimensions") {
|
||||
gfx = eve::graphics::Graphics::create();
|
||||
REQUIRE(win != nullptr);
|
||||
REQUIRE(gfx != nullptr);
|
||||
win->setGraphics(gfx);
|
||||
|
||||
WindowSettings s = makeSettings(0, 0);
|
||||
REQUIRE(win->setWindowSettings(s));
|
||||
@@ -300,34 +319,30 @@ TEST_CASE("window.requestAttentionNoCrash") {
|
||||
win->requestAttention(false);
|
||||
}
|
||||
|
||||
TEST_CASE("window.setAndGetIcon") {
|
||||
TEST_CASE("window.setIconRGBA") {
|
||||
eve::window::Window* win = nullptr;
|
||||
eve::graphics::Graphics* gfx = nullptr;
|
||||
openWindow(win, gfx, 320, 240);
|
||||
|
||||
// Window borrows the ImageData pointer, so it must outlive the window.
|
||||
static eve::image::ImageData icon(32, 32, "RGBA8");
|
||||
for (int y = 0; y < 32; ++y)
|
||||
for (int x = 0; x < 32; ++x)
|
||||
icon.setPixel(x, y, eve::image::ImageData::Colorf{1.0f, 0.0f, 0.0f, 1.0f});
|
||||
|
||||
CHECK(win->getIcon() == nullptr);
|
||||
CHECK(win->setIcon(&icon));
|
||||
CHECK(win->getIcon() == &icon);
|
||||
static std::vector<uint8_t> pixels(32 * 32 * 4, 0);
|
||||
for (size_t i = 0; i < pixels.size(); i += 4) {
|
||||
pixels[i] = 255; // R
|
||||
pixels[i + 3] = 255; // A
|
||||
}
|
||||
CHECK(win->setIconRGBA(pixels.data(), 32, 32));
|
||||
|
||||
// Recreating the window (e.g. via setWindowSettings) must re-apply the icon.
|
||||
WindowSettings s = makeSettings(320, 240);
|
||||
REQUIRE(win->setWindowSettings(s));
|
||||
CHECK(win->getHandle() != nullptr);
|
||||
CHECK(win->getIcon() == &icon);
|
||||
|
||||
win->close();
|
||||
}
|
||||
|
||||
TEST_CASE("window.setIconNullFails") {
|
||||
TEST_CASE("window.setIconRGBANullFails") {
|
||||
auto* win = eve::window::Window::create();
|
||||
REQUIRE(win != nullptr);
|
||||
CHECK(!win->setIcon(nullptr));
|
||||
CHECK(!win->setIconRGBA(nullptr, 32, 32));
|
||||
}
|
||||
|
||||
TEST_CASE("window.showMessageBoxOptional") {
|
||||
|
||||
Reference in new issue
Block a user