Turret child object by Ikreb1 · Pull Request #47 · carbonengine/trinity

Ikreb1 · 2026-08-04T14:03:14Z

No description provided.

…veturretset and update clang format to never wrap

Copilot

Pull request overview

This PR introduces an EveChildTurret space-object child implementation and adds supporting animation hooks/APIs to enable turret-specific pose modification and animation stopping behavior, along with a few related fixes and build/config updates.

Changes:

Add EveChildTurret (new child type) with firing/tracking state logic, Blue exposure, and cached geometry/animation integration.
Add ITr2PoseModifier and integrate it into Tr2GrannyAnimation so external components can modify a sampled CMF pose (e.g., turret tracking bone edits).
Add StopAnimations(delay) to animation layers / updater and expose it to Blue; plus minor comment/spelling and formatting/config updates.

Reviewed changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
trinity/Tr2GrannyAnimationLayer.h	Adds `StopAnimations(delay)` API to the layer interface.
trinity/Tr2GrannyAnimationLayer.cpp	Implements `StopAnimations(delay)` and ensures finished CMF animations are removed.
trinity/Tr2GrannyAnimation.h	Adds pose-modifier plumbing (`ITr2PoseModifier*`) and `StopAnimations(delay)` on the updater.
trinity/Tr2GrannyAnimation.cpp	Wires `StopAnimations` to the base layer and calls pose modifier during CMF pose sampling.
trinity/Tr2GrannyAnimation_Blue.cpp	Exposes `StopAnimations(delay)` to Blue.
trinity/Include/ITr2PoseModifier.h	New interface for skeletal pose modification.
trinity/Eve/Turret/EveTurretTarget.h	Adds `SetImpactBehaviour` API.
trinity/Eve/Turret/EveTurretTarget.cpp	Implements `SetImpactBehaviour` and reuses it from `SetBehaviour`.
trinity/Eve/Turret/EveTurretSet.cpp	Comment spelling fixes (and minor documentation cleanups).
trinity/Eve/SpaceObject/EveSpaceObject2.cpp	Initializes runtime-inserted children that implement `IInitialize`.
trinity/Eve/SpaceObject/Children/EveChildTurret.h	New turret child declaration; implements `ITr2PoseModifier`.
trinity/Eve/SpaceObject/Children/EveChildTurret.cpp	New turret child implementation: state machine, firing FX, tracking pose edits, animation control.
trinity/Eve/SpaceObject/Children/EveChildTurret_Blue.cpp	Blue exposure for `EveChildTurret` API and attributes.
trinity/Eve/SpaceObject/Children/EveChildMesh.h	Adds `override` markers for update methods; makes `InitializeAnimation()` virtual.
trinity/CMakeLists.txt	Adds new source/header files to the build.
.clang-format	Sets ObjC `ColumnLimit: 0` with rationale comment to avoid unwanted wrapping.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@@ -0,0 +1,19 @@
+// Copyright © 2026 Fenris Creations ehf.


+					if( int closestLocator = m_target->FindClosestLocator( &source, &position ) )
+					{
+						if( closestLocator != m_target->GetLocator() )
+						{
+							// Set up the firing states correctly
+							SetupFiringState();
+						}
+					}


 					GrannyColumnMatrixMultiply4x3Transpose(
 						(granny_real32*)( (granny_matrix_3x4*)m_boneTransforms.get() )[i],
-						(granny_real32*)m_meshSkeleton->Bones[meshToBone[i]].InverseWorld4x4,
+						(granny_real32*)m_meshSkeleton -> Bones[meshToBone[i]].InverseWorld4x4,


+		MAP_METHOD_AND_WRAP(
+			"GetFiringBoneWorldTransform",
+			GetFiringBoneWorldTransform,
+			"Returns the world transform matrix of the specfified firing bone in the currently firing turret."


Ikreb1 · 2026-08-05T10:34:25Z


 // --------------------------------------------------------------------------------
 // Description:
-//   Initialize data members, set everything to inlavid/empty and call


This has been spun out into their own PR and ill be merging it in and this should get removed once you updated latest on main when that other PR is in

Ikreb1 · 2026-08-05T10:34:31Z

+# Kept at 0 to match the Cpp section: some tools (e.g. CLion's ClangFormat
+# integration) misclassify C++ .h files as ObjC and would otherwise re-wrap
+# lines at the column limit.
+ColumnLimit: 0


This has been spun out into their own PR and ill be merging it in and this should get removed once you updated latest on main when that other PR is in

Ikreb1 · 2026-08-05T10:35:04Z

 	bool PlayAnimation( const Tr2GrannyAnimation* grannyAnimation, const char* animName, bool replace, int loopCount, float delay, float speed, bool clearWhenDone );
 	void QueueAnimation( const char* animName, bool replace, int loopCount, float delay, float speed, bool clearWhenDone );
 	void EndAnimation();
+	void StopAnimations( float delay );


blue optional for the delay is something i wanted to do

Ikreb1 · 2026-08-05T10:37:30Z

 }
 #endif

+void Tr2GrannyAnimationLayer::StopAnimations( float delay )


this is buggy and spins the turret around if there is no animation set, works fine in the turret class as it does stop -> nextanimation

Ikreb1 · 2026-08-05T10:37:49Z

 			ClearAnimations,
 			"ClearAnimations()\n\n"
 			"Abruptly ends all animations." )
