Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Important API changes

GLProgram -> CCGLProgram
EAGLView -> CCGLView
MacView -> CCGLView
MacWindow -> CCWindow
ESRenderer -> CCESRenderer
ES2Renderer -> CCES2Renderer
  • Loading branch information...
commit edac658de373101c963467d75d4c56af3c41a747 1 parent 878ccd1
@ricardoquesada ricardoquesada authored
Showing with 977 additions and 583 deletions.
  1. +1 −1  AUTHORS
  2. +8 −1 CHANGELOG
  3. +1 −1  CocosDenshion/TestsAndDemos/TomTheTurret/Classes/TomTheTurretAppDelegate.m
  4. +4 −4 Resources-Mac/English.lproj/MainMenu-NoWindow.xib
  5. +5 −5 Resources-Mac/English.lproj/MainMenu.xib
  6. +1 −1  Resources-Mac/main.m
  7. +494 −52 cocos2d-ios.xcodeproj/project.pbxproj
  8. +72 −72 cocos2d-mac.xcodeproj/project.pbxproj
  9. +1 −1  cocos2d/CCAtlasNode.m
  10. +3 −4 cocos2d/CCDirector.h
  11. +2 −2 cocos2d/CCDirector.m
  12. +3 −3 cocos2d/CCDrawingPrimitives.m
  13. +3 −2 cocos2d/CCGLProgram.h
  14. +3 −3 cocos2d/CCGLProgram.m
  15. +3 −3 cocos2d/CCGrid.h
  16. +2 −2 cocos2d/CCGrid.m
  17. +1 −1  cocos2d/CCLabelAtlas.m
  18. +1 −1  cocos2d/CCLabelTTF.m
  19. +1 −1  cocos2d/CCLayer.m
  20. +1 −1  cocos2d/CCMenu.m
  21. +1 −1  cocos2d/CCMotionStreak.m
  22. +3 −3 cocos2d/CCNode.h
  23. +1 −1  cocos2d/CCNode.m
  24. +1 −1  cocos2d/CCParticleBatchNode.m
  25. +1 −1  cocos2d/CCParticleSystemQuad.m
  26. +1 −1  cocos2d/CCProgressTimer.m
  27. +1 −1  cocos2d/CCRenderTexture.m
  28. +4 −4 cocos2d/CCShaderCache.h
  29. +9 −9 cocos2d/CCShaderCache.m
  30. +1 −1  cocos2d/CCSprite.m
  31. +1 −1  cocos2d/CCSpriteBatchNode.m
  32. +1 −1  cocos2d/CCTMXLayer.m
  33. +3 −3 cocos2d/CCTexture2D.h
  34. +1 −1  cocos2d/CCTexture2D.m
  35. +1 −1  cocos2d/CCTextureAtlas.m
  36. +3 −7 cocos2d/CCTextureCache.m
  37. +2 −4 cocos2d/Platforms/CCGL.h
  38. +1 −1  cocos2d/Platforms/Mac/CCDirectorMac.h
  39. +10 −10 cocos2d/Platforms/Mac/CCDirectorMac.m
  40. +2 −2 cocos2d/Platforms/Mac/CCEventDispatcher.h
  41. +6 −6 cocos2d/Platforms/Mac/CCGLView.h
  42. +5 −5 cocos2d/Platforms/Mac/CCGLView.m
  43. +1 −1  cocos2d/Platforms/Mac/CCWindow.h
  44. +2 −2 cocos2d/Platforms/Mac/CCWindow.m
  45. +3 −3 cocos2d/Platforms/iOS/CCDirectorIOS.m
  46. +2 −2 cocos2d/Platforms/iOS/CCES2Renderer.h
  47. +2 −2 cocos2d/Platforms/iOS/CCES2Renderer.m
  48. +1 −1  cocos2d/Platforms/iOS/CCESRenderer.h
  49. +17 −18 cocos2d/Platforms/iOS/CCGLView.h
  50. +12 −8 cocos2d/Platforms/iOS/CCGLView.m
  51. +2 −2 cocos2d/Platforms/iOS/CCTouchDispatcher.h
  52. +2 −2 cocos2d/ccGLState.h
  53. +2 −2 cocos2d/ccGLState.m
  54. +9 −9 cocos2d/ccMacros.h
  55. +4 −4 cocos2d/cocos2d.h
  56. +42 −104 templates/Xcode4_templates/base_mac.xctemplate/Resources/English.lproj/MainMenu.xib
  57. +2 −2 templates/Xcode4_templates/cocos2d Mac with Box2d.xctemplate/AppDelegate.h
  58. +3 −0  templates/Xcode4_templates/cocos2d Mac with Box2d.xctemplate/AppDelegate.mm
  59. +1 −1  templates/Xcode4_templates/cocos2d Mac with Box2d.xctemplate/main.m
  60. +2 −2 templates/Xcode4_templates/cocos2d Mac with Chipmunk.xctemplate/AppDelegate.h
  61. +3 −0  templates/Xcode4_templates/cocos2d Mac with Chipmunk.xctemplate/AppDelegate.m
  62. +14 −15 templates/Xcode4_templates/cocos2d Mac with Chipmunk.xctemplate/HelloWorldLayer.m
  63. +1 −1  templates/Xcode4_templates/cocos2d Mac with Chipmunk.xctemplate/main.m
  64. +2 −2 templates/Xcode4_templates/cocos2d Mac.xctemplate/AppDelegate.h
  65. +2 −0  templates/Xcode4_templates/cocos2d Mac.xctemplate/AppDelegate.m
  66. +1 −1  templates/Xcode4_templates/cocos2d Mac.xctemplate/main.m
  67. +2 −2 templates/Xcode4_templates/cocos2d iOS with Box2d.xctemplate/AppDelegate.mm
  68. +2 −2 templates/Xcode4_templates/cocos2d iOS with Chipmunk.xctemplate/AppDelegate.m
  69. +2 −2 templates/Xcode4_templates/cocos2d iOS.xctemplate/AppDelegate.m
  70. +67 −67 templates/Xcode4_templates/lib_cocos2d.xctemplate/TemplateInfo.plist
  71. +2 −2 tests/BaseAppController.h
  72. +3 −3 tests/BaseAppController.m
  73. +1 −1  tests/Box2DTestBed-Cocos2dIntegration/GLES-Render.h
  74. +1 −1  tests/Box2DTestBed-Cocos2dIntegration/GLES-Render.mm
  75. +13 −13 tests/ChipmunkAccelTouchTest.m
  76. +3 −3 tests/EAGLViewTest/EAGLViewTest.h
  77. +2 −2 tests/EAGLViewTest/EAGLViewTest.m
  78. +18 −19 tests/EAGLViewTest/MainWindow-ipad.xib
  79. +5 −5 tests/EAGLViewTest/MainWindow.xib
  80. +1 −1  tests/EAGLViewTest/main.m
  81. +2 −2 tests/EffectsAdvancedTest.m
  82. +2 −2 tests/EffectsTest.m
  83. +2 −2 tests/PerformanceTests/PerformanceNodeChildrenTest/AppController.m
  84. +2 −2 tests/PerformanceTests/PerformanceParticleTest/AppController.m
  85. +2 −2 tests/PerformanceTests/PerformanceSpriteTest/AppController.m
  86. +5 −5 tests/PerformanceTests/PerformanceTouchesTest/AppController.m
  87. +8 −4 tests/SchedulerTest.m
  88. +5 −5 tests/ShaderTest.m
  89. +4 −4 tests/SpriteTest.m
  90. +2 −2 tests/Texture2dTest.m
  91. +4 −4 tests/TileMapTest.m
  92. +2 −2 tests/TransitionsTest.m
  93. +1 −1  tests/attachDemo/attachDemo.m
  94. +2 −2 tests/bugs/Bug-1159.m
  95. +2 −2 tests/bugs/Bug-914/EAGLViewBugAppDelegate.h
  96. +2 −2 tests/bugs/Bug-914/EAGLViewBugAppDelegate.m
  97. +1 −1  tests/bugs/Bug-914/HelloWorldScene.h
  98. +1 −1  tests/bugs/Bug-914/HelloWorldScene.m
  99. +2 −2 tests/bugs/Bug-914/bugViewController.h
  100. +3 −3 tests/bugs/Bug-914/bugViewController.m
