From a106f48fbff985d75406add11e90ff21245ef0c1 Mon Sep 17 00:00:00 2001 From: ccpHenry <153081976+ccpHenry@users.noreply.github.com> Date: Wed, 2 Sep 2026 14:46:25 +0000 Subject: [PATCH 1/4] Set Granny Deprication level to not stop on gr2 assertions --- trinity/Resources/TriGeometryRes.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trinity/Resources/TriGeometryRes.cpp b/trinity/Resources/TriGeometryRes.cpp index fc5472ad6..ef9ebc9cd 100644 --- a/trinity/Resources/TriGeometryRes.cpp +++ b/trinity/Resources/TriGeometryRes.cpp @@ -24,7 +24,7 @@ std::atomic AudioGeometryResData::s_nextId{ 1 }; bool g_eveIsAudioOcclusionGeometryEnabled = false; TRI_REGISTER_SETTING( "eveIsAudioOcclusionGeometryEnabled", g_eveIsAudioOcclusionGeometryEnabled ); -int g_grannyDeprecationLevel = (int)GrannyDeprecationLevel::LOG_ERROR_AND_ASSERT; +int g_grannyDeprecationLevel = (int)GrannyDeprecationLevel::DO_NOTHING; TRI_REGISTER_SETTING( "grannyDeprecationLevel", g_grannyDeprecationLevel ); CCP_STATS_DECLARE( geometryResBytes, "Trinity/geometryResBytes", false, CST_MEMORY, "Size of memory occupied by geometry resources." ); From 274cefd221be41c38b013f7153abd5eca4b6f0cc Mon Sep 17 00:00:00 2001 From: ccpHenry <153081976+ccpHenry@users.noreply.github.com> Date: Wed, 2 Sep 2026 15:42:03 +0000 Subject: [PATCH 2/4] Revert "Set Granny Deprication level to not stop on gr2 assertions" This reverts commit a106f48fbff985d75406add11e90ff21245ef0c1. --- trinity/Resources/TriGeometryRes.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trinity/Resources/TriGeometryRes.cpp b/trinity/Resources/TriGeometryRes.cpp index ef9ebc9cd..fc5472ad6 100644 --- a/trinity/Resources/TriGeometryRes.cpp +++ b/trinity/Resources/TriGeometryRes.cpp @@ -24,7 +24,7 @@ std::atomic AudioGeometryResData::s_nextId{ 1 }; bool g_eveIsAudioOcclusionGeometryEnabled = false; TRI_REGISTER_SETTING( "eveIsAudioOcclusionGeometryEnabled", g_eveIsAudioOcclusionGeometryEnabled ); -int g_grannyDeprecationLevel = (int)GrannyDeprecationLevel::DO_NOTHING; +int g_grannyDeprecationLevel = (int)GrannyDeprecationLevel::LOG_ERROR_AND_ASSERT; TRI_REGISTER_SETTING( "grannyDeprecationLevel", g_grannyDeprecationLevel ); CCP_STATS_DECLARE( geometryResBytes, "Trinity/geometryResBytes", false, CST_MEMORY, "Size of memory occupied by geometry resources." ); From 4d754e720d3bcaddbb6bb9bdb54e6b0bbecff736 Mon Sep 17 00:00:00 2001 From: ccpHenry <153081976+ccpHenry@users.noreply.github.com> Date: Tue, 8 Sep 2026 15:07:05 +0000 Subject: [PATCH 3/4] visibility group options for controllers --- trinity/Eve/SpaceObjectFactory/EveSOF.cpp | 5 +++++ trinity/Eve/SpaceObjectFactory/EveSOFData.cpp | 5 +++++ trinity/Eve/SpaceObjectFactory/EveSOFData.h | 4 ++++ trinity/Eve/SpaceObjectFactory/EveSOFDataMgr.cpp | 4 +++- trinity/Eve/SpaceObjectFactory/EveSOFDataMgr.h | 1 + trinity/Eve/SpaceObjectFactory/EveSOFData_Blue.cpp | 3 ++- 6 files changed, 20 insertions(+), 2 deletions(-) diff --git a/trinity/Eve/SpaceObjectFactory/EveSOF.cpp b/trinity/Eve/SpaceObjectFactory/EveSOF.cpp index 8502a7362..9ac21cabb 100644 --- a/trinity/Eve/SpaceObjectFactory/EveSOF.cpp +++ b/trinity/Eve/SpaceObjectFactory/EveSOF.cpp @@ -2232,6 +2232,11 @@ void EveSOF::SetupControllers( ITr2ControllerOwnerPtr owner, const EveSOFDNAPtr continue; } + if( !dna->IsInVisibilityData( cit->visibilityGroup ) ) + { + continue; + } + if( auto controller = BeResMan->LoadObject( cit->path.c_str() ) ) { owner->AddController( controller ); diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp index a5db8bd82..34ce01072 100644 --- a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp +++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp @@ -297,6 +297,11 @@ EveSOFDataRaceDamage::EveSOFDataRaceDamage( IRoot* lockobj ) : { } +EveSOFDataHullController::EveSOFDataHullController( IRoot* lockobj ) : + m_visibilityGroup( PRIMARY_VISIBILITY_GROUP ) +{ +} + std::string EveSOFDataHullController::GetName() const { diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.h b/trinity/Eve/SpaceObjectFactory/EveSOFData.h index 279a4aa31..73ed57545 100644 --- a/trinity/Eve/SpaceObjectFactory/EveSOFData.h +++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.h @@ -1493,8 +1493,12 @@ 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; }; diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFDataMgr.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFDataMgr.cpp index a59788bcd..c84a6af1e 100644 --- a/trinity/Eve/SpaceObjectFactory/EveSOFDataMgr.cpp +++ b/trinity/Eve/SpaceObjectFactory/EveSOFDataMgr.cpp @@ -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 diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFDataMgr.h b/trinity/Eve/SpaceObjectFactory/EveSOFDataMgr.h index 1fc58063b..39842cc09 100644 --- a/trinity/Eve/SpaceObjectFactory/EveSOFDataMgr.h +++ b/trinity/Eve/SpaceObjectFactory/EveSOFDataMgr.h @@ -526,6 +526,7 @@ BLUE_CLASS( EveSOFDataMgr ) : { BlueSharedString path; uint32_t buildFilter; + uint32_t visibilityGroup; }; struct HullData diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue.cpp index c39490f72..2247faf8b 100644 --- a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue.cpp +++ b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue.cpp @@ -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() } From c361c8a8635da486b304cf8d847837f284ad13dd Mon Sep 17 00:00:00 2001 From: ccpHenry <153081976+ccpHenry@users.noreply.github.com> Date: Tue, 8 Sep 2026 15:45:50 +0000 Subject: [PATCH 4/4] small new formatting fix --- trinity/Eve/SpaceObjectFactory/EveSOFData.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.h b/trinity/Eve/SpaceObjectFactory/EveSOFData.h index 73ed57545..4f7d1134f 100644 --- a/trinity/Eve/SpaceObjectFactory/EveSOFData.h +++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.h @@ -1494,7 +1494,9 @@ BLUE_CLASS( EveSOFDataHullController ) : EXPOSE_TO_BLUE(); EveSOFDataHullController( IRoot* lockobj = NULL ); - ~EveSOFDataHullController() {} + ~EveSOFDataHullController() + { + } std::string GetName() const;