Skip to content

Turret child object - #47

Open
Ikreb1 wants to merge 21 commits into
mainfrom
turret-child-object
Open

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

Conversation

@Ikreb1

@Ikreb1 Ikreb1 commented Aug 4, 2026

Copy link
Copy Markdown
Member

No description provided.

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

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

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.

Comment thread trinity/Include/ITr2PoseModifier.h Outdated
Comment on lines +169 to +176
if( int closestLocator = m_target->FindClosestLocator( &source, &position ) )
{
if( closestLocator != m_target->GetLocator() )
{
// Set up the firing states correctly
SetupFiringState();
}
}
Comment thread trinity/Tr2GrannyAnimation.cpp Outdated
Comment thread trinity/Eve/SpaceObject/Children/EveChildTurret_Blue.cpp Outdated
Comment thread trinity/Eve/Turret/EveTurretSet.cpp Outdated
Comment thread .clang-format
Comment thread trinity/Tr2GrannyAnimationLayer.h
Comment thread trinity/Tr2GrannyAnimationLayer.cpp
Comment thread trinity/Tr2GrannyAnimation_Blue.cpp
Comment thread trinity/Tr2GrannyAnimation.cpp
Comment thread trinity/Eve/Turret/EveTurretTarget.h
Comment thread trinity/Eve/SpaceObject/Children/EveChildTurret.h
Comment thread trinity/Eve/SpaceObject/Children/EveChildMesh.h
berkeleynerd pushed a commit to berkeleynerd/trinity that referenced this pull request Aug 9, 2026
…ping (carbonengine#47)

Co-authored-by: rebecca <1+rebecca@noreply.localhost>
@ccpgames-carbon

ccpgames-carbon commented Aug 14, 2026

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

JohnGreenFC and others added 5 commits August 17, 2026 12:50
# Conflicts:
#	trinity/Eve/Turret/EveTurretSet.cpp
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@Ikreb1
Ikreb1 marked this pull request as ready for review August 20, 2026 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants