feat: allow multiple filters to be bound to the same pass (#293)

Closes: #289
bdunderscore · Jul 28, 2024 · d322161 · d322161
1 parent b5a6505
commit d322161
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - [#287] Added PublishedValue class
 - [#288] Added support for passing ObjectRegistry to IRenderFilter
+- [#289] Added support for binding multiple render filters to a single pass
 
 ### Fixed
 - [#283] Cached proxy objects are visible after exiting play mode 

diff --git a/Editor/API/Fluent/Sequence/Sequence.cs b/Editor/API/Fluent/Sequence/Sequence.cs
@@ -1,6 +1,5 @@
 #region
 
-using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using nadena.dev.ndmf.model;
@@ -52,15 +51,13 @@ internal DeclaringPass(SolverPass pass, SolverContext solverContext, BuildPhase
             _seq = seq;
         }
 
-        public DeclaringPass PreviewingWith(IRenderFilter filter)
+        public DeclaringPass PreviewingWith(params IRenderFilter[] filters)
         {
-            if (_pass.RenderFilter != null)
+            foreach (var filter in filters)
             {
-                throw new InvalidOperationException("Render filter already set");
+                _pass.RenderFilters.Add(filter);
             }
 
-            _pass.RenderFilter = filter;
-
             return this;
         }
 

diff --git a/Editor/API/Model/SolverPass.cs b/Editor/API/Model/SolverPass.cs
@@ -1,6 +1,7 @@
 #region
 
 using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using nadena.dev.ndmf.preview;
 
@@ -23,7 +24,7 @@ internal class SolverPass
 
         internal IImmutableSet<Type> RequiredExtensions { get; set; }
         internal IImmutableSet<string> CompatibleExtensions { get; set; }
-        internal IRenderFilter RenderFilter { get; set; }
+        internal List<IRenderFilter> RenderFilters { get; } = new();
 
         internal bool IsExtensionCompatible(Type ty)
         {

diff --git a/Editor/API/Solver/PluginResolver.cs b/Editor/API/Solver/PluginResolver.cs
@@ -199,9 +199,9 @@ ImmutableList<ConcretePass> ToConcretePasses(BuildPhase phase, IEnumerable<Solve
                 concrete.Add(new ConcretePass(pass.Plugin, pass.Pass, toDeactivate.ToImmutableList(),
                     toActivate.ToImmutableList()));
 
-                if (pass.RenderFilter != null)
+                foreach (var filter in pass.RenderFilters)
                 {
-                    PreviewSession.AddMutator(new SequencePoint(), pass.RenderFilter);
+                    PreviewSession.AddMutator(new SequencePoint(), filter);
                 }
             }