Skip to content

Commit b1e5105

Browse files
osinolegosinoleg
committed
Updated DropShadow and OuterGlow effects to reflect naming changes to CCEffect.
1 parent a61e79f commit b1e5105

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

‎cocos2d-ios.xcodeproj/project.pbxproj

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,6 @@
259259
B7EE69E31819E75700B983FE /* CCLayoutBox.m in Sources */ = {isa = PBXBuildFile; fileRef = B7EE69DF1819E75700B983FE /* CCLayoutBox.m */; };
260260
B7EE6A1E181AE34600B983FE /* CCSlider.h in Headers */ = {isa = PBXBuildFile; fileRef = B7EE6A1C181AE34600B983FE /* CCSlider.h */; };
261261
B7EE6A1F181AE34600B983FE /* CCSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = B7EE6A1D181AE34600B983FE /* CCSlider.m */; };
262-
D208E79D1993FEDA00BD8D6B /* CCEffectDropShadow.h in Headers */ = {isa = PBXBuildFile; fileRef = D208E79B1993FEDA00BD8D6B /* CCEffectDropShadow.h */; };
263-
D208E79E1993FEDA00BD8D6B /* CCEffectDropShadow.h in Headers */ = {isa = PBXBuildFile; fileRef = D208E79B1993FEDA00BD8D6B /* CCEffectDropShadow.h */; };
264262
D208E79F1993FEDA00BD8D6B /* CCEffectDropShadow.m in Sources */ = {isa = PBXBuildFile; fileRef = D208E79C1993FEDA00BD8D6B /* CCEffectDropShadow.m */; };
265263
D208E7A01993FEDA00BD8D6B /* CCEffectDropShadow.m in Sources */ = {isa = PBXBuildFile; fileRef = D208E79C1993FEDA00BD8D6B /* CCEffectDropShadow.m */; };
266264
D208E7AD19959A4800BD8D6B /* CCEffectOuterGlow.h in Headers */ = {isa = PBXBuildFile; fileRef = D208E7AB19959A4800BD8D6B /* CCEffectOuterGlow.h */; };
@@ -362,6 +360,8 @@
362360
D2DDB0A619805E8400233D80 /* CCQuaternion.m in Sources */ = {isa = PBXBuildFile; fileRef = D2DDB09119805E8400233D80 /* CCQuaternion.m */; };
363361
D2DDB0A719805E8400233D80 /* CCMatrix3.m in Sources */ = {isa = PBXBuildFile; fileRef = D2DDB09219805E8400233D80 /* CCMatrix3.m */; };
364362
D2DDB0A819805E8400233D80 /* CCMatrix3.m in Sources */ = {isa = PBXBuildFile; fileRef = D2DDB09219805E8400233D80 /* CCMatrix3.m */; };
363+
D2E8E1861999ABA2004F18DF /* CCEffectDropShadow.h in Headers */ = {isa = PBXBuildFile; fileRef = D2F78CC71999AB6E00229357 /* CCEffectDropShadow.h */; };
364+
D2F78CC81999AB6E00229357 /* CCEffectDropShadow.h in Headers */ = {isa = PBXBuildFile; fileRef = D2F78CC71999AB6E00229357 /* CCEffectDropShadow.h */; };
365365
D2FEB611194F6C9E00FC0574 /* CCBLocalizationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = B7D273041822F4AA0054849B /* CCBLocalizationManager.h */; };
366366
D2FEB612194F6C9E00FC0574 /* CCAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 5018F2520DFDEAFF00C013A5 /* CCAction.h */; };
367367
D2FEB613194F6C9E00FC0574 /* CCNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 5018F2540DFDEAFF00C013A5 /* CCNode.h */; };
@@ -991,7 +991,6 @@
991991
B7EE69DF1819E75700B983FE /* CCLayoutBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCLayoutBox.m; sourceTree = "<group>"; };
992992
B7EE6A1C181AE34600B983FE /* CCSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCSlider.h; path = "cocos2d-ui/CCSlider.h"; sourceTree = "<group>"; };
993993
B7EE6A1D181AE34600B983FE /* CCSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCSlider.m; path = "cocos2d-ui/CCSlider.m"; sourceTree = "<group>"; };
994-
D208E79B1993FEDA00BD8D6B /* CCEffectDropShadow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectDropShadow.h; sourceTree = "<group>"; };
995994
D208E79C1993FEDA00BD8D6B /* CCEffectDropShadow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectDropShadow.m; sourceTree = "<group>"; };
996995
D208E7AB19959A4800BD8D6B /* CCEffectOuterGlow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectOuterGlow.h; sourceTree = "<group>"; };
997996
D208E7AC19959A4800BD8D6B /* CCEffectOuterGlow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectOuterGlow.m; sourceTree = "<group>"; };
@@ -1056,6 +1055,7 @@
10561055
D2DDB09019805E8400233D80 /* CCVector2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCVector2.h; path = Platforms/Android/CCVector2.h; sourceTree = "<group>"; };
10571056
D2DDB09119805E8400233D80 /* CCQuaternion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCQuaternion.m; path = Platforms/Android/CCQuaternion.m; sourceTree = "<group>"; };
10581057
D2DDB09219805E8400233D80 /* CCMatrix3.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCMatrix3.m; path = Platforms/Android/CCMatrix3.m; sourceTree = "<group>"; };
1058+
D2F78CC71999AB6E00229357 /* CCEffectDropShadow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectDropShadow.h; sourceTree = "<group>"; };
10591059
D2FEB74F194F6C9E00FC0574 /* libcocos2dAndroid.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcocos2dAndroid.a; sourceTree = BUILT_PRODUCTS_DIR; };
10601060
D309054F18AC23110081BF11 /* CCRenderer_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderer_private.h; sourceTree = "<group>"; };
10611061
D33803DC18032E4F0072D8FE /* CCPhysics+ObjectiveChipmunk.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CCPhysics+ObjectiveChipmunk.h"; sourceTree = "<group>"; };
@@ -1795,9 +1795,7 @@
17951795
9D856720191B019900573093 /* CCEffectContrast.m */,
17961796
9DF3761F191C594A00C6D27A /* CCEffectPixellate.h */,
17971797
9DF37620191C594A00C6D27A /* CCEffectPixellate.m */,
1798-
D2B49102192146FB00C3443A /* CCEffectGaussianBlur.h */,
1799-
D2B49103192146FB00C3443A /* CCEffectGaussianBlur.m */,
1800-
D208E79B1993FEDA00BD8D6B /* CCEffectDropShadow.h */,
1798+
D2F78CC71999AB6E00229357 /* CCEffectDropShadow.h */,
18011799
D208E79C1993FEDA00BD8D6B /* CCEffectDropShadow.m */,
18021800
D208E7AB19959A4800BD8D6B /* CCEffectOuterGlow.h */,
18031801
D208E7AC19959A4800BD8D6B /* CCEffectOuterGlow.m */,
@@ -1924,6 +1922,7 @@
19241922
B7705FE21831A07B0043CC67 /* ALCaptureDevice.h in Headers */,
19251923
5018F26F0DFDEAFF00C013A5 /* CCActionInstant.h in Headers */,
19261924
B7705FF21831A07B0043CC67 /* ALWrapper.h in Headers */,
1925+
D2F78CC81999AB6E00229357 /* CCEffectDropShadow.h in Headers */,
19271926
5018F2710DFDEAFF00C013A5 /* CCActionInterval.h in Headers */,
19281927
5018F2730DFDEAFF00C013A5 /* CCLabelTTF.h in Headers */,
19291928
5018F2750DFDEAFF00C013A5 /* CCNodeColor.h in Headers */,
@@ -2089,7 +2088,6 @@
20892088
D268FE0D198078FF00ECBCD0 /* CCEffectBloom.h in Headers */,
20902089
B78AE46217E7AF1C0028BE0B /* CCButton.h in Headers */,
20912090
B798D15318205EFB00E7BFCD /* CCParticleSystem_Private.h in Headers */,
2092-
D208E79D1993FEDA00BD8D6B /* CCEffectDropShadow.h in Headers */,
20932091
D26A042A194B815500503BEC /* CCTouchEvent.h in Headers */,
20942092
B7705FD61831A07B0043CC67 /* OALAudioTrack.h in Headers */,
20952093
B78AE46417E7AF1C0028BE0B /* CCControl.h in Headers */,
@@ -2240,7 +2238,7 @@
22402238
D2FEB691194F6C9E00FC0574 /* CCGLView.h in Headers */,
22412239
D208E7AE19959A4800BD8D6B /* CCEffectOuterGlow.h in Headers */,
22422240
D2FEB692194F6C9E00FC0574 /* CCWindow.h in Headers */,
2243-
D208E79E1993FEDA00BD8D6B /* CCEffectDropShadow.h in Headers */,
2241+
D2E8E1861999ABA2004F18DF /* CCEffectDropShadow.h in Headers */,
22442242
D2FEB693194F6C9E00FC0574 /* CCProgressNode.h in Headers */,
22452243
D2DDB09419805E8400233D80 /* CCMathUtilsAndroid.h in Headers */,
22462244
D2FEB694194F6C9E00FC0574 /* CCLayout.h in Headers */,

‎cocos2d/CCEffectDropShadow.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ -(id)initWithShadowOffset:(GLKVector2)shadowOffset shadowColor:(CCColor*)shadowC
2525
[CCEffectUniform uniform:@"vec4" name:@"u_shadowColor" value: [NSValue valueWithGLKVector4:shadowColor.glkVector4]],
2626
];
2727

28-
if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varying:nil]))
28+
if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varyings:nil]))
2929
{
3030
_shadowColor = shadowColor;
3131
_shadowOffset = shadowOffset;

‎cocos2d/CCEffectOuterGlow.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ -(id)initWithGlowColor:(CCColor*)glowColor
2626
[CCEffectUniform uniform:@"vec4" name:@"u_glowColor" value: [NSValue valueWithGLKVector4:glowColor.glkVector4]]
2727
];
2828

29-
if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varying:nil]))
29+
if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varyings:nil]))
3030
{
3131
_glowColor = glowColor;
3232
self.debugName = @"CCEffectOuterGlow";

0 commit comments

Comments
 (0)