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

Force primitiive uniform buffer update on the frame after a primitive is moved, since the uniform buffer contains PreviousLocalToWorld

Browse Source 
#rb Krzyzstof
#jira UE-69831

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: daniel.wright
#ROBOMERGE-SOURCE: CL 5072629 in //UE4/Release-4.22/... via CL 5072635
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5137238 by daniel wright in Dev-Anim branch]
This commit is contained in:
daniel wright
2019-02-22 04:20:11 -05:00
parent 94ef53fc80
commit ffcf145baa
2 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Engine/Source/Runtime/Renderer/Private/RendererScene.cpp
View File

@@ -1180,7 +1180,7 @@ void FScene::UpdatePrimitiveTransform_RenderThread(FRHICommandListImmediate& RHI
// (note that the octree update relies on the bounds not being modified yet).
PrimitiveSceneInfo->RemoveFromScene(bUpdateStaticDrawLists);
VelocityData.UpdateTransform(PrimitiveSceneInfo->PrimitiveComponentId, LocalToWorld, PrimitiveSceneProxy->GetLocalToWorld());
VelocityData.UpdateTransform(PrimitiveSceneInfo, LocalToWorld, PrimitiveSceneProxy->GetLocalToWorld());
if (GWarningOnRedundantTransformUpdate && PrimitiveSceneProxy->WouldSetTransformBeRedundant(LocalToWorld, WorldBounds, LocalBounds, AttachmentRootPosition))
{
@@ -2251,6 +2251,32 @@ bool FScene::GetPreviousLocalToWorld(const FPrimitiveSceneInfo* PrimitiveSceneIn
return VelocityData.GetComponentPreviousLocalToWorld(PrimitiveSceneInfo->PrimitiveComponentId, OutPreviousLocalToWorld);
}
void FSceneVelocityData::StartFrame(FScene* Scene)
{
InternalFrameIndex++;
const bool bTrimOld = InternalFrameIndex % 100 == 0;
for (TMap<FPrimitiveComponentId, FComponentVelocityData>::TIterator It(ComponentData); It; ++It)
{
FComponentVelocityData& VelocityData = It.Value();
VelocityData.PreviousLocalToWorld = VelocityData.LocalToWorld;
VelocityData.bPreviousLocalToWorldValid = true;
if (InternalFrameIndex - VelocityData.LastFrameUpdated == 1)
{
// Recreate PrimitiveUniformBuffer on the frame after the primitive moved, since it contains PreviousLocalToWorld
VelocityData.PrimitiveSceneInfo->SetNeedsUniformBufferUpdate(true);
AddPrimitiveToUpdateGPU(*Scene, VelocityData.PrimitiveSceneInfo->GetIndex());
}
if (bTrimOld && (InternalFrameIndex - VelocityData.LastFrameUsed) > 10)
{
It.RemoveCurrent();
}
}
}
void FScene::GetPrimitiveUniformShaderParameters_RenderThread(const FPrimitiveSceneInfo* PrimitiveSceneInfo, bool& bHasPrecomputedVolumetricLightmap, FMatrix& PreviousLocalToWorld, int32& SingleCaptureIndex) const
{
bHasPrecomputedVolumetricLightmap = VolumetricLightmapSceneData.HasData();

29
Engine/Source/Runtime/Renderer/Private/ScenePrivate.h
View File

@@ -2140,9 +2140,11 @@ class FComponentVelocityData
{
public:
FPrimitiveSceneInfo* PrimitiveSceneInfo;
FMatrix LocalToWorld;
FMatrix PreviousLocalToWorld;
mutable uint64 LastFrameUsed;
uint64 LastFrameUpdated;
bool bPreviousLocalToWorldValid = false;
};
@@ -2156,24 +2158,7 @@ public:
/**
* Must be called once per frame, even when there are multiple BeginDrawingViewports.
*/
void StartFrame()
{
InternalFrameIndex++;
const bool bTrimOld = InternalFrameIndex % 100 == 0;
for (TMap<FPrimitiveComponentId, FComponentVelocityData>::TIterator It(ComponentData); It; ++It)
{
FComponentVelocityData& VelocityData = It.Value();
VelocityData.PreviousLocalToWorld = VelocityData.LocalToWorld;
VelocityData.bPreviousLocalToWorldValid = true;
if (bTrimOld && (InternalFrameIndex - VelocityData.LastFrameUsed) > 10)
{
It.RemoveCurrent();
}
}
}
void StartFrame(FScene* Scene);
/**
* Looks up the PreviousLocalToWorld state for the given component. Returns false if none is found (the primitive has never been moved).
@@ -2196,11 +2181,13 @@ public:
/**
* Updates a primitives current LocalToWorld state.
*/
void UpdateTransform(FPrimitiveComponentId PrimitiveComponentId, FMatrix LocalToWorld, FMatrix PreviousLocalToWorld)
void UpdateTransform(FPrimitiveSceneInfo* PrimitiveSceneInfo, FMatrix LocalToWorld, FMatrix PreviousLocalToWorld)
{
FComponentVelocityData& VelocityData = ComponentData.FindOrAdd(PrimitiveComponentId);
FComponentVelocityData& VelocityData = ComponentData.FindOrAdd(PrimitiveSceneInfo->PrimitiveComponentId);
VelocityData.LocalToWorld = LocalToWorld;
VelocityData.LastFrameUsed = InternalFrameIndex;
VelocityData.LastFrameUpdated = InternalFrameIndex;
VelocityData.PrimitiveSceneInfo = PrimitiveSceneInfo;
// If this transform state is newly added, use the passed in PreviousLocalToWorld for this frame
if (!VelocityData.bPreviousLocalToWorldValid)
@@ -2847,7 +2834,7 @@ public:
virtual void StartFrame() override
{
VelocityData.StartFrame();
VelocityData.StartFrame(this);
}
virtual uint32 GetFrameNumber() const override