Skip to content

Commit 8ecc938

Browse files
committed
Merge branch 'master' of github.com:BradLarson/GPUImage3
2 parents 8aed354 + 283dac4 commit 8ecc938

File tree

21 files changed

+1979
-61
lines changed

21 files changed

+1979
-61
lines changed

examples/Mac/FilterShowcase/FilterShowcase/FilterOperations.swift

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@ let filterOperations: Array<FilterOperationInterface> = [
5656
},
5757
filterOperationType:.singleInput
5858
),
59-
// FilterOperation(
60-
// filter:{RGBAdjustment()},
61-
// listName:"RGB",
62-
// titleName:"RGB",
63-
// sliderConfiguration:.enabled(minimumValue:0.0, maximumValue:2.0, initialValue:1.0),
64-
// sliderUpdateCallback: {(filter, sliderValue) in
65-
// filter.green = sliderValue
66-
// },
67-
// filterOperationType:.singleInput
68-
// ),
59+
FilterOperation(
60+
filter:{RGBAdjustment()},
61+
listName:"RGB",
62+
titleName:"RGB",
63+
sliderConfiguration:.enabled(minimumValue:0.0, maximumValue:2.0, initialValue:1.0),
64+
sliderUpdateCallback: {(filter, sliderValue) in
65+
filter.green = sliderValue
66+
},
67+
filterOperationType:.singleInput
68+
),
6969
FilterOperation(
7070
filter:{HueAdjustment()},
7171
listName:"Hue",
@@ -201,16 +201,16 @@ let filterOperations: Array<FilterOperationInterface> = [
201201
},
202202
filterOperationType:.singleInput
203203
),
204-
// FilterOperation(
205-
// filter:{Haze()},
206-
// listName:"Haze / UV",
207-
// titleName:"Haze / UV",
208-
// sliderConfiguration:.enabled(minimumValue:-0.2, maximumValue:0.2, initialValue:0.2),
209-
// sliderUpdateCallback: {(filter, sliderValue) in
210-
// filter.distance = sliderValue
211-
// },
212-
// filterOperationType:.singleInput
213-
// ),
204+
FilterOperation(
205+
filter:{Haze()},
206+
listName:"Haze / UV",
207+
titleName:"Haze / UV",
208+
sliderConfiguration:.enabled(minimumValue:-0.2, maximumValue:0.2, initialValue:0.2),
209+
sliderUpdateCallback: {(filter, sliderValue) in
210+
filter.distance = sliderValue
211+
},
212+
filterOperationType:.singleInput
213+
),
214214
// FilterOperation(
215215
// filter:{SepiaToneFilter()},
216216
// listName:"Sepia tone",
@@ -979,16 +979,16 @@ let filterOperations: Array<FilterOperationInterface> = [
979979
// sliderUpdateCallback:nil,
980980
// filterOperationType:.singleInput
981981
// ),
982-
// FilterOperation(
983-
// filter:{DissolveBlend()},
984-
// listName:"Dissolve blend",
985-
// titleName:"Dissolve Blend",
986-
// sliderConfiguration:.enabled(minimumValue:0.0, maximumValue:1.0, initialValue:0.5),
987-
// sliderUpdateCallback: {(filter, sliderValue) in
988-
// filter.mix = sliderValue
989-
// },
990-
// filterOperationType:.blend
991-
// ),
982+
FilterOperation(
983+
filter:{DissolveBlend()},
984+
listName:"Dissolve blend",
985+
titleName:"Dissolve Blend",
986+
sliderConfiguration:.enabled(minimumValue:0.0, maximumValue:1.0, initialValue:0.5),
987+
sliderUpdateCallback: {(filter, sliderValue) in
988+
filter.mix = sliderValue
989+
},
990+
filterOperationType:.blend
991+
),
992992
// FilterOperation(
993993
// filter:{ChromaKeyBlend()},
994994
// listName:"Chroma key blend (green)",

0 commit comments

Comments
 (0)