Added normal blend to the FilterShowcase, although it doesn't really …

…show much with an opaque input image.
amrzagloul · Sep 6, 2012 · cdddaea · cdddaea
1 parent cccff72
commit cdddaea
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/examples/FilterShowcase/FilterShowcase/ShowcaseFilterListController.m b/examples/FilterShowcase/FilterShowcase/ShowcaseFilterListController.m
@@ -154,6 +154,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 		case GPUIMAGE_SUBTRACTBLEND: cell.textLabel.text = @"Subtract blend"; break;
 	    case GPUIMAGE_HARDLIGHTBLEND: cell.textLabel.text = @"Hard light blend"; break;
 	    case GPUIMAGE_SOFTLIGHTBLEND: cell.textLabel.text = @"Soft light blend"; break;
+	    case GPUIMAGE_NORMALBLEND: cell.textLabel.text = @"Normal blend"; break;
 	    case GPUIMAGE_OPACITY: cell.textLabel.text = @"Opacity adjustment"; break;
         case GPUIMAGE_KUWAHARA: cell.textLabel.text = @"Kuwahara"; break;
         case GPUIMAGE_VIGNETTE: cell.textLabel.text = @"Vignette"; break;

diff --git a/examples/FilterShowcase/FilterShowcase/ShowcaseFilterViewController.h b/examples/FilterShowcase/FilterShowcase/ShowcaseFilterViewController.h
@@ -95,6 +95,7 @@ typedef enum {
     GPUIMAGE_EXCLUSIONBLEND,
     GPUIMAGE_HARDLIGHTBLEND,
     GPUIMAGE_SOFTLIGHTBLEND,
+    GPUIMAGE_NORMALBLEND,
     GPUIMAGE_OPACITY,
     GPUIMAGE_CUSTOM,
     GPUIMAGE_UIELEMENT,

diff --git a/examples/FilterShowcase/FilterShowcase/ShowcaseFilterViewController.m b/examples/FilterShowcase/FilterShowcase/ShowcaseFilterViewController.m
@@ -947,6 +947,15 @@ - (void)setupFilter;
 
             filter = [[GPUImageSoftLightBlendFilter alloc] init];
         }; break;
+        case GPUIMAGE_NORMALBLEND:
+        {
+            self.title = @"Normal Blend";
+            self.filterSettingsSlider.hidden = YES;
+            needsSecondImage = YES;
+
+            filter = [[GPUImageNormalBlendFilter alloc] init];
+        }; break;
+
         case GPUIMAGE_OPACITY:
         {
             self.title = @"Opacity Adjustment";

diff --git a/framework/Source/GPUImageNormalBlendFilter.h b/framework/Source/GPUImageNormalBlendFilter.h
@@ -1,9 +1,4 @@
-//
-//  GPUNormalBlendFilter.h
-//  GPUImage
-//
 //  Created by Jorge Garcia on 9/5/12.
-//  Copyright (c) 2012 Brad Larson. All rights reserved.
 //
 
 #import "GPUImageTwoInputFilter.h"

diff --git a/framework/Source/GPUImageNormalBlendFilter.m b/framework/Source/GPUImageNormalBlendFilter.m
@@ -1,10 +1,4 @@
-//
-//  GPUNormalBlendFilter.m
-//  GPUImage
-//
 //  Created by Jorge Garcia on 9/5/12.
-//  Copyright (c) 2012 Brad Larson. All rights reserved.
-//
 
 #import "GPUImageNormalBlendFilter.h"
 /*