izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fracture Editor :

Browse Source 
- Change display column to column mode
- Rename runtime data collectors classes
- Fix issue where collected damage values were invalid
- Added damage threshold and breaking state to runtime data
- Add refresh button to the outliner

#rb none
#jira none
#preflight 629ed9168f61d191c1e99b6b

[CL 20533218 by cedric caillaud in ue5-main branch]
This commit is contained in:
cedric caillaud
2022-06-07 01:41:53 -04:00
parent 5796fcb620
commit 16cae88d4a
9 changed files with 174 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Engine/Source/Runtime/Experimental/GeometryCollectionEngine/Private/GeometryCollection/GeometryCollectionComponent.cpp
View File

@@ -2228,11 +2228,11 @@ void UGeometryCollectionComponent::RegisterAndInitializePhysicsProxy()
CollectorGuid = RunTimeDataCollectionGuid;
if (bEnableRunTimeDataCollection && RestCollection)
{
FCollisionImpulseWatcher::GetInstance().AddCollector(CollectorGuid, RestCollection->NumElements(FGeometryCollection::TransformGroup));
FRuntimeDataCollector::GetInstance().AddCollector(CollectorGuid, RestCollection->NumElements(FGeometryCollection::TransformGroup));
}
else
{
FCollisionImpulseWatcher::GetInstance().RemoveCollector(CollectorGuid);
FRuntimeDataCollector::GetInstance().RemoveCollector(CollectorGuid);
}
#endif
PhysicsProxy = new FGeometryCollectionPhysicsProxy(this, *DynamicCollection, SimulationParameters, InitialSimFilter, InitialQueryFilter, CollectorGuid);
@@ -2244,9 +2244,9 @@ void UGeometryCollectionComponent::RegisterAndInitializePhysicsProxy()
}
#if WITH_EDITORONLY_DATA
const FCollisionImpulseCollector* UGeometryCollectionComponent::GetRunTimeDataCollector() const
const FDamageCollector* UGeometryCollectionComponent::GetRunTimeDataCollector() const
{
return FCollisionImpulseWatcher::GetInstance().Find(RunTimeDataCollectionGuid);
return FRuntimeDataCollector::GetInstance().Find(RunTimeDataCollectionGuid);
}
#endif

4
Engine/Source/Runtime/Experimental/GeometryCollectionEngine/Public/GeometryCollection/GeometryCollectionComponent.h
View File

@@ -35,7 +35,7 @@ class UChaosPhysicalMaterial;
class AChaosSolverActor;
struct FGeometryCollectionEmbeddedExemplar;
class UInstancedStaticMeshComponent;
struct FCollisionImpulseCollector;
struct FDamageCollector;
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnChaosBreakEvent, const FChaosBreakEvent&, BreakEvent);
@@ -710,7 +710,7 @@ public:
#endif
#if WITH_EDITORONLY_DATA
const FCollisionImpulseCollector* GetRunTimeDataCollector() const;
const FDamageCollector* GetRunTimeDataCollector() const;
#endif
// #todo should this only be available in editor?