[Rendering] EffectSystem: Remove dependency to Game class and move Ef…

…fectCompilationMode in the same namespace
stride3d · Feb 15, 2019 · 0cc2134 · 0cc2134
1 parent 9b11625
commit 0cc2134
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/sources/engine/Xenko.Engine/Engine/Game.cs b/sources/engine/Xenko.Engine/Engine/Game.cs
@@ -372,6 +372,11 @@ protected override void Initialize()
             // If requested in game settings, compile effects remotely and/or notify new shader requests
             EffectSystem.Compiler = EffectSystem.CreateEffectCompiler(Content.FileProvider, EffectSystem, Settings?.PackageName, Settings?.EffectCompilation ?? EffectCompilationMode.Local, Settings?.RecordUsedEffects ?? false);
 
+            // Setup shader compiler settings from a compilation mode. 
+            // TODO: We might want to provide overrides on the GameSettings to specify debug and/or optim level specifically.
+            if (Settings != null)
+                EffectSystem.SetCompilationMode(Settings.CompilationMode);
+
             GameSystems.Add(EffectSystem);
 
             GameSystems.Add(Streaming);

diff --git a/sources/engine/Xenko.Engine/Rendering/EffectSystem.cs b/sources/engine/Xenko.Engine/Rendering/EffectSystem.cs
@@ -7,12 +7,8 @@
 using System.Threading.Tasks;
 using Xenko.Core;
 using Xenko.Core.Diagnostics;
-using Xenko.Core.Extensions;
 using Xenko.Core.IO;
 using Xenko.Core.ReferenceCounting;
-using Xenko.Core.Serialization.Contents;
-using Xenko.Engine;
-using Xenko.Engine.Design;
 using Xenko.Games;
 using Xenko.Graphics;
 using Xenko.Shaders;
@@ -79,13 +75,11 @@ public override void Initialize()
             directoryWatcher.Modified += FileModifiedEvent;
             // TODO: xkfx too
 #endif
+        }
 
-            // Setup shader compiler settings from a compilation mode. 
-            // TODO: We might want to provide overrides on the GameSettings to specify debug and/or optim level specifically.
-            if (Game != null && (((Game)Game).Settings != null))
-            {
-                effectCompilerParameters.ApplyCompilationMode(((Game)Game).Settings.CompilationMode);
-            }
+        public void SetCompilationMode(CompilationMode compilationMode)
+        {
+            effectCompilerParameters.ApplyCompilationMode(compilationMode);
         }
 
         protected override void Destroy()