Skip to content

Fix entity validation #4

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

Merged
adsk-truscad merged 1 commit into from
Jun 8, 2026
Merged

Fix entity validation #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 16 additions & 9 deletions Plugins/GolaemPlugin/Source/CrowdModule/Private/GolaemCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1658,8 +1658,15 @@ void AGolaemCache::RefreshCharacters()
glm::PODArray<int> cacheCharacterToBoneCount;
for (uint32_t iEntity = 0; iEntity < simuData->_entityCount; iEntity++)
{
if (!glm::crowdio::isEntityValid(simuData, iEntity))
{
continue;
}

if (cacheCharacterToBoneCount.size() <= simuData->_characterIdx[iEntity])
{
cacheCharacterToBoneCount.resize(simuData->_characterIdx[iEntity] + 1, -1);
}

cacheCharacterToBoneCount[simuData->_characterIdx[iEntity]] = simuData->_boneCount[simuData->_entityTypes[iEntity]];
}
Expand Down Expand Up @@ -1691,10 +1698,8 @@ void AGolaemCache::RefreshCharacters()
bool collapseCacheInOutliner = false;
for (uint32_t simDataEntityIdx = 0, entityCount = simuData->_entityCount; simDataEntityIdx < entityCount; ++simDataEntityIdx)
{
int64_t entityId = simuData->_entityIds[simDataEntityIdx];
if (entityId < 0)
if (!glm::crowdio::isEntityValid(simuData, simDataEntityIdx))
{
// entity was probably killed
continue;
}

Expand Down Expand Up @@ -1812,12 +1817,11 @@ void AGolaemCache::LoadFrameData(int crowdFieldIndex, bool bInitSimuShader, bool
// not optimized, look for each actor by crowdEntityId
for (uint32_t simDataEntityIdx = 0, entityCount = simuData->_entityCount; simDataEntityIdx < entityCount; ++simDataEntityIdx)
{
int64_t entityId = simuData->_entityIds[simDataEntityIdx];
if (entityId < 0)
if (!glm::crowdio::isEntityValid(simuData, simDataEntityIdx))
{
// entity was probably killed
continue;
}
int64_t entityId = simuData->_entityIds[simDataEntityIdx];
for (int iChildChar = 0; iChildChar < allChildCharacters.Num(); iChildChar++)
{
if (allChildCharacters[iChildChar]->CrowdEntityId == entityId)
Expand Down Expand Up @@ -2434,11 +2438,14 @@ bool AGolaemCache::GetBoneSpaceTransforms_AnyThread(int simulationIndex, int ent
USkeletalMeshComponent* SkelMeshComp = currentChar->GetSkeletalMeshComponent();
USkeletalMesh* skelMesh = SkelMeshComp->SkeletalMesh;

int64_t entityId = simuData->_entityIds[entityIndex];

TArray<FTransform> ComponentSpaceTransforms;

if (entityId != -1 && frameData->_entityEnabled[entityIndex] == 1 && !currentChar->IsHidden())
if (!glm::crowdio::isEntityValid(simuData, entityIndex))
{
return false;
}

if (frameData->_entityEnabled[entityIndex] == 1 && !currentChar->IsHidden())
{
unsigned int entityType = simuData->_entityTypes[entityIndex];

Expand Down
16 changes: 8 additions & 8 deletions Plugins/GolaemPlugin/Source/CrowdModule/Private/GolaemSimulation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "HAL/PlatformFilemanager.h"
#include "Engine/StaticMesh.h"
#include "StaticMeshResources.h"
#include "Components/StaticMeshComponent.h"
#include "Materials/MaterialInstanceDynamic.h"
#include "Misc/ConfigCacheIni.h"
#include "AssetRegistry/AssetData.h"
Expand Down Expand Up @@ -65,7 +64,7 @@ int exportLibraryItem(const char* filePath, const char* libraryName, const char*
if (!fileOutput.good())
return -1;

// buid json item
// build json item
fileOutput << "{";
fileOutput << "\n \"libFile\": \"\",";
fileOutput << "\n \"libFileDirty\": true,";
Expand Down Expand Up @@ -616,10 +615,8 @@ void AGolaemSimulation::InitSimulation()

for (uint32_t simDataEntityIdx = 0, entityCount = simulationData->_entityCount; simDataEntityIdx < entityCount; ++simDataEntityIdx)
{
int64_t entityId = simulationData->_entityIds[simDataEntityIdx];
if (entityId < 0)
if (!glm::crowdio::isEntityValid(simulationData, simDataEntityIdx))
{
// entity was probably killed
continue;
}

Expand Down Expand Up @@ -778,11 +775,14 @@ bool AGolaemSimulation::GetBoneSpaceTransforms_AnyThread(int simulationIndex, in
USkeletalMeshComponent* SkelMeshComp = currentChar->GetSkeletalMeshComponent();
USkeletalMesh* skelMesh = SkelMeshComp->SkeletalMesh;

int64_t entityId = simulationData->_entityIds[entityCacheIndex];

TArray<FTransform> ComponentSpaceTransforms;

if (entityId != -1 && frameData->_entityEnabled[entityCacheIndex] == 1)
if (!glm::crowdio::isEntityValid(simulationData, entityCacheIndex))
{
return false;
}

if (frameData->_entityEnabled[entityCacheIndex] == 1)
{
unsigned int entityType = simulationData->_entityTypes[entityCacheIndex];

Expand Down