CCEffects - Remove CC_ENABLE_EXPERIMENTAL_EFFECTS

Thayer J Andrews · Thayer J Andrews · commit 016c90d1c3b2 · 2014-07-25T10:29:43.000-07:00
diff --git a/cocos2d-ui-tests/tests/CCEffectPongTest.m b/cocos2d-ui-tests/tests/CCEffectPongTest.m
@@ -12,7 +12,6 @@
 #import "CCEffectNode.h"
 #import "CCEffectGaussianBlur.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 
 #define PADDLE_SCALE 0.5f
 #define PADDLE_X_OFFSET 10.0f
@@ -377,7 +376,3 @@ - (void)decreasePixellate:(CCTime)interval
 
 @end
 
-#endif
-
-
-
diff --git a/cocos2d-ui-tests/tests/CCEffectsTest.m b/cocos2d-ui-tests/tests/CCEffectsTest.m
@@ -4,7 +4,6 @@
 #import "CCEffectNode.h"
 #import "CCEffectGaussianBlur.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 
 @interface CCEffectsTest : TestBase @end
 @implementation CCEffectsTest
@@ -711,5 +710,4 @@ -(void)renderTextureHelper:(CCNode *)stage size:(CGSize)size
 	[node addChild:sprite];
 }
 @end
-#endif
 
diff --git a/cocos2d/CCEffect.h b/cocos2d/CCEffect.h
@@ -12,10 +12,8 @@
 #import "ccConfig.h"
 #import "ccTypes.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @interface CCEffect : NSObject
 
 @property (nonatomic, copy) NSString *debugName;
 
 @end
-#endif
diff --git a/cocos2d/CCEffect.m b/cocos2d/CCEffect.m
@@ -10,7 +10,6 @@
 #import "CCEffect_Private.h"
 #import "CCTexture.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 NSString * const CCShaderUniformPreviousPassTexture = @"cc_PreviousPassTexture";
 
 static NSString* fragBase =
@@ -548,7 +547,6 @@ -(BOOL)stitchSupported:(CCEffectFunctionStitchFlags)stitch
 
 
 @end
-#endif
 
 
 
diff --git a/cocos2d/CCEffectBloom.h b/cocos2d/CCEffectBloom.h
@@ -8,7 +8,6 @@
 
 #import "CCEffect.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @interface CCEffectBloom : CCEffect
 
 // ranges between 0.0-1.0 - defines which part of the image should be glown via a luminance factor (brightness).
@@ -33,4 +32,3 @@
 +(id)effectWithPixelBlurRadius:(NSUInteger)blurRadius intensity:(float)intensity luminanceThreshold:(float)luminanceThreshold;
 
 @end
-#endif
diff --git a/cocos2d/CCEffectBloom.m b/cocos2d/CCEffectBloom.m
@@ -45,7 +45,6 @@
 #import "CCRenderer.h"
 #import "CCTexture.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @implementation CCEffectBloom {
     NSUInteger _numberOfOptimizedOffsets;
     GLfloat _sigma;
@@ -379,5 +378,4 @@ - (CCEffectPrepareStatus)prepareForRendering
 }
 
 @end
-#endif
 
diff --git a/cocos2d/CCEffectBrightness.h b/cocos2d/CCEffectBrightness.h
@@ -8,7 +8,6 @@
 
 #import "CCEffect.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @interface CCEffectBrightness : CCEffect
 
 @property (nonatomic) float brightness;
@@ -18,4 +17,3 @@
 +(id)effectWithBrightness:(float)brightness;
 
 @end
-#endif
diff --git a/cocos2d/CCEffectBrightness.m b/cocos2d/CCEffectBrightness.m
@@ -11,7 +11,6 @@
 #import "CCRenderer.h"
 #import "CCTexture.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 static float conditionBrightness(float brightness);
 
 @interface CCEffectBrightness ()
@@ -91,5 +90,3 @@ float conditionBrightness(float brightness)
     NSCAssert((brightness >= -1.0) && (brightness <= 1.0), @"Supplied brightness out of range [-1..1].");
     return clampf(brightness, -1.0f, 1.0f);
 }
-
-#endif
diff --git a/cocos2d/CCEffectContrast.h b/cocos2d/CCEffectContrast.h
@@ -8,7 +8,6 @@
 
 #import "CCEffect.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @interface CCEffectContrast : CCEffect
 
 @property (nonatomic) float contrast;
@@ -18,4 +17,3 @@
 +(id)effectWithContrast:(float)contrast;
 
 @end
-#endif
diff --git a/cocos2d/CCEffectContrast.m b/cocos2d/CCEffectContrast.m
@@ -11,7 +11,6 @@
 #import "CCRenderer.h"
 #import "CCTexture.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 static float conditionContrast(float contrast);
 
 
@@ -99,5 +98,3 @@ float conditionContrast(float contrast)
     float clampedExp = clampf(contrast, -1.0f, 1.0f);
     return powf(kContrastBase, clampedExp);
 }
