Skip to content

Commit 6664df7

Browse files
author
Thayer J Andrews
committed
CCEffects - Misc cleanup - No functional change
- Correct case of CCTexture.h in a #import - Replace badly copy-pasted ;; with ; - Remove some trailing whitespace
1 parent c54f21d commit 6664df7

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

cocos2d/CCEffect.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#import "CCEffect.h"
1010
#import "CCEffect_Private.h"
11-
#import "CCtexture.h"
11+
#import "CCTexture.h"
1212

1313
#if CC_ENABLE_EXPERIMENTAL_EFFECTS
1414
NSString * const CCShaderUniformPreviousPassTexture = @"cc_PreviousPassTexture";
@@ -537,7 +537,7 @@ - (CCEffectPrepareStatus)prepareForRendering
537537
-(CCEffectRenderPass *)renderPassAtIndex:(NSInteger)passIndex
538538
{
539539
NSAssert((passIndex >= 0) && (passIndex < _renderPasses.count), @"Pass index out of range.");
540-
return _renderPasses[passIndex];;
540+
return _renderPasses[passIndex];
541541
}
542542

543543
-(BOOL)stitchSupported:(CCEffectFunctionStitchFlags)stitch

cocos2d/CCEffectGlass.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ -(void)buildFragmentFunctions
137137

138138
// Add the reflected color modulated by the fresnel term. Multiplying by the normal
139139
// map alpha also allows the effect to be disabled for specific pixels.
140-
float fresnel = max(u_fresnelBias + (1.0 - u_fresnelBias) * pow((1.0 - nDotV), u_fresnelPower), 0.0);;
140+
float fresnel = max(u_fresnelBias + (1.0 - u_fresnelBias) * pow((1.0 - nDotV), u_fresnelPower), 0.0);
141141
vec4 reflection = normalMap.a * fresnel * texture2D(u_reflectEnvMap, reflectTexCoords);
142142

143143
return primaryColor + refraction + reflection;

cocos2d/CCEffectReflection.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ -(void)buildFragmentFunctions
106106
// Compute the combination of the sprite's color and texture.
107107
vec4 primaryColor = inputValue;
108108

109-
float fresnel = max(u_fresnelBias + (1.0 - u_fresnelBias) * pow((1.0 - nDotV), u_fresnelPower), 0.0);;
109+
float fresnel = max(u_fresnelBias + (1.0 - u_fresnelBias) * pow((1.0 - nDotV), u_fresnelPower), 0.0);
110110

111111
// If the refracted texture coordinates are within the bounds of the environment map
112112
// blend the primary color with the refracted environment. Multiplying by the normal
113113
// map alpha also allows the effect to be disabled for specific pixels.
114-
primaryColor += normalMap.a * fresnel * texture2D(u_envMap, reflectTexCoords);
114+
primaryColor += normalMap.a * fresnel * texture2D(u_envMap, reflectTexCoords);
115115
return primaryColor;
116116
);
117117

0 commit comments

Comments
 (0)