Plat 11607 modular ship assembly

[Ikreb1]

Creating a system for building up a ship or otherwise from components and handling their attachments like locators

[Copilot]

Pull request overview

Adds support for modular ship/space-object assembly by tagging parts, building SOF children as discrete parts, and enabling runtime add/remove/transform operations while keeping instanced meshes and locator sets attributable to the originating part.

Changes:

• Introduces PartTag propagation through locators and shared instanced meshes to track ownership per modular part.
• Adds EveSOF::BuildChild(...) plus related plumbing to build additional hull parts into an existing EveSpaceObject2.
• Adds EveChildPartData + EveModularObjectModifier (and Blue bindings) to create/modify modular objects (add/remove parts, update transforms).

Reviewed changes

Copilot reviewed 14 out of 14 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
trinity/Eve/SpaceObjectFactory/EveSOFDataMgr.h	Extends locator direction data with partTag and forwards it into Locator.
trinity/Eve/SpaceObjectFactory/EveSOF.h	Declares BuildChild and extends SetupLocatorSets to accept an optional partTag.
trinity/Eve/SpaceObjectFactory/EveSOF.cpp	Implements BuildChild, propagates partTag into locators, and adjusts placement/attachment behavior.
trinity/Eve/SpaceObject/Utils/EveLocatorSets.h	Adds partTag to Locator and provides non-const locator list access.
trinity/Eve/SpaceObject/Utils/EveLocatorSets.cpp	Updates structure definition to serialize/reflect partTag and adds non-const accessor impl.
trinity/Eve/SpaceObject/EveSpaceObject2.h	Exposes mutable accessors for effect children and locator sets, plus public bounding-sphere getters.
trinity/Eve/SpaceObject/Children/EveSpaceObjectChild.cpp	Loosens an assertion when unregistering a child with no parent.
trinity/Eve/SpaceObject/Children/EveChildPartData.h	Adds new child type for per-object part bookkeeping and a modular-object modifier API.
trinity/Eve/SpaceObject/Children/EveChildPartData.cpp	Implements modular-object creation/modification (add/remove parts, transform updates, locator cleanup).
trinity/Eve/SpaceObject/Children/EveChildPartData_Blue.cpp	Exposes modular-object APIs to Blue.
trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.h	Extends AddMesh with partTag, adds per-instance part tag storage and removal API.
trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.cpp	Implements part-tag-aware merging and removal of instanced mesh instances.
trinity/Eve/EveInstancedMeshManager.h	Adds move-assignment for DataHandle used by instanced-mesh registration handles.
trinity/CMakeLists.txt	Adds new modular-object source files to the build.

Suppressed comments (1)

trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.cpp:570

• After removing instances, the remaining instances keep their previous sphereIndex values. If removals happen in the middle, sphereIndex can become out-of-range for the resized bounding sphere group, breaking frustum culling/picking.

		mesh.instances.erase( newEnd, end( mesh.instances ) );
		auto newTagEnd = std::remove_if( begin( mesh.partTags ), end( mesh.partTags ), [&]( uint32_t tag ) {
			return tag == partTag;
		} );
		mesh.partTags.erase( newTagEnd, end( mesh.partTags ) );

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[github-actions]

Cpp-linter Review

Used clang-format v21.1.8

Click here for the full clang-format patch

diff --git a/trinity/Eve/SpaceObject/Utils/EveLocatorSets.cpp b/trinity/Eve/SpaceObject/Utils/EveLocatorSets.cpp
index d308673..33be1c0 100644
--- a/trinity/Eve/SpaceObject/Utils/EveLocatorSets.cpp
+++ b/trinity/Eve/SpaceObject/Utils/EveLocatorSets.cpp
@@ -8 +8 @@ static_assert( sizeof( EveSpaceObjectChild::PartTag ) == sizeof( uint32_t ), "Si
-	// locator item definition
+// locator item definition
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOF.h b/trinity/Eve/SpaceObjectFactory/EveSOF.h
index 892b335..367e136 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOF.h
+++ b/trinity/Eve/SpaceObjectFactory/EveSOF.h
@@ -48 +48 @@ public:
-	bool BuildChild( EveSpaceObject2* owner, const char* dnaString, uint32_t partTag, const Matrix& transform, uint32_t& nextPartTag );
+	bool BuildChild( EveSpaceObject2 * owner, const char* dnaString, uint32_t partTag, const Matrix& transform, uint32_t& nextPartTag );

Have any feedback or feature suggestions? Share it here.

outdated suggestion

[github-actions]

Cpp-linter Review

Used clang-format v21.1.8

Click here for the full clang-format patch

diff --git a/trinity/Eve/SpaceObjectFactory/EveSOF.h b/trinity/Eve/SpaceObjectFactory/EveSOF.h
index 892b335..367e136 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOF.h
+++ b/trinity/Eve/SpaceObjectFactory/EveSOF.h
@@ -48 +48 @@ public:
-	bool BuildChild( EveSpaceObject2* owner, const char* dnaString, uint32_t partTag, const Matrix& transform, uint32_t& nextPartTag );
+	bool BuildChild( EveSpaceObject2 * owner, const char* dnaString, uint32_t partTag, const Matrix& transform, uint32_t& nextPartTag );

Have any feedback or feature suggestions? Share it here.

outdated suggestion

[filipppavlov]

It would be good to start adding documentation for new features

[github-actions]

Cpp-linter Review

Used clang-format v21.1.8

Click here for the full clang-format patch

diff --git a/trinity/Eve/SpaceObject/Children/EveChildPartData_Blue.cpp b/trinity/Eve/SpaceObject/Children/EveChildPartData_Blue.cpp
index 6836501..79dfea0 100644
--- a/trinity/Eve/SpaceObject/Children/EveChildPartData_Blue.cpp
+++ b/trinity/Eve/SpaceObject/Children/EveChildPartData_Blue.cpp
@@ -35,8 +35,7 @@ const Be::ClassInfo* EveModularObjectModifier::ExposeToBlue()
-MAP_FUNCTION_AND_WRAP( "CreateModularObject", CreateModularObject,
-	"Creates an empty modular space object and an edit session for it. Returns (object, modifier).\n"
-	"\n"
-	"    obj, mod = trinity.CreateModularObject(sof, 'faction', 'race')\n"
-	"    tag = mod.AddHull('hullname', '', '', pos, rot, scale)  # '' -> seed faction/race\n"
-	"    mod.SetTransform(tag, pos2, rot2, scale2)\n"
-	"    mod.ApplyBounds()  # apply culling bounds after a batch of edits\n"
-	"    mod = None  # end the session (also applies bounds)" );
+MAP_FUNCTION_AND_WRAP( "CreateModularObject", CreateModularObject, "Creates an empty modular space object and an edit session for it. Returns (object, modifier).\n"
+																   "\n"
+																   "    obj, mod = trinity.CreateModularObject(sof, 'faction', 'race')\n"
+																   "    tag = mod.AddHull('hullname', '', '', pos, rot, scale)  # '' -> seed faction/race\n"
+																   "    mod.SetTransform(tag, pos2, rot2, scale2)\n"
+																   "    mod.ApplyBounds()  # apply culling bounds after a batch of edits\n"
+																   "    mod = None  # end the session (also applies bounds)" );

Have any feedback or feature suggestions? Share it here.

outdated suggestion