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

Merge remote-tracking branch 'origin/gi' into large-worlds

Browse Source 
# Conflicts:
#	Source/Engine/Graphics/PostProcessSettings.cpp
#	Source/Engine/Level/Actors/SkyLight.cpp
#	Source/Engine/Renderer/GBufferPass.cpp
#	Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp
#	Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp
#	Source/Engine/Renderer/GlobalSignDistanceFieldPass.h
#	Source/Engine/Renderer/RenderList.h
This commit is contained in:
Wojtek Figat
2022-06-13 00:46:33 +02:00
parent bc65057eb7 d4839b9c78
commit e43515f653
53 changed files with 2309 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Editor/CustomEditors/Dedicated/PostProcessSettingsEditor.cs
View File

@@ -110,6 +110,25 @@ namespace FlaxEditor.CustomEditors.Dedicated
}
}
/// <summary>
/// Editor for <see cref="GlobalIlluminationSettings"/> type.
/// </summary>
[CustomEditor(typeof(GlobalIlluminationSettings)), DefaultEditor]
sealed class GlobalIlluminationSettingsEditor : PostProcessSettingsEditor
{
/// <inheritdoc />
protected override int OverrideFlags
{
get => (int)((GlobalIlluminationSettings)Values[0]).OverrideFlags;
set
{
var settings = (GlobalIlluminationSettings)Values[0];
settings.OverrideFlags = (GlobalIlluminationSettingsOverride)value;
SetValue(settings);
}
}
}
/// <summary>
/// Editor for <see cref="BloomSettings"/> type.
/// </summary>