Harden mergeMeshes by preparing candidates and improving diagnostics#300
Merged
tracygardner merged 1 commit intomainfrom Feb 15, 2026
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
mergeMeshesshould normalize candidate meshes the same wayintersectMeshesdoes so composite/child-only meshes and non-indexed geometry are handled reliably.Description
flockCSG.mergeMeshes(modelId, meshList)to run each candidate throughprepareMeshForCSGbefore further checks and skipped meshes that returnnullwith a mesh-name warning viaconsole.warn.nullwhen none remain, and return/clone the single prepared mesh when exactly one remains (preserving metadata andblockKey) without entering the CSG add loop.flock.BABYLON.CSG2.FromMesh(...)call (base mesh and each additional mesh) in targetedtry/catchblocks that log which mesh failed conversion before re-throwing to trigger fallback cleanup.BABYLON.Mesh.MergeMeshespath and ensured it only receives prepared meshes.tests/materials.test.jscovering:single simple meshmerge,multiple valid meshesmerge,one valid + one composite/child-onlymerge, andone valid + one invalid mesh(asserts warning and a valid result). Files changed:api/csg.js,tests/materials.test.js.Testing
tests/materials.test.jsfor the four scenarios described above (tests present but not fully executed here).node --check api/csg.jsandnode --check tests/materials.test.jswhich succeeded.npm run test:api materialsbut it failed in this environment because Playwright’s Chromium browser binary is not installed (npx playwright installrequired), so browser-based tests could not be executed here.Codex Task