Skip to content

Commit

Permalink
Added the lookup filters. Fixed some things I broke in the last commi…
Browse files Browse the repository at this point in the history 
…t on the Mac.
  • Loading branch information
@BradLarson
BradLarson committed Apr 28, 2013
1 parent 7eaf5d3 commit 2d8661d
Show file tree
Hide file tree
Showing 12 changed files with 158 additions and 307 deletions.
16 changes: 16 additions & 0 deletions examples/Mac/FilterShowcase/FilterShowcase.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
objects = {

/* Begin PBXBuildFile section */
BC78B702172DCC7F00342C6A /* lookup_amatorka.png in Resources */ = {isa = PBXBuildFile; fileRef = BC78B6FE172DCC7F00342C6A /* lookup_amatorka.png */; };
BC78B703172DCC7F00342C6A /* lookup_miss_etikate.png in Resources */ = {isa = PBXBuildFile; fileRef = BC78B6FF172DCC7F00342C6A /* lookup_miss_etikate.png */; };
BC78B704172DCC7F00342C6A /* lookup_soft_elegance_1.png in Resources */ = {isa = PBXBuildFile; fileRef = BC78B700172DCC7F00342C6A /* lookup_soft_elegance_1.png */; };
BC78B705172DCC7F00342C6A /* lookup_soft_elegance_2.png in Resources */ = {isa = PBXBuildFile; fileRef = BC78B701172DCC7F00342C6A /* lookup_soft_elegance_2.png */; };
BCB00A4C172B17F400DB804C /* GPUImage.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BCF8678F17263F3500912E34 /* GPUImage.framework */; };
BCF8676E17263EAC00912E34 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF8676D17263EAC00912E34 /* Cocoa.framework */; };
BCF8677817263EAC00912E34 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = BCF8677617263EAC00912E34 /* InfoPlist.strings */; };
Expand Down Expand Up @@ -54,6 +58,10 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
BC78B6FE172DCC7F00342C6A /* lookup_amatorka.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = lookup_amatorka.png; path = ../../../../framework/Resources/lookup_amatorka.png; sourceTree = "<group>"; };
BC78B6FF172DCC7F00342C6A /* lookup_miss_etikate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = lookup_miss_etikate.png; path = ../../../../framework/Resources/lookup_miss_etikate.png; sourceTree = "<group>"; };
BC78B700172DCC7F00342C6A /* lookup_soft_elegance_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = lookup_soft_elegance_1.png; path = ../../../../framework/Resources/lookup_soft_elegance_1.png; sourceTree = "<group>"; };
BC78B701172DCC7F00342C6A /* lookup_soft_elegance_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = lookup_soft_elegance_2.png; path = ../../../../framework/Resources/lookup_soft_elegance_2.png; sourceTree = "<group>"; };
BCF8676A17263EAC00912E34 /* FilterShowcase.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FilterShowcase.app; sourceTree = BUILT_PRODUCTS_DIR; };
BCF8676D17263EAC00912E34 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
BCF8677017263EAC00912E34 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -148,6 +156,10 @@
BCF8677417263EAC00912E34 /* Supporting Files */ = {
isa = PBXGroup;
children = (
BC78B6FE172DCC7F00342C6A /* lookup_amatorka.png */,
BC78B6FF172DCC7F00342C6A /* lookup_miss_etikate.png */,
BC78B700172DCC7F00342C6A /* lookup_soft_elegance_1.png */,
BC78B701172DCC7F00342C6A /* lookup_soft_elegance_2.png */,
BCF868891728791300912E34 /* mask.png */,
BCF868871728790500912E34 /* Lambeau.jpg */,
BCF8677517263EAC00912E34 /* FilterShowcase-Info.plist */,
Expand Down Expand Up @@ -243,6 +255,10 @@
BCF8679717263FCF00912E34 /* SLSFilterShowcaseWindowController.xib in Resources */,
BCF868881728790500912E34 /* Lambeau.jpg in Resources */,
BCF8688A1728791300912E34 /* mask.png in Resources */,
BC78B702172DCC7F00342C6A /* lookup_amatorka.png in Resources */,
BC78B703172DCC7F00342C6A /* lookup_miss_etikate.png in Resources */,
BC78B704172DCC7F00342C6A /* lookup_soft_elegance_1.png in Resources */,
BC78B705172DCC7F00342C6A /* lookup_soft_elegance_2.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
3 changes: 3 additions & 0 deletions examples/Mac/FilterShowcase/SLSFilterShowcaseWindowController.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ typedef enum {
GPUIMAGE_HIGHLIGHTSHADOW,
GPUIMAGE_HAZE,
GPUIMAGE_SEPIA,
GPUIMAGE_AMATORKA,
GPUIMAGE_MISSETIKATE,
GPUIMAGE_SOFTELEGANCE,
GPUIMAGE_PIXELLATE,
GPUIMAGE_GRAYSCALE,
GPUIMAGE_SOBELEDGEDETECTION,
Expand Down
19 changes: 18 additions & 1 deletion examples/Mac/FilterShowcase/SLSFilterShowcaseWindowController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,21 @@ - (void)changeSelectedRow:(NSUInteger)newRowIndex;
self.currentSliderValue = 1.0;
self.enableSlider = YES;
}; break;
case GPUIMAGE_AMATORKA:
{
currentlySelectedFilter = [[GPUImageAmatorkaFilter alloc] init];
self.enableSlider = NO;
}; break;
case GPUIMAGE_MISSETIKATE:
{
currentlySelectedFilter = [[GPUImageMissEtikateFilter alloc] init];
self.enableSlider = NO;
}; break;
case GPUIMAGE_SOFTELEGANCE:
{
currentlySelectedFilter = [[GPUImageSoftEleganceFilter alloc] init];
self.enableSlider = NO;
}; break;
case GPUIMAGE_GRAYSCALE:
{
currentlySelectedFilter = [[GPUImageGrayscaleFilter alloc] init];
Expand Down Expand Up @@ -594,7 +609,6 @@ - (void)changeSelectedRow:(NSUInteger)newRowIndex;

[blendFilter addTarget:self.glView];
}

}

#pragma mark -
Expand Down Expand Up @@ -694,6 +708,9 @@ - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColu
case GPUIMAGE_HIGHLIGHTSHADOW: tableRowTitle = @"Highlights and shadows"; break;
case GPUIMAGE_HAZE: tableRowTitle = @"Haze"; break;
case GPUIMAGE_SEPIA: tableRowTitle = @"Sepia tone"; break;
case GPUIMAGE_AMATORKA: tableRowTitle = @"Amatorka (Lookup)"; break;
case GPUIMAGE_MISSETIKATE: tableRowTitle = @"Miss Etikate (Lookup)"; break;
case GPUIMAGE_SOFTELEGANCE: tableRowTitle = @"Soft elegance (Lookup)"; break;
case GPUIMAGE_GAUSSIAN: tableRowTitle = @"Gaussian blur"; break;
case GPUIMAGE_GAUSSIAN_SELECTIVE: tableRowTitle = @"Gaussian selective blur"; break;
case GPUIMAGE_GAUSSIAN_POSITION: tableRowTitle = @"Gaussian (centered)"; break;
Expand Down
Loading

0 comments on commit 2d8661d

Please sign in to comment.