Permalink
Browse files

Important API changes

GLProgram -> CCGLProgram
EAGLView -> CCGLView
MacView -> CCGLView
MacWindow -> CCWindow
ESRenderer -> CCESRenderer
ES2Renderer -> CCES2Renderer
  • Loading branch information...
1 parent 878ccd1 commit edac658de373101c963467d75d4c56af3c41a747 @ricardoquesada ricardoquesada committed Jan 14, 2012
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
@@ -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
@@ -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
@@ -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]];
@@ -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>
@@ -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
@@ -12,6 +12,6 @@
int main(int argc, char *argv[])
{
- [MacGLView load_];
+ [CCGLView load_];
return NSApplicationMain(argc, (const char **) argv);
}
Oops, something went wrong.

0 comments on commit edac658

Please sign in to comment.