-
-#endif
diff --git a/cocos2d/CCEffectGaussianBlur.h b/cocos2d/CCEffectGaussianBlur.h
@@ -8,7 +8,6 @@
 
 #import "CCEffect.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @interface CCEffectGaussianBlur : CCEffect
 
 // blurRadius number of pixels blur will extend to (6 is the maximum, because we are limited by the number
@@ -24,7 +23,6 @@
 +(id)effectWithPixelBlurRadius:(NSUInteger)blurRadius;
 
 @end
-#endif
 
 
 
diff --git a/cocos2d/CCEffectGaussianBlur.m b/cocos2d/CCEffectGaussianBlur.m
@@ -43,7 +43,6 @@
 #import "CCEffectGaussianBlur.h"
 #import "CCTexture.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 
 @implementation CCEffectGaussianBlur {
     NSUInteger _numberOfOptimizedOffsets;
@@ -315,5 +314,4 @@ - (CCEffectPrepareStatus)prepareForRendering
 }
 
 @end
-#endif
 
diff --git a/cocos2d/CCEffectGlass.h b/cocos2d/CCEffectGlass.h
@@ -8,7 +8,6 @@
 
 #import "CCEffect.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @interface CCEffectGlass : CCEffect
 
 @property (nonatomic) float refraction;
@@ -23,4 +22,3 @@
 +(id)effectWithRefraction:(float)refraction refractionEnvironment:(CCSprite *)refractionEnvironment reflectionEnvironment:(CCSprite *)reflectionEnvironment normalMap:(CCSpriteFrame *)normalMap;
 
 @end
-#endif
diff --git a/cocos2d/CCEffectGlass.m b/cocos2d/CCEffectGlass.m
@@ -17,7 +17,7 @@
 #import "CCEffect_Private.h"
 #import "CCSprite_Private.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
+
 @interface CCEffectGlass ()
 
 @property (nonatomic) float conditionedRefraction;
@@ -223,4 +223,3 @@ -(void)setRefraction:(float)refraction
     _conditionedRefraction = CCEffectUtilsConditionRefraction(refraction);
 }
 @end
-#endif
diff --git a/cocos2d/CCEffectHue.h b/cocos2d/CCEffectHue.h
@@ -8,7 +8,6 @@
 
 #import "CCEffect.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @interface CCEffectHue : CCEffect
 
 @property (nonatomic) float hue;
@@ -18,4 +17,3 @@
 +(id)effectWithHue:(float)hue;
 
 @end
-#endif
diff --git a/cocos2d/CCEffectHue.m b/cocos2d/CCEffectHue.m
@@ -47,7 +47,7 @@
 
 #define CCEFFECTHUE_USES_COLOR_MATRIX 1
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
+
 static float conditionHue(float hue);
 
 #if CCEFFECTHUE_USES_COLOR_MATRIX
@@ -226,4 +226,3 @@ GLKMatrix4 matrixWithHue(float hue)
 }
 #endif
 
-#endif
diff --git a/cocos2d/CCEffectNode.h b/cocos2d/CCEffectNode.h
@@ -19,10 +19,8 @@
 #import <UIKit/UIKit.h>
 #endif // iPHone
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @interface CCEffectNode : CCRenderTexture <CCEffectProtocol>
 
 -(id)initWithWidth:(int)w height:(int)h;
 
 @end
-#endif
diff --git a/cocos2d/CCEffectNode.m b/cocos2d/CCEffectNode.m
@@ -28,7 +28,6 @@
 #import <ApplicationServices/ApplicationServices.h>
 #endif
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @interface CCEffectNode()
 {
     CCEffect *_effect;
@@ -208,4 +207,3 @@ - (void)updateShaderUniformsFromEffect
 }
 
 @end
-#endif
diff --git a/cocos2d/CCEffectPixellate.h b/cocos2d/CCEffectPixellate.h
@@ -8,7 +8,6 @@
 
 #import "CCEffect.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @interface CCEffectPixellate : CCEffect
 
 @property (nonatomic) float blockSize;
@@ -18,4 +17,3 @@
 +(id)effectWithBlockSize:(float)blockSize;
 
 @end
-#endif
diff --git a/cocos2d/CCEffectPixellate.m b/cocos2d/CCEffectPixellate.m
@@ -45,7 +45,6 @@
 #import "CCRenderer.h"
 #import "CCTexture.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 static float conditionBlockSize(float blockSize);
 
 @interface CCEffectPixellate ()
@@ -137,4 +136,3 @@ float conditionBlockSize(float blockSize)
     return (blockSize <= 1.0f) ? 1.0f : blockSize;
 }
 
-#endif
diff --git a/cocos2d/CCEffectReflection.h b/cocos2d/CCEffectReflection.h
@@ -8,7 +8,6 @@
 
 #import "CCEffect.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @interface CCEffectReflection : CCEffect
 
 @property (nonatomic) CCSprite *environment;
