Plat 11607 modular ship assembly by Ikreb1 · Pull Request #62 · carbonengine/trinity

Ikreb1 · 2026-08-13T10:22:41Z

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

The new base class has support "owner", "parent" and "part tag" shared attributes.

Use `UnregisterChild` helper method Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

The new base class has support "owner", "parent" and "part tag" shared attributes.

Use `UnregisterChild` helper method Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

…rbonengine/trinity into space-object-child-base-class

…ip-assembly

… already doing it

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.

…dsphere wasn't being applied

…rs after merge

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.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

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 · 2026-08-19T09:23:30Z

It would be good to start adding documentation for new features

filipppavlov · 2026-08-19T09:17:34Z

+
+
+BLUE_CLASS_IMPL( EveModularObjectModifier );
+class EveModularObjectModifier : public IRoot


Can we move this into a separate file(s)? According to the coding standard, one class per file-ish.

filipppavlov · 2026-08-19T09:18:27Z

+const Be::ClassInfo* EveModularObjectModifier::ExposeToBlue()
+{
+	EXPOSURE_BEGIN( EveModularObjectModifier, "" )
+		MAP_METHOD_AND_WRAP( "AddHull", AddHull, "" );


Missing docstrings

filipppavlov · 2026-08-19T09:21:05Z

+	SetupAudio( BlueCastPtr( placementContainer ), dna, transform );
+
+
+	//SetupInstancedMeshes( newObj, dna, placementOffsets );


Commended code. Maybe add a comment instead that "old-style instanced meshes are not supported here"

filipppavlov · 2026-08-19T09:21:17Z

+		SetupEffects( newObj, (IEveEffectChildrenOwnerPtr)placementContainer, dna, placementOffsets, buildFlags );
+	}
+
+	//SetupCustomMask( newObj, dna );


Same as above

CCPNobody · 2026-08-19T09:22:18Z

+	{
+		std::vector<const EveChildPartData::PartData*> orderedParts;
+		orderedParts.reserve( m_data->m_parts.size() );
+		for( const auto& part : m_data->m_parts )


formatting error!

CCPNobody · 2026-08-19T09:41:14Z

+	SetupAudio( BlueCastPtr( placementContainer ), dna, transform );
+
+
+	//SetupInstancedMeshes( newObj, dna, placementOffsets );


CCPNobody · 2026-08-19T09:41:23Z

+		SetupEffects( newObj, (IEveEffectChildrenOwnerPtr)placementContainer, dna, placementOffsets, buildFlags );
+	}
+
+	//SetupCustomMask( newObj, dna );


CCPNobody · 2026-08-19T09:47:23Z

 			if( owner )
 			{
-				owner->ReplaceHandle( this, &other );
+				owner->ReplaceHandle( &other, this );


this makes me nervous for some reason. Why is this reversed?
Does it have something to do with the fact that the owner and index swap is happening before this call now?
And doesn’t that mean that this and other is the same (value wise)?

filipppavlov and others added 21 commits July 17, 2026 15:25

Refactor IEveSpaceObjectChild interface into a base class

a0d04a0

The new base class has support "owner", "parent" and "part tag" shared attributes.

Add the important files

cf19ad9

Format files

ce89584

Use property to access the part tag

28e6890

Potential fix for pull request finding

3173b93

Use `UnregisterChild` helper method Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Refactor IEveSpaceObjectChild interface into a base class

9384303

The new base class has support "owner", "parent" and "part tag" shared attributes.

Add the important files

98f1653

Format files

d125679

Use property to access the part tag

6fc4d0e

Potential fix for pull request finding

5d1cfe0

Use `UnregisterChild` helper method Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Rebase to main

8d7e70e

Merge branch 'space-object-child-base-class' of https://github.com/ca…

8d7558c

…rbonengine/trinity into space-object-child-base-class

Modular object building wip

af391b2

Transform locators

dad3a52

Merge remote-tracking branch 'origin/main' into PLAT-11607-modular-sh…

b09f06f

…ip-assembly

Merge remote-tracking branch 'origin/main' into PLAT-11607-modular-sh…

2ea14a2

…ip-assembly

unregister child assert allows get parent nullptr as well

7b37392

add invalid part tag for error messages

5c7fd6c

keep locator order on remove

6137ec7

build shapeEllipsoid on modifier deletion like how boundingSphere was…

8588595

… already doing it

apply boundingsphere transform correctly on SetTransform

4aa827e

Copilot AI lite review requested due to automatic review settings August 13, 2026 10:22

Copilot started reviewing on behalf of Ikreb1 August 13, 2026 10:23 View session

Copilot AI reviewed Aug 13, 2026

View reviewed changes

Ikreb1 added 2 commits August 13, 2026 10:34

Set the part tag for the child when adding children

ed89d23

Fix issue where boundingsphere that fully encapsulates a smaller boun…

7f52c36

…dsphere wasn't being applied

phevosccp reviewed Aug 14, 2026

View reviewed changes

Comment thread trinity/Eve/SpaceObjectFactory/EveSOF.cpp

Ikreb1 added 2 commits August 14, 2026 13:28

Merge branch 'main' into PLAT-11607-modular-ship-assembly

d8b67a4

handle layout part tag range support and fix issue with damage locato…

6f2ab51

…rs after merge

Ikreb1 marked this pull request as ready for review August 18, 2026 12:59

apply feedback from copilot review

42e4e49

github-actions Bot previously requested changes Aug 18, 2026

View reviewed changes

Comment thread trinity/Eve/SpaceObject/Utils/EveLocatorSets.cpp Outdated

Comment thread trinity/Eve/SpaceObjectFactory/EveSOF.h Outdated

Update trinity/Eve/SpaceObject/Utils/EveLocatorSets.cpp

38f59ae

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions Bot previously requested changes Aug 18, 2026

View reviewed changes

Comment thread trinity/Eve/SpaceObjectFactory/EveSOF.h Outdated

expland blue class macro to fix clang formatting

d4aef48

remove range based part tag for modular

423bc8f

filipppavlov reviewed Aug 19, 2026

View reviewed changes

CCPNobody reviewed Aug 19, 2026

View reviewed changes



		BLUE_CLASS_IMPL( EveModularObjectModifier );
		class EveModularObjectModifier : public IRoot

		SetupAudio( BlueCastPtr( placementContainer ), dna, transform );


		//SetupInstancedMeshes( newObj, dna, placementOffsets );

Uh oh!

Conversation

Ikreb1 commented Aug 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Cpp-linter Review

Used clang-format v21.1.8

Uh oh!

Uh oh!

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Cpp-linter Review

Used clang-format v21.1.8

Uh oh!

Uh oh!

filipppavlov commented Aug 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Ikreb1 commented Aug 13, 2026 •

edited

Loading

filipppavlov commented Aug 19, 2026 •

edited

Loading