From 710e29b086d4a5c92e45cbbbb44012371018a912 Mon Sep 17 00:00:00 2001 From: Ming Date: Wed, 25 Aug 2010 02:19:20 +0000 Subject: [PATCH] issue #80 --- cocos2dx/CCDirector.cpp | 4 +-- cocos2dx/actions/CCAction.cpp | 2 +- cocos2dx/actions/CCGrid3DAction.cpp | 2 +- cocos2dx/actions/CCIntervalAction.cpp | 2 +- cocos2dx/actions/CCTiledGridAction.cpp | 2 +- cocos2dx/base_nodes/CCNode.cpp | 4 +-- cocos2dx/cocos2dx-uphone.vcproj | 32 +++++++++---------- cocos2dx/effects/CCGrid.cpp | 2 +- cocos2dx/include/CCLayer.h | 2 +- .../{touch_dispatcher => include}/CCTouch.h | 0 .../CCTouchDelegateProtocol.h | 0 .../CCTouchDispatcher.h | 0 .../{support => include}/CGPointExtension.h | 0 cocos2dx/include/cocos2d.h | 21 ++++++++++++ cocos2dx/label_nodes/CCBitmapFontAtlas.cpp | 2 +- .../CCLayer.cpp | 4 +-- .../CCScene.cpp | 2 +- .../CCTransition.cpp | 4 +-- cocos2dx/menu_nodes/CCMenu.cpp | 6 ++-- cocos2dx/menu_nodes/CCMenuItem.cpp | 2 +- cocos2dx/misc_nodes/CCMotionStreak.cpp | 2 +- cocos2dx/misc_nodes/CCProgressTimer.cpp | 2 +- cocos2dx/misc_nodes/CCRibbon.cpp | 2 +- cocos2dx/particle_nodes/CCParticleExample.cpp | 2 +- cocos2dx/particle_nodes/CCParticleSystem.cpp | 2 +- .../platform/uphone/CCXEGLView_uphone.cpp | 4 +-- cocos2dx/sprite_nodes/CCSprite.cpp | 2 +- cocos2dx/sprite_nodes/CCSpriteSheet.cpp | 2 +- 28 files changed, 66 insertions(+), 45 deletions(-) rename cocos2dx/{touch_dispatcher => include}/CCTouch.h (100%) rename cocos2dx/{touch_dispatcher => include}/CCTouchDelegateProtocol.h (100%) rename cocos2dx/{touch_dispatcher => include}/CCTouchDispatcher.h (100%) rename cocos2dx/{support => include}/CGPointExtension.h (100%) diff --git a/cocos2dx/CCDirector.cpp b/cocos2dx/CCDirector.cpp index cde2e01a93..cb6102c5f2 100644 --- a/cocos2dx/CCDirector.cpp +++ b/cocos2dx/CCDirector.cpp @@ -28,9 +28,9 @@ THE SOFTWARE. #include "CCScheduler.h" #include "ccMacros.h" #include "Cocos2dDefine.h" -#include "touch_dispatcher/CCTouchDispatcher.h" +#include "CCTouchDispatcher.h" #include "support/opengl_support/glu.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" #include "CCTransition.h" #include "CCTextureCache.h" #include "CCTransition.h" diff --git a/cocos2dx/actions/CCAction.cpp b/cocos2dx/actions/CCAction.cpp index 3c621883a7..da40f63d4c 100644 --- a/cocos2dx/actions/CCAction.cpp +++ b/cocos2dx/actions/CCAction.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "CCIntervalAction.h" #include "ccMacros.h" #include "CCNode.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" #include "CCDirector.h" #include "NSZone.h" diff --git a/cocos2dx/actions/CCGrid3DAction.cpp b/cocos2dx/actions/CCGrid3DAction.cpp index e36eb05cb4..a4e190b898 100644 --- a/cocos2dx/actions/CCGrid3DAction.cpp +++ b/cocos2dx/actions/CCGrid3DAction.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCGrid3DAction.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" namespace cocos2d { diff --git a/cocos2dx/actions/CCIntervalAction.cpp b/cocos2dx/actions/CCIntervalAction.cpp index 9bb722c3b8..7f6c21d912 100644 --- a/cocos2dx/actions/CCIntervalAction.cpp +++ b/cocos2dx/actions/CCIntervalAction.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #include "CCIntervalAction.h" #include "CCSprite.h" #include "CCNode.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" #include diff --git a/cocos2dx/actions/CCTiledGridAction.cpp b/cocos2dx/actions/CCTiledGridAction.cpp index 5679b15eca..9a340ea93d 100644 --- a/cocos2dx/actions/CCTiledGridAction.cpp +++ b/cocos2dx/actions/CCTiledGridAction.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. #include "CCTiledGridAction.h" #include "CCDirector.h" #include "ccMacros.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" #include "effects/CCGrid.h" namespace cocos2d diff --git a/cocos2dx/base_nodes/CCNode.cpp b/cocos2dx/base_nodes/CCNode.cpp index a56915ddcd..4d064e534d 100644 --- a/cocos2dx/base_nodes/CCNode.cpp +++ b/cocos2dx/base_nodes/CCNode.cpp @@ -23,13 +23,13 @@ THE SOFTWARE. ****************************************************************************/ #include "CCNode.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" #include "support/TransformUtils.h" #include "CCCamera.h" #include "effects/CCGrid.h" #include "CCDirector.h" #include "CCScheduler.h" -#include "touch_dispatcher/CCTouch.h" +#include "CCTouch.h" #include "actions/CCActionManager.h" #if CC_COCOSNODE_RENDER_SUBPIXEL diff --git a/cocos2dx/cocos2dx-uphone.vcproj b/cocos2dx/cocos2dx-uphone.vcproj index b3caaaf5a6..c8fe32adce 100644 --- a/cocos2dx/cocos2dx-uphone.vcproj +++ b/cocos2dx/cocos2dx-uphone.vcproj @@ -296,6 +296,10 @@ RelativePath=".\include\ccConfig.h" > + + @@ -436,6 +440,18 @@ RelativePath=".\include\CCTiledGridAction.h" > + + + + + + @@ -737,22 +753,10 @@ - - - - - - @@ -914,10 +918,6 @@ RelativePath=".\CCDirector.cpp" > - - diff --git a/cocos2dx/effects/CCGrid.cpp b/cocos2dx/effects/CCGrid.cpp index 5ec8872f1c..7d103b8409 100644 --- a/cocos2dx/effects/CCGrid.cpp +++ b/cocos2dx/effects/CCGrid.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #include "CCGrabber.h" #include "support/opengl_support/glu.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" namespace cocos2d { diff --git a/cocos2dx/include/CCLayer.h b/cocos2dx/include/CCLayer.h index 6599c53e70..ecafbe20b9 100644 --- a/cocos2dx/include/CCLayer.h +++ b/cocos2dx/include/CCLayer.h @@ -28,7 +28,7 @@ THE SOFTWARE. #include "Cocos2dDefine.h" #include "CCNode.h" #include "CCProtocols.h" -#include "touch_dispatcher/CCTouchDelegateProtocol.h" +#include "CCTouchDelegateProtocol.h" #include "ccxCommon.h" namespace cocos2d { diff --git a/cocos2dx/touch_dispatcher/CCTouch.h b/cocos2dx/include/CCTouch.h similarity index 100% rename from cocos2dx/touch_dispatcher/CCTouch.h rename to cocos2dx/include/CCTouch.h diff --git a/cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h b/cocos2dx/include/CCTouchDelegateProtocol.h similarity index 100% rename from cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h rename to cocos2dx/include/CCTouchDelegateProtocol.h diff --git a/cocos2dx/touch_dispatcher/CCTouchDispatcher.h b/cocos2dx/include/CCTouchDispatcher.h similarity index 100% rename from cocos2dx/touch_dispatcher/CCTouchDispatcher.h rename to cocos2dx/include/CCTouchDispatcher.h diff --git a/cocos2dx/support/CGPointExtension.h b/cocos2dx/include/CGPointExtension.h similarity index 100% rename from cocos2dx/support/CGPointExtension.h rename to cocos2dx/include/CGPointExtension.h diff --git a/cocos2dx/include/cocos2d.h b/cocos2dx/include/cocos2d.h index 955045e868..18c3991d00 100644 --- a/cocos2dx/include/cocos2d.h +++ b/cocos2dx/include/cocos2d.h @@ -74,6 +74,27 @@ THE SOFTWARE. #include "CCPVRTexture.h" #include "CCRadialTransition.h" #include "CCProgressTimerActions.h" +#include "CCTouchDispatcher.h" + +// +// cocoa includes +// +#include "NSSet.h" +#include "NSMutableArray.h" +#include "NSMutableDictionary.h" +#include "NSObject.h" +#include "NSZone.h" +#include "CGGeometry.h" +#include "CGAffineTransform.h" +#include "selector_protocol.h" +#include "CCTouch.h" +#include "CGPointExtension.h" + +// +// platform specific +// +#include "CCXApplication.h" +#include "CCXEGLView.h" // // cocos2d macros diff --git a/cocos2dx/label_nodes/CCBitmapFontAtlas.cpp b/cocos2dx/label_nodes/CCBitmapFontAtlas.cpp index 81cacfd3a8..8f9a2dcdb3 100644 --- a/cocos2dx/label_nodes/CCBitmapFontAtlas.cpp +++ b/cocos2dx/label_nodes/CCBitmapFontAtlas.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "CCConfiguration.h" #include "CCDrawingPrimitives.h" #include "CCSprite.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" namespace cocos2d{ // diff --git a/cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp b/cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp index 85eca0dee6..90623ae2e0 100644 --- a/cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp +++ b/cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp @@ -24,9 +24,9 @@ THE SOFTWARE. #include #include "CCLayer.h" -#include "touch_dispatcher/CCTouchDispatcher.h" +#include "CCTouchDispatcher.h" #include "CCDirector.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" namespace cocos2d { // CCLayer diff --git a/cocos2dx/layers_scenes_transitions_nodes/CCScene.cpp b/cocos2dx/layers_scenes_transitions_nodes/CCScene.cpp index 584f7e6c41..889784b7f7 100644 --- a/cocos2dx/layers_scenes_transitions_nodes/CCScene.cpp +++ b/cocos2dx/layers_scenes_transitions_nodes/CCScene.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "CCScene.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" #include "CCDirector.h" namespace cocos2d { diff --git a/cocos2dx/layers_scenes_transitions_nodes/CCTransition.cpp b/cocos2dx/layers_scenes_transitions_nodes/CCTransition.cpp index 8cb5f9c0b9..f7c6142777 100644 --- a/cocos2dx/layers_scenes_transitions_nodes/CCTransition.cpp +++ b/cocos2dx/layers_scenes_transitions_nodes/CCTransition.cpp @@ -24,9 +24,9 @@ THE SOFTWARE. #include "CCTransition.h" #include "CCCamera.h" -#include "support/cgpointextension.h" +#include "cgpointextension.h" #include "CCDirector.h" -#include "touch_dispatcher/CCTouchDispatcher.h" +#include "CCTouchDispatcher.h" #include "CCIntervalAction.h" #include "CCInstantAction.h" #include "CCEaseAction.h" diff --git a/cocos2dx/menu_nodes/CCMenu.cpp b/cocos2dx/menu_nodes/CCMenu.cpp index bb960ad32d..790920cd25 100644 --- a/cocos2dx/menu_nodes/CCMenu.cpp +++ b/cocos2dx/menu_nodes/CCMenu.cpp @@ -24,9 +24,9 @@ THE SOFTWARE. #include "CCMenu.h" #include "CCDirector.h" #include "CCXApplication.h" -#include "support/CGPointExtension.h" -#include "touch_dispatcher/CCTouchDispatcher.h" -#include "touch_dispatcher/CCTouch.h" +#include "CGPointExtension.h" +#include "CCTouchDispatcher.h" +#include "CCTouch.h" #include #include diff --git a/cocos2dx/menu_nodes/CCMenuItem.cpp b/cocos2dx/menu_nodes/CCMenuItem.cpp index c677ae750e..c7e82db55b 100644 --- a/cocos2dx/menu_nodes/CCMenuItem.cpp +++ b/cocos2dx/menu_nodes/CCMenuItem.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include #include "CCMenuItem.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" #include "CCIntervalAction.h" #include "CCSprite.h" #include "CCLabelAtlas.h" diff --git a/cocos2dx/misc_nodes/CCMotionStreak.cpp b/cocos2dx/misc_nodes/CCMotionStreak.cpp index e85e719ce2..5b818c3580 100644 --- a/cocos2dx/misc_nodes/CCMotionStreak.cpp +++ b/cocos2dx/misc_nodes/CCMotionStreak.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCMotionStreak.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" #include "CCRibbon.h" namespace cocos2d { /* diff --git a/cocos2dx/misc_nodes/CCProgressTimer.cpp b/cocos2dx/misc_nodes/CCProgressTimer.cpp index c7e7cc0fdd..d8d53356d3 100644 --- a/cocos2dx/misc_nodes/CCProgressTimer.cpp +++ b/cocos2dx/misc_nodes/CCProgressTimer.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #include "ccMacros.h" #include "CCTextureCache.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" #include diff --git a/cocos2dx/misc_nodes/CCRibbon.cpp b/cocos2dx/misc_nodes/CCRibbon.cpp index ac235a2ece..8e2971a0e7 100644 --- a/cocos2dx/misc_nodes/CCRibbon.cpp +++ b/cocos2dx/misc_nodes/CCRibbon.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "CCRibbon.h" #include "CCTextureCache.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" namespace cocos2d { /* diff --git a/cocos2dx/particle_nodes/CCParticleExample.cpp b/cocos2dx/particle_nodes/CCParticleExample.cpp index 7872654edf..032fd4ceb8 100644 --- a/cocos2dx/particle_nodes/CCParticleExample.cpp +++ b/cocos2dx/particle_nodes/CCParticleExample.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. #include "CCParticleExample.h" #include "CCDirector.h" #include "CCTextureCache.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" namespace cocos2d { // // ParticleFire diff --git a/cocos2dx/particle_nodes/CCParticleSystem.cpp b/cocos2dx/particle_nodes/CCParticleSystem.cpp index c2a3077e23..f8f2bf8efa 100644 --- a/cocos2dx/particle_nodes/CCParticleSystem.cpp +++ b/cocos2dx/particle_nodes/CCParticleSystem.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #include "ccTypes.h" #include "CCTextureCache.h" #include "support/base64.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" #if CC_ENABLE_PROFILERS #include "Support/CCProfiling.h" diff --git a/cocos2dx/platform/uphone/CCXEGLView_uphone.cpp b/cocos2dx/platform/uphone/CCXEGLView_uphone.cpp index 5fb81fabd6..476d4165e1 100644 --- a/cocos2dx/platform/uphone/CCXEGLView_uphone.cpp +++ b/cocos2dx/platform/uphone/CCXEGLView_uphone.cpp @@ -40,8 +40,8 @@ THE SOFTWARE. #include "Cocos2dDefine.h" #include "NSSet.h" #include "CCDirector.h" -#include "touch_dispatcher/CCTouch.h" -#include "touch_dispatcher/CCTouchDispatcher.h" +#include "CCTouch.h" +#include "CCTouchDispatcher.h" #ifndef USE_EGL_UMU #define WIN_CLASS_NAME "OpenGL" diff --git a/cocos2dx/sprite_nodes/CCSprite.cpp b/cocos2dx/sprite_nodes/CCSprite.cpp index d417109d59..4c6218758d 100644 --- a/cocos2dx/sprite_nodes/CCSprite.cpp +++ b/cocos2dx/sprite_nodes/CCSprite.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #include "CCSpriteFrame.h" #include "CCSpriteFrameCache.h" #include "CCTextureCache.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" #include "CCDrawingPrimitives.h" #include "CGGeometry.h" #include "CCTexture2D.h" diff --git a/cocos2dx/sprite_nodes/CCSpriteSheet.cpp b/cocos2dx/sprite_nodes/CCSpriteSheet.cpp index 7696c4aa68..bca4c3ad56 100644 --- a/cocos2dx/sprite_nodes/CCSpriteSheet.cpp +++ b/cocos2dx/sprite_nodes/CCSpriteSheet.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #include "effects/CCGrid.h" #include "CCDrawingPrimitives.h" #include "CCTextureCache.h" -#include "support/CGPointExtension.h" +#include "CGPointExtension.h" namespace cocos2d {