Skip to content

Turret child object #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ikreb1 wants to merge 21 commits into
base: main
Choose a base branch
from
Open

Turret child object #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
64a8574
first iteration of filling in evechildturret and fix some typoes in e…
Ikreb1 Jul 24, 2026
3565268
fix formatting
Ikreb1 Jul 24, 2026
add33a3
initalize turret variable and setup _blue file and fix compile error
Ikreb1 Jul 27, 2026
2462b9a
add validation guards
Ikreb1 Jul 27, 2026
f82b14d
fix async loading
Ikreb1 Jul 27, 2026
e58b0bf
cleanup more todos
Ikreb1 Jul 27, 2026
34784fe
impact behviour support
Ikreb1 Jul 27, 2026
0cbdbfd
resolve more todos
Ikreb1 Jul 28, 2026
e05dd34
Add posemodifer interface and remove more todos
Ikreb1 Jul 28, 2026
b22b565
more animation setup, play/stop working now
Ikreb1 Jul 28, 2026
e338a31
runtime child init and firingEffectResPath consumption
Ikreb1 Jul 31, 2026
3b3bd27
remove animation clearing fix
Ikreb1 Aug 4, 2026
889e172
revert initalization and stopanimation
Ikreb1 Aug 4, 2026
170bddd
workaround because clang formatter is being weird
Ikreb1 Aug 5, 2026
352c2f7
Fixed animation rotation snapping to default position on animation stop
JohnGreenFC Aug 12, 2026
4f4bd84
Fixed firing effect not spawning on child turret
JohnGreenFC Aug 14, 2026
daf7095
Extracted shared sysbone aiming math into EveTurretAiming
JohnGreenFC Aug 17, 2026
f2f68d1
Fixed aim snapping when firing starts or stops at a locator
JohnGreenFC Aug 19, 2026
fd03872
Merge remote-tracking branch 'origin/main' into turret-child-object
JohnGreenFC Aug 19, 2026
a79e4ad
Potential fix for pull request finding
Ikreb1 Aug 20, 2026
4e2930b
Potential fix for pull request finding
Ikreb1 Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions trinity/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,9 @@ set(_SOURCES
Eve/SpaceObject/Children/EveChildSpherePin_Blue.cpp
Eve/SpaceObject/Children/EveChildTransform.cpp
Eve/SpaceObject/Children/EveChildTransform.cpp
Eve/SpaceObject/Children/EveChildTurret.cpp
Eve/SpaceObject/Children/EveChildTurret.h
Eve/SpaceObject/Children/EveChildTurret_Blue.cpp
Eve/SpaceObject/Children/EveCloudEditableVolume.cpp
Eve/SpaceObject/Children/EveCloudEditableVolume.h
Eve/SpaceObject/Children/EveCloudEditableVolume_Blue.cpp
Expand Down Expand Up @@ -691,6 +694,8 @@ set(_SOURCES
Eve/SpaceObjectFactory/EveSOFDNA_Blue.cpp
Eve/SpaceObjectFactory/EveSOFUtils.cpp
Eve/SpaceObjectFactory/EveSOFUtils.h
Eve/Turret/EveTurretAiming.cpp
Eve/Turret/EveTurretAiming.h
Eve/Turret/EveTurretFiringFX.cpp
Eve/Turret/EveTurretFiringFX.h
Eve/Turret/EveTurretFiringFX_Blue.cpp
Expand Down Expand Up @@ -845,6 +850,7 @@ set(_SOURCES
Include/ITr2InstanceData.h
Include/ITr2Interior.h
Include/ITr2MultiPassScene.h
Include/ITr2PoseModifier.h
Include/ITr2Scene.h
Include/ITr2Updateable.h
Include/ITr2ValueBinding.h
Expand Down
6 changes: 3 additions & 3 deletions trinity/Eve/SpaceObject/Children/EveChildMesh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ BLUE_CLASS( EveChildMesh ) :
void UpdateVisibility( const EveUpdateContext& updateContext, const Matrix& parentTransform, Tr2Lod parentLod );
void GetRenderables( std::vector<ITr2Renderable*> & renderables );
bool GetBoundingSphere( Vector4 & sphere, BoundingSphereQuery query = EVE_BOUNDS_NORMAL ) const;
void UpdateSyncronous( const EveUpdateContext& updateContext, const EveChildUpdateParams& params );
void UpdateAsyncronous( const EveUpdateContext& updateContext, const EveChildUpdateParams& params );
void UpdateSyncronous( const EveUpdateContext& updateContext, const EveChildUpdateParams& params ) override;
void UpdateAsyncronous( const EveUpdateContext& updateContext, const EveChildUpdateParams& params ) override;
void GetLocalToWorldTransform( Matrix & transform ) const;
void ChangeLOD( Tr2Lod lod ) override;
virtual void Setup( const Vector3* scale, const Quaternion* rotation, const Vector3* translation, Tr2Lod lowestLodVisible );
Expand Down Expand Up @@ -210,7 +210,7 @@ BLUE_CLASS( EveChildMesh ) :
virtual void ReleaseResources( TriStorage s );
virtual bool OnPrepareResources();

void InitializeAnimation();
virtual void InitializeAnimation();
bool ShouldReflect() const;

bool DisplayDecals() const;
Expand Down
Loading