Skip to content

Visibility options to SOF hullControllers #86

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
ccpHenry wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Visibility options to SOF hullControllers #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a106f48
Set Granny Deprication level to not stop on gr2 assertions
ccpHenry Sep 2, 2026
274cefd
Revert "Set Granny Deprication level to not stop on gr2 assertions"
ccpHenry Sep 2, 2026
4d754e7
visibility group options for controllers
ccpHenry Sep 8, 2026
b581978
Merge branch 'carbonengine:main' into main
ccpHenry Sep 8, 2026
c361c8a
small new formatting fix
ccpHenry Sep 8, 2026
4762424
Merge branch 'main' of https://github.com/ccpHenry/trinity
ccpHenry Sep 8, 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
5 changes: 5 additions & 0 deletions trinity/Eve/SpaceObjectFactory/EveSOF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2232,6 +2232,11 @@ void EveSOF::SetupControllers( ITr2ControllerOwnerPtr owner, const EveSOFDNAPtr
continue;
}

if( !dna->IsInVisibilityData( cit->visibilityGroup ) )
{
continue;
}

if( auto controller = BeResMan->LoadObject<ITr2Controller>( cit->path.c_str() ) )
{
owner->AddController( controller );
Expand Down
5 changes: 5 additions & 0 deletions trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,11 @@ EveSOFDataRaceDamage::EveSOFDataRaceDamage( IRoot* lockobj ) :
{
}

EveSOFDataHullController::EveSOFDataHullController( IRoot* lockobj ) :
m_visibilityGroup( PRIMARY_VISIBILITY_GROUP )
{
}


std::string EveSOFDataHullController::GetName() const
{
Expand Down
6 changes: 6 additions & 0 deletions trinity/Eve/SpaceObjectFactory/EveSOFData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,8 +1493,14 @@ BLUE_CLASS( EveSOFDataHullController ) :
public:
EXPOSE_TO_BLUE();

EveSOFDataHullController( IRoot* lockobj = NULL );
~EveSOFDataHullController()
{
}

std::string GetName() const;

BlueSharedString m_visibilityGroup;
std::string m_path;
uint32_t m_buildFilter = EveSOFDataHullBuildFilter::DEFAULT_FILTER;
};
Expand Down
4 changes: 3 additions & 1 deletion trinity/Eve/SpaceObjectFactory/EveSOFDataMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,9 @@ void EveSOFDataMgr::GenerateHullData( HullData& hd, EveSOFDataHullPtr srcData )
hd.controllers.clear();
for( auto cit = begin( srcData->m_controllers ); cit != end( srcData->m_controllers ); ++cit )
{
hd.controllers.push_back( { BlueSharedString( ( *cit )->m_path ), ( *cit )->m_buildFilter } );
std::string visGroupName( ( *cit )->m_visibilityGroup.c_str() );
uint32_t visibilityGroup = CcpHashFNV1( visGroupName.c_str(), visGroupName.size() );
hd.controllers.push_back( { BlueSharedString( ( *cit )->m_path ), ( *cit )->m_buildFilter, visibilityGroup } );
}

// model curves
Expand Down
1 change: 1 addition & 0 deletions trinity/Eve/SpaceObjectFactory/EveSOFDataMgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,7 @@ BLUE_CLASS( EveSOFDataMgr ) :
{
BlueSharedString path;
uint32_t buildFilter;
uint32_t visibilityGroup;
};

struct HullData
Expand Down
3 changes: 2 additions & 1 deletion trinity/Eve/SpaceObjectFactory/EveSOFData_Blue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,8 @@ const Be::ClassInfo* EveSOFDataHullController::ExposeToBlue(){
":jessica-file-filter: redfile",
Be::READWRITE | Be::PERSIST )
MAP_ATTRIBUTE_WITH_CHOOSER( "buildFilter", m_buildFilter, "", Be::READWRITE | Be::PERSIST, EveSOFDataHullBuildFilterChooser )
EXPOSURE_END()
MAP_ATTRIBUTE( "visibilityGroup", m_visibilityGroup, ":jessica-widget: visibilitygroup", Be::READWRITE | Be::PERSIST )
EXPOSURE_END()
}


Expand Down