Skip to content

Commit 6bda31e

Browse files
vlidholtvlidholt
committed
Merge pull request #819 from osinoleg/develop
CCEffects - added CCEffectRenderer
2 parents 283ca3c + db5d747 commit 6bda31e

40 files changed

+1515
-521
lines changed

‎Resources/Images/planet1.png

76.3 KB
Loading

‎Resources/Images/sample_vertical_rect.png

3.42 KB
Loading

‎Resources/Images/sphere-23.png

13.8 KB
Loading

‎Resources/Images/starynight.png

14.8 KB
Loading

‎cocos2d-ios.xcodeproj/project.pbxproj

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,12 @@
110110
9D85671E191B018200573093 /* CCEffectBrightness.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D85671C191B018200573093 /* CCEffectBrightness.m */; };
111111
9D856721191B019900573093 /* CCEffectContrast.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D85671F191B019900573093 /* CCEffectContrast.h */; };
112112
9D856722191B019900573093 /* CCEffectContrast.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D856720191B019900573093 /* CCEffectContrast.m */; };
113+
9DE90429192D630000AEB37A /* CCEffectRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DE90427192D630000AEB37A /* CCEffectRenderer.h */; };
114+
9DE9042A192D630000AEB37A /* CCEffectRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DE90428192D630000AEB37A /* CCEffectRenderer.m */; };
113115
9DF37621191C594A00C6D27A /* CCEffectPixellate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DF3761F191C594A00C6D27A /* CCEffectPixellate.h */; };
114116
9DF37622191C594A00C6D27A /* CCEffectPixellate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DF37620191C594A00C6D27A /* CCEffectPixellate.m */; };
117+
9DFB1E5019241AEF008371EF /* CCEffectSaturation.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DFB1E4E19241AEF008371EF /* CCEffectSaturation.h */; };
118+
9DFB1E5119241AEF008371EF /* CCEffectSaturation.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DFB1E4F19241AEF008371EF /* CCEffectSaturation.m */; };
115119
A003AC8C1657071100C7B792 /* ccFPSImages.h in Headers */ = {isa = PBXBuildFile; fileRef = A003AC8B1657071100C7B792 /* ccFPSImages.h */; };
116120
A003AC8F16572D6000C7B792 /* ccFPSImages.m in Sources */ = {isa = PBXBuildFile; fileRef = A003AC8E16572D6000C7B792 /* ccFPSImages.m */; };
117121
A039EBFF155C686B0061EE37 /* CCNode+Debug.h in Headers */ = {isa = PBXBuildFile; fileRef = A039EBFD155C686B0061EE37 /* CCNode+Debug.h */; };
@@ -254,16 +258,10 @@
254258
D272032418FC89A000B100FF /* CCEffect_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D272031718FC89A000B100FF /* CCEffect_Private.h */; };
255259
D272032518FC89A000B100FF /* CCEffect.h in Headers */ = {isa = PBXBuildFile; fileRef = D272031818FC89A000B100FF /* CCEffect.h */; };
256260
D272032618FC89A000B100FF /* CCEffect.m in Sources */ = {isa = PBXBuildFile; fileRef = D272031918FC89A000B100FF /* CCEffect.m */; };
257-
D272032718FC89A000B100FF /* CCEffectColor.h in Headers */ = {isa = PBXBuildFile; fileRef = D272031A18FC89A000B100FF /* CCEffectColor.h */; };
258-
D272032818FC89A000B100FF /* CCEffectColor.m in Sources */ = {isa = PBXBuildFile; fileRef = D272031B18FC89A000B100FF /* CCEffectColor.m */; };
259-
D272032918FC89A000B100FF /* CCEffectColorPulse.h in Headers */ = {isa = PBXBuildFile; fileRef = D272031C18FC89A000B100FF /* CCEffectColorPulse.h */; };
260-
D272032A18FC89A000B100FF /* CCEffectColorPulse.m in Sources */ = {isa = PBXBuildFile; fileRef = D272031D18FC89A000B100FF /* CCEffectColorPulse.m */; };
261261
D272032B18FC89A000B100FF /* CCEffectNode.h in Headers */ = {isa = PBXBuildFile; fileRef = D272031E18FC89A000B100FF /* CCEffectNode.h */; };
262262
D272032C18FC89A000B100FF /* CCEffectNode.m in Sources */ = {isa = PBXBuildFile; fileRef = D272031F18FC89A000B100FF /* CCEffectNode.m */; };
263263
D272032D18FC89A000B100FF /* CCEffectStack.h in Headers */ = {isa = PBXBuildFile; fileRef = D272032018FC89A000B100FF /* CCEffectStack.h */; };
264264
D272032E18FC89A000B100FF /* CCEffectStack.m in Sources */ = {isa = PBXBuildFile; fileRef = D272032118FC89A000B100FF /* CCEffectStack.m */; };
265-
D272032F18FC89A000B100FF /* CCEffectTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = D272032218FC89A000B100FF /* CCEffectTexture.h */; };
266-
D272033018FC89A000B100FF /* CCEffectTexture.m in Sources */ = {isa = PBXBuildFile; fileRef = D272032318FC89A000B100FF /* CCEffectTexture.m */; };
267265
D272033318FC9A4700B100FF /* CCEffectGlow.h in Headers */ = {isa = PBXBuildFile; fileRef = D272033118FC9A4700B100FF /* CCEffectGlow.h */; };
268266
D272033418FC9A4700B100FF /* CCEffectGlow.m in Sources */ = {isa = PBXBuildFile; fileRef = D272033218FC9A4700B100FF /* CCEffectGlow.m */; };
269267
D2B49104192146FB00C3443A /* CCEffectGaussianBlur.h in Headers */ = {isa = PBXBuildFile; fileRef = D2B49102192146FB00C3443A /* CCEffectGaussianBlur.h */; };
@@ -435,8 +433,12 @@
435433
9D85671C191B018200573093 /* CCEffectBrightness.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectBrightness.m; sourceTree = "<group>"; };
436434
9D85671F191B019900573093 /* CCEffectContrast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectContrast.h; sourceTree = "<group>"; };
437435
9D856720191B019900573093 /* CCEffectContrast.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectContrast.m; sourceTree = "<group>"; };
436+
9DE90427192D630000AEB37A /* CCEffectRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectRenderer.h; sourceTree = "<group>"; };
437+
9DE90428192D630000AEB37A /* CCEffectRenderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectRenderer.m; sourceTree = "<group>"; };
438438
9DF3761F191C594A00C6D27A /* CCEffectPixellate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectPixellate.h; sourceTree = "<group>"; };
439439
9DF37620191C594A00C6D27A /* CCEffectPixellate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectPixellate.m; sourceTree = "<group>"; };
440+
9DFB1E4E19241AEF008371EF /* CCEffectSaturation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectSaturation.h; sourceTree = "<group>"; };
441+
9DFB1E4F19241AEF008371EF /* CCEffectSaturation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectSaturation.m; sourceTree = "<group>"; };
440442
A003AC8B1657071100C7B792 /* ccFPSImages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccFPSImages.h; sourceTree = "<group>"; };
441443
A003AC8E16572D6000C7B792 /* ccFPSImages.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ccFPSImages.m; sourceTree = "<group>"; };
442444
A034FF85149DC993009F11AA /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
@@ -587,16 +589,10 @@
587589
D272031718FC89A000B100FF /* CCEffect_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffect_Private.h; sourceTree = "<group>"; };
588590
D272031818FC89A000B100FF /* CCEffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffect.h; sourceTree = "<group>"; };
589591
D272031918FC89A000B100FF /* CCEffect.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffect.m; sourceTree = "<group>"; };
590-
D272031A18FC89A000B100FF /* CCEffectColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectColor.h; sourceTree = "<group>"; };
591-
D272031B18FC89A000B100FF /* CCEffectColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectColor.m; sourceTree = "<group>"; };
592-
D272031C18FC89A000B100FF /* CCEffectColorPulse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectColorPulse.h; sourceTree = "<group>"; };
593-
D272031D18FC89A000B100FF /* CCEffectColorPulse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectColorPulse.m; sourceTree = "<group>"; };
594592
D272031E18FC89A000B100FF /* CCEffectNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectNode.h; sourceTree = "<group>"; };
595593
D272031F18FC89A000B100FF /* CCEffectNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectNode.m; sourceTree = "<group>"; };
596594
D272032018FC89A000B100FF /* CCEffectStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectStack.h; sourceTree = "<group>"; };
597595
D272032118FC89A000B100FF /* CCEffectStack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectStack.m; sourceTree = "<group>"; };
598-
D272032218FC89A000B100FF /* CCEffectTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectTexture.h; sourceTree = "<group>"; };
599-
D272032318FC89A000B100FF /* CCEffectTexture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectTexture.m; sourceTree = "<group>"; };
600596
D272033118FC9A4700B100FF /* CCEffectGlow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectGlow.h; sourceTree = "<group>"; };
601597
D272033218FC9A4700B100FF /* CCEffectGlow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectGlow.m; sourceTree = "<group>"; };
602598
D2B49102192146FB00C3443A /* CCEffectGaussianBlur.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectGaussianBlur.h; sourceTree = "<group>"; };
@@ -1207,15 +1203,9 @@
12071203
D272031718FC89A000B100FF /* CCEffect_Private.h */,
12081204
D272031818FC89A000B100FF /* CCEffect.h */,
12091205
D272031918FC89A000B100FF /* CCEffect.m */,
1210-
D272031A18FC89A000B100FF /* CCEffectColor.h */,
1211-
D272031B18FC89A000B100FF /* CCEffectColor.m */,
1212-
D272031C18FC89A000B100FF /* CCEffectColorPulse.h */,
1213-
D272031D18FC89A000B100FF /* CCEffectColorPulse.m */,
12141206
D272032018FC89A000B100FF /* CCEffectStack.h */,
12151207
9D85671A191AE2CC00573093 /* CCEffectStack_Private.h */,
12161208
D272032118FC89A000B100FF /* CCEffectStack.m */,
1217-
D272032218FC89A000B100FF /* CCEffectTexture.h */,
1218-
D272032318FC89A000B100FF /* CCEffectTexture.m */,
12191209
D272033118FC9A4700B100FF /* CCEffectGlow.h */,
12201210
D272033218FC9A4700B100FF /* CCEffectGlow.m */,
12211211
9D85671B191B018200573093 /* CCEffectBrightness.h */,
@@ -1226,6 +1216,10 @@
12261216
9DF37620191C594A00C6D27A /* CCEffectPixellate.m */,
12271217
D2B49102192146FB00C3443A /* CCEffectGaussianBlur.h */,
12281218
D2B49103192146FB00C3443A /* CCEffectGaussianBlur.m */,
1219+
9DFB1E4E19241AEF008371EF /* CCEffectSaturation.h */,
1220+
9DFB1E4F19241AEF008371EF /* CCEffectSaturation.m */,
1221+
9DE90427192D630000AEB37A /* CCEffectRenderer.h */,
1222+
9DE90428192D630000AEB37A /* CCEffectRenderer.m */,
12291223
);
12301224
name = Effects;
12311225
sourceTree = "<group>";
@@ -1333,6 +1327,7 @@
13331327
B7D2730D1822F4AA0054849B /* CCBAnimationManager.h in Headers */,
13341328
50F7B2780F28DE7C00057537 /* CCActionEase.h in Headers */,
13351329
B798D1451820305400E7BFCD /* CCSprite_Private.h in Headers */,
1330+
9DFB1E5019241AEF008371EF /* CCEffectSaturation.h in Headers */,
13361331
50BAF3990F33CCD8003F654C /* ccMacros.h in Headers */,
13371332
B798D13D181F2E4500E7BFCD /* CCNode_Private.h in Headers */,
13381333
509A79970F6188420032F449 /* CCSprite.h in Headers */,
@@ -1348,7 +1343,6 @@
13481343
D272032518FC89A000B100FF /* CCEffect.h in Headers */,
13491344
D272032418FC89A000B100FF /* CCEffect_Private.h in Headers */,
13501345
D272032D18FC89A000B100FF /* CCEffectStack.h in Headers */,
1351-
D272032718FC89A000B100FF /* CCEffectColor.h in Headers */,
13521346
B7E260D818171D2000A0E872 /* CCTextField.h in Headers */,
13531347
B7D273131822F4AA0054849B /* CCBReader.h in Headers */,
13541348
9DF37621191C594A00C6D27A /* CCEffectPixellate.h in Headers */,
@@ -1388,7 +1382,6 @@
13881382
E0C54DCB11F9CF2700B9E4CB /* ccUtils.h in Headers */,
13891383
B7705FF11831A07B0043CC67 /* ALTypes.h in Headers */,
13901384
E01E6D8C121F130E001A484F /* CCLabelBMFont.h in Headers */,
1391-
D272032F18FC89A000B100FF /* CCEffectTexture.h in Headers */,
13921385
B7705FDA1831A07B0043CC67 /* OALAudioTracks.h in Headers */,
13931386
E0EAD0FF121F4B4600B0C81C /* CCDirectorIOS.h in Headers */,
13941387
E0EAD108121F4B4600B0C81C /* CCGLView.h in Headers */,
@@ -1444,11 +1437,11 @@
14441437
A6A0734517C788EB004343C8 /* CCResponderManager.h in Headers */,
14451438
A6A0734A17C78EF3004343C8 /* CCResponder.h in Headers */,
14461439
B78AE46217E7AF1C0028BE0B /* CCButton.h in Headers */,
1440+
9DE90429192D630000AEB37A /* CCEffectRenderer.h in Headers */,
14471441
B798D15318205EFB00E7BFCD /* CCParticleSystem_Private.h in Headers */,
14481442
B7705FD61831A07B0043CC67 /* OALAudioTrack.h in Headers */,
14491443
B78AE46417E7AF1C0028BE0B /* CCControl.h in Headers */,
14501444
B78AE46617E7AF1C0028BE0B /* CCControlTextureFactory.h in Headers */,
1451-
D272032918FC89A000B100FF /* CCEffectColorPulse.h in Headers */,
14521445
B78AE46817E7AF1C0028BE0B /* CCScrollView.h in Headers */,
14531446
B78AE46C17E7AF6C0028BE0B /* UITouch+CC.h in Headers */,
14541447
B7D2730F1822F4AA0054849B /* CCBKeyframe.h in Headers */,
@@ -1549,7 +1542,6 @@
15491542
5018F2700DFDEAFF00C013A5 /* CCActionInstant.m in Sources */,
15501543
5018F2720DFDEAFF00C013A5 /* CCActionInterval.m in Sources */,
15511544
B77060071831A07B0043CC67 /* OALTools.m in Sources */,
1552-
D272033018FC89A000B100FF /* CCEffectTexture.m in Sources */,
15531545
D33803EA180331A90072D8FE /* CCPhysicsJoint.m in Sources */,
15541546
B7705FE91831A07B0043CC67 /* ALDevice.m in Sources */,
15551547
5018F2740DFDEAFF00C013A5 /* CCLabelTTF.m in Sources */,
@@ -1607,6 +1599,7 @@
16071599
50FBB2DB117613F500150761 /* CCActionTween.m in Sources */,
16081600
B7705FD71831A07B0043CC67 /* OALAudioTrack.m in Sources */,
16091601
D37D197B18B6666E00B23FDE /* CCSpriteBatchNode.m in Sources */,
1602+
9DFB1E5119241AEF008371EF /* CCEffectSaturation.m in Sources */,
16101603
E0C54DCA11F9CF2700B9E4CB /* ccUtils.c in Sources */,
16111604
D33803E618032F390072D8FE /* CCPhysicsNode.m in Sources */,
16121605
E01E6D8D121F130E001A484F /* CCLabelBMFont.m in Sources */,
@@ -1621,7 +1614,6 @@
16211614
E02BB705126CADEA006E46A2 /* CCAnimation.m in Sources */,
16221615
E0BC7DA01342CE7B001B4DCC /* CCShader.m in Sources */,
16231616
B7705FE31831A07B0043CC67 /* ALCaptureDevice.m in Sources */,
1624-
D272032A18FC89A000B100FF /* CCEffectColorPulse.m in Sources */,
16251617
E0BC7DA91342CF27001B4DCC /* CCES2Renderer.m in Sources */,
16261618
A0C20AC9144FDAF700D84B47 /* CCParticleBatchNode.m in Sources */,
16271619
A046E29414C1DB7D0005BBF2 /* CCDirectorMac.m in Sources */,
@@ -1635,7 +1627,6 @@
16351627
9DF37622191C594A00C6D27A /* CCEffectPixellate.m in Sources */,
16361628
A0A7A53D1514F27D00C8BD16 /* CCActionCatmullRom.m in Sources */,
16371629
D380581B1889AD6000822437 /* CCRenderer.m in Sources */,
1638-
D272032818FC89A000B100FF /* CCEffectColor.m in Sources */,
16391630
A039EC00155C686B0061EE37 /* CCNode+Debug.m in Sources */,
16401631
D36D31B718BD3CAA00E45F08 /* CCProgressNode.m in Sources */,
16411632
B7705FDD1831A07B0043CC67 /* OALSimpleAudio.m in Sources */,
@@ -1655,6 +1646,7 @@
16551646
B7705FF71831A07B0043CC67 /* OALAudioSession.m in Sources */,
16561647
B7E776221857A159004221AA /* CCColor.m in Sources */,
16571648
A6DC4E0A18055DCC00C280A6 /* CCTransition.m in Sources */,
1649+
9DE9042A192D630000AEB37A /* CCEffectRenderer.m in Sources */,
16581650
B77060021831A07B0043CC67 /* NSMutableDictionary+WeakReferences.m in Sources */,
16591651
A6A0734617C788EB004343C8 /* CCResponderManager.m in Sources */,
16601652
A6A0734B17C78EF3004343C8 /* CCResponder.m in Sources */,

‎cocos2d-tests-ios.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
B7EE69811818760700B983FE /* CCSprite9SliceTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B7EE69801818760700B983FE /* CCSprite9SliceTest.m */; };
6969
B7EE69CF1819D82300B983FE /* CCLayoutTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B7EE69CE1819D82300B983FE /* CCLayoutTest.m */; };
7070
B7EE6A28181B075E00B983FE /* CCSliderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B7EE6A27181B075E00B983FE /* CCSliderTest.m */; };
71+
D29698121926DF7500BBB097 /* CCEffectPongTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D29698111926DF7500BBB097 /* CCEffectPongTest.m */; };
7172
D2B4894C1917EE6700C3443A /* CCEffectsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B4894B1917EE6700C3443A /* CCEffectsTest.m */; };
7273
D3395F1A187F83E600F22C74 /* CCMemoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D3395F19187F83E600F22C74 /* CCMemoryTests.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
7374
D340E10E185660BE006E605C /* CCPhysicsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D340E10C185660BE006E605C /* CCPhysicsTest.m */; };
@@ -191,6 +192,7 @@
191192
B7EE69801818760700B983FE /* CCSprite9SliceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCSprite9SliceTest.m; path = "cocos2d-ui-tests/tests/CCSprite9SliceTest.m"; sourceTree = SOURCE_ROOT; };
192193
B7EE69CE1819D82300B983FE /* CCLayoutTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCLayoutTest.m; path = "cocos2d-ui-tests/tests/CCLayoutTest.m"; sourceTree = SOURCE_ROOT; };
193194
B7EE6A27181B075E00B983FE /* CCSliderTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCSliderTest.m; path = "cocos2d-ui-tests/tests/CCSliderTest.m"; sourceTree = SOURCE_ROOT; };
195+
D29698111926DF7500BBB097 /* CCEffectPongTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCEffectPongTest.m; path = "cocos2d-ui-tests/tests/CCEffectPongTest.m"; sourceTree = SOURCE_ROOT; };
194196
D2B4894B1917EE6700C3443A /* CCEffectsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCEffectsTest.m; path = "cocos2d-ui-tests/tests/CCEffectsTest.m"; sourceTree = SOURCE_ROOT; };
195197
D3395F19187F83E600F22C74 /* CCMemoryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCMemoryTests.m; sourceTree = "<group>"; };
196198
D340E10C185660BE006E605C /* CCPhysicsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCPhysicsTest.m; path = "cocos2d-ui-tests/tests/CCPhysicsTest.m"; sourceTree = SOURCE_ROOT; };
@@ -376,6 +378,7 @@
376378
D3B2A7E4187DD60B00406C5A /* CCBMFontTest.m */,
377379
A6167B92189A7D4D0044D391 /* VertexZTest.m */,
378380
A664A4EE18A3D9B8006184B8 /* PositioningTest.m */,
381+
D29698111926DF7500BBB097 /* CCEffectPongTest.m */,
379382
);
380383
name = Tests;
381384
path = "cocos2d-ui-tests/tests";
@@ -651,6 +654,7 @@
651654
D3870C6018B440150033D885 /* SpritePerformanceTest.m in Sources */,
652655
B71B088217EA5B6A0082EBC0 /* CCScrollViewTest.m in Sources */,
653656
B7EE697918186D5200B983FE /* CCTextFieldTest.m in Sources */,
657+
D29698121926DF7500BBB097 /* CCEffectPongTest.m in Sources */,
654658
B7E2620017E7D321007067F0 /* AppDelegate.m in Sources */,
655659
B77060AB1832E3310043CC67 /* CCTextureCacheTest.m in Sources */,
656660
A664A4EF18A3D9B8006184B8 /* PositioningTest.m in Sources */,

‎cocos2d-ui-tests/TestBase.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
CCButton* _btnNext;
3737
CCButton* _btnReload;
3838

39+
CCSprite9Slice* _headerBg;
40+
3941
NSInteger _currentTest;
4042
}
4143

0 commit comments

Comments
 (0)