@@ -24,4 +23,3 @@
 +(id)effectWithFresnelBias:(float)bias fresnelPower:(float)power environment:(CCSprite *)environment normalMap:(CCSpriteFrame *)normalMap;
 
 @end
-#endif
diff --git a/cocos2d/CCEffectReflection.m b/cocos2d/CCEffectReflection.m
@@ -17,7 +17,6 @@
 #import "CCEffect_Private.h"
 #import "CCSprite_Private.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 static GLKMatrix4 GLKMatrix4FromAffineTransform(CGAffineTransform at);
 
 
@@ -177,4 +176,3 @@ GLKMatrix4 GLKMatrix4FromAffineTransform(CGAffineTransform at)
                           at.tx, at.ty, 0.0f,  1.0f);
 }
 
-#endif
diff --git a/cocos2d/CCEffectRefraction.h b/cocos2d/CCEffectRefraction.h
@@ -8,7 +8,6 @@
 
 #import "CCEffect.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @interface CCEffectRefraction : CCEffect
 
 @property (nonatomic) float refraction;
@@ -20,4 +19,3 @@
 +(id)effectWithRefraction:(float)refraction environment:(CCSprite *)environment normalMap:(CCSpriteFrame *)normalMap;
 
 @end
-#endif
diff --git a/cocos2d/CCEffectRefraction.m b/cocos2d/CCEffectRefraction.m
@@ -17,7 +17,6 @@
 #import "CCEffect_Private.h"
 #import "CCSprite_Private.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @interface CCEffectRefraction ()
 
 @property (nonatomic) float conditionedRefraction;
@@ -156,4 +155,4 @@ -(void)setRefraction:(float)refraction
     _conditionedRefraction = CCEffectUtilsConditionRefraction(refraction);
 }
 @end
-#endif
+
diff --git a/cocos2d/CCEffectRenderer.h b/cocos2d/CCEffectRenderer.h
@@ -9,7 +9,6 @@
 #import <Foundation/Foundation.h>
 #import "ccTypes.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @class CCEffect;
 @class CCRenderer;
 @class CCSprite;
@@ -24,4 +23,3 @@
 -(void)drawSprite:(CCSprite *)sprite withEffect:(CCEffect *)effect uniforms:(NSMutableDictionary *)uniforms renderer:(CCRenderer *)renderer transform:(const GLKMatrix4 *)transform;
 
 @end
-#endif
diff --git a/cocos2d/CCEffectRenderer.m b/cocos2d/CCEffectRenderer.m
@@ -18,7 +18,6 @@
 #import "CCSprite_Private.h"
 #import "CCTexture_Private.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 
 @interface CCEffectRenderTarget : NSObject
 
@@ -279,4 +278,3 @@ - (void)freeAllRenderTargets
 }
 
 @end
-#endif
diff --git a/cocos2d/CCEffectSaturation.h b/cocos2d/CCEffectSaturation.h
@@ -8,7 +8,6 @@
 
 #import "CCEffect.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @interface CCEffectSaturation : CCEffect
 
 @property (nonatomic) float saturation;
@@ -18,4 +17,4 @@
 +(id)effectWithSaturation:(float)saturation;
 
 @end
-#endif
+
diff --git a/cocos2d/CCEffectSaturation.m b/cocos2d/CCEffectSaturation.m
@@ -45,7 +45,7 @@
 #import "CCRenderer.h"
 #import "CCTexture.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
+
 static float conditionSaturation(float saturation);
 
 
@@ -139,4 +139,3 @@ float conditionSaturation(float saturation)
     float clampedSaturation = clampf(saturation, -1.0f, 1.0f);
     return clampedSaturation += 1.0f;
 }
-#endif
diff --git a/cocos2d/CCEffectStack.h b/cocos2d/CCEffectStack.h
@@ -8,7 +8,7 @@
 
 #import "CCEffect.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
+
 @interface CCEffectStack : CCEffect
 
 @property (nonatomic, readonly) NSUInteger effectCount;
@@ -19,4 +19,3 @@
 - (CCEffect *)effectAtIndex:(NSUInteger)effectIndex;
 
 @end
-#endif
diff --git a/cocos2d/CCEffectStack.m b/cocos2d/CCEffectStack.m
diff --git a/cocos2d/CCEffectStackProtocol.h b/cocos2d/CCEffectStackProtocol.h
diff --git a/cocos2d/CCEffectStack_Private.h b/cocos2d/CCEffectStack_Private.h
diff --git a/cocos2d/CCEffectUtils.h b/cocos2d/CCEffectUtils.h
diff --git a/cocos2d/CCEffectUtils.m b/cocos2d/CCEffectUtils.m
diff --git a/cocos2d/CCEffect_Private.h b/cocos2d/CCEffect_Private.h
diff --git a/cocos2d/CCProtocols.h b/cocos2d/CCProtocols.h
diff --git a/cocos2d/CCSprite.m b/cocos2d/CCSprite.m
diff --git a/cocos2d/ccConfig.h b/cocos2d/ccConfig.h
