Skip to content

Commit 8f9499f

Browse files
committed
Fix build settings
1 parent 16ad612 commit 8f9499f

File tree

711 files changed

+9125
-13
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

711 files changed

+9125
-13
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Exclude the build directory
2-
build/*
3-
examples/FilterShowcase/build*
2+
framework/build/*
3+
examples/FilterShowcase/build/*
44

55
# Exclude temp nibs and swap files
66
*~.nib
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>English</string>
7+
<key>CFBundleIdentifier</key>
8+
<string>com.apple.xcode.dsym.com.sunsetlakesoftware.GPUImage</string>
9+
<key>CFBundleInfoDictionaryVersion</key>
10+
<string>6.0</string>
11+
<key>CFBundlePackageType</key>
12+
<string>dSYM</string>
13+
<key>CFBundleSignature</key>
14+
<string>????</string>
15+
<key>CFBundleShortVersionString</key>
16+
<string>0.1.4</string>
17+
<key>CFBundleVersion</key>
18+
<string>1</string>
19+
</dict>
20+
</plist>
Binary file not shown.
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// This is Jeff LaMarche's GLProgram OpenGL shader wrapper class from his OpenGL ES 2.0 book.
2+
// A description of this can be found at his page on the topic:
3+
// http://iphonedevelopment.blogspot.com/2010/11/opengl-es-20-for-ios-chapter-4.html
4+
// I've extended this to be able to take programs as NSStrings in addition to files, for baked-in shaders
5+
6+
#import <Foundation/Foundation.h>
7+
8+
#if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
9+
#import <OpenGLES/ES2/gl.h>
10+
#import <OpenGLES/ES2/glext.h>
11+
#else
12+
#import <OpenGL/OpenGL.h>
13+
#import <OpenGL/gl.h>
14+
#endif
15+
16+
@interface GLProgram : NSObject
17+
{
18+
NSMutableArray *attributes;
19+
NSMutableArray *uniforms;
20+
GLuint program,
21+
vertShader,
22+
fragShader;
23+
}
24+
25+
@property(readwrite, nonatomic) BOOL initialized;
26+
@property(readwrite, copy, nonatomic) NSString *vertexShaderLog;
27+
@property(readwrite, copy, nonatomic) NSString *fragmentShaderLog;
28+
@property(readwrite, copy, nonatomic) NSString *programLog;
29+
30+
- (id)initWithVertexShaderString:(NSString *)vShaderString
31+
fragmentShaderString:(NSString *)fShaderString;
32+
- (id)initWithVertexShaderString:(NSString *)vShaderString
33+
fragmentShaderFilename:(NSString *)fShaderFilename;
34+
- (id)initWithVertexShaderFilename:(NSString *)vShaderFilename
35+
fragmentShaderFilename:(NSString *)fShaderFilename;
36+
- (void)addAttribute:(NSString *)attributeName;
37+
- (GLuint)attributeIndex:(NSString *)attributeName;
38+
- (GLuint)uniformIndex:(NSString *)uniformName;
39+
- (BOOL)link;
40+
- (void)use;
41+
- (void)validate;
42+
@end
Lines changed: 171 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
1+
#import "GLProgram.h"
2+
3+
// Base classes
4+
#import "GPUImageContext.h"
5+
#import "GPUImageOutput.h"
6+
#import "GPUImageView.h"
7+
#import "GPUImageVideoCamera.h"
8+
#import "GPUImageStillCamera.h"
9+
#import "GPUImageMovie.h"
10+
#import "GPUImagePicture.h"
11+
#import "GPUImageRawDataInput.h"
12+
#import "GPUImageRawDataOutput.h"
13+
#import "GPUImageMovieWriter.h"
14+
#import "GPUImageFilterPipeline.h"
15+
#import "GPUImageTextureOutput.h"
16+
#import "GPUImageFilterGroup.h"
17+
#import "GPUImageTextureInput.h"
18+
#import "GPUImageUIElement.h"
19+
#import "GPUImageBuffer.h"
20+
#import "GPUImageFramebuffer.h"
21+
#import "GPUImageFramebufferCache.h"
22+
23+
// Filters
24+
#import "GPUImageFilter.h"
25+
#import "GPUImageTwoInputFilter.h"
26+
#import "GPUImagePixellateFilter.h"
27+
#import "GPUImagePixellatePositionFilter.h"
28+
#import "GPUImageSepiaFilter.h"
29+
#import "GPUImageColorInvertFilter.h"
30+
#import "GPUImageSaturationFilter.h"
31+
#import "GPUImageContrastFilter.h"
32+
#import "GPUImageExposureFilter.h"
33+
#import "GPUImageBrightnessFilter.h"
34+
#import "GPUImageLevelsFilter.h"
35+
#import "GPUImageSharpenFilter.h"
36+
#import "GPUImageGammaFilter.h"
37+
#import "GPUImageSobelEdgeDetectionFilter.h"
38+
#import "GPUImageSketchFilter.h"
39+
#import "GPUImageToonFilter.h"
40+
#import "GPUImageSmoothToonFilter.h"
41+
#import "GPUImageMultiplyBlendFilter.h"
42+
#import "GPUImageDissolveBlendFilter.h"
43+
#import "GPUImageKuwaharaFilter.h"
44+
#import "GPUImageKuwaharaRadius3Filter.h"
45+
#import "GPUImageVignetteFilter.h"
46+
#import "GPUImageGaussianBlurFilter.h"
47+
#import "GPUImageGaussianBlurPositionFilter.h"
48+
#import "GPUImageGaussianSelectiveBlurFilter.h"
49+
#import "GPUImageOverlayBlendFilter.h"
50+
#import "GPUImageDarkenBlendFilter.h"
51+
#import "GPUImageLightenBlendFilter.h"
52+
#import "GPUImageSwirlFilter.h"
53+
#import "GPUImageSourceOverBlendFilter.h"
54+
#import "GPUImageColorBurnBlendFilter.h"
55+
#import "GPUImageColorDodgeBlendFilter.h"
56+
#import "GPUImageScreenBlendFilter.h"
57+
#import "GPUImageExclusionBlendFilter.h"
58+
#import "GPUImageDifferenceBlendFilter.h"
59+
#import "GPUImageSubtractBlendFilter.h"
60+
#import "GPUImageHardLightBlendFilter.h"
61+
#import "GPUImageSoftLightBlendFilter.h"
62+
#import "GPUImageColorBlendFilter.h"
63+
#import "GPUImageHueBlendFilter.h"
64+
#import "GPUImageSaturationBlendFilter.h"
65+
#import "GPUImageLuminosityBlendFilter.h"
66+
#import "GPUImageCropFilter.h"
67+
#import "GPUImageGrayscaleFilter.h"
68+
#import "GPUImageTransformFilter.h"
69+
#import "GPUImageChromaKeyBlendFilter.h"
70+
#import "GPUImageHazeFilter.h"
71+
#import "GPUImageLuminanceThresholdFilter.h"
72+
#import "GPUImagePosterizeFilter.h"
73+
#import "GPUImageBoxBlurFilter.h"
74+
#import "GPUImageAdaptiveThresholdFilter.h"
75+
#import "GPUImageSolarizeFilter.h"
76+
#import "GPUImageUnsharpMaskFilter.h"
77+
#import "GPUImageBulgeDistortionFilter.h"
78+
#import "GPUImagePinchDistortionFilter.h"
79+
#import "GPUImageCrosshatchFilter.h"
80+
#import "GPUImageCGAColorspaceFilter.h"
81+
#import "GPUImagePolarPixellateFilter.h"
82+
#import "GPUImageStretchDistortionFilter.h"
83+
#import "GPUImagePerlinNoiseFilter.h"
84+
#import "GPUImageJFAVoronoiFilter.h"
85+
#import "GPUImageVoronoiConsumerFilter.h"
86+
#import "GPUImageMosaicFilter.h"
87+
#import "GPUImageTiltShiftFilter.h"
88+
#import "GPUImage3x3ConvolutionFilter.h"
89+
#import "GPUImageEmbossFilter.h"
90+
#import "GPUImageCannyEdgeDetectionFilter.h"
91+
#import "GPUImageThresholdEdgeDetectionFilter.h"
92+
#import "GPUImageMaskFilter.h"
93+
#import "GPUImageHistogramFilter.h"
94+
#import "GPUImageHistogramGenerator.h"
95+
#import "GPUImageHistogramEqualizationFilter.h"
96+
#import "GPUImagePrewittEdgeDetectionFilter.h"
97+
#import "GPUImageXYDerivativeFilter.h"
98+
#import "GPUImageHarrisCornerDetectionFilter.h"
99+
#import "GPUImageAlphaBlendFilter.h"
100+
#import "GPUImageNormalBlendFilter.h"
101+
#import "GPUImageNonMaximumSuppressionFilter.h"
102+
#import "GPUImageRGBFilter.h"
103+
#import "GPUImageMedianFilter.h"
104+
#import "GPUImageBilateralFilter.h"
105+
#import "GPUImageCrosshairGenerator.h"
106+
#import "GPUImageToneCurveFilter.h"
107+
#import "GPUImageNobleCornerDetectionFilter.h"
108+
#import "GPUImageShiTomasiFeatureDetectionFilter.h"
109+
#import "GPUImageErosionFilter.h"
110+
#import "GPUImageRGBErosionFilter.h"
111+
#import "GPUImageDilationFilter.h"
112+
#import "GPUImageRGBDilationFilter.h"
113+
#import "GPUImageOpeningFilter.h"
114+
#import "GPUImageRGBOpeningFilter.h"
115+
#import "GPUImageClosingFilter.h"
116+
#import "GPUImageRGBClosingFilter.h"
117+
#import "GPUImageColorPackingFilter.h"
118+
#import "GPUImageSphereRefractionFilter.h"
119+
#import "GPUImageMonochromeFilter.h"
120+
#import "GPUImageOpacityFilter.h"
121+
#import "GPUImageHighlightShadowFilter.h"
122+
#import "GPUImageFalseColorFilter.h"
123+
#import "GPUImageHSBFilter.h"
124+
#import "GPUImageHueFilter.h"
125+
#import "GPUImageGlassSphereFilter.h"
126+
#import "GPUImageLookupFilter.h"
127+
#import "GPUImageAmatorkaFilter.h"
128+
#import "GPUImageMissEtikateFilter.h"
129+
#import "GPUImageSoftEleganceFilter.h"
130+
#import "GPUImageAddBlendFilter.h"
131+
#import "GPUImageDivideBlendFilter.h"
132+
#import "GPUImagePolkaDotFilter.h"
133+
#import "GPUImageLocalBinaryPatternFilter.h"
134+
#import "GPUImageColorLocalBinaryPatternFilter.h"
135+
#import "GPUImageLanczosResamplingFilter.h"
136+
#import "GPUImageAverageColor.h"
137+
#import "GPUImageSolidColorGenerator.h"
138+
#import "GPUImageLuminosity.h"
139+
#import "GPUImageAverageLuminanceThresholdFilter.h"
140+
#import "GPUImageWhiteBalanceFilter.h"
141+
#import "GPUImageChromaKeyFilter.h"
142+
#import "GPUImageLowPassFilter.h"
143+
#import "GPUImageHighPassFilter.h"
144+
#import "GPUImageMotionDetector.h"
145+
#import "GPUImageHalftoneFilter.h"
146+
#import "GPUImageThresholdedNonMaximumSuppressionFilter.h"
147+
#import "GPUImageHoughTransformLineDetector.h"
148+
#import "GPUImageParallelCoordinateLineTransformFilter.h"
149+
#import "GPUImageThresholdSketchFilter.h"
150+
#import "GPUImageLineGenerator.h"
151+
#import "GPUImageLinearBurnBlendFilter.h"
152+
#import "GPUImageGaussianBlurPositionFilter.h"
153+
#import "GPUImagePixellatePositionFilter.h"
154+
#import "GPUImageTwoInputCrossTextureSamplingFilter.h"
155+
#import "GPUImagePoissonBlendFilter.h"
156+
#import "GPUImageMotionBlurFilter.h"
157+
#import "GPUImageZoomBlurFilter.h"
158+
#import "GPUImageLaplacianFilter.h"
159+
#import "GPUImageiOSBlurFilter.h"
160+
#import "GPUImageLuminanceRangeFilter.h"
161+
#import "GPUImageDirectionalNonMaximumSuppressionFilter.h"
162+
#import "GPUImageDirectionalSobelEdgeDetectionFilter.h"
163+
#import "GPUImageSingleComponentGaussianBlurFilter.h"
164+
#import "GPUImageThreeInputFilter.h"
165+
#import "GPUImageFourInputFilter.h"
166+
#import "GPUImageWeakPixelInclusionFilter.h"
167+
#import "GPUImageColorConversion.h"
168+
#import "GPUImageColourFASTFeatureDetector.h"
169+
#import "GPUImageColourFASTSamplingOperation.h"
170+
#import "GPUImageFASTCornerDetectionFilter.h"
171+
#import "GPUImageMovieComposition.h"
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#import "GPUImage3x3TextureSamplingFilter.h"
2+
3+
/** Runs a 3x3 convolution kernel against the image
4+
*/
5+
@interface GPUImage3x3ConvolutionFilter : GPUImage3x3TextureSamplingFilter
6+
{
7+
GLint convolutionMatrixUniform;
8+
}
9+
10+
/** Convolution kernel to run against the image
11+
12+
The convolution kernel is a 3x3 matrix of values to apply to the pixel and its 8 surrounding pixels.
13+
The matrix is specified in row-major order, with the top left pixel being one.one and the bottom right three.three
14+
If the values in the matrix don't add up to 1.0, the image could be brightened or darkened.
15+
*/
16+
@property(readwrite, nonatomic) GPUMatrix3x3 convolutionKernel;
17+
18+
@end
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#import "GPUImageFilter.h"
2+
3+
extern NSString *const kGPUImageNearbyTexelSamplingVertexShaderString;
4+
5+
@interface GPUImage3x3TextureSamplingFilter : GPUImageFilter
6+
{
7+
GLint texelWidthUniform, texelHeightUniform;
8+
9+
CGFloat texelWidth, texelHeight;
10+
BOOL hasOverriddenImageSizeFactor;
11+
}
12+
13+
// The texel width and height determines how far out to sample from this texel. By default, this is the normalized width of a pixel, but this can be overridden for different effects.
14+
@property(readwrite, nonatomic) CGFloat texelWidth;
15+
@property(readwrite, nonatomic) CGFloat texelHeight;
16+
17+
18+
@end
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#import "GPUImageFilterGroup.h"
2+
3+
@interface GPUImageAdaptiveThresholdFilter : GPUImageFilterGroup
4+
5+
/** A multiplier for the background averaging blur radius in pixels, with a default of 4
6+
*/
7+
@property(readwrite, nonatomic) CGFloat blurRadiusInPixels;
8+
9+
@end
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#import "GPUImageTwoInputFilter.h"
2+
3+
@interface GPUImageAddBlendFilter : GPUImageTwoInputFilter
4+
5+
@end

0 commit comments

Comments
 (0)