Skip to content

Refactor IEveSpaceObjectChild interface into a base class #29

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

Draft
filipppavlov wants to merge 13 commits into
base: main
Choose a base branch
from
Draft

Refactor IEveSpaceObjectChild interface into a base class #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a0d04a0
Refactor IEveSpaceObjectChild interface into a base class
filipppavlov Jul 17, 2026
cf19ad9
Add the important files
filipppavlov Jul 20, 2026
ce89584
Format files
filipppavlov Jul 20, 2026
28e6890
Use property to access the part tag
filipppavlov Jul 20, 2026
3173b93
Potential fix for pull request finding
filipppavlov Jul 20, 2026
342fbe5
Rename .cmake files when installing to monolith. They need to match w…
filipppavlov Jul 21, 2026
9384303
Refactor IEveSpaceObjectChild interface into a base class
filipppavlov Jul 17, 2026
98f1653
Add the important files
filipppavlov Jul 20, 2026
d125679
Format files
filipppavlov Jul 20, 2026
6fc4d0e
Use property to access the part tag
filipppavlov Jul 20, 2026
5d1cfe0
Potential fix for pull request finding
filipppavlov Jul 20, 2026
8d7e70e
Rebase to main
filipppavlov Jul 22, 2026
8d7558c
Merge branch 'space-object-child-base-class' of https://github.com/ca…
filipppavlov Jul 22, 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
17 changes: 10 additions & 7 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/EveCloudEditableVolume.cpp
Eve/SpaceObject/Children/EveCloudEditableVolume.h
Eve/SpaceObject/Children/EveCloudEditableVolume_Blue.cpp
Eve/SpaceObject/Children/EveSpaceObjectChild.cpp
Eve/SpaceObject/Children/EveSpaceObjectChild.h
Eve/SpaceObject/Children/EveSpaceObjectChild_Blue.cpp
Comment thread
filipppavlov marked this conversation as resolved.
Eve/SpaceObject/Children/IEveEffectChildrenOwner.h
Eve/SpaceObject/Children/IEveSpaceObjectChild.h
Eve/SpaceObject/Utils/EveDistributionMethods/DistributionAttributeModifiers/EveDistributionModifierProcessLifetime.cpp
Expand Down Expand Up @@ -1846,7 +1849,7 @@ else()
endif()

# utility function that sets properties shared between all trinity targets
function(set_shared_trinity_properties target package_name)
function(set_shared_trinity_properties target)

target_link_libraries(${target}
PUBLIC
Expand Down Expand Up @@ -1935,11 +1938,11 @@ function(set_shared_trinity_properties target package_name)

configure_ccp_vendor_config_file(
TARGET ${target}
DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake"
DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${target}Config.cmake"
DEPENDENCIES ""
)

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake DESTINATION .)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${target}Config.cmake DESTINATION .)
else () # VCPKG install mode

# Install rule to ensure that our runtime and linker files are in the vcpkg structure
Expand Down Expand Up @@ -1981,7 +1984,7 @@ if(WIN32)
)

target_link_libraries(${TRINITY_STUB_TARGET_NAME} PRIVATE TrinityAL_stub)
set_shared_trinity_properties(${TRINITY_STUB_TARGET_NAME} carbon-trinity-stub)
set_shared_trinity_properties(${TRINITY_STUB_TARGET_NAME})
endif()

if(WIN32)
Expand All @@ -1997,7 +2000,7 @@ if(WIN32)
)
#find_package(nvidia-aftermath CONFIG REQUIRED)#Required for dx11
target_link_libraries(${TRINITY_DX11_TARGET_NAME} PRIVATE TrinityAL_dx11)
set_shared_trinity_properties(${TRINITY_DX11_TARGET_NAME} carbon-trinity-dx11)
set_shared_trinity_properties(${TRINITY_DX11_TARGET_NAME})
endif()

if (BUILD_DX12)
Expand All @@ -2011,7 +2014,7 @@ if(WIN32)
TRINITYNAME=_trinity_dx12
)
target_link_libraries(${TRINITY_DX12_TARGET_NAME} PRIVATE TrinityAL_dx12 )
set_shared_trinity_properties(${TRINITY_DX12_TARGET_NAME} carbon-trinity-dx12)
set_shared_trinity_properties(${TRINITY_DX12_TARGET_NAME})
endif()

