GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Remove unused LodProxyView feature from RenderContext (shadow projections are using the same draw batch as main view now)"

Browse Source 
This reverts commit c33fe04645.
This commit is contained in:
Wojtek Figat
2022-11-26 20:37:04 +01:00
parent bdb27fef1b
commit 39dc439cd8
6 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Engine/Graphics/RenderTask.h
View File

@@ -426,6 +426,11 @@ API_STRUCT(NoDefault) struct RenderContext
/// </summary>
API_FIELD() SceneRenderTask* Task = nullptr;
/// <summary>
/// The proxy render view used to synchronize objects level of detail during rendering (eg. during shadow maps rendering passes). It's optional.
/// </summary>
API_FIELD() RenderView* LodProxyView = nullptr;
/// <summary>
/// The render view.
/// </summary>

6
Source/Engine/Graphics/RenderTools.cpp
View File

@@ -441,7 +441,8 @@ float RenderTools::ComputeBoundsScreenRadiusSquared(const Float3& origin, float
int32 RenderTools::ComputeModelLOD(const Model* model, const Float3& origin, float radius, const RenderContext& renderContext)
{
const float screenRadiusSquared = ComputeBoundsScreenRadiusSquared(origin, radius, renderContext.View) * renderContext.View.ModelLODDistanceFactorSqrt;
const auto lodView = (renderContext.LodProxyView ? renderContext.LodProxyView : &renderContext.View);
const float screenRadiusSquared = ComputeBoundsScreenRadiusSquared(origin, radius, *lodView) * renderContext.View.ModelLODDistanceFactorSqrt;
// Check if model is being culled
if (Math::Square(model->MinScreenSize * 0.5f) > screenRadiusSquared)
@@ -465,7 +466,8 @@ int32 RenderTools::ComputeModelLOD(const Model* model, const Float3& origin, flo
int32 RenderTools::ComputeSkinnedModelLOD(const SkinnedModel* model, const Float3& origin, float radius, const RenderContext& renderContext)
{
const float screenRadiusSquared = ComputeBoundsScreenRadiusSquared(origin, radius, renderContext.View) * renderContext.View.ModelLODDistanceFactorSqrt;
const auto lodView = (renderContext.LodProxyView ? renderContext.LodProxyView : &renderContext.View);
const float screenRadiusSquared = ComputeBoundsScreenRadiusSquared(origin, radius, *lodView) * renderContext.View.ModelLODDistanceFactorSqrt;
// Check if model is being culled
if (Math::Square(model->MinScreenSize * 0.5f) > screenRadiusSquared)

3
Source/Engine/Graphics/RenderView.cpp
View File

@@ -55,6 +55,7 @@ void RenderView::Prepare(RenderContext& renderContext)
}
renderContext.List->Init(renderContext);
renderContext.LodProxyView = nullptr;
PrepareCache(renderContext, width, height, taaJitter);
}
@@ -73,7 +74,7 @@ void RenderView::PrepareCache(const RenderContext& renderContext, float width, f
WorldPosition = Origin + Position;
// Ortho views have issues with screen size LOD culling
const float modelLODDistanceFactor = IsOrthographicProjection() ? 100.0f : ModelLODDistanceFactor;
const float modelLODDistanceFactor = (renderContext.LodProxyView ? renderContext.LodProxyView->IsOrthographicProjection() : IsOrthographicProjection()) ? 100.0f : ModelLODDistanceFactor;
ModelLODDistanceFactorSqrt = modelLODDistanceFactor * modelLODDistanceFactor;
// Setup main view render info

3
Source/Engine/Level/Actors/Decal.cpp
View File

@@ -75,7 +75,8 @@ void Decal::Draw(RenderContext& renderContext)
Material->IsLoaded() &&
Material->IsDecal())
{
const float screenRadiusSquared = RenderTools::ComputeBoundsScreenRadiusSquared(_sphere.Center - renderContext.View.Origin, (float)_sphere.Radius, renderContext.View) * renderContext.View.ModelLODDistanceFactorSqrt;
const auto lodView = (renderContext.LodProxyView ? renderContext.LodProxyView : &renderContext.View);
const float screenRadiusSquared = RenderTools::ComputeBoundsScreenRadiusSquared(_sphere.Center - renderContext.View.Origin, (float)_sphere.Radius, *lodView) * renderContext.View.ModelLODDistanceFactorSqrt;
// Check if decal is being culled
if (Math::Square(DrawMinScreenSize * 0.5f) > screenRadiusSquared)

3
Source/Engine/Renderer/ShadowsPass.cpp
View File

@@ -193,6 +193,9 @@ void ShadowsPass::SetupRenderContext(RenderContext& renderContext, RenderContext
{
const auto& view = renderContext.View;
// Use the current render view to sync model LODs with the shadow maps rendering stage
shadowContext.LodProxyView = &renderContext.View;
// Prepare properties
auto& shadowView = shadowContext.View;
shadowView.Flags = view.Flags;

3
Source/Engine/Terrain/TerrainChunk.cpp
View File

@@ -44,7 +44,8 @@ bool TerrainChunk::PrepareDraw(const RenderContext& renderContext)
const float chunkEdgeSize = (_patch->_terrain->_chunkSize * TERRAIN_UNITS_PER_VERTEX);
// Calculate chunk distance to view
const float distance = Float3::Distance(_boundsCenter - renderContext.View.Origin, renderContext.View.Position);
const auto lodView = (renderContext.LodProxyView ? renderContext.LodProxyView : &renderContext.View);
const float distance = Float3::Distance(_boundsCenter - lodView->Origin, lodView->Position);
lod = (int32)Math::Pow(distance / chunkEdgeSize, lodDistribution);
lod += lodBias;