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

Fixes to NiagaraLightRenderer

Browse Source 
-skip generation of dynamic data if we're not using deferred shading
-make it draw relevant so that they will actually render without relying on other renderers
#rb stu.mckenna

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: rob.krajcarski
#ROBOMERGE-SOURCE: CL 13055364 via CL 13055367 via CL 13055374 via CL 13055379
#ROBOMERGE-BOT: NETWORKING (Main -> Dev-Networking) (v686-13045012)

[CL 13099275 by rob krajcarski in Dev-Networking branch]
This commit is contained in:
rob krajcarski
2020-04-29 22:27:47 -04:00
parent ae2959b2f4
commit 63413392d6
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Engine/Plugins/FX/Niagara/Source/Niagara/Private/NiagaraRendererLights.cpp
View File

@@ -28,24 +28,31 @@ struct FNiagaraDynamicDataLights : public FNiagaraDynamicDataBase
FNiagaraRendererLights::FNiagaraRendererLights(ERHIFeatureLevel::Type FeatureLevel, const UNiagaraRendererProperties *InProps, const FNiagaraEmitterInstance* Emitter)
: FNiagaraRenderer(FeatureLevel, InProps, Emitter)
{
// todo - for platforms where we know we can't support deferred shading we can just set this to false
bHasLights = true;
}
FPrimitiveViewRelevance FNiagaraRendererLights::GetViewRelevance(const FSceneView* View, const FNiagaraSceneProxy *SceneProxy)const
{
FPrimitiveViewRelevance Result;
Result.bDrawRelevance = false;
Result.bDrawRelevance = bHasLights;
Result.bShadowRelevance = false;
Result.bDynamicRelevance = false;
Result.bOpaque = false;
Result.bHasSimpleLights = true;
//MaterialRelevance.SetPrimitiveViewRelevance(Result);
Result.bHasSimpleLights = bHasLights;
return Result;
}
/** Update render data buffer from attributes */
FNiagaraDynamicDataBase* FNiagaraRendererLights::GenerateDynamicData(const FNiagaraSceneProxy* Proxy, const UNiagaraRendererProperties* InProperties, const FNiagaraEmitterInstance* Emitter) const
{
// particle (simple) lights are only supported with deferred shading
if (!bHasLights || Proxy->GetScene().GetShadingPath() != EShadingPath::Deferred)
{
return nullptr;
}
SCOPE_CYCLE_COUNTER(STAT_NiagaraGenLights);
//Bail if we don't have the required attributes to render this emitter.
@@ -99,7 +106,8 @@ FNiagaraDynamicDataBase* FNiagaraRendererLights::GenerateDynamicData(const FNiag
float LightRadius = RadiusAccessor.GetSafe(ParticleIndex, DefaultRadius) * Properties->RadiusScale;
if (ShouldRenderParticleLight && LightRadius > 0)
{
SimpleLightData LightData;
SimpleLightData& LightData = DynamicData->LightArray.AddDefaulted_GetRef();
LightData.LightEntry.Radius = LightRadius;
LightData.LightEntry.Color = FVector(ColAccessor.GetSafe(ParticleIndex, DefaultColor)) + Properties->ColorAdd;
LightData.LightEntry.Exponent = Properties->bUseInverseSquaredFalloff ? 0 : ExponentAccessor.GetSafe(ParticleIndex, 1.0f);
@@ -110,8 +118,6 @@ FNiagaraDynamicDataBase* FNiagaraRendererLights::GenerateDynamicData(const FNiag
{
LightData.PerViewEntry.Position = LocalToWorldMatrix.TransformPosition(LightData.PerViewEntry.Position);
}
DynamicData->LightArray.Add(LightData);
}
}
@@ -120,15 +126,14 @@ FNiagaraDynamicDataBase* FNiagaraRendererLights::GenerateDynamicData(const FNiag
void FNiagaraRendererLights::GatherSimpleLights(FSimpleLightArray& OutParticleLights)const
{
FNiagaraDynamicDataLights* DynamicData = (FNiagaraDynamicDataLights*)DynamicDataRender;
if (DynamicData)
if (const FNiagaraDynamicDataLights* DynamicData = static_cast<const FNiagaraDynamicDataLights*>(DynamicDataRender))
{
int32 LightCount = DynamicData->LightArray.Num();
const int32 LightCount = DynamicData->LightArray.Num();
OutParticleLights.InstanceData.Reserve(OutParticleLights.InstanceData.Num() + LightCount);
OutParticleLights.PerViewData.Reserve(OutParticleLights.PerViewData.Num() + LightCount);
for (FNiagaraRendererLights::SimpleLightData &LightData : DynamicData->LightArray)
for (const FNiagaraRendererLights::SimpleLightData &LightData : DynamicData->LightArray)
{
// When not using camera-offset, output one position for all views to share.
OutParticleLights.PerViewData.Add(LightData.PerViewEntry);