elseif(APPLE)
Expand All @@ -2026,7 +2029,7 @@ elseif(APPLE)
TRINITY_PLATFORM=TRINITY_METAL
TRINITYNAME=_trinity_metal
)
set_shared_trinity_properties(${TRINITY_METAL_TARGET_NAME} carbon-trinity-metal)
set_shared_trinity_properties(${TRINITY_METAL_TARGET_NAME})
target_link_libraries(${TRINITY_METAL_TARGET_NAME}
PRIVATE
TrinityAL_metal
Expand Down
4 changes: 2 additions & 2 deletions trinity/Controllers/Actions/Tr2ActionChildEffect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "Tr2ActionChildEffect.h"
#include "Controllers/Tr2Controller.h"
#include "Eve/SpaceObject/Children/IEveEffectChildrenOwner.h"
#include "Eve/SpaceObject/Children/IEveSpaceObjectChild.h"
#include "Eve/SpaceObject/Children/EveSpaceObjectChild.h"
#include "Eve/EveMultiEffect.h"
#include "Eve/EveMultiEffectParameter.h"
#include "Eve/Renderable/Stretch/EveStretch3.h"
Expand Down Expand Up @@ -115,7 +115,7 @@ void Tr2ActionChildEffect::Start( ITr2ActionController& controller )
}
if( m_addOnStart && !m_child && !m_path.empty() )
{
m_child = BeResMan->LoadObject<IEveSpaceObjectChild>( m_path.c_str() );
m_child = BeResMan->LoadObject<EveSpaceObjectChild>( m_path.c_str() );
if( m_child )
{
if( !m_childName.empty() )
Expand Down
4 changes: 2 additions & 2 deletions trinity/Controllers/Actions/Tr2ActionChildEffect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "ITr2ControllerAction.h"

BLUE_DECLARE_INTERFACE( IEveSpaceObjectChild );
BLUE_DECLARE( EveSpaceObjectChild );


BLUE_CLASS( Tr2ActionChildEffect ) :
Expand All @@ -21,7 +21,7 @@ BLUE_CLASS( Tr2ActionChildEffect ) :
private:
std::string m_path;
std::string m_childName;
IEveSpaceObjectChildPtr m_child;
EveSpaceObjectChildPtr m_child;
bool m_addOnStart;
bool m_removeOnStop;
BlueSharedString m_targetAnotherOwner;
Expand Down
1 change: 0 additions & 1 deletion trinity/Controllers/Actions/Tr2ActionPlayCurveSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "Curves/TriCurveSet.h"

#include "Eve/SpaceObject/EveSpaceObject2.h"
#include "Eve/SpaceObject/Children/IEveSpaceObjectChild.h"
#include "Eve/EveEffectRoot2.h"


Expand Down
29 changes: 23 additions & 6 deletions trinity/Eve/EveEffectRoot2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,18 @@ EveEffectRoot2::~EveEffectRoot2()
{
controller->Unlink( UnlinkReason::DELETING );
}
for( auto& child : m_effectChildren )
{
child->SetOwner( nullptr );
}
}

bool EveEffectRoot2::Initialize()
{
for( auto& child : m_effectChildren )
{
child->SetOwner( this );
}
for( auto& controller : m_controllers )
{
if( !controller->IsLinked() )
Expand Down Expand Up @@ -113,8 +121,9 @@ void EveEffectRoot2::OnListModified( long event, ssize_t key, ssize_t key2, IRoo
switch( event & BELIST_EVENTMASK )
{
case BELIST_INSERTED:
if( IEveSpaceObjectChildPtr child = BlueCastPtr( value ) )
if( EveSpaceObjectChildPtr child = BlueCastPtr( value ) )
{
child->SetOwner( this );
for( auto it = begin( m_controllerVariables ); it != end( m_controllerVariables ); ++it )
{
child->SetControllerVariable( it->first.c_str(), it->second );
Expand All @@ -137,6 +146,10 @@ void EveEffectRoot2::OnListModified( long event, ssize_t key, ssize_t key2, IRoo
entity->UnRegister( GetComponentRegistry() );
}
}
if( EveSpaceObjectChildPtr child = BlueCastPtr( value ) )
{
child->SetOwner( nullptr );
}
break;
case BELIST_UNLOADSTART:
if( IsInRegistry() )
Expand All @@ -149,6 +162,10 @@ void EveEffectRoot2::OnListModified( long event, ssize_t key, ssize_t key2, IRoo
}
}
}
for( auto& child : m_effectChildren )
{
child->SetOwner( nullptr );
}
default:
break;
}
Expand Down Expand Up @@ -668,7 +685,7 @@ void EveEffectRoot2::GetMissPosition( const Vector3* hit, const Vector3* source,
}

// -----------------------------------------------------------------------------
PIEveSpaceObjectChildVector& EveEffectRoot2::GetChildren()
PEveSpaceObjectChildVector& EveEffectRoot2::GetChildren()
{
return m_effectChildren;
}
Expand Down Expand Up @@ -884,7 +901,7 @@ void EveEffectRoot2::StartControllers()
}

// --------------------------------------------------------------------------------
IEveSpaceObjectChildPtr EveEffectRoot2::GetEffectChildByName( const char* name ) const
EveSpaceObjectChildPtr EveEffectRoot2::GetEffectChildByName( const char* name ) const
{
for( auto it = begin( m_effectChildren ); it != end( m_effectChildren ); ++it )
{
Expand All @@ -898,7 +915,7 @@ IEveSpaceObjectChildPtr EveEffectRoot2::GetEffectChildByName( const char* name )
}

// --------------------------------------------------------------------------------
void EveEffectRoot2::AddToEffectChildrenList( IEveSpaceObjectChild* child )
void EveEffectRoot2::AddToEffectChildrenList( EveSpaceObjectChild* child )
{
if( IsInRegistry() && m_display )
{
Expand All @@ -911,7 +928,7 @@ void EveEffectRoot2::AddToEffectChildrenList( IEveSpaceObjectChild* child )
}

// --------------------------------------------------------------------------------
void EveEffectRoot2::RemoveFromEffectChildrenList( IEveSpaceObjectChild* child )
void EveEffectRoot2::RemoveFromEffectChildrenList( EveSpaceObjectChild* child )
{
auto index = m_effectChildren.FindKey( child );
if( index >= 0 )
Expand All @@ -931,7 +948,7 @@ void EveEffectRoot2::SetShaderOption( const BlueSharedString& name, const BlueSh
{
for( auto it = m_effectChildren.begin(); it != m_effectChildren.end(); ++it )
{
IEveSpaceObjectChild* child = *it;
EveSpaceObjectChild* child = *it;
child->SetShaderOption( name, value );
}
}
Expand Down
12 changes: 6 additions & 6 deletions trinity/Eve/EveEffectRoot2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "EveTransform.h"
#include "EveLODHelper.h"
#include "IEveSpaceObject2.h"
#include "Eve/SpaceObject/Children/IEveSpaceObjectChild.h"
#include "Eve/SpaceObject/Children/EveSpaceObjectChild.h"
#include "Eve/SpaceObject/Children/IEveEffectChildrenOwner.h"
#include "Tr2ShLightingManager.h"
#include "Include/ITriTargetable.h"
Expand Down Expand Up @@ -134,9 +134,9 @@ BLUE_CLASS( EveEffectRoot2 ) :

/////////////////////////////////////////////////////////////////////////////////////
// IEveEffectChildrenOwner
IEveSpaceObjectChildPtr GetEffectChildByName( const char* name ) const;
void AddToEffectChildrenList( IEveSpaceObjectChild * child );
void RemoveFromEffectChildrenList( IEveSpaceObjectChild * child );
EveSpaceObjectChildPtr GetEffectChildByName( const char* name ) const;
void AddToEffectChildrenList( EveSpaceObjectChild * child );
void RemoveFromEffectChildrenList( EveSpaceObjectChild * child );
void SetShaderOption( const BlueSharedString& name, const BlueSharedString& value ) override;

/////////////////////////////////////////////////////////////////////////////////////
Expand All @@ -160,7 +160,7 @@ BLUE_CLASS( EveEffectRoot2 ) :
void Start();
void Stop();

PIEveSpaceObjectChildVector& GetChildren();
PEveSpaceObjectChildVector& GetChildren();

void SetTransform( const Matrix& transform );

Expand Down Expand Up @@ -204,7 +204,7 @@ BLUE_CLASS( EveEffectRoot2 ) :
std::string m_name;
bool m_display;
bool m_mute;
PIEveSpaceObjectChildVector m_effectChildren;
PEveSpaceObjectChildVector m_effectChildren;

Vector3 m_scaling;
Quaternion m_rotation;
Expand Down
Loading