View
2  AUTHORS
@@ -40,7 +40,7 @@ People/companies who were/are contributing code to cocos2d for iPhone (alphabeti
Added Tint + opacity test cases for CCProgressTimer
* Justin Graham (http://www.zynga.com)
- GLProgram: fixes in fragmentShaderLog
+ CCGLProgram: fixes in fragmentShaderLog
CCShaderCache: Added addProgram:forKey: method
CCArray: Fixed copyWithZone
View
9 CHANGELOG
@@ -8,6 +8,13 @@ version 2.0-beta2 14-Jan-2012
automatically once the view is displayed (iOS only)
. [NEW] Director: FPS & seconds per frame are displayed at the same time
. [NEW] EventDispatcher / TouchDispatcher: They are no longer singletons. They are an ivar of director.
+. [NEW] GL View: Some classes were renamed to have more API concistency:
+ MacWindow -> CCWindow (Mac)
+ MacView -> CCGLView (Mac)
+ EAGLView -> CCGLView (iOS)
+ ESRenderer -> CCESRenderer (iOS)
+ ES2Renderer -> CCES2Renderer (iOS)
+ GLProgram -> CCGLProgram
. [NEW] Macros: Using __CC_PLATFORM_IOS/MAC internally. Suggested way for games too.
. [NEW] Menu: API CHANGE. "itemFrom..." was replaced with "itemWith..."
. [NEW] Menu: target/selector pattern simulated with blocks. Before, blocks were simulated with target/selector
@@ -316,7 +323,7 @@ version 0.99.5 - 16-Dec-2010
. [FIX] Templates: removeStartup compiles (issue #1059)
. [FIX] Texture: PVR with non-square mipmaps generates a warning log in debug mode (issue #1052)
. [FIX-MAC] Display Link thread: async images works as expected. Enabled by default.
-. [FIX-MAC] MacGLView: VSync is enabled when the view is loaded from the NIB
+. [FIX-MAC] EAGLView: VSync is enabled when the view is loaded from the NIB
. [TEST] Added Glyph Designer test case
. [TEST] Added LayerGradient test
. [TEST-MAC] Added cocos2d icon to Mac tests
View
2  CocosDenshion/TestsAndDemos/TomTheTurret/Classes/TomTheTurretAppDelegate.m
@@ -53,7 +53,7 @@ - (void)loadScenes {
// main content
// See http://www.cocos2d-iphone.org/forum/topic/363 for more details
- EAGLView *view = (EAGLView*) [[CCDirector sharedDirector] view];
+ CCGLView *view = (CCGLView*) [[CCDirector sharedDirector] view];
EAGLContext *k_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2
sharegroup: [view.context sharegroup]];
View
8 Resources-Mac/English.lproj/MainMenu-NoWindow.xib
@@ -736,7 +736,7 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>MacGLView</string>
+ <string>CCGLView</string>
<string>NSWindow</string>
</object>
</object>
@@ -751,7 +751,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">glView</string>
- <string key="candidateClassName">MacGLView</string>
+ <string key="candidateClassName">CCGLView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">window</string>
@@ -765,11 +765,11 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">MacGLView</string>
+ <string key="className">CCGLView</string>
<string key="superclassName">NSOpenGLView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/MacGLView.h</string>
+ <string key="minorKey">./Classes/CCGLView.h</string>
</object>
</object>
</object>
View
10 Resources-Mac/English.lproj/MainMenu.xib
@@ -770,7 +770,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>MacGLView</string>
+ <string>CCGLView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -827,7 +827,7 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>MacGLView</string>
+ <string>CCGLView</string>
<string>NSWindow</string>
</object>
</object>
@@ -842,7 +842,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">glView</string>
- <string key="candidateClassName">MacGLView</string>
+ <string key="candidateClassName">CCGLView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">window</string>
@@ -856,11 +856,11 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">MacGLView</string>
+ <string key="className">CCGLView</string>
<string key="superclassName">NSOpenGLView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/MacGLView.h</string>
+ <string key="minorKey">./Classes/CCGLView.h</string>
</object>
</object>
</object>
View
2  Resources-Mac/main.m
@@ -12,6 +12,6 @@
int main(int argc, char *argv[])
{
- [MacGLView load_];
+ [CCGLView load_];
return NSApplicationMain(argc, (const char **) argv);
}
View
546 cocos2d-ios.xcodeproj/project.pbxproj
@@ -1282,6 +1282,14 @@
A01AB916149709E300C93DB6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 503092B210447296005F7AFC /* libz.dylib */; };
A01AB95414970B1F00C93DB6 /* DirectorTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A01AB95314970B1F00C93DB6 /* DirectorTest.m */; };
A034FF86149DC994009F11AA /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A034FF85149DC993009F11AA /* GameKit.framework */; };
+ A046E29314C1DB7D0005BBF2 /* CCDirectorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E28B14C1DB7D0005BBF2 /* CCDirectorMac.h */; };
+ A046E29414C1DB7D0005BBF2 /* CCDirectorMac.m in Sources */ = {isa = PBXBuildFile; fileRef = A046E28C14C1DB7D0005BBF2 /* CCDirectorMac.m */; };
+ A046E29514C1DB7D0005BBF2 /* CCEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E28D14C1DB7D0005BBF2 /* CCEventDispatcher.h */; };
+ A046E29614C1DB7D0005BBF2 /* CCEventDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = A046E28E14C1DB7D0005BBF2 /* CCEventDispatcher.m */; };
+ A046E29714C1DB7D0005BBF2 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E28F14C1DB7D0005BBF2 /* CCGLView.h */; };
+ A046E29814C1DB7D0005BBF2 /* CCGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = A046E29014C1DB7D0005BBF2 /* CCGLView.m */; };
+ A046E29914C1DB7E0005BBF2 /* CCWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E29114C1DB7D0005BBF2 /* CCWindow.h */; };
+ A046E29A14C1DB7E0005BBF2 /* CCWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = A046E29214C1DB7D0005BBF2 /* CCWindow.m */; };
A04B0D4A149E701A005EB429 /* bugs in Resources */ = {isa = PBXBuildFile; fileRef = 50CBA4A711CBD7FB007B009D /* bugs */; };
A04B0D4C149E7FFA005EB429 /* BaseAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = A0D3A8FE149D2FA40077CD93 /* BaseAppController.m */; };
A04B0D4D149E7FFB005EB429 /* BaseAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = A0D3A8FE149D2FA40077CD93 /* BaseAppController.m */; };
@@ -3224,10 +3232,10 @@
E0BBADEA1282E838007DB81E /* test_image_rgba4444.pvr.gz in Resources */ = {isa = PBXBuildFile; fileRef = E0BBADE81282E838007DB81E /* test_image_rgba4444.pvr.gz */; };
E0BC7D9D1342CE7B001B4DCC /* CCShaderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = E0BC7D991342CE7B001B4DCC /* CCShaderCache.h */; };
E0BC7D9E1342CE7B001B4DCC /* CCShaderCache.m in Sources */ = {isa = PBXBuildFile; fileRef = E0BC7D9A1342CE7B001B4DCC /* CCShaderCache.m */; };
- E0BC7D9F1342CE7B001B4DCC /* GLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = E0BC7D9B1342CE7B001B4DCC /* GLProgram.h */; };
- E0BC7DA01342CE7B001B4DCC /* GLProgram.m in Sources */ = {isa = PBXBuildFile; fileRef = E0BC7D9C1342CE7B001B4DCC /* GLProgram.m */; };
- E0BC7DA81342CF27001B4DCC /* ES2Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = E0BC7DA61342CF27001B4DCC /* ES2Renderer.h */; };
- E0BC7DA91342CF27001B4DCC /* ES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = E0BC7DA71342CF27001B4DCC /* ES2Renderer.m */; };
+ E0BC7D9F1342CE7B001B4DCC /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = E0BC7D9B1342CE7B001B4DCC /* CCGLProgram.h */; };
+ E0BC7DA01342CE7B001B4DCC /* CCGLProgram.m in Sources */ = {isa = PBXBuildFile; fileRef = E0BC7D9C1342CE7B001B4DCC /* CCGLProgram.m */; };
+ E0BC7DA81342CF27001B4DCC /* CCES2Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = E0BC7DA61342CF27001B4DCC /* CCES2Renderer.h */; };
+ E0BC7DA91342CF27001B4DCC /* CCES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = E0BC7DA71342CF27001B4DCC /* CCES2Renderer.m */; };
E0C3655B11F0AE9B001C08F9 /* CCSpriteBatchNode.h in Headers */ = {isa = PBXBuildFile; fileRef = E0C3655911F0AE9B001C08F9 /* CCSpriteBatchNode.h */; };
E0C3655C11F0AE9B001C08F9 /* CCSpriteBatchNode.m in Sources */ = {isa = PBXBuildFile; fileRef = E0C3655A11F0AE9B001C08F9 /* CCSpriteBatchNode.m */; };
E0C54DCA11F9CF2700B9E4CB /* ccUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = E0C54DC811F9CF2700B9E4CB /* ccUtils.c */; };
@@ -3265,12 +3273,6 @@
E0CC4F7D12677DB400691051 /* blocks-hd.png in Resources */ = {isa = PBXBuildFile; fileRef = E0CC4F7C12677DB400691051 /* blocks-hd.png */; };
E0D2C5D412AF1067008D5DBB /* particles-hd.png in Resources */ = {isa = PBXBuildFile; fileRef = E0D2C5D312AF1067008D5DBB /* particles-hd.png */; };
E0D2D4F3128CA9E300F78C63 /* piece.png in Resources */ = {isa = PBXBuildFile; fileRef = E0D2D4F2128CA9E300F78C63 /* piece.png */; };
- E0E974A51237E4EA00E3E64B /* CCDirectorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = E0E9749F1237E4EA00E3E64B /* CCDirectorMac.h */; };
- E0E974A61237E4EA00E3E64B /* CCDirectorMac.m in Sources */ = {isa = PBXBuildFile; fileRef = E0E974A01237E4EA00E3E64B /* CCDirectorMac.m */; };
- E0E974A71237E4EA00E3E64B /* CCEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E0E974A11237E4EA00E3E64B /* CCEventDispatcher.h */; };
- E0E974A81237E4EA00E3E64B /* CCEventDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = E0E974A21237E4EA00E3E64B /* CCEventDispatcher.m */; };
- E0E974A91237E4EA00E3E64B /* MacGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = E0E974A31237E4EA00E3E64B /* MacGLView.h */; };
- E0E974AA1237E4EA00E3E64B /* MacGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = E0E974A41237E4EA00E3E64B /* MacGLView.m */; };
E0EA5679134B9CA800F212C8 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 50B2CB240E10EE4A00AE9530 /* Default.png */; };
E0EA567A134B9CA800F212C8 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 50B2CB250E10EE4A00AE9530 /* Icon.png */; };
E0EA567B134B9CA800F212C8 /* grossini.png in Resources */ = {isa = PBXBuildFile; fileRef = 50B2CB280E10EE4A00AE9530 /* grossini.png */; };
@@ -3316,9 +3318,9 @@
E0EAD105121F4B4600B0C81C /* CCTouchDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = E0EAD0F0121F4B4600B0C81C /* CCTouchDispatcher.m */; };
E0EAD106121F4B4600B0C81C /* CCTouchHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = E0EAD0F1121F4B4600B0C81C /* CCTouchHandler.h */; };
E0EAD107121F4B4600B0C81C /* CCTouchHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = E0EAD0F2121F4B4600B0C81C /* CCTouchHandler.m */; };
- E0EAD108121F4B4600B0C81C /* EAGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = E0EAD0F3121F4B4600B0C81C /* EAGLView.h */; };
- E0EAD109121F4B4600B0C81C /* EAGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = E0EAD0F4121F4B4600B0C81C /* EAGLView.m */; };
- E0EAD10C121F4B4600B0C81C /* ESRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = E0EAD0F7121F4B4600B0C81C /* ESRenderer.h */; };
+ E0EAD108121F4B4600B0C81C /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = E0EAD0F3121F4B4600B0C81C /* CCGLView.h */; };
+ E0EAD109121F4B4600B0C81C /* CCGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = E0EAD0F4121F4B4600B0C81C /* CCGLView.m */; };
+ E0EAD10C121F4B4600B0C81C /* CCESRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = E0EAD0F7121F4B4600B0C81C /* CCESRenderer.h */; };
E0EAD19D121F4D7300B0C81C /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = E0EAD19C121F4D7300B0C81C /* CCGL.h */; };
E0EAD1F1121F522A00B0C81C /* CCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = E0EAD1F0121F522A00B0C81C /* CCConfiguration.h */; };
E0F924711224140400EF2362 /* CCTexturePVR.h in Headers */ = {isa = PBXBuildFile; fileRef = E0F9246F1224140400EF2362 /* CCTexturePVR.h */; };
@@ -4752,6 +4754,109 @@
A01AB95214970B1F00C93DB6 /* DirectorTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectorTest.h; path = tests/DirectorTest.h; sourceTree = "<group>"; };
A01AB95314970B1F00C93DB6 /* DirectorTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectorTest.m; path = tests/DirectorTest.m; sourceTree = "<group>"; };
A034FF85149DC993009F11AA /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
+ A046E28B14C1DB7D0005BBF2 /* CCDirectorMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDirectorMac.h; sourceTree = "<group>"; };
+ A046E28C14C1DB7D0005BBF2 /* CCDirectorMac.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCDirectorMac.m; sourceTree = "<group>"; };
+ A046E28D14C1DB7D0005BBF2 /* CCEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEventDispatcher.h; sourceTree = "<group>"; };
+ A046E28E14C1DB7D0005BBF2 /* CCEventDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEventDispatcher.m; sourceTree = "<group>"; };
+ A046E28F14C1DB7D0005BBF2 /* CCGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLView.h; sourceTree = "<group>"; };
+ A046E29014C1DB7D0005BBF2 /* CCGLView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCGLView.m; sourceTree = "<group>"; };
+ A046E29114C1DB7D0005BBF2 /* CCWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCWindow.h; sourceTree = "<group>"; };
+ A046E29214C1DB7D0005BBF2 /* CCWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCWindow.m; sourceTree = "<group>"; };
+ A046E72B14C1E7320005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E72E14C1E7320005BBF2 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
+ A046E72F14C1E7320005BBF2 /* fps_images-hd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "fps_images-hd.png"; sourceTree = "<group>"; };
+ A046E73014C1E7320005BBF2 /* fps_images.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fps_images.png; sourceTree = "<group>"; };
+ A046E73114C1E7320005BBF2 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
+ A046E73214C1E7320005BBF2 /* Icon-Small-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small-50.png"; sourceTree = "<group>"; };
+ A046E73314C1E7320005BBF2 /* Icon-Small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small.png"; sourceTree = "<group>"; };
+ A046E73414C1E7320005BBF2 /* Icon-Small@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small@2x.png"; sourceTree = "<group>"; };
+ A046E73514C1E7320005BBF2 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
+ A046E73614C1E7320005BBF2 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = "<group>"; };
+ A046E73714C1E7320005BBF2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ A046E73814C1E7320005BBF2 /* iTunesArtwork */ = {isa = PBXFileReference; lastKnownFileType = file; path = iTunesArtwork; sourceTree = "<group>"; };
+ A046E73914C1E7320005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E73D14C1E7320005BBF2 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+ A046E73F14C1E7320005BBF2 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
+ A046E74014C1E7320005BBF2 /* fps_images.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fps_images.png; sourceTree = "<group>"; };
+ A046E74114C1E7320005BBF2 /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = "<group>"; };
+ A046E74214C1E7320005BBF2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ A046E74314C1E7320005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E74514C1E7320005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E74814C1E7320005BBF2 /* ___FILEBASENAME___.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "___FILEBASENAME___.h"; sourceTree = "<group>"; };
+ A046E74914C1E7320005BBF2 /* ___FILEBASENAME___.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "___FILEBASENAME___.m"; sourceTree = "<group>"; };
+ A046E74B14C1E7320005BBF2 /* ___FILEBASENAME___.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "___FILEBASENAME___.h"; sourceTree = "<group>"; };
+ A046E74C14C1E7320005BBF2 /* ___FILEBASENAME___.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "___FILEBASENAME___.m"; sourceTree = "<group>"; };
+ A046E74E14C1E7320005BBF2 /* ___FILEBASENAME___.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "___FILEBASENAME___.h"; sourceTree = "<group>"; };
+ A046E74F14C1E7320005BBF2 /* ___FILEBASENAME___.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "___FILEBASENAME___.m"; sourceTree = "<group>"; };
+ A046E75014C1E7320005BBF2 /* TemplateIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = TemplateIcon.icns; sourceTree = "<group>"; };
+ A046E75114C1E7320005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E75314C1E7320005BBF2 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+ A046E75414C1E7320005BBF2 /* AppDelegate.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate.mm; sourceTree = "<group>"; };
+ A046E75514C1E7320005BBF2 /* GLES-Render.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "GLES-Render.h"; sourceTree = "<group>"; };
+ A046E75614C1E7320005BBF2 /* GLES-Render.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "GLES-Render.mm"; sourceTree = "<group>"; };
+ A046E75714C1E7320005BBF2 /* HelloWorldLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HelloWorldLayer.h; sourceTree = "<group>"; };
+ A046E75814C1E7320005BBF2 /* HelloWorldLayer.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = HelloWorldLayer.mm; sourceTree = "<group>"; };
+ A046E75914C1E7320005BBF2 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+ A046E75A14C1E7320005BBF2 /* PhysicsSprite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PhysicsSprite.h; sourceTree = "<group>"; };
+ A046E75B14C1E7320005BBF2 /* PhysicsSprite.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PhysicsSprite.mm; sourceTree = "<group>"; };
+ A046E75C14C1E7320005BBF2 /* Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = "<group>"; };
+ A046E75E14C1E7320005BBF2 /* blocks.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = blocks.png; sourceTree = "<group>"; };
+ A046E75F14C1E7320005BBF2 /* TemplateIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = TemplateIcon.icns; sourceTree = "<group>"; };
+ A046E76014C1E7320005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E76214C1E7320005BBF2 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+ A046E76314C1E7320005BBF2 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+ A046E76414C1E7320005BBF2 /* HelloWorldLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HelloWorldLayer.h; sourceTree = "<group>"; };
+ A046E76514C1E7320005BBF2 /* HelloWorldLayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HelloWorldLayer.m; sourceTree = "<group>"; };
+ A046E76614C1E7320005BBF2 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+ A046E76714C1E7320005BBF2 /* PhysicsSprite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PhysicsSprite.h; sourceTree = "<group>"; };
+ A046E76814C1E7320005BBF2 /* PhysicsSprite.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PhysicsSprite.m; sourceTree = "<group>"; };
+ A046E76914C1E7320005BBF2 /* Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = "<group>"; };
+ A046E76B14C1E7320005BBF2 /* grossini_dance_atlas.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = grossini_dance_atlas.png; sourceTree = "<group>"; };
+ A046E76C14C1E7320005BBF2 /* TemplateIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = TemplateIcon.icns; sourceTree = "<group>"; };
+ A046E76D14C1E7320005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E76F14C1E7320005BBF2 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+ A046E77014C1E7320005BBF2 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+ A046E77114C1E7320005BBF2 /* HelloWorldLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HelloWorldLayer.h; sourceTree = "<group>"; };
+ A046E77214C1E7320005BBF2 /* HelloWorldLayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HelloWorldLayer.m; sourceTree = "<group>"; };
+ A046E77314C1E7320005BBF2 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+ A046E77414C1E7320005BBF2 /* Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = "<group>"; };
+ A046E77514C1E7320005BBF2 /* TemplateIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = TemplateIcon.icns; sourceTree = "<group>"; };
+ A046E77614C1E7320005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E77814C1E7330005BBF2 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+ A046E77914C1E7330005BBF2 /* AppDelegate.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate.mm; sourceTree = "<group>"; };
+ A046E77A14C1E7330005BBF2 /* GLES-Render.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "GLES-Render.h"; sourceTree = "<group>"; };
+ A046E77B14C1E7330005BBF2 /* GLES-Render.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "GLES-Render.mm"; sourceTree = "<group>"; };
+ A046E77C14C1E7330005BBF2 /* HelloWorldLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HelloWorldLayer.h; sourceTree = "<group>"; };
+ A046E77D14C1E7330005BBF2 /* HelloWorldLayer.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = HelloWorldLayer.mm; sourceTree = "<group>"; };
+ A046E77E14C1E7330005BBF2 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+ A046E77F14C1E7330005BBF2 /* Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = "<group>"; };
+ A046E78114C1E7330005BBF2 /* blocks.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = blocks.png; sourceTree = "<group>"; };
+ A046E78214C1E7330005BBF2 /* TemplateIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = TemplateIcon.icns; sourceTree = "<group>"; };
+ A046E78314C1E7330005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E78514C1E7330005BBF2 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+ A046E78614C1E7330005BBF2 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+ A046E78714C1E7330005BBF2 /* HelloWorldLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HelloWorldLayer.h; sourceTree = "<group>"; };
+ A046E78814C1E7330005BBF2 /* HelloWorldLayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HelloWorldLayer.m; sourceTree = "<group>"; };
+ A046E78914C1E7330005BBF2 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+ A046E78A14C1E7330005BBF2 /* Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = "<group>"; };
+ A046E78C14C1E7330005BBF2 /* grossini_dance_atlas.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = grossini_dance_atlas.png; sourceTree = "<group>"; };
+ A046E78D14C1E7330005BBF2 /* TemplateIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = TemplateIcon.icns; sourceTree = "<group>"; };
+ A046E78E14C1E7330005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E79014C1E7330005BBF2 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+ A046E79114C1E7330005BBF2 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+ A046E79214C1E7330005BBF2 /* HelloWorldLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HelloWorldLayer.h; sourceTree = "<group>"; };
+ A046E79314C1E7330005BBF2 /* HelloWorldLayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HelloWorldLayer.m; sourceTree = "<group>"; };
+ A046E79414C1E7330005BBF2 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+ A046E79514C1E7330005BBF2 /* Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = "<group>"; };
+ A046E79614C1E7330005BBF2 /* TemplateIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = TemplateIcon.icns; sourceTree = "<group>"; };
+ A046E79714C1E7330005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E79914C1E7330005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E79B14C1E7330005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E79D14C1E7330005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E79F14C1E7330005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E7A114C1E7330005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E7A314C1E7330005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
+ A046E7A514C1E7330005BBF2 /* TemplateInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TemplateInfo.plist; sourceTree = "<group>"; };
A04A1FEB13B826B300ABAFB7 /* libkazmath.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libkazmath.a; sourceTree = BUILT_PRODUCTS_DIR; };
A060106813C2992800BB6F49 /* LICENSE_Kazmath.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE_Kazmath.txt; sourceTree = "<group>"; };
A079344F141990CC00AC44D4 /* AddPair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddPair.h; sourceTree = "<group>"; };
@@ -5090,10 +5195,10 @@
E0BC7D741342CC58001B4DCC /* LICENSE_libpng.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE_libpng.txt; sourceTree = "<group>"; };
E0BC7D991342CE7B001B4DCC /* CCShaderCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShaderCache.h; sourceTree = "<group>"; };
E0BC7D9A1342CE7B001B4DCC /* CCShaderCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCShaderCache.m; sourceTree = "<group>"; };
- E0BC7D9B1342CE7B001B4DCC /* GLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLProgram.h; sourceTree = "<group>"; };
- E0BC7D9C1342CE7B001B4DCC /* GLProgram.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GLProgram.m; sourceTree = "<group>"; };
- E0BC7DA61342CF27001B4DCC /* ES2Renderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ES2Renderer.h; sourceTree = "<group>"; };
- E0BC7DA71342CF27001B4DCC /* ES2Renderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ES2Renderer.m; sourceTree = "<group>"; };
+ E0BC7D9B1342CE7B001B4DCC /* CCGLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgram.h; sourceTree = "<group>"; };
+ E0BC7D9C1342CE7B001B4DCC /* CCGLProgram.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCGLProgram.m; sourceTree = "<group>"; };
+ E0BC7DA61342CF27001B4DCC /* CCES2Renderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCES2Renderer.h; sourceTree = "<group>"; };
+ E0BC7DA71342CF27001B4DCC /* CCES2Renderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCES2Renderer.m; sourceTree = "<group>"; };
E0C3655911F0AE9B001C08F9 /* CCSpriteBatchNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSpriteBatchNode.h; sourceTree = "<group>"; };
E0C3655A11F0AE9B001C08F9 /* CCSpriteBatchNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCSpriteBatchNode.m; sourceTree = "<group>"; };
E0C54DC811F9CF2700B9E4CB /* ccUtils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ccUtils.c; sourceTree = "<group>"; };
@@ -5106,12 +5211,6 @@
E0CC4F7C12677DB400691051 /* blocks-hd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "blocks-hd.png"; sourceTree = "<group>"; };
E0D2C5D312AF1067008D5DBB /* particles-hd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "particles-hd.png"; sourceTree = "<group>"; };
E0D2D4F2128CA9E300F78C63 /* piece.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = piece.png; sourceTree = "<group>"; };
- E0E9749F1237E4EA00E3E64B /* CCDirectorMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDirectorMac.h; sourceTree = "<group>"; };
- E0E974A01237E4EA00E3E64B /* CCDirectorMac.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCDirectorMac.m; sourceTree = "<group>"; };
- E0E974A11237E4EA00E3E64B /* CCEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEventDispatcher.h; sourceTree = "<group>"; };
- E0E974A21237E4EA00E3E64B /* CCEventDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEventDispatcher.m; sourceTree = "<group>"; };
- E0E974A31237E4EA00E3E64B /* MacGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacGLView.h; sourceTree = "<group>"; };
- E0E974A41237E4EA00E3E64B /* MacGLView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MacGLView.m; sourceTree = "<group>"; };
E0EA56A5134B9CA800F212C8 /* Bug1159.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Bug1159.app; sourceTree = BUILT_PRODUCTS_DIR; };
E0EA56A7134B9D1000F212C8 /* Bug-1159.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-1159.h"; sourceTree = "<group>"; };
E0EA56A8134B9D1000F212C8 /* Bug-1159.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Bug-1159.m"; sourceTree = "<group>"; };
@@ -5122,9 +5221,9 @@
E0EAD0F0121F4B4600B0C81C /* CCTouchDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCTouchDispatcher.m; sourceTree = "<group>"; };
E0EAD0F1121F4B4600B0C81C /* CCTouchHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTouchHandler.h; sourceTree = "<group>"; };
E0EAD0F2121F4B4600B0C81C /* CCTouchHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCTouchHandler.m; sourceTree = "<group>"; };
- E0EAD0F3121F4B4600B0C81C /* EAGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EAGLView.h; sourceTree = "<group>"; };
- E0EAD0F4121F4B4600B0C81C /* EAGLView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EAGLView.m; sourceTree = "<group>"; };
- E0EAD0F7121F4B4600B0C81C /* ESRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESRenderer.h; sourceTree = "<group>"; };
+ E0EAD0F3121F4B4600B0C81C /* CCGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLView.h; sourceTree = "<group>"; };
+ E0EAD0F4121F4B4600B0C81C /* CCGLView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCGLView.m; sourceTree = "<group>"; };
+ E0EAD0F7121F4B4600B0C81C /* CCESRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCESRenderer.h; sourceTree = "<group>"; };
E0EAD19C121F4D7300B0C81C /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = "<group>"; };
E0EAD1F0121F522A00B0C81C /* CCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCConfiguration.h; sourceTree = "<group>"; };
E0F9246F1224140400EF2362 /* CCTexturePVR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTexturePVR.h; sourceTree = "<group>"; };
@@ -5956,6 +6055,7 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
+ A046E72914C1E7320005BBF2 /* Xcode4_templates */,
A07EC9B2141A8D32008C1F12 /* README.md */,
501A7CAC0EBC97BA005BC158 /* AUTHORS */,
508A4A2310B47A46004B9CC3 /* RELEASE_NOTES */,
@@ -7252,6 +7352,325 @@
path = gl_utils;
sourceTree = "<group>";
};
+ A046E72914C1E7320005BBF2 /* Xcode4_templates */ = {
+ isa = PBXGroup;
+ children = (
+ A046E72A14C1E7320005BBF2 /* base.xctemplate */,
+ A046E72C14C1E7320005BBF2 /* base_ios.xctemplate */,
+ A046E73A14C1E7320005BBF2 /* base_mac.xctemplate */,
+ A046E74414C1E7320005BBF2 /* bundle.xctemplate */,
+ A046E74614C1E7320005BBF2 /* CCNode class.xctemplate */,
+ A046E75214C1E7320005BBF2 /* cocos2d iOS with Box2d.xctemplate */,
+ A046E76114C1E7320005BBF2 /* cocos2d iOS with Chipmunk.xctemplate */,
+ A046E76E14C1E7320005BBF2 /* cocos2d iOS.xctemplate */,
+ A046E77714C1E7320005BBF2 /* cocos2d Mac with Box2d.xctemplate */,
+ A046E78414C1E7330005BBF2 /* cocos2d Mac with Chipmunk.xctemplate */,
+ A046E78F14C1E7330005BBF2 /* cocos2d Mac.xctemplate */,
+ A046E79814C1E7330005BBF2 /* lib_box2d.xctemplate */,
+ A046E79A14C1E7330005BBF2 /* lib_chipmunk.xctemplate */,
+ A046E79C14C1E7330005BBF2 /* lib_cocos2d.xctemplate */,
+ A046E79E14C1E7330005BBF2 /* lib_cocos2d_shaders.xctemplate */,
+ A046E7A014C1E7330005BBF2 /* lib_cocosdenshion.xctemplate */,
+ A046E7A214C1E7330005BBF2 /* lib_cocosdenshionextras.xctemplate */,
+ A046E7A414C1E7330005BBF2 /* lib_kazmath.xctemplate */,
+ );
+ name = Xcode4_templates;
+ path = templates/Xcode4_templates;
+ sourceTree = "<group>";
+ };
+ A046E72A14C1E7320005BBF2 /* base.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E72B14C1E7320005BBF2 /* TemplateInfo.plist */,
+ );
+ path = base.xctemplate;
+ sourceTree = "<group>";
+ };
+ A046E72C14C1E7320005BBF2 /* base_ios.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E72D14C1E7320005BBF2 /* Resources */,
+ A046E73914C1E7320005BBF2 /* TemplateInfo.plist */,
+ );
+ path = base_ios.xctemplate;
+ sourceTree = "<group>";
+ };
+ A046E72D14C1E7320005BBF2 /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ A046E72E14C1E7320005BBF2 /* Default.png */,
+ A046E72F14C1E7320005BBF2 /* fps_images-hd.png */,
+ A046E73014C1E7320005BBF2 /* fps_images.png */,
+ A046E73114C1E7320005BBF2 /* Icon-72.png */,
+ A046E73214C1E7320005BBF2 /* Icon-Small-50.png */,
+ A046E73314C1E7320005BBF2 /* Icon-Small.png */,
+ A046E73414C1E7320005BBF2 /* Icon-Small@2x.png */,
+ A046E73514C1E7320005BBF2 /* Icon.png */,
+ A046E73614C1E7320005BBF2 /* Icon@2x.png */,
+ A046E73714C1E7320005BBF2 /* Info.plist */,
+ A046E73814C1E7320005BBF2 /* iTunesArtwork */,
+ );
+ path = Resources;
+ sourceTree = "<group>";
+ };
+ A046E73A14C1E7320005BBF2 /* base_mac.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E73B14C1E7320005BBF2 /* Resources */,
+ A046E74314C1E7320005BBF2 /* TemplateInfo.plist */,
+ );
+ path = base_mac.xctemplate;
+ sourceTree = "<group>";
+ };
+ A046E73B14C1E7320005BBF2 /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ A046E73C14C1E7320005BBF2 /* InfoPlist.strings */,
+ A046E73E14C1E7320005BBF2 /* MainMenu.xib */,
+ A046E74014C1E7320005BBF2 /* fps_images.png */,
+ A046E74114C1E7320005BBF2 /* icon.icns */,
+ A046E74214C1E7320005BBF2 /* Info.plist */,
+ );
+ path = Resources;
+ sourceTree = "<group>";
+ };
+ A046E74414C1E7320005BBF2 /* bundle.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E74514C1E7320005BBF2 /* TemplateInfo.plist */,
+ );
+ path = bundle.xctemplate;
+ sourceTree = "<group>";
+ };
+ A046E74614C1E7320005BBF2 /* CCNode class.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E74714C1E7320005BBF2 /* CCLayer */,
+ A046E74A14C1E7320005BBF2 /* CCNode */,
+ A046E74D14C1E7320005BBF2 /* CCSprite */,
+ A046E75014C1E7320005BBF2 /* TemplateIcon.icns */,
+ A046E75114C1E7320005BBF2 /* TemplateInfo.plist */,
+ );
+ path = "CCNode class.xctemplate";
+ sourceTree = "<group>";
+ };
+ A046E74714C1E7320005BBF2 /* CCLayer */ = {
+ isa = PBXGroup;
+ children = (
+ A046E74814C1E7320005BBF2 /* ___FILEBASENAME___.h */,
+ A046E74914C1E7320005BBF2 /* ___FILEBASENAME___.m */,
+ );
+ path = CCLayer;
+ sourceTree = "<group>";
+ };
+ A046E74A14C1E7320005BBF2 /* CCNode */ = {
+ isa = PBXGroup;
+ children = (
+ A046E74B14C1E7320005BBF2 /* ___FILEBASENAME___.h */,
+ A046E74C14C1E7320005BBF2 /* ___FILEBASENAME___.m */,
+ );
+ path = CCNode;
+ sourceTree = "<group>";
+ };
+ A046E74D14C1E7320005BBF2 /* CCSprite */ = {
+ isa = PBXGroup;
+ children = (
+ A046E74E14C1E7320005BBF2 /* ___FILEBASENAME___.h */,
+ A046E74F14C1E7320005BBF2 /* ___FILEBASENAME___.m */,
+ );
+ path = CCSprite;
+ sourceTree = "<group>";
+ };
+ A046E75214C1E7320005BBF2 /* cocos2d iOS with Box2d.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E75314C1E7320005BBF2 /* AppDelegate.h */,
+ A046E75414C1E7320005BBF2 /* AppDelegate.mm */,
+ A046E75514C1E7320005BBF2 /* GLES-Render.h */,
+ A046E75614C1E7320005BBF2 /* GLES-Render.mm */,
+ A046E75714C1E7320005BBF2 /* HelloWorldLayer.h */,
+ A046E75814C1E7320005BBF2 /* HelloWorldLayer.mm */,
+ A046E75914C1E7320005BBF2 /* main.m */,
+ A046E75A14C1E7320005BBF2 /* PhysicsSprite.h */,
+ A046E75B14C1E7320005BBF2 /* PhysicsSprite.mm */,
+ A046E75C14C1E7320005BBF2 /* Prefix.pch */,
+ A046E75D14C1E7320005BBF2 /* Resources */,
+ A046E75F14C1E7320005BBF2 /* TemplateIcon.icns */,
+ A046E76014C1E7320005BBF2 /* TemplateInfo.plist */,
+ );
+ path = "cocos2d iOS with Box2d.xctemplate";
+ sourceTree = "<group>";
+ };
+ A046E75D14C1E7320005BBF2 /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ A046E75E14C1E7320005BBF2 /* blocks.png */,
+ );
+ path = Resources;
+ sourceTree = "<group>";
+ };
+ A046E76114C1E7320005BBF2 /* cocos2d iOS with Chipmunk.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E76214C1E7320005BBF2 /* AppDelegate.h */,
+ A046E76314C1E7320005BBF2 /* AppDelegate.m */,
+ A046E76414C1E7320005BBF2 /* HelloWorldLayer.h */,
+ A046E76514C1E7320005BBF2 /* HelloWorldLayer.m */,
+ A046E76614C1E7320005BBF2 /* main.m */,
+ A046E76714C1E7320005BBF2 /* PhysicsSprite.h */,
+ A046E76814C1E7320005BBF2 /* PhysicsSprite.m */,
+ A046E76914C1E7320005BBF2 /* Prefix.pch */,
+ A046E76A14C1E7320005BBF2 /* Resources */,
+ A046E76C14C1E7320005BBF2 /* TemplateIcon.icns */,
+ A046E76D14C1E7320005BBF2 /* TemplateInfo.plist */,
+ );
+ path = "cocos2d iOS with Chipmunk.xctemplate";
+ sourceTree = "<group>";
+ };
+ A046E76A14C1E7320005BBF2 /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ A046E76B14C1E7320005BBF2 /* grossini_dance_atlas.png */,
+ );
+ path = Resources;
+ sourceTree = "<group>";
+ };
+ A046E76E14C1E7320005BBF2 /* cocos2d iOS.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E76F14C1E7320005BBF2 /* AppDelegate.h */,
+ A046E77014C1E7320005BBF2 /* AppDelegate.m */,
+ A046E77114C1E7320005BBF2 /* HelloWorldLayer.h */,
+ A046E77214C1E7320005BBF2 /* HelloWorldLayer.m */,
+ A046E77314C1E7320005BBF2 /* main.m */,
+ A046E77414C1E7320005BBF2 /* Prefix.pch */,
+ A046E77514C1E7320005BBF2 /* TemplateIcon.icns */,
+ A046E77614C1E7320005BBF2 /* TemplateInfo.plist */,
+ );
+ path = "cocos2d iOS.xctemplate";
+ sourceTree = "<group>";
+ };
+ A046E77714C1E7320005BBF2 /* cocos2d Mac with Box2d.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E77814C1E7330005BBF2 /* AppDelegate.h */,
+ A046E77914C1E7330005BBF2 /* AppDelegate.mm */,
+ A046E77A14C1E7330005BBF2 /* GLES-Render.h */,
+ A046E77B14C1E7330005BBF2 /* GLES-Render.mm */,
+ A046E77C14C1E7330005BBF2 /* HelloWorldLayer.h */,
+ A046E77D14C1E7330005BBF2 /* HelloWorldLayer.mm */,
+ A046E77E14C1E7330005BBF2 /* main.m */,
+ A046E77F14C1E7330005BBF2 /* Prefix.pch */,
+ A046E78014C1E7330005BBF2 /* Resources */,
+ A046E78214C1E7330005BBF2 /* TemplateIcon.icns */,
+ A046E78314C1E7330005BBF2 /* TemplateInfo.plist */,
+ );
+ path = "cocos2d Mac with Box2d.xctemplate";
+ sourceTree = "<group>";
+ };
+ A046E78014C1E7330005BBF2 /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ A046E78114C1E7330005BBF2 /* blocks.png */,
+ );
+ path = Resources;
+ sourceTree = "<group>";
+ };
+ A046E78414C1E7330005BBF2 /* cocos2d Mac with Chipmunk.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E78514C1E7330005BBF2 /* AppDelegate.h */,
+ A046E78614C1E7330005BBF2 /* AppDelegate.m */,
+ A046E78714C1E7330005BBF2 /* HelloWorldLayer.h */,
+ A046E78814C1E7330005BBF2 /* HelloWorldLayer.m */,
+ A046E78914C1E7330005BBF2 /* main.m */,
+ A046E78A14C1E7330005BBF2 /* Prefix.pch */,
+ A046E78B14C1E7330005BBF2 /* Resources */,
+ A046E78D14C1E7330005BBF2 /* TemplateIcon.icns */,
+ A046E78E14C1E7330005BBF2 /* TemplateInfo.plist */,
+ );
+ path = "cocos2d Mac with Chipmunk.xctemplate";
+ sourceTree = "<group>";
+ };
+ A046E78B14C1E7330005BBF2 /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ A046E78C14C1E7330005BBF2 /* grossini_dance_atlas.png */,
+ );
+ path = Resources;
+ sourceTree = "<group>";
+ };
+ A046E78F14C1E7330005BBF2 /* cocos2d Mac.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E79014C1E7330005BBF2 /* AppDelegate.h */,
+ A046E79114C1E7330005BBF2 /* AppDelegate.m */,
+ A046E79214C1E7330005BBF2 /* HelloWorldLayer.h */,
+ A046E79314C1E7330005BBF2 /* HelloWorldLayer.m */,
+ A046E79414C1E7330005BBF2 /* main.m */,
+ A046E79514C1E7330005BBF2 /* Prefix.pch */,
+ A046E79614C1E7330005BBF2 /* TemplateIcon.icns */,
+ A046E79714C1E7330005BBF2 /* TemplateInfo.plist */,
+ );
+ path = "cocos2d Mac.xctemplate";
+ sourceTree = "<group>";
+ };
+ A046E79814C1E7330005BBF2 /* lib_box2d.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E79914C1E7330005BBF2 /* TemplateInfo.plist */,
+ );
+ path = lib_box2d.xctemplate;
+ sourceTree = "<group>";
+ };
+ A046E79A14C1E7330005BBF2 /* lib_chipmunk.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E79B14C1E7330005BBF2 /* TemplateInfo.plist */,
+ );
+ path = lib_chipmunk.xctemplate;
+ sourceTree = "<group>";
+ };
+ A046E79C14C1E7330005BBF2 /* lib_cocos2d.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E79D14C1E7330005BBF2 /* TemplateInfo.plist */,
+ );
+ path = lib_cocos2d.xctemplate;
+ sourceTree = "<group>";
+ };
+ A046E79E14C1E7330005BBF2 /* lib_cocos2d_shaders.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E79F14C1E7330005BBF2 /* TemplateInfo.plist */,
+ );
+ path = lib_cocos2d_shaders.xctemplate;
+ sourceTree = "<group>";
+ };
+ A046E7A014C1E7330005BBF2 /* lib_cocosdenshion.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E7A114C1E7330005BBF2 /* TemplateInfo.plist */,
+ );
+ path = lib_cocosdenshion.xctemplate;
+ sourceTree = "<group>";
+ };
+ A046E7A214C1E7330005BBF2 /* lib_cocosdenshionextras.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E7A314C1E7330005BBF2 /* TemplateInfo.plist */,
+ );
+ path = lib_cocosdenshionextras.xctemplate;
+ sourceTree = "<group>";
+ };
+ A046E7A414C1E7330005BBF2 /* lib_kazmath.xctemplate */ = {
+ isa = PBXGroup;
+ children = (
+ A046E7A514C1E7330005BBF2 /* TemplateInfo.plist */,
+ );
+ path = lib_kazmath.xctemplate;
+ sourceTree = "<group>";
+ };
A0793447141990CC00AC44D4 /* Testbed */ = {
isa = PBXGroup;
children = (
@@ -7653,8 +8072,8 @@
children = (
E0BC7D991342CE7B001B4DCC /* CCShaderCache.h */,
E0BC7D9A1342CE7B001B4DCC /* CCShaderCache.m */,
- E0BC7D9B1342CE7B001B4DCC /* GLProgram.h */,
- E0BC7D9C1342CE7B001B4DCC /* GLProgram.m */,
+ E0BC7D9B1342CE7B001B4DCC /* CCGLProgram.h */,
+ E0BC7D9C1342CE7B001B4DCC /* CCGLProgram.m */,
E03A4F281354E2F000D4B515 /* ccGLState.h */,
E03A4F271354E2F000D4B515 /* ccGLState.m */,
);
@@ -7675,12 +8094,14 @@
E0E9749E1237E4EA00E3E64B /* Mac */ = {
isa = PBXGroup;
children = (
- E0E9749F1237E4EA00E3E64B /* CCDirectorMac.h */,
- E0E974A01237E4EA00E3E64B /* CCDirectorMac.m */,
- E0E974A11237E4EA00E3E64B /* CCEventDispatcher.h */,
- E0E974A21237E4EA00E3E64B /* CCEventDispatcher.m */,
- E0E974A31237E4EA00E3E64B /* MacGLView.h */,
- E0E974A41237E4EA00E3E64B /* MacGLView.m */,
+ A046E28B14C1DB7D0005BBF2 /* CCDirectorMac.h */,
+ A046E28C14C1DB7D0005BBF2 /* CCDirectorMac.m */,
+ A046E28D14C1DB7D0005BBF2 /* CCEventDispatcher.h */,
+ A046E28E14C1DB7D0005BBF2 /* CCEventDispatcher.m */,
+ A046E28F14C1DB7D0005BBF2 /* CCGLView.h */,
+ A046E29014C1DB7D0005BBF2 /* CCGLView.m */,
+ A046E29114C1DB7D0005BBF2 /* CCWindow.h */,
+ A046E29214C1DB7D0005BBF2 /* CCWindow.m */,
);
path = Mac;
sourceTree = "<group>";
@@ -7706,11 +8127,11 @@
E0EAD0F0121F4B4600B0C81C /* CCTouchDispatcher.m */,
E0EAD0F1121F4B4600B0C81C /* CCTouchHandler.h */,
E0EAD0F2121F4B4600B0C81C /* CCTouchHandler.m */,
- E0EAD0F3121F4B4600B0C81C /* EAGLView.h */,
- E0EAD0F4121F4B4600B0C81C /* EAGLView.m */,
- E0BC7DA61342CF27001B4DCC /* ES2Renderer.h */,
- E0BC7DA71342CF27001B4DCC /* ES2Renderer.m */,
- E0EAD0F7121F4B4600B0C81C /* ESRenderer.h */,
+ E0EAD0F3121F4B4600B0C81C /* CCGLView.h */,
+ E0EAD0F4121F4B4600B0C81C /* CCGLView.m */,
+ E0BC7DA61342CF27001B4DCC /* CCES2Renderer.h */,
+ E0BC7DA71342CF27001B4DCC /* CCES2Renderer.m */,
+ E0EAD0F7121F4B4600B0C81C /* CCESRenderer.h */,
);
path = iOS;
sourceTree = "<group>";
@@ -7789,24 +8210,25 @@
E0EAD103121F4B4600B0C81C /* CCTouchDelegateProtocol.h in Headers */,
E0EAD104121F4B4600B0C81C /* CCTouchDispatcher.h in Headers */,
E0EAD106121F4B4600B0C81C /* CCTouchHandler.h in Headers */,
- E0EAD108121F4B4600B0C81C /* EAGLView.h in Headers */,
- E0EAD10C121F4B4600B0C81C /* ESRenderer.h in Headers */,
+ E0EAD108121F4B4600B0C81C /* CCGLView.h in Headers */,
+ E0EAD10C121F4B4600B0C81C /* CCESRenderer.h in Headers */,
E0EAD19D121F4D7300B0C81C /* CCGL.h in Headers */,
E0EAD1F1121F522A00B0C81C /* CCConfiguration.h in Headers */,
E0F924711224140400EF2362 /* CCTexturePVR.h in Headers */,
E0F92AC41224559800EF2362 /* CCNS.h in Headers */,
- E0E974A51237E4EA00E3E64B /* CCDirectorMac.h in Headers */,
- E0E974A71237E4EA00E3E64B /* CCEventDispatcher.h in Headers */,
- E0E974A91237E4EA00E3E64B /* MacGLView.h in Headers */,
E02BB6D6126CA93A006E46A2 /* CCAnimationCache.h in Headers */,
E02BB704126CADEA006E46A2 /* CCAnimation.h in Headers */,
E0BC7D9D1342CE7B001B4DCC /* CCShaderCache.h in Headers */,
- E0BC7D9F1342CE7B001B4DCC /* GLProgram.h in Headers */,
- E0BC7DA81342CF27001B4DCC /* ES2Renderer.h in Headers */,
+ E0BC7D9F1342CE7B001B4DCC /* CCGLProgram.h in Headers */,
+ E0BC7DA81342CF27001B4DCC /* CCES2Renderer.h in Headers */,
E03A4F2A1354E2F100D4B515 /* ccGLState.h in Headers */,
A0BE62D9140535F000DAA336 /* CCVertex.h in Headers */,
A0C20AC8144FDAF700D84B47 /* CCParticleBatchNode.h in Headers */,
A0C3815114BA0548001655CC /* CCTransitionProgress.h in Headers */,
+ A046E29314C1DB7D0005BBF2 /* CCDirectorMac.h in Headers */,
+ A046E29514C1DB7D0005BBF2 /* CCEventDispatcher.h in Headers */,
+ A046E29714C1DB7D0005BBF2 /* CCGLView.h in Headers */,
+ A046E29914C1DB7E0005BBF2 /* CCWindow.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -11992,20 +12414,21 @@
E0EAD100121F4B4600B0C81C /* CCDirectorIOS.m in Sources */,
E0EAD105121F4B4600B0C81C /* CCTouchDispatcher.m in Sources */,
E0EAD107121F4B4600B0C81C /* CCTouchHandler.m in Sources */,
- E0EAD109121F4B4600B0C81C /* EAGLView.m in Sources */,
+ E0EAD109121F4B4600B0C81C /* CCGLView.m in Sources */,
E0F924721224140400EF2362 /* CCTexturePVR.m in Sources */,
- E0E974A61237E4EA00E3E64B /* CCDirectorMac.m in Sources */,
- E0E974A81237E4EA00E3E64B /* CCEventDispatcher.m in Sources */,
- E0E974AA1237E4EA00E3E64B /* MacGLView.m in Sources */,
E02BB6D7126CA93A006E46A2 /* CCAnimationCache.m in Sources */,
E02BB705126CADEA006E46A2 /* CCAnimation.m in Sources */,
E0BC7D9E1342CE7B001B4DCC /* CCShaderCache.m in Sources */,
- E0BC7DA01342CE7B001B4DCC /* GLProgram.m in Sources */,
- E0BC7DA91342CF27001B4DCC /* ES2Renderer.m in Sources */,
+ E0BC7DA01342CE7B001B4DCC /* CCGLProgram.m in Sources */,
+ E0BC7DA91342CF27001B4DCC /* CCES2Renderer.m in Sources */,
E03A4F291354E2F100D4B515 /* ccGLState.m in Sources */,
A0BE62DA140535F000DAA336 /* CCVertex.m in Sources */,
A0C20AC9144FDAF700D84B47 /* CCParticleBatchNode.m in Sources */,
A0C3815214BA0548001655CC /* CCTransitionProgress.m in Sources */,
+ A046E29414C1DB7D0005BBF2 /* CCDirectorMac.m in Sources */,
+ A046E29614C1DB7D0005BBF2 /* CCEventDispatcher.m in Sources */,
+ A046E29814C1DB7D0005BBF2 /* CCGLView.m in Sources */,
+ A046E29A14C1DB7E0005BBF2 /* CCWindow.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -13163,6 +13586,25 @@
};
/* End PBXTargetDependency section */
+/* Begin PBXVariantGroup section */
+ A046E73C14C1E7320005BBF2 /* InfoPlist.strings */ = {
+ isa = PBXVariantGroup;
+ children = (
+ A046E73D14C1E7320005BBF2 /* English */,
+ );
+ name = InfoPlist.strings;
+ sourceTree = "<group>";
+ };
+ A046E73E14C1E7320005BBF2 /* MainMenu.xib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ A046E73F14C1E7320005BBF2 /* English */,
+ );
+ name = MainMenu.xib;
+ sourceTree = "<group>";
+ };
+/* End PBXVariantGroup section */
+
/* Begin XCBuildConfiguration section */
05CA7B0210ED674700F12774 /* Debug */ = {
isa = XCBuildConfiguration;
View
144 cocos2d-mac.xcodeproj/project.pbxproj
@@ -662,6 +662,20 @@
A04443F314A91DB600E62742 /* BaseAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = A04443E114A91DB600E62742 /* BaseAppController.m */; };
A04443F414A91DB600E62742 /* BaseAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = A04443E114A91DB600E62742 /* BaseAppController.m */; };
A04443F514A91DB600E62742 /* BaseAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = A04443E114A91DB600E62742 /* BaseAppController.m */; };
+ A046E2B214C1E5000005BBF2 /* CCDirectorIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E2A614C1E5000005BBF2 /* CCDirectorIOS.h */; };
+ A046E2B314C1E5000005BBF2 /* CCDirectorIOS.m in Sources */ = {isa = PBXBuildFile; fileRef = A046E2A714C1E5000005BBF2 /* CCDirectorIOS.m */; };
+ A046E2B414C1E5000005BBF2 /* CCES2Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E2A814C1E5000005BBF2 /* CCES2Renderer.h */; };
+ A046E2B514C1E5000005BBF2 /* CCES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = A046E2A914C1E5000005BBF2 /* CCES2Renderer.m */; };
+ A046E2B614C1E5000005BBF2 /* CCESRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E2AA14C1E5000005BBF2 /* CCESRenderer.h */; };
+ A046E2B714C1E5000005BBF2 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E2AB14C1E5000005BBF2 /* CCGLView.h */; };
+ A046E2B814C1E5000005BBF2 /* CCGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = A046E2AC14C1E5000005BBF2 /* CCGLView.m */; };
+ A046E2B914C1E5000005BBF2 /* CCTouchDelegateProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E2AD14C1E5000005BBF2 /* CCTouchDelegateProtocol.h */; };
+ A046E2BA14C1E5000005BBF2 /* CCTouchDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E2AE14C1E5000005BBF2 /* CCTouchDispatcher.h */; };
+ A046E2BB14C1E5000005BBF2 /* CCTouchDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = A046E2AF14C1E5000005BBF2 /* CCTouchDispatcher.m */; };
+ A046E2BC14C1E5000005BBF2 /* CCTouchHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E2B014C1E5000005BBF2 /* CCTouchHandler.h */; };
+ A046E2BD14C1E5000005BBF2 /* CCTouchHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = A046E2B114C1E5000005BBF2 /* CCTouchHandler.m */; };
+ A046E2C014C1E5480005BBF2 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = A046E2BE14C1E5480005BBF2 /* CCGLProgram.h */; };
+ A046E2C114C1E5480005BBF2 /* CCGLProgram.m in Sources */ = {isa = PBXBuildFile; fileRef = A046E2BF14C1E5480005BBF2 /* CCGLProgram.m */; };
A04B0DC814A007D0005EB429 /* bugs in Resources */ = {isa = PBXBuildFile; fileRef = A04B0DC714A007D0005EB429 /* bugs */; };
A04B0EF914A29B77005EB429 /* PositionTextureColorAlphaTest.fsh in Resources */ = {isa = PBXBuildFile; fileRef = A05483151457C4AB00B47D05 /* PositionTextureColorAlphaTest.fsh */; };
A04B0EFA14A29B77005EB429 /* Position_uColor.fsh in Resources */ = {isa = PBXBuildFile; fileRef = A0EC4CAF1403278200EC482A /* Position_uColor.fsh */; };
@@ -2364,8 +2378,6 @@
E04C31201357138100F65F71 /* ccGLState.m in Sources */ = {isa = PBXBuildFile; fileRef = E04C311A1357138100F65F71 /* ccGLState.m */; };
E04C31211357138100F65F71 /* CCShaderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = E04C311B1357138100F65F71 /* CCShaderCache.h */; };
E04C31221357138100F65F71 /* CCShaderCache.m in Sources */ = {isa = PBXBuildFile; fileRef = E04C311C1357138100F65F71 /* CCShaderCache.m */; };
- E04C31231357138100F65F71 /* GLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = E04C311D1357138100F65F71 /* GLProgram.h */; };
- E04C31241357138100F65F71 /* GLProgram.m in Sources */ = {isa = PBXBuildFile; fileRef = E04C311E1357138100F65F71 /* GLProgram.m */; };
E05052B2122D5655005B74CB /* fps_images.png in Resources */ = {isa = PBXBuildFile; fileRef = E076E7B11225EDD000DE0DA2 /* fps_images.png */; };
E0505334122D5AE6005B74CB /* A Damn Mess.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E076E7A21225EDD000DE0DA2 /* A Damn Mess.ttf */; };
E0505335122D5AE6005B74CB /* Abberancy.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E076E7A31225EDD000DE0DA2 /* Abberancy.ttf */; };
@@ -2689,8 +2701,8 @@
E076E7561225EC7400DE0DA2 /* CCDirectorMac.m in Sources */ = {isa = PBXBuildFile; fileRef = E076E6B31225EC7400DE0DA2 /* CCDirectorMac.m */; };
E076E7571225EC7400DE0DA2 /* CCEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E076E6B41225EC7400DE0DA2 /* CCEventDispatcher.h */; };
E076E7581225EC7400DE0DA2 /* CCEventDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = E076E6B51225EC7400DE0DA2 /* CCEventDispatcher.m */; };
- E076E7591225EC7400DE0DA2 /* MacGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = E076E6B61225EC7400DE0DA2 /* MacGLView.h */; };
- E076E75A1225EC7400DE0DA2 /* MacGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = E076E6B71225EC7400DE0DA2 /* MacGLView.m */; };
+ E076E7591225EC7400DE0DA2 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = E076E6B61225EC7400DE0DA2 /* CCGLView.h */; };
+ E076E75A1225EC7400DE0DA2 /* CCGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = E076E6B71225EC7400DE0DA2 /* CCGLView.m */; };
E076E75B1225EC7400DE0DA2 /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = E076E6B91225EC7400DE0DA2 /* base64.c */; };
E076E75C1225EC7400DE0DA2 /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = E076E6BA1225EC7400DE0DA2 /* base64.h */; };
E076E75D1225EC7400DE0DA2 /* CCArray.h in Headers */ = {isa = PBXBuildFile; fileRef = E076E6BB1225EC7400DE0DA2 /* CCArray.h */; };
@@ -3688,8 +3700,8 @@
E076F21F12268AF100DE0DA2 /* SpriteTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E076F21E12268AF100DE0DA2 /* SpriteTest.m */; };
E0796B5812DF8A8C002442F5 /* futura-48.fnt in Resources */ = {isa = PBXBuildFile; fileRef = E0796B5612DF8A8C002442F5 /* futura-48.fnt */; };
E0796B5912DF8A8C002442F5 /* futura-48.png in Resources */ = {isa = PBXBuildFile; fileRef = E0796B5712DF8A8C002442F5 /* futura-48.png */; };
- E08AA19B12C262B3000341BD /* MacWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = E08AA19912C262B3000341BD /* MacWindow.h */; };
- E08AA19C12C262B3000341BD /* MacWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = E08AA19A12C262B3000341BD /* MacWindow.m */; };
+ E08AA19B12C262B3000341BD /* CCWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = E08AA19912C262B3000341BD /* CCWindow.h */; };
+ E08AA19C12C262B3000341BD /* CCWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = E08AA19A12C262B3000341BD /* CCWindow.m */; };
E08AA22C12C27DEA000341BD /* MainMenu-NoWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = E08AA22A12C27DEA000341BD /* MainMenu-NoWindow.xib */; };
E08AA22D12C27DEA000341BD /* MainMenu-NoWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = E08AA22A12C27DEA000341BD /* MainMenu-NoWindow.xib */; };
E08AA22F12C27E2F000341BD /* MainMenu-NoWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = E08AA22A12C27DEA000341BD /* MainMenu-NoWindow.xib */; };
@@ -4955,18 +4967,6 @@
E0D2D560128CB06A00F78C63 /* piece.png in Resources */ = {isa = PBXBuildFile; fileRef = E0D2D55F128CB06A00F78C63 /* piece.png */; };
E0D44F3A1291BFFB0094708A /* test_image_rgba4444.pvr.ccz in Resources */ = {isa = PBXBuildFile; fileRef = E0D44F381291BFFB0094708A /* test_image_rgba4444.pvr.ccz */; };
E0D44F3B1291BFFB0094708A /* test_image_rgba4444.pvr.gz in Resources */ = {isa = PBXBuildFile; fileRef = E0D44F391291BFFB0094708A /* test_image_rgba4444.pvr.gz */; };
- E0D5D7151344056600A7B1B9 /* CCDirectorIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = E0D5D6FC1344056600A7B1B9 /* CCDirectorIOS.h */; };
- E0D5D7161344056600A7B1B9 /* CCDirectorIOS.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D5D6FD1344056600A7B1B9 /* CCDirectorIOS.m */; };
- E0D5D7171344056600A7B1B9 /* CCTouchDelegateProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = E0D5D6FE1344056600A7B1B9 /* CCTouchDelegateProtocol.h */; };
- E0D5D7181344056600A7B1B9 /* CCTouchDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E0D5D6FF1344056600A7B1B9 /* CCTouchDispatcher.h */; };
- E0D5D7191344056600A7B1B9 /* CCTouchDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D5D7001344056600A7B1B9 /* CCTouchDispatcher.m */; };
- E0D5D71A1344056600A7B1B9 /* CCTouchHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = E0D5D7011344056600A7B1B9 /* CCTouchHandler.h */; };
- E0D5D71B1344056600A7B1B9 /* CCTouchHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D5D7021344056600A7B1B9 /* CCTouchHandler.m */; };
- E0D5D71C1344056600A7B1B9 /* EAGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = E0D5D7031344056600A7B1B9 /* EAGLView.h */; };
- E0D5D71D1344056600A7B1B9 /* EAGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D5D7041344056600A7B1B9 /* EAGLView.m */; };
- E0D5D71E1344056600A7B1B9 /* ES2Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = E0D5D7051344056600A7B1B9 /* ES2Renderer.h */; };
- E0D5D71F1344056600A7B1B9 /* ES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D5D7061344056600A7B1B9 /* ES2Renderer.m */; };
- E0D5D7201344056600A7B1B9 /* ESRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = E0D5D7071344056600A7B1B9 /* ESRenderer.h */; };
E0DA427212A03A3C00210ACE /* A Damn Mess.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E076E7A21225EDD000DE0DA2 /* A Damn Mess.ttf */; };
E0DA427312A03A3C00210ACE /* Abberancy.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E076E7A31225EDD000DE0DA2 /* Abberancy.ttf */; };
E0DA427412A03A3C00210ACE /* Abduction.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E076E7A41225EDD000DE0DA2 /* Abduction.ttf */; };
@@ -5812,6 +5812,20 @@
A044439314A6027300E62742 /* GLES-Render.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "GLES-Render.mm"; path = "tests/Box2DTestBed-Cocos2dIntegration/GLES-Render.mm"; sourceTree = "<group>"; };
A04443E014A91DB600E62742 /* BaseAppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BaseAppController.h; path = tests/BaseAppController.h; sourceTree = "<group>"; };
A04443E114A91DB600E62742 /* BaseAppController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BaseAppController.m; path = tests/BaseAppController.m; sourceTree = "<group>"; };
+ A046E2A614C1E5000005BBF2 /* CCDirectorIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDirectorIOS.h; sourceTree = "<group>"; };
+ A046E2A714C1E5000005BBF2 /* CCDirectorIOS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCDirectorIOS.m; sourceTree = "<group>"; };
+ A046E2A814C1E5000005BBF2 /* CCES2Renderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCES2Renderer.h; sourceTree = "<group>"; };
+ A046E2A914C1E5000005BBF2 /* CCES2Renderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCES2Renderer.m; sourceTree = "<group>"; };
+ A046E2AA14C1E5000005BBF2 /* CCESRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCESRenderer.h; sourceTree = "<group>"; };
+ A046E2AB14C1E5000005BBF2 /* CCGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLView.h; sourceTree = "<group>"; };
+ A046E2AC14C1E5000005BBF2 /* CCGLView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCGLView.m; sourceTree = "<group>"; };
+ A046E2AD14C1E5000005BBF2 /* CCTouchDelegateProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTouchDelegateProtocol.h; sourceTree = "<group>"; };
+ A046E2AE14C1E5000005BBF2 /* CCTouchDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTouchDispatcher.h; sourceTree = "<group>"; };
+ A046E2AF14C1E5000005BBF2 /* CCTouchDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCTouchDispatcher.m; sourceTree = "<group>"; };
+ A046E2B014C1E5000005BBF2 /* CCTouchHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTouchHandler.h; sourceTree = "<group>"; };
+ A046E2B114C1E5000005BBF2 /* CCTouchHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCTouchHandler.m; sourceTree = "<group>"; };
+ A046E2BE14C1E5480005BBF2 /* CCGLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgram.h; sourceTree = "<group>"; };
+ A046E2BF14C1E5480005BBF2 /* CCGLProgram.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCGLProgram.m; sourceTree = "<group>"; };
A04B0DC714A007D0005EB429 /* bugs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = bugs; path = Resources/Images/bugs; sourceTree = "<group>"; };
A04B0F5D14A29B77005EB429 /* SchedulerTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SchedulerTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
A04B0F6114A29BEB005EB429 /* SchedulerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SchedulerTest.m; path = tests/SchedulerTest.m; sourceTree = "<group>"; };
@@ -5925,8 +5939,6 @@
E04C311A1357138100F65F71 /* ccGLState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ccGLState.m; sourceTree = "<group>"; };
E04C311B1357138100F65F71 /* CCShaderCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShaderCache.h; sourceTree = "<group>"; };
E04C311C1357138100F65F71 /* CCShaderCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCShaderCache.m; sourceTree = "<group>"; };
- E04C311D1357138100F65F71 /* GLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLProgram.h; sourceTree = "<group>"; };
- E04C311E1357138100F65F71 /* GLProgram.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GLProgram.m; sourceTree = "<group>"; };
E0505401122D5AE6005B74CB /* RenderTextureTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RenderTextureTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
E0505404122D5B58005B74CB /* RenderTextureTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RenderTextureTest.h; path = tests/RenderTextureTest.h; sourceTree = "<group>"; };
E0505405122D5B58005B74CB /* RenderTextureTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RenderTextureTest.m; path = tests/RenderTextureTest.m; sourceTree = "<group>"; };
@@ -6053,8 +6065,8 @@
E076E6B31225EC7400DE0DA2 /* CCDirectorMac.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCDirectorMac.m; sourceTree = "<group>"; };
E076E6B41225EC7400DE0DA2 /* CCEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEventDispatcher.h; sourceTree = "<group>"; };
E076E6B51225EC7400DE0DA2 /* CCEventDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEventDispatcher.m; sourceTree = "<group>"; };
- E076E6B61225EC7400DE0DA2 /* MacGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacGLView.h; sourceTree = "<group>"; };
- E076E6B71225EC7400DE0DA2 /* MacGLView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MacGLView.m; sourceTree = "<group>"; };
+ E076E6B61225EC7400DE0DA2 /* CCGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLView.h; sourceTree = "<group>"; };
+ E076E6B71225EC7400DE0DA2 /* CCGLView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCGLView.m; sourceTree = "<group>"; };
E076E6B91225EC7400DE0DA2 /* base64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base64.c; sourceTree = "<group>"; };
E076E6BA1225EC7400DE0DA2 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base64.h; sourceTree = "<group>"; };
E076E6BB1225EC7400DE0DA2 /* CCArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCArray.h; sourceTree = "<group>"; };
@@ -6319,8 +6331,8 @@
E076F21E12268AF100DE0DA2 /* SpriteTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SpriteTest.m; path = tests/SpriteTest.m; sourceTree = "<group>"; };
E0796B5612DF8A8C002442F5 /* futura-48.fnt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "futura-48.fnt"; sourceTree = "<group>"; };
E0796B5712DF8A8C002442F5 /* futura-48.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "futura-48.png"; sourceTree = "<group>"; };
- E08AA19912C262B3000341BD /* MacWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacWindow.h; sourceTree = "<group>"; };
- E08AA19A12C262B3000341BD /* MacWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MacWindow.m; sourceTree = "<group>"; };
+ E08AA19912C262B3000341BD /* CCWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCWindow.h; sourceTree = "<group>"; };
+ E08AA19A12C262B3000341BD /* CCWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCWindow.m; sourceTree = "<group>"; };
E08AA22B12C27DEA000341BD /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = "Resources-Mac/English.lproj/MainMenu-NoWindow.xib"; sourceTree = "<group>"; };
E08AA23512C27E7D000341BD /* cocos2d_mac-no-window-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "cocos2d_mac-no-window-Info.plist"; path = "Resources-Mac/cocos2d_mac-no-window-Info.plist"; sourceTree = "<group>"; };
E0AC06A51228021600EFA814 /* ActionTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ActionTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -6359,18 +6371,6 @@
E0D5D6DE1343FAEF00A7B1B9 /* LICENSE_cocos2d.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE_cocos2d.txt; sourceTree = "<group>"; };
E0D5D6DF1343FAEF00A7B1B9 /* LICENSE_cocosdenshion.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE_cocosdenshion.txt; sourceTree = "<group>"; };
E0D5D6E11343FAEF00A7B1B9 /* LICENSE_libpng.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE_libpng.txt; sourceTree = "<group>"; };
- E0D5D6FC1344056600A7B1B9 /* CCDirectorIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDirectorIOS.h; sourceTree = "<group>"; };
- E0D5D6FD1344056600A7B1B9 /* CCDirectorIOS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCDirectorIOS.m; sourceTree = "<group>"; };
- E0D5D6FE1344056600A7B1B9 /* CCTouchDelegateProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTouchDelegateProtocol.h; sourceTree = "<group>"; };
- E0D5D6FF1344056600A7B1B9 /* CCTouchDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTouchDispatcher.h; sourceTree = "<group>"; };
- E0D5D7001344056600A7B1B9 /* CCTouchDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCTouchDispatcher.m; sourceTree = "<group>"; };
- E0D5D7011344056600A7B1B9 /* CCTouchHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTouchHandler.h; sourceTree = "<group>"; };
- E0D5D7021344056600A7B1B9 /* CCTouchHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCTouchHandler.m; sourceTree = "<group>"; };
- E0D5D7031344056600A7B1B9 /* EAGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EAGLView.h; sourceTree = "<group>"; };
- E0D5D7041344056600A7B1B9 /* EAGLView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EAGLView.m; sourceTree = "<group>"; };
- E0D5D7051344056600A7B1B9 /* ES2Renderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ES2Renderer.h; sourceTree = "<group>"; };
- E0D5D7061344056600A7B1B9 /* ES2Renderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ES2Renderer.m; sourceTree = "<group>"; };
- E0D5D7071344056600A7B1B9 /* ESRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESRenderer.h; sourceTree = "<group>"; };
E0DA434212A03A3C00210ACE /* FullScreenTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FullScreenTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
E0DA434812A03AE100210ACE /* FullScreenTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FullScreenTest.m; path = tests/FullScreenTest.m; sourceTree = "<group>"; };
E0DA434A12A03B0C00210ACE /* FullScreenTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FullScreenTest.h; path = tests/FullScreenTest.h; sourceTree = "<group>"; };
@@ -7286,12 +7286,12 @@
E0506A8413169AE100EAE33F /* Shaders */ = {
isa = PBXGroup;
children = (
+ A046E2BE14C1E5480005BBF2 /* CCGLProgram.h */,
+ A046E2BF14C1E5480005BBF2 /* CCGLProgram.m */,
E04C31191357138100F65F71 /* ccGLState.h */,
E04C311A1357138100F65F71 /* ccGLState.m */,
E04C311B1357138100F65F71 /* CCShaderCache.h */,
E04C311C1357138100F65F71 /* CCShaderCache.m */,
- E04C311D1357138100F65F71 /* GLProgram.h */,
- E04C311E1357138100F65F71 /* GLProgram.m */,
);
name = Shaders;
sourceTree = "<group>";
@@ -7413,10 +7413,10 @@
E076E6B31225EC7400DE0DA2 /* CCDirectorMac.m */,
E076E6B41225EC7400DE0DA2 /* CCEventDispatcher.h */,
E076E6B51225EC7400DE0DA2 /* CCEventDispatcher.m */,
- E076E6B61225EC7400DE0DA2 /* MacGLView.h */,
- E076E6B71225EC7400DE0DA2 /* MacGLView.m */,
- E08AA19912C262B3000341BD /* MacWindow.h */,
- E08AA19A12C262B3000341BD /* MacWindow.m */,
+ E076E6B61225EC7400DE0DA2 /* CCGLView.h */,
+ E076E6B71225EC7400DE0DA2 /* CCGLView.m */,
+ E08AA19912C262B3000341BD /* CCWindow.h */,
+ E08AA19A12C262B3000341BD /* CCWindow.m */,
);
path = Mac;
sourceTree = "<group>";
@@ -7924,18 +7924,18 @@
E0D5D6FB1344056600A7B1B9 /* iOS */ = {
isa = PBXGroup;
children = (
- E0D5D6FC1344056600A7B1B9 /* CCDirectorIOS.h */,
- E0D5D6FD1344056600A7B1B9 /* CCDirectorIOS.m */,
- E0D5D6FE1344056600A7B1B9 /* CCTouchDelegateProtocol.h */,
- E0D5D6FF1344056600A7B1B9 /* CCTouchDispatcher.h */,
- E0D5D7001344056600A7B1B9 /* CCTouchDispatcher.m */,
- E0D5D7011344056600A7B1B9 /* CCTouchHandler.h */,
- E0D5D7021344056600A7B1B9 /* CCTouchHandler.m */,
- E0D5D7031344056600A7B1B9 /* EAGLView.h */,
- E0D5D7041344056600A7B1B9 /* EAGLView.m */,
- E0D5D7051344056600A7B1B9 /* ES2Renderer.h */,
- E0D5D7061344056600A7B1B9 /* ES2Renderer.m */,
- E0D5D7071344056600A7B1B9 /* ESRenderer.h */,
+ A046E2A614C1E5000005BBF2 /* CCDirectorIOS.h */,
+ A046E2A714C1E5000005BBF2 /* CCDirectorIOS.m */,
+ A046E2A814C1E5000005BBF2 /* CCES2Renderer.h */,
+ A046E2A914C1E5000005BBF2 /* CCES2Renderer.m */,
+ A046E2AA14C1E5000005BBF2 /* CCESRenderer.h */,
+ A046E2AB14C1E5000005BBF2 /* CCGLView.h */,
+ A046E2AC14C1E5000005BBF2 /* CCGLView.m */,
+ A046E2AD14C1E5000005BBF2 /* CCTouchDelegateProtocol.h */,
+ A046E2AE14C1E5000005BBF2 /* CCTouchDispatcher.h */,
+ A046E2AF14C1E5000005BBF2 /* CCTouchDispatcher.m */,
+ A046E2B014C1E5000005BBF2 /* CCTouchHandler.h */,
+ A046E2B114C1E5000005BBF2 /* CCTouchHandler.m */,
);
path = iOS;
sourceTree = "<group>";
@@ -8117,7 +8117,7 @@
E076E7461225EC7400DE0DA2 /* CCNS.h in Headers */,
E076E7551225EC7400DE0DA2 /* CCDirectorMac.h in Headers */,
E076E7571225EC7400DE0DA2 /* CCEventDispatcher.h in Headers */,
- E076E7591225EC7400DE0DA2 /* MacGLView.h in Headers */,
+ E076E7591225EC7400DE0DA2 /* CCGLView.h in Headers */,
E076E75C1225EC7400DE0DA2 /* base64.h in Headers */,
E076E75D1225EC7400DE0DA2 /* CCArray.h in Headers */,
E076E75F1225EC7400DE0DA2 /* ccCArray.h in Headers */,
@@ -8133,19 +8133,19 @@
E076E76F1225EC7400DE0DA2 /* ZipUtils.h in Headers */,
E02BBC7E126CD870006E46A2 /* CCAnimation.h in Headers */,
E02BBC80126CD870006E46A2 /* CCAnimationCache.h in Headers */,
- E08AA19B12C262B3000341BD /* MacWindow.h in Headers */,
- E0D5D7151344056600A7B1B9 /* CCDirectorIOS.h in Headers */,
- E0D5D7171344056600A7B1B9 /* CCTouchDelegateProtocol.h in Headers */,
- E0D5D7181344056600A7B1B9 /* CCTouchDispatcher.h in Headers */,
- E0D5D71A1344056600A7B1B9 /* CCTouchHandler.h in Headers */,
- E0D5D71C1344056600A7B1B9 /* EAGLView.h in Headers */,
- E0D5D71E1344056600A7B1B9 /* ES2Renderer.h in Headers */,
- E0D5D7201344056600A7B1B9 /* ESRenderer.h in Headers */,
+ E08AA19B12C262B3000341BD /* CCWindow.h in Headers */,
E04C311F1357138100F65F71 /* ccGLState.h in Headers */,
E04C31211357138100F65F71 /* CCShaderCache.h in Headers */,
- E04C31231357138100F65F71 /* GLProgram.h in Headers */,
A0BE62FC140552BD00DAA336 /* CCVertex.h in Headers */,
A0AAB80B1451BD3600850F2C /* CCParticleBatchNode.h in Headers */,
+ A046E2B214C1E5000005BBF2 /* CCDirectorIOS.h in Headers */,
+ A046E2B414C1E5000005BBF2 /* CCES2Renderer.h in Headers */,
+ A046E2B614C1E5000005BBF2 /* CCESRenderer.h in Headers */,
+ A046E2B714C1E5000005BBF2 /* CCGLView.h in Headers */,
+ A046E2B914C1E5000005BBF2 /* CCTouchDelegateProtocol.h in Headers */,
+ A046E2BA14C1E5000005BBF2 /* CCTouchDispatcher.h in Headers */,
+ A046E2BC14C1E5000005BBF2 /* CCTouchHandler.h in Headers */,
+ A046E2C014C1E5480005BBF2 /* CCGLProgram.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -13778,7 +13778,7 @@
E076E7441225EC7400DE0DA2 /* cocos2d.m in Sources */,
E076E7561225EC7400DE0DA2 /* CCDirectorMac.m in Sources */,
E076E7581225EC7400DE0DA2 /* CCEventDispatcher.m in Sources */,
- E076E75A1225EC7400DE0DA2 /* MacGLView.m in Sources */,
+ E076E75A1225EC7400DE0DA2 /* CCGLView.m in Sources */,
E076E75B1225EC7400DE0DA2 /* base64.c in Sources */,
E076E75E1225EC7400DE0DA2 /* CCArray.m in Sources */,
E076E7611225EC7400DE0DA2 /* CCFileUtils.m in Sources */,
@@ -13790,17 +13790,17 @@
E076E7701225EC7400DE0DA2 /* ZipUtils.m in Sources */,
E02BBC7D126CD870006E46A2 /* CCAnimation.m in Sources */,
E02BBC7F126CD870006E46A2 /* CCAnimationCache.m in Sources */,
- E08AA19C12C262B3000341BD /* MacWindow.m in Sources */,
- E0D5D7161344056600A7B1B9 /* CCDirectorIOS.m in Sources */,
- E0D5D7191344056600A7B1B9 /* CCTouchDispatcher.m in Sources */,
- E0D5D71B1344056600A7B1B9 /* CCTouchHandler.m in Sources */,
- E0D5D71D1344056600A7B1B9 /* EAGLView.m in Sources */,
- E0D5D71F1344056600A7B1B9 /* ES2Renderer.m in Sources */,
+ E08AA19C12C262B3000341BD /* CCWindow.m in Sources */,
E04C31201357138100F65F71 /* ccGLState.m in Sources */,
E04C31221357138100F65F71 /* CCShaderCache.m in Sources */,
- E04C31241357138100F65F71 /* GLProgram.m in Sources */,
A0BE62FD140552BD00DAA336 /* CCVertex.m in Sources */,
A0AAB80C1451BD3600850F2C /* CCParticleBatchNode.m in Sources */,
+ A046E2B314C1E5000005BBF2 /* CCDirectorIOS.m in Sources */,
+ A046E2B514C1E5000005BBF2 /* CCES2Renderer.m in Sources */,
+ A046E2B814C1E5000005BBF2 /* CCGLView.m in Sources */,
+ A046E2BB14C1E5000005BBF2 /* CCTouchDispatcher.m in Sources */,
+ A046E2BD14C1E5000005BBF2 /* CCTouchHandler.m in Sources */,
+ A046E2C114C1E5480005BBF2 /* CCGLProgram.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
2  cocos2d/CCAtlasNode.m
@@ -26,7 +26,7 @@
#import "CCAtlasNode.h"
#import "ccMacros.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "CCShaderCache.h"
#import "ccGLState.h"
#import "CCDirector.h"
View
7 cocos2d/CCDirector.h
@@ -299,13 +299,12 @@ and when to execute the Scenes.
// XXX: Hack. Should be placed on CCDirectorMac.h. Refactoring needed
-#ifdef __CC_PLATFORM_IOS
-#elif defined(__CC_PLATFORM_MAC)
+#if defined(__CC_PLATFORM_MAC)
/** sets the openGL view */
--(void) setView:(CC_GLVIEW*)view;
+-(void) setView:(CCGLView*)view;
/** returns the OpenGL view */
--(CC_GLVIEW*) view;
+-(CCGLView*) view;
#endif
#pragma mark Director - Memory Helper
View
4 cocos2d/CCDirector.m
@@ -291,7 +291,7 @@ - (void) setDepthTest: (BOOL) on
#pragma mark Director Integration with a UIKit view
--(void) setView:(CC_GLVIEW *)view
+-(void) setView:(CCGLView*)view
{
NSAssert( view, @"OpenGLView must be non-nil");
@@ -309,7 +309,7 @@ -(void) setView:(CC_GLVIEW *)view
}
#ifdef __CC_PLATFORM_MAC
--(CC_GLVIEW*) view
+-(CCGLView*) view
{
// ignore on Mac
return nil;
View
6 cocos2d/CCDrawingPrimitives.m
@@ -32,12 +32,12 @@
#import "Platforms/CCGL.h"
#import "ccGLState.h"
#import "CCShaderCache.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "Support/OpenGL_Internal.h"
static BOOL initialized = NO;
-static GLProgram *shader_ = nil;
+static CCGLProgram *shader_ = nil;
static int colorLocation_ = -1;
static ccColor4F color_ = {1,1,1,1};
static int pointSizeLocation_ = -1;
@@ -50,7 +50,7 @@ static void lazy_init( void )
//
// Position and 1 color passed as a uniform (to similate glColor4ub )
//
- shader_ = [[GLProgram alloc] initWithVertexShaderFilename:@"Position_uColor.vsh"
+ shader_ = [[CCGLProgram alloc] initWithVertexShaderFilename:@"Position_uColor.vsh"
fragmentShaderFilename:@"Position_uColor.fsh"];
View
5 cocos2d/CCGLProgram.h
@@ -66,9 +66,10 @@ enum {
#define kCCAttributeNameTexCoord @"a_texCoord"
-/** GLProgram
+/** CCGLProgram
+ Class that implements a glProgram
*/
-@interface GLProgram : NSObject
+@interface CCGLProgram : NSObject
{
@public
GLuint program_,
View
6 cocos2d/CCGLProgram.m
@@ -22,7 +22,7 @@
//
// Adapted for cocos2d http://www.cocos2d-iphone.org
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "ccGLState.h"
#import "ccMacros.h"
#import "Support/CCFileUtils.h"
@@ -39,7 +39,7 @@ typedef void (*GLLogFunction) (GLuint program,
#pragma mark -
#pragma mark Private Extension Method Declaration
-@interface GLProgram()
+@interface CCGLProgram()
- (BOOL)compileShader:(GLuint *)shader
type:(GLenum)type
file:(NSString *)file;
@@ -50,7 +50,7 @@ - (NSString *)logForOpenGLObject:(GLuint)object
#pragma mark -
-@implementation GLProgram
+@implementation CCGLProgram
- (id)initWithVertexShaderFilename:(NSString *)vShaderFilename
fragmentShaderFilename:(NSString *)fShaderFilename
{
View
6 cocos2d/CCGrid.h
@@ -34,7 +34,7 @@
@class CCTexture2D;
@class CCGrabber;
-@class GLProgram;
+@class CCGLProgram;
/** Base class for other
*/
@@ -48,7 +48,7 @@
CCGrabber *grabber_;
BOOL isTextureFlipped_;
- GLProgram *shaderProgram_;
+ CCGLProgram *shaderProgram_;
ccDirectorProjection directorProjection_;
}
@@ -68,7 +68,7 @@
/** is texture flipped */
@property (nonatomic, readwrite) BOOL isTextureFlipped;
/** shader program */
-@property (nonatomic, readwrite, assign) GLProgram *shaderProgram;
+@property (nonatomic, readwrite, assign) CCGLProgram *shaderProgram;
+(id) gridWithSize:(ccGridSize)gridSize texture:(CCTexture2D*)texture flippedTexture:(BOOL)flipped;
+(id) gridWithSize:(ccGridSize)gridSize;
View
4 cocos2d/CCGrid.m
@@ -29,7 +29,7 @@
#import "CCTexture2D.h"
#import "CCDirector.h"
#import "CCGrabber.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "CCShaderCache.h"
#import "ccGLState.h"
@@ -103,7 +103,7 @@ -(id)initWithSize:(ccGridSize)gSize
unsigned long POTHigh = ccNextPOT(s.height);
#ifdef __CC_PLATFORM_IOS
- EAGLView *glview = (CC_GLVIEW*)[[CCDirector sharedDirector] view];
+ CCGLView *glview = (CCGLView*)[[CCDirector sharedDirector] view];
NSString *pixelFormat = [glview pixelFormat];
CCTexture2DPixelFormat format = [pixelFormat isEqualToString: kEAGLColorFormatRGB565] ? kCCTexture2DPixelFormat_RGB565 : kCCTexture2DPixelFormat_RGBA8888;
View
2  cocos2d/CCLabelAtlas.m
@@ -30,7 +30,7 @@
#import "CCDrawingPrimitives.h"
#import "CCLabelAtlas.h"
#import "CCShaderCache.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "ccGLState.h"
#import "CCDirector.h"
#import "Support/CGPointExtension.h"
View
2  cocos2d/CCLabelTTF.m
@@ -29,7 +29,7 @@
#import "Support/CGPointExtension.h"
#import "ccMacros.h"
#import "CCShaderCache.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#ifdef __CC_PLATFORM_IOS
#import "Platforms/iOS/CCDirectorIOS.h"
View
2  cocos2d/CCLayer.m
@@ -33,7 +33,7 @@
#import "CCDirector.h"
#import "ccMacros.h"
#import "CCShaderCache.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "ccGLState.h"
#import "Support/TransformUtils.h"
#import "Support/CGPointExtension.h"
View
2  cocos2d/CCMenu.m
@@ -35,7 +35,7 @@
#import "Platforms/iOS/CCDirectorIOS.h"
#import "Platforms/iOS/CCTouchDispatcher.h"
#elif defined(__CC_PLATFORM_MAC)
-#import "Platforms/Mac/MacGLView.h"
+#import "Platforms/Mac/CCGLView.h"
#import "Platforms/Mac/CCDirectorMac.h"
#endif
View
2  cocos2d/CCMotionStreak.m
@@ -26,7 +26,7 @@
#import "CCMotionStreak.h"
#import "CCTextureCache.h"
#import "ccGLState.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "CCShaderCache.h"
#import "ccMacros.h"
View
6 cocos2d/CCNode.h
@@ -39,7 +39,7 @@ enum {
@class CCCamera;
@class CCGridBase;
-@class GLProgram;
+@class CCGLProgram;
@class CCScheduler;
@class CCActionManager;
@class CCAction;
@@ -150,7 +150,7 @@ enum {
void *userData_;
// Shader
- GLProgram *shaderProgram_;
+ CCGLProgram *shaderProgram_;
// Server side state
ccGLServerState glServerState_;
@@ -260,7 +260,7 @@ enum {
/** Shader Program
@since v2.0
*/
-@property(nonatomic,readwrite,retain) GLProgram *shaderProgram;
+@property(nonatomic,readwrite,retain) CCGLProgram *shaderProgram;
/** used internally for zOrder sorting, don't change this manually */
@property(nonatomic,readwrite) NSUInteger orderOfArrival;
View
2  cocos2d/CCNode.m
@@ -37,7 +37,7 @@
#import "Support/ccCArray.h"
#import "Support/TransformUtils.h"
#import "ccMacros.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
// externals
#import "kazmath/GL/matrix.h"
View
2  cocos2d/CCParticleBatchNode.m
@@ -38,7 +38,7 @@
#import "CCParticleSystem.h"
#import "CCParticleSystem.h"
#import "CCShaderCache.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "ccGLState.h"
#import "Support/base64.h"
View
2  cocos2d/CCParticleSystemQuad.m
@@ -41,7 +41,7 @@
#import "CCDirector.h"
#import "CCShaderCache.h"
#import "ccGLState.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
// support
#import "Support/OpenGL_Internal.h"
View
2  cocos2d/CCProgressTimer.m
@@ -27,7 +27,7 @@
#import "ccMacros.h"
#import "CCTextureCache.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "CCShaderCache.h"
#import "ccGLState.h"
#import "CCDirector.h"
View
2  cocos2d/CCRenderTexture.m
@@ -26,7 +26,7 @@
#import "CCRenderTexture.h"
#import "CCDirector.h"
#import "ccMacros.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "ccGLState.h"
#import "CCConfiguration.h"
#import "Support/ccUtils.h"
View
8 cocos2d/CCShaderCache.h
@@ -28,7 +28,7 @@
#import <OpenGLES/ES2/gl.h>
#endif // __CC_PLATFORM_IOS
-@class GLProgram;
+@class CCGLProgram;
/** CCShaderCache
Singleton that stores manages GL shaders
@@ -50,10 +50,10 @@
-(void) loadDefaultShaders;
/** returns a GL program for a given key */
--(GLProgram *) programForKey:(NSString*)key;
+-(CCGLProgram *) programForKey:(NSString*)key;
-/** adds a GLProgram to the cache for a given name */
-- (void) addProgram:(GLProgram*)program forKey:(NSString*)key;
+/** adds a CCGLProgram to the cache for a given name */
+- (void) addProgram:(CCGLProgram*)program forKey:(NSString*)key;
@end
View
18 cocos2d/CCShaderCache.m
@@ -24,7 +24,7 @@
*/
#import "CCShaderCache.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "ccMacros.h"
#import "Support/OpenGL_Internal.h"
@@ -83,7 +83,7 @@ -(id) init
-(void) loadDefaultShaders
{
// Position Texture Color shader
- GLProgram *p = [[GLProgram alloc] initWithVertexShaderFilename:@"PositionTextureColor.vsh"
+ CCGLProgram *p = [[CCGLProgram alloc] initWithVertexShaderFilename:@"PositionTextureColor.vsh"
fragmentShaderFilename:@"PositionTextureColor.fsh"];
[p addAttribute:kCCAttributeNamePosition index:kCCVertexAttrib_Position];
@@ -97,7 +97,7 @@ -(void) loadDefaultShaders
[p release];
// Position Texture Color alpha test
- p = [[GLProgram alloc] initWithVertexShaderFilename:@"PositionTextureColor.vsh"
+ p = [[CCGLProgram alloc] initWithVertexShaderFilename:@"PositionTextureColor.vsh"
fragmentShaderFilename:@"PositionTextureColorAlphaTest.fsh"];
[p addAttribute:kCCAttributeNamePosition index:kCCVertexAttrib_Position];
@@ -113,7 +113,7 @@ -(void) loadDefaultShaders
//
// Position, Color shader
//
- p = [[GLProgram alloc] initWithVertexShaderFilename:@"PositionColor.vsh"
+ p = [[CCGLProgram alloc] initWithVertexShaderFilename:@"PositionColor.vsh"
fragmentShaderFilename:@"PositionColor.fsh"];
[p addAttribute:kCCAttributeNamePosition index:kCCVertexAttrib_Position];
@@ -128,7 +128,7 @@ -(void) loadDefaultShaders
//
// Position Texture shader
//
- p = [[GLProgram alloc] initWithVertexShaderFilename:@"PositionTexture.vsh"
+ p = [[CCGLProgram alloc] initWithVertexShaderFilename:@"PositionTexture.vsh"
fragmentShaderFilename:@"PositionTexture.fsh"];
[p addAttribute:kCCAttributeNamePosition index:kCCVertexAttrib_Position];
@@ -143,7 +143,7 @@ -(void) loadDefaultShaders
//
// Position, Texture attribs, 1 Color as uniform shader
//
- p = [[GLProgram alloc] initWithVertexShaderFilename:@"PositionTexture_uColor.vsh"
+ p = [[CCGLProgram alloc] initWithVertexShaderFilename:@"PositionTexture_uColor.vsh"
fragmentShaderFilename:@"PositionTexture_uColor.fsh"];
[p addAttribute:kCCAttributeNamePosition index:kCCVertexAttrib_Position];
@@ -158,7 +158,7 @@ -(void) loadDefaultShaders
//
// Position Texture A8 Color shader
//
- p = [[GLProgram alloc] initWithVertexShaderFilename:@"PositionTextureA8Color.vsh"
+ p = [[CCGLProgram alloc] initWithVertexShaderFilename:@"PositionTextureA8Color.vsh"
fragmentShaderFilename:@"PositionTextureA8Color.fsh"];
[p addAttribute:kCCAttributeNamePosition index:kCCVertexAttrib_Position];
@@ -174,12 +174,12 @@ -(void) loadDefaultShaders
CHECK_GL_ERROR_DEBUG();
}
--(GLProgram *) programForKey:(NSString*)key
+-(CCGLProgram *) programForKey:(NSString*)key
{
return [programs_ objectForKey:key];
}
-- (void) addProgram:(GLProgram*)program forKey:(NSString*)key
+- (void) addProgram:(CCGLProgram*)program forKey:(NSString*)key
{
[programs_ setObject:program forKey:key];
}
View
2  cocos2d/CCSprite.m
@@ -35,7 +35,7 @@
#import "CCDrawingPrimitives.h"
#import "CCShaderCache.h"
#import "ccGLState.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "CCDirector.h"
#import "Support/CGPointExtension.h"
#import "Support/TransformUtils.h"
View
2  cocos2d/CCSpriteBatchNode.m
@@ -34,7 +34,7 @@
#import "CCDrawingPrimitives.h"
#import "CCTextureCache.h"
#import "CCShaderCache.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "ccGLState.h"
#import "CCDirector.h"
#import "Support/CGPointExtension.h"
View
2  cocos2d/CCTMXLayer.m
@@ -35,7 +35,7 @@
#import "CCSpriteBatchNode.h"
#import "CCTextureCache.h"
#import "CCShaderCache.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "Support/CGPointExtension.h"
View
6 cocos2d/CCTexture2D.h
@@ -102,7 +102,7 @@ typedef enum {
} CCTexture2DPixelFormat;
-@class GLProgram;
+@class CCGLProgram;
/** CCTexture2D class.
* This class allows to easily create OpenGL 2D textures from images, text or raw data.
@@ -126,7 +126,7 @@ typedef enum {
#endif
// needed for drawAtRect, drawInPoint
- GLProgram *shaderProgram_;
+ CCGLProgram *shaderProgram_;
}
/** Intializes with a texture2d with data */
@@ -157,7 +157,7 @@ typedef enum {
@property(nonatomic,readonly) BOOL hasPremultipliedAlpha;
/** shader program used by drawAtPoint and drawInRect */
-@property(nonatomic,readwrite,retain) GLProgram *shaderProgram;
+@property(nonatomic,readwrite,retain) CCGLProgram *shaderProgram;
#ifdef __CC_PLATFORM_IOS
/** Returns the resolution type of the texture.
View
2  cocos2d/CCTexture2D.m
@@ -77,7 +77,7 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
#import "ccMacros.h"
#import "CCConfiguration.h"
#import "CCTexturePVR.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "ccGLState.h"
#import "CCShaderCache.h"
View
2  cocos2d/CCTextureAtlas.m
@@ -30,7 +30,7 @@
#import "ccMacros.h"
#import "CCTexture2D.h"
#import "CCTextureCache.h"
-#import "GLProgram.h"
+#import "CCGLProgram.h"
#import "ccGLState.h"
#import "Support/OpenGL_Internal.h"
//#import "CGPointExtension.h"
View
10 cocos2d/CCTextureCache.m
@@ -83,19 +83,15 @@ -(id) init
_loadingQueue = dispatch_queue_create("org.cocos2d.texturecacheloading", NULL);
_dictQueue = dispatch_queue_create("org.cocos2d.texturecachedict", NULL);
-#ifdef __CC_PLATFORM_IOS
- CC_GLVIEW *view = (CC_GLVIEW*)[[CCDirector sharedDirector] view];
+ CCGLView *view = (CCGLView*)[[CCDirector sharedDirector] view];
NSAssert(view, @"Do not initialize the TextureCache before the Director");
+
+#ifdef __CC_PLATFORM_IOS
_auxGLcontext = [[EAGLContext alloc]
initWithAPI:kEAGLRenderingAPIOpenGLES2
sharegroup:[[view context] sharegroup]];
#elif defined(__CC_PLATFORM_MAC)
-
- MacGLView *view = (CC_GLVIEW*)[[CCDirector sharedDirector] view];
- NSAssert(view, @"Do not initialize the TextureCache before the Director");
-
-
NSOpenGLPixelFormat *pf = [view pixelFormat];
NSOpenGLContext *share = [view openGLContext];
View
6 cocos2d/Platforms/CCGL.h
@@ -33,19 +33,18 @@
#import <OpenGLES/ES2/gl.h>
#import <OpenGLES/ES2/glext.h>
#import <OpenGLES/EAGL.h>
-#import "iOS/EAGLView.h"
+#import "iOS/CCGLView.h"
#elif defined(__CC_PLATFORM_MAC)
#import <OpenGL/gl.h>
#import <OpenGL/glu.h>
#import <Cocoa/Cocoa.h> // needed for NSOpenGLView
-#import "Mac/MacGLView.h"
+#import "Mac/CCGLView.h"
#endif
// iOS
#ifdef __CC_PLATFORM_IOS
-#define CC_GLVIEW EAGLView
#define glClearDepth glClearDepthf
#define glGenerateMipmap glGenerateMipmapOES
#define glGenFramebuffers glGenFramebuffersOES
@@ -64,7 +63,6 @@
// Mac
#elif defined(__CC_PLATFORM_MAC)
-#define CC_GLVIEW MacGLView
#define glDeleteVertexArrays glDeleteVertexArraysAPPLE
#define glGenVertexArrays glGenVertexArraysAPPLE
#define glBindVertexArray glBindVertexArrayAPPLE
View
2  cocos2d/Platforms/Mac/CCDirectorMac.h
@@ -63,7 +63,7 @@ enum {
NSWindow *fullScreenWindow_;
// OpenGLView
- CC_GLVIEW *view_;
+ CCGLView *view_;
// Event Dispatcher
CCEventDispatcher *eventDispatcher_;
View
20 cocos2d/Platforms/Mac/CCDirectorMac.m
@@ -32,13 +32,13 @@
#import "CCDirectorMac.h"
#import "CCEventDispatcher.h"
-#import "MacGLView.h"
-#import "MacWindow.h"
+#import "CCGLView.h"
+#import "CCWindow.h"
#import "../../CCNode.h"
#import "../../CCScheduler.h"
#import "../../ccMacros.h"
-#import "../../GLProgram.h"
+#import "../../CCGLProgram.h"
#import "../../ccGLState.h"
// external
@@ -124,7 +124,7 @@ - (void) setFullScreen:(BOOL)fullscreen
if (isFullScreen_ == fullscreen)
return;
- MacGLView *openGLview = (MacGLView*) self.view;
+ CCGLView *openGLview = (CCGLView*) self.view;
if( fullscreen ) {
originalWinRect_ = [openGLview frame];
@@ -141,7 +141,7 @@ - (void) setFullScreen:(BOOL)fullscreen
NSRect displayRect = [[NSScreen mainScreen] frame];
// Create a screen-sized window on the display you want to take over
- fullScreenWindow_ = [[MacWindow alloc] initWithFrame:displayRect fullscreen:YES];
+ fullScreenWindow_ = [[CCWindow alloc] initWithFrame:displayRect fullscreen:YES];
// Remove glView from window
[openGLview removeFromSuperview];
@@ -191,7 +191,7 @@ - (void) setFullScreen:(BOOL)fullscreen
#endif
}
--(void) setView:(CC_GLVIEW *)view
+-(void) setView:(CCGLView *)view
{
if( view != view_) {
@@ -208,7 +208,7 @@ -(void) setView:(CC_GLVIEW *)view
}
}
--(CC_GLVIEW*) view
+-(CCGLView*) view
{
return view_;
}
@@ -419,7 +419,7 @@ - (void) startAnimation
CVDisplayLinkSetOutputCallback(displayLink, &MyDisplayLinkCallback, self);
// Set the display link for the current renderer
- MacGLView *openGLview = (MacGLView*) self.view;
+ CCGLView *openGLview = (CCGLView*) self.view;
CGLContextObj cglContext = [[openGLview openGLContext] CGLContextObj];
CGLPixelFormatObj cglPixelFormat = [[openGLview pixelFormat] CGLPixelFormatObj];
CVDisplayLinkSetCurrentCGDisplayFromOpenGLContext(displayLink, cglContext, cglPixelFormat);
@@ -482,7 +482,7 @@ - (void) drawScene
// When resizing the view, -reshape is called automatically on the main thread
// Add a mutex around to avoid the threads accessing the context simultaneously when resizing
- MacGLView *openGLview = (MacGLView*) self.view;
+ CCGLView *openGLview = (CCGLView*) self.view;
CGLLockContext([[openGLview openGLContext] CGLContextObj]);
[[openGLview openGLContext] makeCurrentContext];
@@ -521,7 +521,7 @@ - (void) drawScene
}
// set the event dispatcher
--(void) setView:(CC_GLVIEW *)view
+-(void) setView:(CCGLView *)view
{
[super setView:view];
View
4 cocos2d/Platforms/Mac/CCEventDispatcher.h
@@ -30,7 +30,7 @@
#import <Cocoa/Cocoa.h>
-#import "MacGLView.h"
+#import "CCGLView.h"
#import "../../Support/uthash.h" // hack: uthash needs to be imported before utlist to prevent warning
#import "../../Support/utlist.h"
#import "../../ccConfig.h"
@@ -211,7 +211,7 @@ struct _listAddedEntry;
Only available on Mac
*/
-@interface CCEventDispatcher : NSObject <MacEventDelegate> {
+@interface CCEventDispatcher : NSObject <CCEventDelegate> {
BOOL dispatchEvents_;
BOOL dispatchingInProgress_;
View
12 cocos2d/Platforms/Mac/CCGLView.h
@@ -34,7 +34,7 @@
//PROTOCOLS:
-@protocol MacEventDelegate <NSObject>
+@protocol CCEventDelegate <NSObject>
// Mouse
- (void)mouseDown:(NSEvent *)theEvent;
- (void)mouseUp:(NSEvent *)theEvent;
@@ -64,17 +64,17 @@
@end
-/** MacGLView
+/** CCGLView
Only available for Mac OS X
*/
-@interface MacGLView : NSOpenGLView {
- id<MacEventDelegate> eventDelegate_;
+@interface CCGLView : NSOpenGLView {
+ id<CCEventDelegate> eventDelegate_;
}
-@property (nonatomic, readwrite, assign) id<MacEventDelegate> eventDelegate;
+@property (nonatomic, readwrite, assign) id<CCEventDelegate> eventDelegate;
-// initializes the MacGLView with a frame rect and an OpenGL context
+// initializes the CCGLView with a frame rect and an OpenGL context
- (id) initWithFrame:(NSRect)frameRect shareContext:(NSOpenGLContext*)context;
// private
View
10 cocos2d/Platforms/Mac/CCGLView.m
@@ -32,16 +32,16 @@
#import "../../ccMacros.h"
#ifdef __CC_PLATFORM_MAC
-#import "MacGLView.h"
#import <OpenGL/gl.h>
+#import "CCGLView.h"
#import "CCDirectorMac.h"
#import "CCEventDispatcher.h"
#import "../../ccConfig.h"
#import "../../ccMacros.h"
-@implementation MacGLView
+@implementation CCGLView
@synthesize eventDelegate = eventDelegate_;
@@ -141,7 +141,7 @@ - (void) dealloc
withObject:event \
waitUntilDone:NO];
-#pragma mark MacGLView - Mouse events
+#pragma mark CCGLView - Mouse events
- (void)mouseDown:(NSEvent *)theEvent
{
@@ -199,7 +199,7 @@ -(void) scrollWheel:(NSEvent *)theEvent {
DISPATCH_EVENT(theEvent, _cmd);
}
-#pragma mark MacGLView - Key events
+#pragma mark CCGLView - Key events
-(BOOL) becomeFirstResponder
{
@@ -231,7 +231,7 @@ - (void)flagsChanged:(NSEvent *)theEvent
DISPATCH_EVENT(theEvent, _cmd);
}
-#pragma mark MacGLView - Touch events
+#pragma mark CCGLView - Touch events
- (void)touchesBeganWithEvent:(NSEvent *)theEvent
{
DISPATCH_EVENT(theEvent, _cmd);
View
2  cocos2d/Platforms/Mac/CCWindow.h
@@ -30,7 +30,7 @@
#import <Cocoa/Cocoa.h>