Merge remote-tracking branch 'origin/gi'
# Conflicts: # Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp
This commit is contained in:
@@ -864,6 +864,11 @@ API_ENUM() enum class ViewMode
|
||||
/// Draw Global Surface Atlas preview.
|
||||
/// </summary>
|
||||
GlobalSurfaceAtlas = 25,
|
||||
|
||||
/// <summary>
|
||||
/// Draw Global Illumination debug preview (eg. irradiance probes).
|
||||
/// </summary>
|
||||
GlobalIllumination = 26,
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -16,7 +16,6 @@ Quality Graphics::ShadowMapsQuality = Quality::Medium;
|
||||
bool Graphics::AllowCSMBlending = false;
|
||||
Quality Graphics::GlobalSDFQuality = Quality::High;
|
||||
Quality Graphics::GIQuality = Quality::High;
|
||||
int32 Graphics::GlobalSurfaceAtlasResolution = 2048;
|
||||
PostProcessSettings Graphics::PostProcessSettings;
|
||||
|
||||
#if GRAPHICS_API_NULL
|
||||
|
||||
@@ -63,11 +63,6 @@ public:
|
||||
/// </summary>
|
||||
API_FIELD() static Quality GIQuality;
|
||||
|
||||
/// <summary>
|
||||
/// The Global Surface Atlas resolution. Adjust it if atlas `flickers` due to overflow.
|
||||
/// </summary>
|
||||
API_FIELD() static int32 GlobalSurfaceAtlasResolution;
|
||||
|
||||
/// <summary>
|
||||
/// The default Post Process settings. Can be overriden by PostFxVolume on a level locally, per camera or for a whole map.
|
||||
/// </summary>
|
||||
|
||||
@@ -502,7 +502,7 @@ void MaterialParameter::Bind(BindMeta& meta) const
|
||||
GlobalSignDistanceFieldPass::BindingData bindingData;
|
||||
if (GlobalSignDistanceFieldPass::Instance()->Get(meta.Buffers, bindingData))
|
||||
Platform::MemoryClear(&bindingData, sizeof(bindingData));
|
||||
bindingData.BindCascades(meta.Context, _registerIndex);
|
||||
meta.Context->BindSR(_registerIndex, bindingData.Texture ? bindingData.Texture->ViewVolume() : nullptr);
|
||||
*((GlobalSignDistanceFieldPass::ConstantsData*)(meta.Constants.Get() + _offset)) = bindingData.Constants;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -333,7 +333,7 @@ API_STRUCT() struct FLAXENGINE_API GlobalIlluminationSettings : ISerializable
|
||||
/// Defines how quickly GI blends between the the current frame and the history buffer. Lower values update GI faster, but with more jittering and noise. If the camera in your game doesn't move much, we recommend values closer to 1.
|
||||
/// </summary>
|
||||
API_FIELD(Attributes="EditorOrder(20), Limit(0, 1), PostProcessSetting((int)GlobalIlluminationSettingsOverride.TemporalResponse)")
|
||||
float TemporalResponse = 0.8f;
|
||||
float TemporalResponse = 0.9f;
|
||||
|
||||
/// <summary>
|
||||
/// Draw distance of the Global Illumination effect. Scene outside the range will use fallback irradiance.
|
||||
|
||||
Reference in New Issue
Block a user