Skip to content

Commit 5124bee

Browse files
slembckeslembcke
committed
Fixed some Mac issues.
1 parent c04c592 commit 5124bee

File tree

6 files changed

+57
-41
lines changed

6 files changed

+57
-41
lines changed

‎CCRendererGLSupport.m

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,10 @@ -(void)bindWithClear:(GLbitfield)mask color:(GLKVector4)color4 depth:(GLclampf)d
387387
-(void)syncWithView:(CC_VIEW<CCDirectorView> *)view;
388388
{
389389
CCGLView *glView = (CCGLView *)view;
390-
self.sizeInPixels = CC_SIZE_SCALE(view.bounds.size, view.contentScaleFactor);
391-
self.contentScale = view.contentScaleFactor;
390+
391+
CGFloat contentScale = [CCDirector sharedDirector].contentScaleFactor;
392+
self.sizeInPixels = CC_SIZE_SCALE(view.bounds.size, contentScale);
393+
self.contentScale = contentScale;
392394

393395
_fbo = glView.fbo;
394396
}

‎cocos2d-osx.xcodeproj/project.pbxproj

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,12 @@
2020
926B97EB1938602200E345FB /* CCAnimationManager+FrameAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 926B97E91938602200E345FB /* CCAnimationManager+FrameAnimation.h */; };
2121
9D9E341519B7AAB800ADD7CB /* CCEffectColorChannelOffset.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D9E340F19B7AAB800ADD7CB /* CCEffectColorChannelOffset.h */; };
2222
9D9E341619B7AAB800ADD7CB /* CCEffectColorChannelOffset.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D9E341019B7AAB800ADD7CB /* CCEffectColorChannelOffset.m */; };
23-
9D9E341719B7AAB800ADD7CB /* CCEffectDropShadow.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D9E341119B7AAB800ADD7CB /* CCEffectDropShadow.h */; };
24-
9D9E341819B7AAB800ADD7CB /* CCEffectDropShadow.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D9E341219B7AAB800ADD7CB /* CCEffectDropShadow.m */; };
25-
9D9E341919B7AAB800ADD7CB /* CCEffectOuterGlow.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D9E341319B7AAB800ADD7CB /* CCEffectOuterGlow.h */; };
26-
9D9E341A19B7AAB800ADD7CB /* CCEffectOuterGlow.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D9E341419B7AAB800ADD7CB /* CCEffectOuterGlow.m */; };
2723
A003ACA7165731D500C7B792 /* ccFPSImages.h in Headers */ = {isa = PBXBuildFile; fileRef = A003ACA5165731D500C7B792 /* ccFPSImages.h */; };
2824
A003ACA8165731D500C7B792 /* ccFPSImages.m in Sources */ = {isa = PBXBuildFile; fileRef = A003ACA6165731D500C7B792 /* ccFPSImages.m */; };
2925
A03714D7154F1D9300081CBA /* CCNode+Debug.h in Headers */ = {isa = PBXBuildFile; fileRef = A03714D5154F1D9300081CBA /* CCNode+Debug.h */; };
3026
A03714D8154F1D9300081CBA /* CCNode+Debug.m in Sources */ = {isa = PBXBuildFile; fileRef = A03714D6154F1D9300081CBA /* CCNode+Debug.m */; };
3127
A046E2B214C1E5000005BBF2 /* CCDirectorIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E2A614C1E5000005BBF2 /* CCDirectorIOS.h */; };
3228
A046E2B314C1E5000005BBF2 /* CCDirectorIOS.m in Sources */ = {isa = PBXBuildFile; fileRef = A046E2A714C1E5000005BBF2 /* CCDirectorIOS.m */; };
33-
A046E2B414C1E5000005BBF2 /* CCES2Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E2A814C1E5000005BBF2 /* CCES2Renderer.h */; };
34-
A046E2B514C1E5000005BBF2 /* CCES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = A046E2A914C1E5000005BBF2 /* CCES2Renderer.m */; };
35-
A046E2B614C1E5000005BBF2 /* CCESRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E2AA14C1E5000005BBF2 /* CCESRenderer.h */; };
3629
A046E2B714C1E5000005BBF2 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E2AB14C1E5000005BBF2 /* CCGLView.h */; };
3730
A046E2B814C1E5000005BBF2 /* CCGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = A046E2AC14C1E5000005BBF2 /* CCGLView.m */; };
3831
A0A7A506151416A000C8BD16 /* CCActionCatmullRom.m in Sources */ = {isa = PBXBuildFile; fileRef = A0A7A504151416A000C8BD16 /* CCActionCatmullRom.m */; };
@@ -205,6 +198,13 @@
205198
D3AD532218C84FC9005B6CF3 /* CCRenderer_private.h in Headers */ = {isa = PBXBuildFile; fileRef = D3AD531F18C84FC9005B6CF3 /* CCRenderer_private.h */; };
206199
D3AD532318C84FC9005B6CF3 /* CCRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = D3AD532018C84FC9005B6CF3 /* CCRenderer.h */; };
207200
D3AD532418C84FC9005B6CF3 /* CCRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = D3AD532118C84FC9005B6CF3 /* CCRenderer.m */; };
201+
D3BEEFB919CFED350055B624 /* CCRendererBasicTypes_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D3BEEFB219CFED340055B624 /* CCRendererBasicTypes_Private.h */; };
202+
D3BEEFBA19CFED350055B624 /* CCRendererBasicTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = D3BEEFB319CFED340055B624 /* CCRendererBasicTypes.h */; };
203+
D3BEEFBB19CFED350055B624 /* CCRendererBasicTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = D3BEEFB419CFED340055B624 /* CCRendererBasicTypes.m */; };
204+
D3BEEFBC19CFED350055B624 /* CCRendererSharedTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = D3BEEFB519CFED350055B624 /* CCRendererSharedTypes.h */; };
205+
D3BEEFBD19CFED350055B624 /* CCRenderTexture_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D3BEEFB619CFED350055B624 /* CCRenderTexture_Private.h */; };
206+
D3BEEFBE19CFED350055B624 /* NSValue+CCRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = D3BEEFB719CFED350055B624 /* NSValue+CCRenderer.h */; };
207+
D3BEEFBF19CFED350055B624 /* NSValue+CCRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = D3BEEFB819CFED350055B624 /* NSValue+CCRenderer.m */; };
208208
D3DBE17119C8DED80009E45F /* CCEffectDFOutline.h in Headers */ = {isa = PBXBuildFile; fileRef = D3DBE16919C8DED80009E45F /* CCEffectDFOutline.h */; };
209209
D3DBE17219C8DED80009E45F /* CCEffectDFOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = D3DBE16A19C8DED80009E45F /* CCEffectDFOutline.m */; };
210210
D3DBE17319C8DED80009E45F /* CCEffectDistanceField.h in Headers */ = {isa = PBXBuildFile; fileRef = D3DBE16B19C8DED80009E45F /* CCEffectDistanceField.h */; };
@@ -308,13 +308,6 @@
308308
remoteGlobalIDString = CBBAB312171D0B84009B955F;
309309
remoteInfo = "ObjectAL (iOS)";
310310
};
311-
D369B4C219C8E3D300BA46EA /* PBXContainerItemProxy */ = {
312-
isa = PBXContainerItemProxy;
313-
containerPortal = D369B4B919C8E3D300BA46EA /* ObjectAL.xcodeproj */;
314-
proxyType = 2;
315-
remoteGlobalIDString = CBBAB33D171D0BC4009B955F;
316-
remoteInfo = "ObjectAL (OSX)";
317-
};
318311
D369B4C419C8E3D300BA46EA /* PBXContainerItemProxy */ = {
319312
isa = PBXContainerItemProxy;
320313
containerPortal = D369B4B919C8E3D300BA46EA /* ObjectAL.xcodeproj */;
@@ -379,10 +372,6 @@
379372
926B97E91938602200E345FB /* CCAnimationManager+FrameAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "CCAnimationManager+FrameAnimation.h"; path = "cocos2d-ui/CCBReader/CCAnimationManager+FrameAnimation.h"; sourceTree = "<group>"; };
380373
9D9E340F19B7AAB800ADD7CB /* CCEffectColorChannelOffset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectColorChannelOffset.h; sourceTree = "<group>"; };
381374
9D9E341019B7AAB800ADD7CB /* CCEffectColorChannelOffset.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectColorChannelOffset.m; sourceTree = "<group>"; };
382-
9D9E341119B7AAB800ADD7CB /* CCEffectDropShadow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectDropShadow.h; sourceTree = "<group>"; };
383-
9D9E341219B7AAB800ADD7CB /* CCEffectDropShadow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectDropShadow.m; sourceTree = "<group>"; };
384-
9D9E341319B7AAB800ADD7CB /* CCEffectOuterGlow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectOuterGlow.h; sourceTree = "<group>"; };
385-
9D9E341419B7AAB800ADD7CB /* CCEffectOuterGlow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectOuterGlow.m; sourceTree = "<group>"; };
386375
A003ACA5165731D500C7B792 /* ccFPSImages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccFPSImages.h; sourceTree = "<group>"; };
387376
A003ACA6165731D500C7B792 /* ccFPSImages.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ccFPSImages.m; sourceTree = "<group>"; };
388377
A0191EAA167FDBA40099349A /* libc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.dylib"; path = "usr/lib/libc++.dylib"; sourceTree = SDKROOT; };
@@ -603,6 +592,13 @@
603592
D3AD531F18C84FC9005B6CF3 /* CCRenderer_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderer_private.h; sourceTree = "<group>"; };
604593
D3AD532018C84FC9005B6CF3 /* CCRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderer.h; sourceTree = "<group>"; };
605594
D3AD532118C84FC9005B6CF3 /* CCRenderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCRenderer.m; sourceTree = "<group>"; };
595+
D3BEEFB219CFED340055B624 /* CCRendererBasicTypes_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRendererBasicTypes_Private.h; sourceTree = "<group>"; };
596+
D3BEEFB319CFED340055B624 /* CCRendererBasicTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRendererBasicTypes.h; sourceTree = "<group>"; };
597+
D3BEEFB419CFED340055B624 /* CCRendererBasicTypes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCRendererBasicTypes.m; sourceTree = "<group>"; };
598+
D3BEEFB519CFED350055B624 /* CCRendererSharedTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRendererSharedTypes.h; sourceTree = "<group>"; };
599+
D3BEEFB619CFED350055B624 /* CCRenderTexture_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderTexture_Private.h; sourceTree = "<group>"; };
600+
D3BEEFB719CFED350055B624 /* NSValue+CCRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSValue+CCRenderer.h"; sourceTree = "<group>"; };
601+
D3BEEFB819CFED350055B624 /* NSValue+CCRenderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSValue+CCRenderer.m"; sourceTree = "<group>"; };
606602
D3DBE16919C8DED80009E45F /* CCEffectDFOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectDFOutline.h; sourceTree = "<group>"; };
607603
D3DBE16A19C8DED80009E45F /* CCEffectDFOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectDFOutline.m; sourceTree = "<group>"; };
608604
D3DBE16B19C8DED80009E45F /* CCEffectDistanceField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectDistanceField.h; sourceTree = "<group>"; };
@@ -988,7 +984,6 @@
988984
isa = PBXGroup;
989985
children = (
990986
D369B4C119C8E3D300BA46EA /* libObjectAL.a */,
991-
D369B4C319C8E3D300BA46EA /* ObjectAL.framework */,
992987
D369B4C519C8E3D300BA46EA /* libObjectAL (Android).a */,
993988
D3758C0C19C8E80300B4E13A /* libObjectAL (Mac).a */,
994989
);
@@ -1142,14 +1137,27 @@
11421137
name = Physics;
11431138
sourceTree = "<group>";
11441139
};
1145-
E0506A8413169AE100EAE33F /* Shaders */ = {
1140+
D3BEEFB119CFED160055B624 /* Renderer */ = {
11461141
isa = PBXGroup;
11471142
children = (
1143+
D3BEEFB219CFED340055B624 /* CCRendererBasicTypes_Private.h */,
1144+
D3BEEFB319CFED340055B624 /* CCRendererBasicTypes.h */,
1145+
D3BEEFB419CFED340055B624 /* CCRendererBasicTypes.m */,
1146+
D3BEEFB519CFED350055B624 /* CCRendererSharedTypes.h */,
1147+
D3BEEFB619CFED350055B624 /* CCRenderTexture_Private.h */,
1148+
D3BEEFB719CFED350055B624 /* NSValue+CCRenderer.h */,
1149+
D3BEEFB819CFED350055B624 /* NSValue+CCRenderer.m */,
11481150
D3AD531318C84F79005B6CF3 /* CCShader_Private.h */,
11491151
D3AD531418C84F79005B6CF3 /* CCShader.h */,
11501152
D3AD531518C84F79005B6CF3 /* CCShader.m */,
1153+
D3AD531F18C84FC9005B6CF3 /* CCRenderer_private.h */,
1154+
D2EC6033199D9F2E001A15E9 /* CCRendererGLSupport.m */,
1155+
D3AD532018C84FC9005B6CF3 /* CCRenderer.h */,
1156+
D3AD532118C84FC9005B6CF3 /* CCRenderer.m */,
1157+
D2342005199AD36D00DF8FCD /* CCRenderDispatch.h */,
1158+
D2342006199AD36D00DF8FCD /* CCRenderDispatch.m */,
11511159
);
1152-
name = Shaders;
1160+
name = Renderer;
11531161
sourceTree = "<group>";
11541162
};
11551163
E076E6281225EC7400DE0DA2 /* cocos2d */ = {
@@ -1171,7 +1179,7 @@
11711179
E076E7761225ECB800DE0DA2 /* Textures */,
11721180
E076E69F1225EC7400DE0DA2 /* Platforms */,
11731181
E076E6B81225EC7400DE0DA2 /* Support */,
1174-
E0506A8413169AE100EAE33F /* Shaders */,
1182+
D3BEEFB119CFED160055B624 /* Renderer */,
11751183
E076E69D1225EC7400DE0DA2 /* cocos2d.h */,
11761184
E076E69E1225EC7400DE0DA2 /* cocos2d.m */,
11771185
E076E6491225EC7400DE0DA2 /* ccConfig.h */,
@@ -1187,13 +1195,7 @@
11871195
E076E6781225EC7400DE0DA2 /* CCScheduler.h */,
11881196
E076E6791225EC7400DE0DA2 /* CCScheduler.m */,
11891197
B706B19A1820A42300B27A2C /* CCDirector_Private.h */,
1190-
D3AD531F18C84FC9005B6CF3 /* CCRenderer_private.h */,
1191-
D2EC6033199D9F2E001A15E9 /* CCRendererGLSupport.m */,
1192-
D3AD532018C84FC9005B6CF3 /* CCRenderer.h */,
1193-
D3AD532118C84FC9005B6CF3 /* CCRenderer.m */,
11941198
D2342004199AD36D00DF8FCD /* CCNoARC.m */,
1195-
D2342005199AD36D00DF8FCD /* CCRenderDispatch.h */,
1196-
D2342006199AD36D00DF8FCD /* CCRenderDispatch.m */,
11971199
);
11981200
path = cocos2d;
11991201
sourceTree = "<group>";
@@ -1494,6 +1496,7 @@
14941496
E076E73A1225EC7400DE0DA2 /* CCTMXXMLParser.h in Headers */,
14951497
D3DBE17119C8DED80009E45F /* CCEffectDFOutline.h in Headers */,
14961498
E076E73C1225EC7400DE0DA2 /* CCTransition.h in Headers */,
1499+
D3BEEFBE19CFED350055B624 /* NSValue+CCRenderer.h in Headers */,
14971500
D389412A18639DD400725CFC /* CCPhysicsNode.h in Headers */,
14981501
E076E7451225EC7400DE0DA2 /* CCGL.h in Headers */,
14991502
D2D598741987132700BDAF25 /* CCEffectNode.h in Headers */,
@@ -1526,11 +1529,9 @@
15261529
A0BE62FC140552BD00DAA336 /* CCVertex.h in Headers */,
15271530
A0AAB80B1451BD3600850F2C /* CCParticleBatchNode.h in Headers */,
15281531
A046E2B214C1E5000005BBF2 /* CCDirectorIOS.h in Headers */,
1529-
A046E2B414C1E5000005BBF2 /* CCES2Renderer.h in Headers */,
15301532
B7D273331822F5460054849B /* CCBSequenceProperty.h in Headers */,
15311533
D257084A199D81C900B56E04 /* CCRenderDispatch_Private.h in Headers */,
15321534
D3903B03199527AA003AA81A /* CCEffectBlur.h in Headers */,
1533-
A046E2B614C1E5000005BBF2 /* CCESRenderer.h in Headers */,
15341535
A046E2B714C1E5000005BBF2 /* CCGLView.h in Headers */,
15351536
B7E7758C184FBA47004221AA /* CCNodeColor.h in Headers */,
15361537
B77060DB18342E540043CC67 /* CCBReader_Private.h in Headers */,
@@ -1548,11 +1549,13 @@
15481549
A0D7D68D15E2D2CC000CA0C4 /* ccConfig.h in Headers */,
15491550
A0D7D69015E2D2CC000CA0C4 /* ccMacros.h in Headers */,
15501551
926B97E319385F8A00E345FB /* CCAnimationManager_Private.h in Headers */,
1552+
D3BEEFBA19CFED350055B624 /* CCRendererBasicTypes.h in Headers */,
15511553
D3AD531618C84F79005B6CF3 /* CCShader_Private.h in Headers */,
15521554
B7D2732D1822F5460054849B /* CCBLocalizationManager.h in Headers */,
15531555
A0D7D69115E2D2CC000CA0C4 /* ccTypes.h in Headers */,
15541556
A0D7D69415E2D2CC000CA0C4 /* CCConfiguration.h in Headers */,
15551557
A0D7D69615E2D2CC000CA0C4 /* CCDirector.h in Headers */,
1558+
D3BEEFB919CFED350055B624 /* CCRendererBasicTypes_Private.h in Headers */,
15561559
B7EE6A34181B287300B983FE /* CCSlider.h in Headers */,
15571560
A0D7D69815E2D2CC000CA0C4 /* CCProtocols.h in Headers */,
15581561
A0D7D69915E2D2CC000CA0C4 /* CCScheduler.h in Headers */,
@@ -1568,10 +1571,12 @@
15681571
A66680C517D4D73000ECDE6F /* CCResponderManager.h in Headers */,
15691572
D3AD532318C84FC9005B6CF3 /* CCRenderer.h in Headers */,
15701573
D2D598641987132700BDAF25 /* CCEffect_Private.h in Headers */,
1574+
D3BEEFBD19CFED350055B624 /* CCRenderTexture_Private.h in Headers */,
15711575
D389412618639DD400725CFC /* CCPhysicsBody.h in Headers */,
15721576
D2D5987C1987132700BDAF25 /* CCEffectRenderer.h in Headers */,
15731577
B7E2603517E7C774007067F0 /* NSEvent+CC.h in Headers */,
15741578
B7E2603917E7C786007067F0 /* UITouch+CC.h in Headers */,
1579+
D3BEEFBC19CFED350055B624 /* CCRendererSharedTypes.h in Headers */,
15751580
D2342008199AD36D00DF8FCD /* CCRenderDispatch.h in Headers */,
15761581
D2D5987E1987132700BDAF25 /* CCEffectSaturation.h in Headers */,
15771582
);
@@ -1659,13 +1664,6 @@
16591664
remoteRef = D369B4C019C8E3D300BA46EA /* PBXContainerItemProxy */;
16601665
sourceTree = BUILT_PRODUCTS_DIR;
16611666
};
1662-
D369B4C319C8E3D300BA46EA /* ObjectAL.framework */ = {
1663-
isa = PBXReferenceProxy;
1664-
fileType = wrapper.framework;
1665-
path = ObjectAL.framework;
1666-
remoteRef = D369B4C219C8E3D300BA46EA /* PBXContainerItemProxy */;
1667-
sourceTree = BUILT_PRODUCTS_DIR;
1668-
};
16691667
D369B4C519C8E3D300BA46EA /* libObjectAL (Android).a */ = {
16701668
isa = PBXReferenceProxy;
16711669
fileType = archive.ar;
@@ -1727,6 +1725,7 @@
17271725
isa = PBXSourcesBuildPhase;
17281726
buildActionMask = 2147483647;
17291727
files = (
1728+
D3BEEFBB19CFED350055B624 /* CCRendererBasicTypes.m in Sources */,
17301729
E076E6D01225EC7400DE0DA2 /* CCAction.m in Sources */,
17311730
E076E6D41225EC7400DE0DA2 /* CCActionEase.m in Sources */,
17321731
D2D5987D1987132700BDAF25 /* CCEffectRenderer.m in Sources */,
@@ -1789,6 +1788,7 @@
17891788
E076E76A1225EC7400DE0DA2 /* TGAlib.m in Sources */,
17901789
B7EE69ED1819EAAC00B983FE /* CCLayoutBox.m in Sources */,
17911790
E076E7701225EC7400DE0DA2 /* ZipUtils.m in Sources */,
1791+
D3BEEFBF19CFED350055B624 /* NSValue+CCRenderer.m in Sources */,
17921792
D2D598681987132700BDAF25 /* CCEffectBloom.m in Sources */,
17931793
E02BBC7D126CD870006E46A2 /* CCAnimation.m in Sources */,
17941794
E02BBC7F126CD870006E46A2 /* CCAnimationCache.m in Sources */,
@@ -1797,7 +1797,6 @@
17971797
A0BE62FD140552BD00DAA336 /* CCVertex.m in Sources */,
17981798
A0AAB80C1451BD3600850F2C /* CCParticleBatchNode.m in Sources */,
17991799
A046E2B314C1E5000005BBF2 /* CCDirectorIOS.m in Sources */,
1800-
A046E2B514C1E5000005BBF2 /* CCES2Renderer.m in Sources */,
18011800
A046E2B814C1E5000005BBF2 /* CCGLView.m in Sources */,
18021801
D389412918639DD400725CFC /* CCPhysicsJoint.m in Sources */,
18031802
9D9E341619B7AAB800ADD7CB /* CCEffectColorChannelOffset.m in Sources */,

‎cocos2d/CCConfiguration.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,10 @@ @implementation CCConfiguration
8989

9090
+ (CCConfiguration *)sharedConfiguration
9191
{
92-
if (!_sharedConfiguration)
92+
if (!_sharedConfiguration){
9393
_sharedConfiguration = [[self alloc] init];
94+
[_sharedConfiguration configure];
95+
}
9496

9597
return _sharedConfiguration;
9698
}

‎cocos2d/Platforms/CCGL.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@
5353
#define CC_CHECK_GL_ERROR_DEBUG() __CC_CHECK_GL_ERROR_DEBUG(__FUNCTION__, __LINE__)
5454
static inline void __CC_CHECK_GL_ERROR_DEBUG(const char *function, int line)
5555
{
56+
#if __CC_PLATFORM_IOS
5657
NSCAssert([EAGLContext currentContext], @"GL context is not set.");
58+
#endif
5759

5860
GLenum error;
5961
while((error = glGetError())){

‎cocos2d/Platforms/Mac/CCGLView.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@
5252
/** unlocks the openGL context */
5353
-(void) unlockOpenGLContext;
5454

55+
-(GLuint)fbo;
56+
57+
5558
@end
5659

5760
#endif // __CC_PLATFORM_MAC

‎cocos2d/Platforms/Mac/CCGLView.m

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@ - (void) prepareOpenGL
165165
// Synchronize buffer swaps with vertical refresh rate
166166
GLint swapInt = 1;
167167
[[self openGLContext] setValues:&swapInt forParameter:NSOpenGLCPSwapInterval];
168+
169+
// Force the configuration to init as early as possible.
170+
[CCConfiguration sharedConfiguration];
168171

169172
// GLint order = -1;
170173
// [[self openGLContext] setValues:&order forParameter:NSOpenGLCPSurfaceOrder];
@@ -276,6 +279,11 @@ -(void)presentFrame
276279
[self unlockOpenGLContext];
277280
}
278281

282+
-(GLuint)fbo
283+
{
284+
return 0;
285+
}
286+
279287
- (void) dealloc
280288
{
281289
CCLOGINFO(@"cocos2d: deallocing %@", self);

0 commit comments

Comments
 (0)