diff --git a/Source/Editor/Content/Proxy/AssetProxy.cs b/Source/Editor/Content/Proxy/AssetProxy.cs index 6f081c050..67a0704c0 100644 --- a/Source/Editor/Content/Proxy/AssetProxy.cs +++ b/Source/Editor/Content/Proxy/AssetProxy.cs @@ -93,5 +93,25 @@ namespace FlaxEditor.Content public virtual void OnThumbnailDrawCleanup(ThumbnailRequest request) { } + + /// + /// Initializes rendering settings for asset preview drawing for a thumbnail. + /// + /// The asset preview. + protected void InitAssetPreview(Viewport.Previews.AssetPreview preview) + { + preview.RenderOnlyWithWindow = false; + preview.UseAutomaticTaskManagement = false; + preview.AnchorPreset = AnchorPresets.StretchAll; + preview.Offsets = Margin.Zero; + + var task = preview.Task; + task.Enabled = false; + + var eyeAdaptation = preview.PostFxVolume.EyeAdaptation; + eyeAdaptation.Mode = EyeAdaptationMode.None; + eyeAdaptation.OverrideFlags |= EyeAdaptationSettingsOverride.Mode; + preview.PostFxVolume.EyeAdaptation = eyeAdaptation; + } } } diff --git a/Source/Editor/Content/Proxy/CubeTextureProxy.cs b/Source/Editor/Content/Proxy/CubeTextureProxy.cs index fbf75d9f5..d89771b13 100644 --- a/Source/Editor/Content/Proxy/CubeTextureProxy.cs +++ b/Source/Editor/Content/Proxy/CubeTextureProxy.cs @@ -44,19 +44,8 @@ namespace FlaxEditor.Content { if (_preview == null) { - _preview = new CubeTexturePreview(false) - { - RenderOnlyWithWindow = false, - UseAutomaticTaskManagement = false, - AnchorPreset = AnchorPresets.StretchAll, - Offsets = Margin.Zero, - }; - _preview.Task.Enabled = false; - - var eyeAdaptation = _preview.PostFxVolume.EyeAdaptation; - eyeAdaptation.Mode = EyeAdaptationMode.None; - eyeAdaptation.OverrideFlags |= EyeAdaptationSettingsOverride.Mode; - _preview.PostFxVolume.EyeAdaptation = eyeAdaptation; + _preview = new CubeTexturePreview(false); + InitAssetPreview(_preview); } // TODO: disable streaming for asset during thumbnail rendering (and restore it after) diff --git a/Source/Editor/Content/Proxy/MaterialInstanceProxy.cs b/Source/Editor/Content/Proxy/MaterialInstanceProxy.cs index 38faf5b71..663c191ef 100644 --- a/Source/Editor/Content/Proxy/MaterialInstanceProxy.cs +++ b/Source/Editor/Content/Proxy/MaterialInstanceProxy.cs @@ -51,19 +51,8 @@ namespace FlaxEditor.Content { if (_preview == null) { - _preview = new MaterialPreview(false) - { - RenderOnlyWithWindow = false, - UseAutomaticTaskManagement = false, - AnchorPreset = AnchorPresets.StretchAll, - Offsets = Margin.Zero, - }; - _preview.Task.Enabled = false; - - var eyeAdaptation = _preview.PostFxVolume.EyeAdaptation; - eyeAdaptation.Mode = EyeAdaptationMode.None; - eyeAdaptation.OverrideFlags |= EyeAdaptationSettingsOverride.Mode; - _preview.PostFxVolume.EyeAdaptation = eyeAdaptation; + _preview = new MaterialPreview(false); + InitAssetPreview(_preview); } // TODO: disable streaming for dependant assets during thumbnail rendering (and restore it after) diff --git a/Source/Editor/Content/Proxy/MaterialProxy.cs b/Source/Editor/Content/Proxy/MaterialProxy.cs index 8c31bd4c8..e2e74eb14 100644 --- a/Source/Editor/Content/Proxy/MaterialProxy.cs +++ b/Source/Editor/Content/Proxy/MaterialProxy.cs @@ -97,19 +97,8 @@ namespace FlaxEditor.Content { if (_preview == null) { - _preview = new MaterialPreview(false) - { - RenderOnlyWithWindow = false, - UseAutomaticTaskManagement = false, - AnchorPreset = AnchorPresets.StretchAll, - Offsets = Margin.Zero, - }; - _preview.Task.Enabled = false; - - var eyeAdaptation = _preview.PostFxVolume.EyeAdaptation; - eyeAdaptation.Mode = EyeAdaptationMode.None; - eyeAdaptation.OverrideFlags |= EyeAdaptationSettingsOverride.Mode; - _preview.PostFxVolume.EyeAdaptation = eyeAdaptation; + _preview = new MaterialPreview(false); + InitAssetPreview(_preview); } // TODO: disable streaming for dependant assets during thumbnail rendering (and restore it after) diff --git a/Source/Editor/Content/Proxy/ModelProxy.cs b/Source/Editor/Content/Proxy/ModelProxy.cs index 7122bee77..b99d15134 100644 --- a/Source/Editor/Content/Proxy/ModelProxy.cs +++ b/Source/Editor/Content/Proxy/ModelProxy.cs @@ -58,19 +58,8 @@ namespace FlaxEditor.Content { if (_preview == null) { - _preview = new ModelPreview(false) - { - RenderOnlyWithWindow = false, - UseAutomaticTaskManagement = false, - AnchorPreset = AnchorPresets.StretchAll, - Offsets = Margin.Zero, - }; - _preview.Task.Enabled = false; - - var eyeAdaptation = _preview.PostFxVolume.EyeAdaptation; - eyeAdaptation.Mode = EyeAdaptationMode.None; - eyeAdaptation.OverrideFlags |= EyeAdaptationSettingsOverride.Mode; - _preview.PostFxVolume.EyeAdaptation = eyeAdaptation; + _preview = new ModelPreview(false); + InitAssetPreview(_preview); } // TODO: disable streaming for asset during thumbnail rendering (and restore it after) diff --git a/Source/Editor/Content/Proxy/ParticleEmitterProxy.cs b/Source/Editor/Content/Proxy/ParticleEmitterProxy.cs index f10c6cfe1..089c614da 100644 --- a/Source/Editor/Content/Proxy/ParticleEmitterProxy.cs +++ b/Source/Editor/Content/Proxy/ParticleEmitterProxy.cs @@ -52,19 +52,8 @@ namespace FlaxEditor.Content { if (_preview == null) { - _preview = new ParticleEmitterPreview(false) - { - RenderOnlyWithWindow = false, - UseAutomaticTaskManagement = false, - AnchorPreset = AnchorPresets.StretchAll, - Offsets = Margin.Zero, - }; - _preview.Task.Enabled = false; - - var eyeAdaptation = _preview.PostFxVolume.EyeAdaptation; - eyeAdaptation.Mode = EyeAdaptationMode.None; - eyeAdaptation.OverrideFlags |= EyeAdaptationSettingsOverride.Mode; - _preview.PostFxVolume.EyeAdaptation = eyeAdaptation; + _preview = new ParticleEmitterPreview(false); + InitAssetPreview(_preview); } // Mark for initial warmup diff --git a/Source/Editor/Content/Proxy/ParticleSystemProxy.cs b/Source/Editor/Content/Proxy/ParticleSystemProxy.cs index 4d1261232..c19e84a78 100644 --- a/Source/Editor/Content/Proxy/ParticleSystemProxy.cs +++ b/Source/Editor/Content/Proxy/ParticleSystemProxy.cs @@ -83,19 +83,8 @@ namespace FlaxEditor.Content { if (_preview == null) { - _preview = new ParticleEmitterPreview(false) - { - RenderOnlyWithWindow = false, - UseAutomaticTaskManagement = false, - AnchorPreset = AnchorPresets.StretchAll, - Offsets = Margin.Zero, - }; - _preview.Task.Enabled = false; - - var eyeAdaptation = _preview.PostFxVolume.EyeAdaptation; - eyeAdaptation.Mode = EyeAdaptationMode.None; - eyeAdaptation.OverrideFlags |= EyeAdaptationSettingsOverride.Mode; - _preview.PostFxVolume.EyeAdaptation = eyeAdaptation; + _preview = new ParticleEmitterPreview(false); + InitAssetPreview(_preview); } // Mark for initial warmup diff --git a/Source/Editor/Content/Proxy/PrefabProxy.cs b/Source/Editor/Content/Proxy/PrefabProxy.cs index edc4ebba0..9ec143368 100644 --- a/Source/Editor/Content/Proxy/PrefabProxy.cs +++ b/Source/Editor/Content/Proxy/PrefabProxy.cs @@ -94,19 +94,8 @@ namespace FlaxEditor.Content { if (_preview == null) { - _preview = new PrefabPreview(false) - { - RenderOnlyWithWindow = false, - UseAutomaticTaskManagement = false, - AnchorPreset = AnchorPresets.StretchAll, - Offsets = Margin.Zero, - }; - _preview.Task.Enabled = false; - - var eyeAdaptation = _preview.PostFxVolume.EyeAdaptation; - eyeAdaptation.Mode = EyeAdaptationMode.None; - eyeAdaptation.OverrideFlags |= EyeAdaptationSettingsOverride.Mode; - _preview.PostFxVolume.EyeAdaptation = eyeAdaptation; + _preview = new PrefabPreview(false); + InitAssetPreview(_preview); } // TODO: disable streaming for asset during thumbnail rendering (and restore it after) diff --git a/Source/Editor/Content/Proxy/SkinnedModelProxy.cs b/Source/Editor/Content/Proxy/SkinnedModelProxy.cs index 2666b836c..597c69a1d 100644 --- a/Source/Editor/Content/Proxy/SkinnedModelProxy.cs +++ b/Source/Editor/Content/Proxy/SkinnedModelProxy.cs @@ -44,19 +44,8 @@ namespace FlaxEditor.Content { if (_preview == null) { - _preview = new AnimatedModelPreview(false) - { - RenderOnlyWithWindow = false, - UseAutomaticTaskManagement = false, - AnchorPreset = AnchorPresets.StretchAll, - Offsets = Margin.Zero, - }; - _preview.Task.Enabled = false; - - var eyeAdaptation = _preview.PostFxVolume.EyeAdaptation; - eyeAdaptation.Mode = EyeAdaptationMode.None; - eyeAdaptation.OverrideFlags |= EyeAdaptationSettingsOverride.Mode; - _preview.PostFxVolume.EyeAdaptation = eyeAdaptation; + _preview = new AnimatedModelPreview(false); + InitAssetPreview(_preview); } // TODO: disable streaming for asset during thumbnail rendering (and restore it after)