+		MAP_METHOD_AND_WRAP(


blue optional for the delay parameter maybe?

Ikreb1 · 2026-08-05T10:39:08Z


+			if( m_poseModifier )
+			{
+				m_poseModifier->ModifyPose( skeleton, m_pose );


still not super sure what this does, but it was needed from eveturretset which had its own animation handling logic

Ikreb1 · 2026-08-05T10:39:57Z


 	// hit/miss
 	void SetBehaviour( bool laserMiss, bool projectileMiss, float impactSize, ImpactBehaviour::Type impactBehaviour );
+	void SetImpactBehaviour( float impactSize, ImpactBehaviour::Type impactBehaviour );


didnt need lasermiss and projectilemiss in evechildturret so split into two functions

Ikreb1 · 2026-08-05T10:40:43Z

@@ -0,0 +1,182 @@
+// Copyright © 2026 Fenris Creations ehf.
+
+#pragma once


mostly a copy of eveturretset but simplified greatly and inherits from evechildmesh

Ikreb1 · 2026-08-05T10:41:20Z

just needed inheritance logic, simple as

…ping (carbonengine#47) Co-authored-by: rebecca <1+rebecca@noreply.localhost>

Ikreb1 added 11 commits July 24, 2026 16:19

first iteration of filling in evechildturret and fix some typoes in e…

64a8574

…veturretset and update clang format to never wrap

fix formatting

3565268

initalize turret variable and setup _blue file and fix compile error

add33a3

add validation guards

2462b9a

fix async loading

f82b14d

cleanup more todos

e58b0bf

impact behviour support

34784fe

resolve more todos

0cbdbfd

Add posemodifer interface and remove more todos

e05dd34

more animation setup, play/stop working now

b22b565

runtime child init and firingEffectResPath consumption

e338a31

Copilot AI review requested due to automatic review settings August 4, 2026 14:03

Copilot started reviewing on behalf of Ikreb1 August 4, 2026 14:03 View session

remove animation clearing fix

3b3bd27

Copilot AI reviewed Aug 4, 2026

View reviewed changes

Ikreb1 added 2 commits August 4, 2026 14:50

revert initalization and stopanimation

889e172

workaround because clang formatter is being weird

170bddd

Ikreb1 commented Aug 5, 2026

View reviewed changes

Comment thread trinity/Eve/SpaceObject/Children/EveChildMesh.h

Ikreb1 Aug 5, 2026

Copy link
Copy Markdown

Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just needed inheritance logic, simple as

berkeleynerd pushed a commit to berkeleynerd/trinity that referenced this pull request Aug 9, 2026

Replay B10/B36: validate complete HDR composition and client tone map…

5c842ba

…ping (carbonengine#47) Co-authored-by: rebecca <1+rebecca@noreply.localhost>

Navigation Menu

Uh oh!

Turret child object - #47

Turret child object#47
Ikreb1 wants to merge 14 commits into
mainfrom
turret-child-object

Ikreb1 commented Aug 4, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Ikreb1 Aug 5, 2026

Uh oh!

Ikreb1 Aug 5, 2026

Uh oh!

Ikreb1 Aug 5, 2026

Uh oh!

Ikreb1 Aug 5, 2026

Uh oh!

Ikreb1 Aug 5, 2026

Uh oh!

Ikreb1 Aug 5, 2026

Uh oh!

Ikreb1 Aug 5, 2026

Uh oh!

Ikreb1 Aug 5, 2026

Uh oh!

Ikreb1 Aug 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		@@ -0,0 +1,182 @@
		// Copyright © 2026 Fenris Creations ehf.

		#pragma once

Uh oh!

Conversation

Ikreb1 commented Aug 4, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

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!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants