Skip to content

Commit ea53e27

Browse files
slembckeslembcke
committed
Merge CCES2Renderer and CCGLView.m on iOS.
1 parent ae37cbc commit ea53e27

File tree

8 files changed

+113
-449
lines changed

8 files changed

+113
-449
lines changed

‎CCRendererGLSupport.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ -(void)syncWithView:(CC_VIEW<CCDirectorView> *)view;
380380
self.contentScale = view.contentScaleFactor;
381381

382382
#warning TODO does this need to handle MSAA specially?
383-
_fbo = glView->_renderer.defaultFrameBuffer;
383+
_fbo = glView.defaultFramebuffer;
384384
}
385385

386386
@end

‎cocos2d-ios.xcodeproj/project.pbxproj

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,6 @@
461461
D2FEB679194F6C9E00FC0574 /* CCLabelBMFont_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B798D142181F469100E7BFCD /* CCLabelBMFont_Private.h */; };
462462
D2FEB67A194F6C9E00FC0574 /* OALAction.h in Headers */ = {isa = PBXBuildFile; fileRef = B7705F8D1831A07B0043CC67 /* OALAction.h */; };
463463
D2FEB67B194F6C9E00FC0574 /* OpenALManager.h in Headers */ = {isa = PBXBuildFile; fileRef = B7705FB51831A07B0043CC67 /* OpenALManager.h */; };
464-
D2FEB67C194F6C9E00FC0574 /* CCESRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = E0EAD0F7121F4B4600B0C81C /* CCESRenderer.h */; };
465464
D2FEB67D194F6C9E00FC0574 /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = E0EAD19C121F4D7300B0C81C /* CCGL.h */; };
466465
D2FEB67E194F6C9E00FC0574 /* CCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = E0EAD1F0121F522A00B0C81C /* CCConfiguration.h */; };
467466
D2FEB67F194F6C9E00FC0574 /* CCEffectBrightness.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D85671B191B018200573093 /* CCEffectBrightness.h */; };
@@ -474,7 +473,6 @@
474473
D2FEB686194F6C9E00FC0574 /* CCBuilderReader.h in Headers */ = {isa = PBXBuildFile; fileRef = B7D2730C1822F4AA0054849B /* CCBuilderReader.h */; };
475474
D2FEB687194F6C9E00FC0574 /* CCAppDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = B7E775CE18527EF0004221AA /* CCAppDelegate.h */; };
476475
D2FEB688194F6C9E00FC0574 /* CCShader.h in Headers */ = {isa = PBXBuildFile; fileRef = E0BC7D9B1342CE7B001B4DCC /* CCShader.h */; };
477-
D2FEB689194F6C9E00FC0574 /* CCES2Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = E0BC7DA61342CF27001B4DCC /* CCES2Renderer.h */; };
478476
D2FEB68A194F6C9E00FC0574 /* OALAudioTrackNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = B7705F981831A07B0043CC67 /* OALAudioTrackNotifications.h */; };
479477
D2FEB68B194F6C9E00FC0574 /* OALAudioFile.h in Headers */ = {isa = PBXBuildFile; fileRef = B7705FC61831A07B0043CC67 /* OALAudioFile.h */; };
480478
D2FEB68C194F6C9E00FC0574 /* CCShader_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D39FA9C718C1BC6B00441627 /* CCShader_Private.h */; };
@@ -593,7 +591,6 @@
593591
D2FEB709194F6C9E00FC0574 /* CCAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = E02BB703126CADEA006E46A2 /* CCAnimation.m */; };
594592
D2FEB70A194F6C9E00FC0574 /* CCShader.m in Sources */ = {isa = PBXBuildFile; fileRef = E0BC7D9C1342CE7B001B4DCC /* CCShader.m */; };
595593
D2FEB70B194F6C9E00FC0574 /* ALCaptureDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = B7705FA41831A07B0043CC67 /* ALCaptureDevice.m */; };
596-
D2FEB70E194F6C9E00FC0574 /* CCES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = E0BC7DA71342CF27001B4DCC /* CCES2Renderer.m */; };
597594
D2FEB70F194F6C9E00FC0574 /* CCParticleBatchNode.m in Sources */ = {isa = PBXBuildFile; fileRef = A0C20AC7144FDAF700D84B47 /* CCParticleBatchNode.m */; };
598595
D2FEB710194F6C9E00FC0574 /* CCDirectorMac.m in Sources */ = {isa = PBXBuildFile; fileRef = A046E28C14C1DB7D0005BBF2 /* CCDirectorMac.m */; };
599596
D2FEB711194F6C9E00FC0574 /* CCGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = A046E29014C1DB7D0005BBF2 /* CCGLView.m */; };
@@ -686,16 +683,13 @@
686683
E02BB705126CADEA006E46A2 /* CCAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = E02BB703126CADEA006E46A2 /* CCAnimation.m */; };
687684
E0BC7D9F1342CE7B001B4DCC /* CCShader.h in Headers */ = {isa = PBXBuildFile; fileRef = E0BC7D9B1342CE7B001B4DCC /* CCShader.h */; };
688685
E0BC7DA01342CE7B001B4DCC /* CCShader.m in Sources */ = {isa = PBXBuildFile; fileRef = E0BC7D9C1342CE7B001B4DCC /* CCShader.m */; };
689-
E0BC7DA81342CF27001B4DCC /* CCES2Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = E0BC7DA61342CF27001B4DCC /* CCES2Renderer.h */; };
690-
E0BC7DA91342CF27001B4DCC /* CCES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = E0BC7DA71342CF27001B4DCC /* CCES2Renderer.m */; };
691686
E0C3655B11F0AE9B001C08F9 /* CCSpriteBatchNode.h in Headers */ = {isa = PBXBuildFile; fileRef = E0C3655911F0AE9B001C08F9 /* CCSpriteBatchNode.h */; };
692687
E0C54DCA11F9CF2700B9E4CB /* ccUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = E0C54DC811F9CF2700B9E4CB /* ccUtils.c */; };
693688
E0C54DCB11F9CF2700B9E4CB /* ccUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = E0C54DC911F9CF2700B9E4CB /* ccUtils.h */; };
694689
E0EAD0FF121F4B4600B0C81C /* CCDirectorIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = E0EAD0EA121F4B4600B0C81C /* CCDirectorIOS.h */; };
695690
E0EAD100121F4B4600B0C81C /* CCDirectorIOS.m in Sources */ = {isa = PBXBuildFile; fileRef = E0EAD0EB121F4B4600B0C81C /* CCDirectorIOS.m */; };
696691
E0EAD108121F4B4600B0C81C /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = E0EAD0F3121F4B4600B0C81C /* CCGLView.h */; };
697692
E0EAD109121F4B4600B0C81C /* CCGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = E0EAD0F4121F4B4600B0C81C /* CCGLView.m */; };
698-
E0EAD10C121F4B4600B0C81C /* CCESRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = E0EAD0F7121F4B4600B0C81C /* CCESRenderer.h */; };
699693
E0EAD19D121F4D7300B0C81C /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = E0EAD19C121F4D7300B0C81C /* CCGL.h */; };
700694
E0EAD1F1121F522A00B0C81C /* CCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = E0EAD1F0121F522A00B0C81C /* CCConfiguration.h */; };
701695
E0F924711224140400EF2362 /* CCTexturePVR.h in Headers */ = {isa = PBXBuildFile; fileRef = E0F9246F1224140400EF2362 /* CCTexturePVR.h */; };
@@ -1137,8 +1131,6 @@
11371131
E0BC7D721342CC58001B4DCC /* LICENSE_CocosDenshion.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE_CocosDenshion.txt; sourceTree = "<group>"; };
11381132
E0BC7D9B1342CE7B001B4DCC /* CCShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShader.h; sourceTree = "<group>"; };
11391133
E0BC7D9C1342CE7B001B4DCC /* CCShader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCShader.m; sourceTree = "<group>"; };
1140-
E0BC7DA61342CF27001B4DCC /* CCES2Renderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCES2Renderer.h; sourceTree = "<group>"; };
1141-
E0BC7DA71342CF27001B4DCC /* CCES2Renderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCES2Renderer.m; sourceTree = "<group>"; };
11421134
E0C3655911F0AE9B001C08F9 /* CCSpriteBatchNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSpriteBatchNode.h; sourceTree = "<group>"; };
11431135
E0C3655A11F0AE9B001C08F9 /* CCSpriteBatchNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCSpriteBatchNode.m; sourceTree = "<group>"; };
11441136
E0C54DC811F9CF2700B9E4CB /* ccUtils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ccUtils.c; sourceTree = "<group>"; };
@@ -1147,7 +1139,6 @@
11471139
E0EAD0EB121F4B4600B0C81C /* CCDirectorIOS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCDirectorIOS.m; sourceTree = "<group>"; };
11481140
E0EAD0F3121F4B4600B0C81C /* CCGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLView.h; sourceTree = "<group>"; };
11491141
E0EAD0F4121F4B4600B0C81C /* CCGLView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCGLView.m; sourceTree = "<group>"; };
1150-
E0EAD0F7121F4B4600B0C81C /* CCESRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCESRenderer.h; sourceTree = "<group>"; };
11511142
E0EAD19C121F4D7300B0C81C /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = "<group>"; };
11521143
E0EAD1F0121F522A00B0C81C /* CCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCConfiguration.h; sourceTree = "<group>"; };
11531144
E0F9246F1224140400EF2362 /* CCTexturePVR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTexturePVR.h; sourceTree = "<group>"; };
@@ -1965,9 +1956,6 @@
19651956
E0EAD0EB121F4B4600B0C81C /* CCDirectorIOS.m */,
19661957
E0EAD0F3121F4B4600B0C81C /* CCGLView.h */,
19671958
E0EAD0F4121F4B4600B0C81C /* CCGLView.m */,
1968-
E0BC7DA61342CF27001B4DCC /* CCES2Renderer.h */,
1969-
E0EAD0F7121F4B4600B0C81C /* CCESRenderer.h */,
1970-
E0BC7DA71342CF27001B4DCC /* CCES2Renderer.m */,
19711959
B7E775CE18527EF0004221AA /* CCAppDelegate.h */,
19721960
B7E775CF18527EF0004221AA /* CCAppDelegate.m */,
19731961
D23C5CB2194BC108007CA669 /* CCTouchIOS.h */,
@@ -2113,7 +2101,6 @@
21132101
D3903B0A1995285B003AA81A /* CCEffectBlur.h in Headers */,
21142102
B7705FCE1831A07B0043CC67 /* OALAction.h in Headers */,
21152103
B7705FF41831A07B0043CC67 /* OpenALManager.h in Headers */,
2116-
E0EAD10C121F4B4600B0C81C /* CCESRenderer.h in Headers */,
21172104
E0EAD19D121F4D7300B0C81C /* CCGL.h in Headers */,
21182105
E0EAD1F1121F522A00B0C81C /* CCConfiguration.h in Headers */,
21192106
9D85671D191B018200573093 /* CCEffectBrightness.h in Headers */,
@@ -2129,7 +2116,6 @@
21292116
B7E775D018527EF0004221AA /* CCAppDelegate.h in Headers */,
21302117
E0BC7D9F1342CE7B001B4DCC /* CCShader.h in Headers */,
21312118
D2DDB09319805E8400233D80 /* CCMathUtilsAndroid.h in Headers */,
2132-
E0BC7DA81342CF27001B4DCC /* CCES2Renderer.h in Headers */,
21332119
B7705FD81831A07B0043CC67 /* OALAudioTrackNotifications.h in Headers */,
21342120
B77060031831A07B0043CC67 /* OALAudioFile.h in Headers */,
21352121
D39FA9C818C1BC6B00441627 /* CCShader_Private.h in Headers */,
@@ -2298,7 +2284,6 @@
22982284
D2FEB679194F6C9E00FC0574 /* CCLabelBMFont_Private.h in Headers */,
22992285
D2FEB67A194F6C9E00FC0574 /* OALAction.h in Headers */,
23002286
D2FEB67B194F6C9E00FC0574 /* OpenALManager.h in Headers */,
2301-
D2FEB67C194F6C9E00FC0574 /* CCESRenderer.h in Headers */,
23022287
D2FEB67D194F6C9E00FC0574 /* CCGL.h in Headers */,
23032288
D2FEB67E194F6C9E00FC0574 /* CCConfiguration.h in Headers */,
23042289
D2FEB67F194F6C9E00FC0574 /* CCEffectBrightness.h in Headers */,
@@ -2314,7 +2299,6 @@
23142299
D2FEB687194F6C9E00FC0574 /* CCAppDelegate.h in Headers */,
23152300
D2FEB688194F6C9E00FC0574 /* CCShader.h in Headers */,
23162301
D27451BE19AEC84F006DA0A1 /* CCEffectDistanceField.h in Headers */,
2317-
D2FEB689194F6C9E00FC0574 /* CCES2Renderer.h in Headers */,
23182302
D268FE1E1980791400ECBCD0 /* CCEffectUtils.h in Headers */,
23192303
D2FEB68A194F6C9E00FC0574 /* OALAudioTrackNotifications.h in Headers */,
23202304
D2FEB68B194F6C9E00FC0574 /* OALAudioFile.h in Headers */,
@@ -2611,7 +2595,6 @@
26112595
E02BB705126CADEA006E46A2 /* CCAnimation.m in Sources */,
26122596
E0BC7DA01342CE7B001B4DCC /* CCShader.m in Sources */,
26132597
B7705FE31831A07B0043CC67 /* ALCaptureDevice.m in Sources */,
2614-
E0BC7DA91342CF27001B4DCC /* CCES2Renderer.m in Sources */,
26152598
A0C20AC9144FDAF700D84B47 /* CCParticleBatchNode.m in Sources */,
26162599
A046E29414C1DB7D0005BBF2 /* CCDirectorMac.m in Sources */,
26172600
A046E29814C1DB7D0005BBF2 /* CCGLView.m in Sources */,
@@ -2774,7 +2757,6 @@
27742757
D2FEB709194F6C9E00FC0574 /* CCAnimation.m in Sources */,
27752758
D2FEB70A194F6C9E00FC0574 /* CCShader.m in Sources */,
27762759
D2FEB70B194F6C9E00FC0574 /* ALCaptureDevice.m in Sources */,
2777-
D2FEB70E194F6C9E00FC0574 /* CCES2Renderer.m in Sources */,
27782760
D2FEB70F194F6C9E00FC0574 /* CCParticleBatchNode.m in Sources */,
27792761
D2FEB710194F6C9E00FC0574 /* CCDirectorMac.m in Sources */,
27802762
D2FEB711194F6C9E00FC0574 /* CCGLView.m in Sources */,

‎cocos2d/Platforms/iOS/CCES2Renderer.h

Lines changed: 0 additions & 88 deletions
This file was deleted.

0 commit comments

Comments
 (0)