issue #80

2010-08-25 02:19:20 +00:00 · 2010-08-25 02:19:20 +00:00 · 710e29b086
parent b784e6bf6b
commit 710e29b086
28 changed files with 66 additions and 45 deletions
--- 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"
--- 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"

--- 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
 {
--- 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 <float.h>

--- 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
--- 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
--- a/cocos2dx/cocos2dx-uphone.vcproj
+++ b/cocos2dx/cocos2dx-uphone.vcproj
@ -296,6 +296,10 @@
 				RelativePath=".\include\ccConfig.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\CCDirector.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\CCEaseAction.h"
 				>
@ -436,6 +440,18 @@
 				RelativePath=".\include\CCTiledGridAction.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\CCTouch.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CCTouchDelegateProtocol.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CCTouchDispatcher.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\CCTransition.h"
 				>
@ -737,22 +753,10 @@
 		<Filter
 			Name="touch_dispatcher"
 			>
-			<File
-				RelativePath=".\touch_dispatcher\CCTouch.h"
-				>
-			</File>
-			<File
-				RelativePath=".\touch_dispatcher\CCTouchDelegateProtocol.h"
-				>
-			</File>
 			<File
 				RelativePath=".\touch_dispatcher\CCTouchDispatcher.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\touch_dispatcher\CCTouchDispatcher.h"
-				>
-			</File>
 			<File
 				RelativePath=".\touch_dispatcher\CCTouchHandler.cpp"
 				>
@ -914,10 +918,6 @@
 			RelativePath=".\CCDirector.cpp"
 			>
 		</File>
-		<File
-			RelativePath=".\CCDirector.h"
-			>
-		</File>
 		<File
 			RelativePath=".\CCDrawingPrimitives.cpp"
 			>
--- 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
 {
--- 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 {

--- a/cocos2dx/touch_dispatcher/CCTouch.h
+++ b/cocos2dx/touch_dispatcher/CCTouch.h
--- a/cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
+++ b/cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
--- a/cocos2dx/touch_dispatcher/CCTouchDispatcher.h
+++ b/cocos2dx/touch_dispatcher/CCTouchDispatcher.h
--- a/cocos2dx/include/CGPointExtension.h
+++ b/cocos2dx/include/CGPointExtension.h
--- 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
--- 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{
 	
 	//
--- a/cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
+++ b/cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
@ -24,9 +24,9 @@ THE SOFTWARE.

 #include <stdarg.h>
 #include "CCLayer.h"
-#include "touch_dispatcher/CCTouchDispatcher.h"
+#include "CCTouchDispatcher.h"
 #include "CCDirector.h"
-#include "support/CGPointExtension.h"
+#include "CGPointExtension.h"
 namespace   cocos2d {

 // CCLayer
--- 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 {
--- 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"
--- 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 <vector>
 #include <float.h>
--- a/cocos2dx/menu_nodes/CCMenuItem.cpp
+++ b/cocos2dx/menu_nodes/CCMenuItem.cpp
@ -23,7 +23,7 @@ THE SOFTWARE.
 ****************************************************************************/
 #include <cstring>
 #include "CCMenuItem.h"
-#include "support/CGPointExtension.h"
+#include "CGPointExtension.h"
 #include "CCIntervalAction.h"
 #include "CCSprite.h"
 #include "CCLabelAtlas.h"
--- 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 {
 	/*
--- 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 <float.h>

--- 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 {

 	/*
--- 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
--- 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"
--- 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"
--- 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"
--- 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 {