Skip to content

InstancedMeshManager crash fixes #112

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
ccp-intern wants to merge 2 commits into
base: main
Choose a base branch
from
+51 −4
Open

InstancedMeshManager crash fixes #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a87e84
fixes for isntancedmeshmanager
ccp-intern Sep 30, 2026
3787007
Merge branch 'main' into instancedmeshmanager-fixes
ccp-intern Sep 30, 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
48 changes: 46 additions & 2 deletions trinity/Eve/EveInstancedMeshManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,38 @@ ITriRenderBatchAccumulator* FindBatchAccumulator( const T& batches, TriBatchType
}
}

EveInstancedMeshManager::~EveInstancedMeshManager()
{
for( auto& [key, mesh] : m_meshInstances )
{
for( auto& group : mesh.meshGroups )
{
if( group.handle )
{
group.handle->index = MeshGroupHandle::InvalidIndex;
group.handle->owner = nullptr;
}
}
}

for( auto& [data, handle] : m_perObjectData )
{
if( handle )
{
handle->index = PerObjectDataHandle::InvalidIndex;
handle->owner = nullptr;
}
}

for( auto& group : m_sphereGroups )
{
if( group.handle )
{
group.handle->index = BoundingSphereHandle::InvalidIndex;
group.handle->owner = nullptr;
}
}
}

void EveInstancedMeshManager::CollectMeshes( EveComponentRegistry& registry )
{
Expand Down Expand Up @@ -811,16 +843,22 @@ void EveInstancedMeshManager::GetPickingBatches( EvePendingPickingReadback& read
{
continue;
}
InstanceBuffer::Allocation allocation = AllocateInstanceData( uint32_t( meshInfo.lodIndices[lod].size() ), mesh.isDynamic );
UploadLodData( mesh, meshInfo, lod, allocation );

auto lodData = mesh.geometry->GetMeshLod( mesh.meshIndex, int( lod ) );
if( !lodData || !lodData->m_allocationsValid )
{
continue;
}

auto primCount = GetPrimitiveCount( *lodData, mesh.areaIndex, mesh.areaCount );
if( !primCount )
{
continue;
}

InstanceBuffer::Allocation allocation = AllocateInstanceData( uint32_t( meshInfo.lodIndices[lod].size() ), mesh.isDynamic );
UploadLodData( mesh, meshInfo, lod, allocation );

uint32_t stride = uint32_t( mesh.isDynamic ? sizeof( DynamicPerInstanceBufferElement ) : sizeof( StaticPerInstanceBufferElement ) );

Tr2RenderBatch batch;
Expand Down Expand Up @@ -905,10 +943,16 @@ size_t EveInstancedMeshManager::GetBatches( const std::initializer_list<std::pai
}

auto lodData = mesh.geometry->GetMeshLod( mesh.meshIndex, int( lod ) );
if( !lodData || !lodData->m_allocationsValid )
{
instanceOffset += static_cast<uint32_t>( meshInfo.lodIndices[lod].size() );
continue;
}

auto primCount = GetPrimitiveCount( *lodData, mesh.areaIndex, mesh.areaCount );
if( !primCount )
{
instanceOffset += static_cast<uint32_t>( meshInfo.lodIndices[lod].size() );
continue;
}

Expand Down
4 changes: 3 additions & 1 deletion trinity/Eve/EveInstancedMeshManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ BLUE_DECLARE( Tr2GpuStructuredBuffer );
class EveInstancedMeshManager
{
public:
~EveInstancedMeshManager();

struct InstanceFlags
{
void AddBatchType( TriBatchType type );
Expand Down Expand Up @@ -226,7 +228,7 @@ class EveInstancedMeshManager
{
std::vector<MeshGroup> meshGroups;

Tr2Effect* material = nullptr;
Tr2EffectPtr material = nullptr;
float radius = 0.0f;
float maxScreenSize = 0.0f;
uint32_t totalVisibleInstances = 0;
Expand Down
3 changes: 2 additions & 1 deletion trinity/Eve/SpaceObject/Children/EveChildInstancedMeshes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ EveChildInstancedMeshes::EveChildInstancedMeshes( IRoot* lockobj )

EveChildInstancedMeshes::~EveChildInstancedMeshes()
{
UnregisterFromMeshManager();
for( Mesh& mesh : m_meshes )
{
if( mesh.geometry )
Expand Down Expand Up @@ -735,7 +736,7 @@ void EveChildInstancedMeshes::AddMeshesToManager( EveInstancedMeshManager& manag
{
UnregisterFromMeshManager();
}
if( m_allRegistered )
if( m_allRegistered && m_perObjectDataHandle )
{
return;
}
Expand Down
Loading