update

FluidGroup · May 28, 2024 · b9a4fe9 · b9a4fe9
1 parent c5851c4
commit b9a4fe9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/Dev/Sources/SwiftUIDemo/DemoFilterView.swift b/Dev/Sources/SwiftUIDemo/DemoFilterView.swift
@@ -8,9 +8,6 @@ import UIKit
 struct DemoFilterView: View {
 
   struct InvertFilter: Filtering {
-
-    let key: FilterKey = .init(rawValue: String(describing: InvertFilter.self))
-
     func apply(to image: CIImage, sourceImage: CIImage) -> CIImage {
       image
         .applyingFilter("CIColorInvert")
@@ -37,9 +34,9 @@ struct DemoFilterView: View {
         .onChange(of: toggle) { newValue in
           editingStack.set(filters: {
             if newValue {
-              $0.additionalFilters[invertFilter.key] = invertFilter.asAny()
+              $0.additionalFilters = [invertFilter.asAny()]
             } else {
-              $0.additionalFilters[invertFilter.key] = nil
+              $0.additionalFilters = []
             }
           })
         }

diff --git a/Sources/BrightroomEngine/Core/EditingStack.Edit.swift b/Sources/BrightroomEngine/Core/EditingStack.Edit.swift
@@ -67,7 +67,7 @@ extension EditingStack {
       public var vignette: FilterVignette?
       public var fade: FilterFade?
 
-      public var additionalFilters: [FilterKey : AnyFilter] = [:]
+      public var additionalFilters: [AnyFilter] = []
 
       func makeFilters() -> [AnyFilter] {
         return (
@@ -95,7 +95,7 @@ extension EditingStack {
             vignette?.asAny(),
 
           ] as [AnyFilter?])
-          + Array(additionalFilters.values)
+          + additionalFilters
         )
         .compactMap { $0 }
       }

diff --git a/Sources/BrightroomEngine/Core/Filtering.swift b/Sources/BrightroomEngine/Core/Filtering.swift
@@ -32,16 +32,6 @@ enum RadiusCalculator {
   }
 }
 
-public struct FilterKey: Hashable {
-
-  public let rawValue: String
-
-  public init(rawValue: String) {
-    self.rawValue = rawValue
-  }
-
-}
-
 public protocol Filtering: Hashable {
 
   func apply(to image: CIImage, sourceImage: CIImage) -> CIImage