diff --git a/HelloHTML5World/build.xml b/HelloHTML5World/build.xml index 1fca17e336..baa2a8b220 100644 --- a/HelloHTML5World/build.xml +++ b/HelloHTML5World/build.xml @@ -159,7 +159,7 @@ - + diff --git a/HelloHTML5World/cocos2d.js b/HelloHTML5World/cocos2d.js index 1078929fcd..bba31a16fd 100644 --- a/HelloHTML5World/cocos2d.js +++ b/HelloHTML5World/cocos2d.js @@ -66,7 +66,7 @@ s.src = c.SingleEngineFile; } else if (c.engineDir && !c.SingleEngineFile) { - s.src = c.engineDir + 'platform/jsloader.js'; + s.src = c.engineDir + 'jsloader.js'; } else { alert('You must specify either the single engine file OR the engine directory in "cocos2d.js"'); diff --git a/cocos2d/platform/CCImage.js b/cocos2d/CCImage.js similarity index 100% rename from cocos2d/platform/CCImage.js rename to cocos2d/CCImage.js diff --git a/cocos2d/support/CCNotificationCenter.js b/cocos2d/CCNotificationCenter.js similarity index 100% rename from cocos2d/support/CCNotificationCenter.js rename to cocos2d/CCNotificationCenter.js diff --git a/cocos2d/support/CCUserDefault.js b/cocos2d/CCUserDefault.js similarity index 100% rename from cocos2d/support/CCUserDefault.js rename to cocos2d/CCUserDefault.js diff --git a/cocos2d/platform/CCAccelerometer.js b/cocos2d/accelerometer/CCAccelerometer.js similarity index 100% rename from cocos2d/platform/CCAccelerometer.js rename to cocos2d/accelerometer/CCAccelerometer.js diff --git a/cocos2d/actions/CCActionGrid.js b/cocos2d/actions3d/CCActionGrid.js similarity index 100% rename from cocos2d/actions/CCActionGrid.js rename to cocos2d/actions3d/CCActionGrid.js diff --git a/cocos2d/actions/CCActionGrid3D.js b/cocos2d/actions3d/CCActionGrid3D.js similarity index 100% rename from cocos2d/actions/CCActionGrid3D.js rename to cocos2d/actions3d/CCActionGrid3D.js diff --git a/cocos2d/actions/CCActionPageTurn3D.js b/cocos2d/actions3d/CCActionPageTurn3D.js similarity index 100% rename from cocos2d/actions/CCActionPageTurn3D.js rename to cocos2d/actions3d/CCActionPageTurn3D.js diff --git a/cocos2d/actions/CCActionTiledGrid.js b/cocos2d/actions3d/CCActionTiledGrid.js similarity index 100% rename from cocos2d/actions/CCActionTiledGrid.js rename to cocos2d/actions3d/CCActionTiledGrid.js diff --git a/CocosDenshion/SimpleAudioEngine.js b/cocos2d/audio/SimpleAudioEngine.js similarity index 100% rename from CocosDenshion/SimpleAudioEngine.js rename to cocos2d/audio/SimpleAudioEngine.js diff --git a/cocos2d/build.xml b/cocos2d/build.xml index 813968f104..f5694f0a30 100644 --- a/cocos2d/build.xml +++ b/cocos2d/build.xml @@ -160,7 +160,7 @@ - + diff --git a/cocos2d/platform/ZipUtils.js b/cocos2d/compress/ZipUtils.js similarity index 100% rename from cocos2d/platform/ZipUtils.js rename to cocos2d/compress/ZipUtils.js diff --git a/cocos2d/platform/base64.js b/cocos2d/compress/base64.js similarity index 100% rename from cocos2d/platform/base64.js rename to cocos2d/compress/base64.js diff --git a/cocos2d/platform/gzip.js b/cocos2d/compress/gzip.js similarity index 100% rename from cocos2d/platform/gzip.js rename to cocos2d/compress/gzip.js diff --git a/cocos2d/platform/zlib.min.js b/cocos2d/compress/zlib.min.js similarity index 100% rename from cocos2d/platform/zlib.min.js rename to cocos2d/compress/zlib.min.js diff --git a/cocos2d/CCCamera.js b/cocos2d/core/CCCamera.js similarity index 100% rename from cocos2d/CCCamera.js rename to cocos2d/core/CCCamera.js diff --git a/cocos2d/CCConfiguration.js b/cocos2d/core/CCConfiguration.js similarity index 100% rename from cocos2d/CCConfiguration.js rename to cocos2d/core/CCConfiguration.js diff --git a/cocos2d/CCDirector.js b/cocos2d/core/CCDirector.js similarity index 100% rename from cocos2d/CCDirector.js rename to cocos2d/core/CCDirector.js diff --git a/cocos2d/CCLoader.js b/cocos2d/core/CCLoader.js similarity index 100% rename from cocos2d/CCLoader.js rename to cocos2d/core/CCLoader.js diff --git a/cocos2d/CCScheduler.js b/cocos2d/core/CCScheduler.js similarity index 100% rename from cocos2d/CCScheduler.js rename to cocos2d/core/CCScheduler.js diff --git a/cocos2d/base_nodes/CCAtlasNode.js b/cocos2d/core/base_nodes/CCAtlasNode.js similarity index 100% rename from cocos2d/base_nodes/CCAtlasNode.js rename to cocos2d/core/base_nodes/CCAtlasNode.js diff --git a/cocos2d/base_nodes/CCNode.js b/cocos2d/core/base_nodes/CCNode.js similarity index 99% rename from cocos2d/base_nodes/CCNode.js rename to cocos2d/core/base_nodes/CCNode.js index 60260fb8ff..4721b828a3 100644 --- a/cocos2d/base_nodes/CCNode.js +++ b/cocos2d/core/base_nodes/CCNode.js @@ -165,7 +165,9 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ this._scheduler = director.getScheduler(); this._initializedNode = true; this._additionalTransform = cc.AffineTransformMakeIdentity(); - this._componentContainer = new cc.ComponentContainer(this); + if(cc.ComponentContainer){ + this._componentContainer = new cc.ComponentContainer(this); + } }, /** @@ -1290,7 +1292,9 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ this._running = false; this.pauseSchedulerAndActions(); this._arrayMakeObjectsPerformSelector(this._children, cc.Node.StateCallbackType.onExit); - this._componentContainer.removeAll(); + if(this._componentContainer){ + this._componentContainer.removeAll(); + } }, // actions diff --git a/cocos2d/cocoa/CCAffineTransform.js b/cocos2d/core/cocoa/CCAffineTransform.js similarity index 100% rename from cocos2d/cocoa/CCAffineTransform.js rename to cocos2d/core/cocoa/CCAffineTransform.js diff --git a/cocos2d/cocoa/CCGeometry.js b/cocos2d/core/cocoa/CCGeometry.js similarity index 100% rename from cocos2d/cocoa/CCGeometry.js rename to cocos2d/core/cocoa/CCGeometry.js diff --git a/cocos2d/cocoa/CCNS.js b/cocos2d/core/cocoa/CCNS.js similarity index 100% rename from cocos2d/cocoa/CCNS.js rename to cocos2d/core/cocoa/CCNS.js diff --git a/cocos2d/layers_scenes_transitions_nodes/CCLayer.js b/cocos2d/core/layers_nodes/CCLayer.js similarity index 100% rename from cocos2d/layers_scenes_transitions_nodes/CCLayer.js rename to cocos2d/core/layers_nodes/CCLayer.js diff --git a/cocos2d/platform/AppControl.js b/cocos2d/core/platform/AppControl.js similarity index 100% rename from cocos2d/platform/AppControl.js rename to cocos2d/core/platform/AppControl.js diff --git a/cocos2d/platform/CCApplication.js b/cocos2d/core/platform/CCApplication.js similarity index 100% rename from cocos2d/platform/CCApplication.js rename to cocos2d/core/platform/CCApplication.js diff --git a/cocos2d/platform/CCClass.js b/cocos2d/core/platform/CCClass.js similarity index 100% rename from cocos2d/platform/CCClass.js rename to cocos2d/core/platform/CCClass.js diff --git a/cocos2d/platform/CCCommon.js b/cocos2d/core/platform/CCCommon.js similarity index 100% rename from cocos2d/platform/CCCommon.js rename to cocos2d/core/platform/CCCommon.js diff --git a/cocos2d/platform/CCConfig.js b/cocos2d/core/platform/CCConfig.js similarity index 100% rename from cocos2d/platform/CCConfig.js rename to cocos2d/core/platform/CCConfig.js diff --git a/cocos2d/platform/CCEGLView.js b/cocos2d/core/platform/CCEGLView.js similarity index 99% rename from cocos2d/platform/CCEGLView.js rename to cocos2d/core/platform/CCEGLView.js index 548e4a92b6..e0b91523af 100644 --- a/cocos2d/platform/CCEGLView.js +++ b/cocos2d/core/platform/CCEGLView.js @@ -491,7 +491,9 @@ cc.EGLView = cc.Class.extend(/** @lends cc.EGLView# */{ this._originalScaleX = this._scaleX; this._originalScaleY = this._scaleY; // For editbox - cc.DOM._resetEGLViewDiv(); + if( cc.DOM){ + cc.DOM._resetEGLViewDiv(); + } cc.VisibleRect.init(this.getVisibleSize()); } diff --git a/cocos2d/platform/CCFileUtils.js b/cocos2d/core/platform/CCFileUtils.js similarity index 100% rename from cocos2d/platform/CCFileUtils.js rename to cocos2d/core/platform/CCFileUtils.js diff --git a/cocos2d/platform/CCMacro.js b/cocos2d/core/platform/CCMacro.js similarity index 100% rename from cocos2d/platform/CCMacro.js rename to cocos2d/core/platform/CCMacro.js diff --git a/cocos2d/platform/CCSAXParser.js b/cocos2d/core/platform/CCSAXParser.js similarity index 100% rename from cocos2d/platform/CCSAXParser.js rename to cocos2d/core/platform/CCSAXParser.js diff --git a/cocos2d/platform/CCScreen.js b/cocos2d/core/platform/CCScreen.js similarity index 100% rename from cocos2d/platform/CCScreen.js rename to cocos2d/core/platform/CCScreen.js diff --git a/cocos2d/platform/CCTypes.js b/cocos2d/core/platform/CCTypes.js similarity index 100% rename from cocos2d/platform/CCTypes.js rename to cocos2d/core/platform/CCTypes.js diff --git a/cocos2d/platform/CCVisibleRect.js b/cocos2d/core/platform/CCVisibleRect.js similarity index 100% rename from cocos2d/platform/CCVisibleRect.js rename to cocos2d/core/platform/CCVisibleRect.js diff --git a/cocos2d/platform/Sys.js b/cocos2d/core/platform/Sys.js similarity index 100% rename from cocos2d/platform/Sys.js rename to cocos2d/core/platform/Sys.js diff --git a/cocos2d/platform/miniFramework.js b/cocos2d/core/platform/miniFramework.js similarity index 100% rename from cocos2d/platform/miniFramework.js rename to cocos2d/core/platform/miniFramework.js diff --git a/cocos2d/layers_scenes_transitions_nodes/CCScene.js b/cocos2d/core/scenes_nodes/CCScene.js similarity index 100% rename from cocos2d/layers_scenes_transitions_nodes/CCScene.js rename to cocos2d/core/scenes_nodes/CCScene.js diff --git a/cocos2d/sprite_nodes/CCAnimation.js b/cocos2d/core/sprite_nodes/CCAnimation.js similarity index 100% rename from cocos2d/sprite_nodes/CCAnimation.js rename to cocos2d/core/sprite_nodes/CCAnimation.js diff --git a/cocos2d/sprite_nodes/CCAnimationCache.js b/cocos2d/core/sprite_nodes/CCAnimationCache.js similarity index 100% rename from cocos2d/sprite_nodes/CCAnimationCache.js rename to cocos2d/core/sprite_nodes/CCAnimationCache.js diff --git a/cocos2d/sprite_nodes/CCSprite.js b/cocos2d/core/sprite_nodes/CCSprite.js similarity index 100% rename from cocos2d/sprite_nodes/CCSprite.js rename to cocos2d/core/sprite_nodes/CCSprite.js diff --git a/cocos2d/sprite_nodes/CCSpriteBatchNode.js b/cocos2d/core/sprite_nodes/CCSpriteBatchNode.js similarity index 100% rename from cocos2d/sprite_nodes/CCSpriteBatchNode.js rename to cocos2d/core/sprite_nodes/CCSpriteBatchNode.js diff --git a/cocos2d/sprite_nodes/CCSpriteFrame.js b/cocos2d/core/sprite_nodes/CCSpriteFrame.js similarity index 100% rename from cocos2d/sprite_nodes/CCSpriteFrame.js rename to cocos2d/core/sprite_nodes/CCSpriteFrame.js diff --git a/cocos2d/sprite_nodes/CCSpriteFrameCache.js b/cocos2d/core/sprite_nodes/CCSpriteFrameCache.js similarity index 100% rename from cocos2d/sprite_nodes/CCSpriteFrameCache.js rename to cocos2d/core/sprite_nodes/CCSpriteFrameCache.js diff --git a/cocos2d/support/CCPointExtension.js b/cocos2d/core/support/CCPointExtension.js similarity index 100% rename from cocos2d/support/CCPointExtension.js rename to cocos2d/core/support/CCPointExtension.js diff --git a/cocos2d/support/CCVertex.js b/cocos2d/core/support/CCVertex.js similarity index 100% rename from cocos2d/support/CCVertex.js rename to cocos2d/core/support/CCVertex.js diff --git a/cocos2d/support/TransformUtils.js b/cocos2d/core/support/TransformUtils.js similarity index 100% rename from cocos2d/support/TransformUtils.js rename to cocos2d/core/support/TransformUtils.js diff --git a/cocos2d/textures/CCTexture2D.js b/cocos2d/core/textures/CCTexture2D.js similarity index 100% rename from cocos2d/textures/CCTexture2D.js rename to cocos2d/core/textures/CCTexture2D.js diff --git a/cocos2d/textures/CCTextureAtlas.js b/cocos2d/core/textures/CCTextureAtlas.js similarity index 100% rename from cocos2d/textures/CCTextureAtlas.js rename to cocos2d/core/textures/CCTextureAtlas.js diff --git a/cocos2d/textures/CCTextureCache.js b/cocos2d/core/textures/CCTextureCache.js similarity index 100% rename from cocos2d/textures/CCTextureCache.js rename to cocos2d/core/textures/CCTextureCache.js diff --git a/cocos2d/platform/jsloader.js b/cocos2d/jsloader.js similarity index 82% rename from cocos2d/platform/jsloader.js rename to cocos2d/jsloader.js index 6a26fbe522..3fa202d6f0 100644 --- a/cocos2d/platform/jsloader.js +++ b/cocos2d/jsloader.js @@ -26,24 +26,46 @@ ****************************************************************************/ (function () { var engine = [ - 'platform/CCClass.js', - 'cocoa/CCGeometry.js', - 'platform/Sys.js', - 'platform/CCConfig.js', - 'platform/miniFramework.js', - 'platform/CCCommon.js', - 'platform/ZipUtils.js', - 'platform/base64.js', - 'platform/gzip.js', - 'platform/CCMacro.js', - 'platform/CCFileUtils.js', - 'platform/CCTypes.js', - 'platform/CCAccelerometer.js', - 'platform/zlib.min.js', - 'platform/CCEGLView.js', - 'platform/CCImage.js', - 'platform/CCScreen.js', - 'platform/CCVisibleRect.js', + // Core + 'core/platform/CCClass.js', + 'core/cocoa/CCGeometry.js', + 'core/platform/Sys.js', + 'core/platform/CCConfig.js', + 'core/platform/miniFramework.js', + 'core/platform/CCCommon.js', + 'core/platform/CCMacro.js', + 'core/platform/CCFileUtils.js', + 'core/platform/CCTypes.js', + 'core/platform/CCEGLView.js', + 'core/platform/CCScreen.js', + 'core/platform/CCVisibleRect.js', + 'core/cocoa/CCNS.js', + 'core/cocoa/CCAffineTransform.js', + 'core/support/CCPointExtension.js', + 'core/support/CCVertex.js', + 'core/support/TransformUtils.js', + 'core/base_nodes/CCNode.js', + 'core/base_nodes/CCAtlasNode.js', + 'core/textures/CCTexture2D.js', + 'core/textures/CCTextureCache.js', + 'core/textures/CCTextureAtlas.js', + 'core/scenes_nodes/CCScene.js', + 'core/layers_nodes/CCLayer.js', + 'core/sprite_nodes/CCSprite.js', + 'core/sprite_nodes/CCAnimation.js', + 'core/sprite_nodes/CCAnimationCache.js', + 'core/sprite_nodes/CCSpriteFrame.js', + 'core/sprite_nodes/CCSpriteFrameCache.js', + 'core/sprite_nodes/CCSpriteBatchNode.js', + 'core/CCConfiguration.js', + 'core/CCDirector.js', + 'core/CCCamera.js', + 'core/CCScheduler.js', + 'core/CCLoader.js', + 'core/platform/CCApplication.js', + 'core/platform/CCSAXParser.js', + 'core/platform/AppControl.js', + 'kazmath/utility.js', 'kazmath/vec2.js', 'kazmath/vec3.js', @@ -56,28 +78,11 @@ 'kazmath/aabb.js', 'kazmath/GL/mat4stack.js', 'kazmath/GL/matrix.js', - 'cocoa/CCNS.js', - 'cocoa/CCAffineTransform.js', - 'support/CCPointExtension.js', - 'support/CCUserDefault.js', - 'support/CCVertex.js', - 'support/TransformUtils.js', - 'support/CCTGAlib.js', - 'support/CCPNGReader.js', - 'support/CCTIFFReader.js', - 'support/component/CCComponent.js', - 'support/component/CCComponentContainer.js', 'shaders/CCShaders.js', 'shaders/CCShaderCache.js', 'shaders/CCGLProgram.js', 'shaders/CCGLStateCache.js', - 'base_nodes/CCNode.js', - 'base_nodes/CCAtlasNode.js', - 'textures/CCTexture2D.js', - 'textures/CCTextureCache.js', - 'textures/CCTextureAtlas.js', 'misc_nodes/CCRenderTexture.js', - 'misc_nodes/CCProgressTimer.js', 'misc_nodes/CCMotionStreak.js', 'misc_nodes/CCClippingNode.js', 'effects/CCGrid.js', @@ -87,29 +92,28 @@ 'actions/CCActionInterval.js', 'actions/CCActionInstant.js', 'actions/CCActionManager.js', - 'actions/CCActionProgressTimer.js', 'actions/CCActionCamera.js', 'actions/CCActionEase.js', - 'actions/CCActionGrid.js', - 'actions/CCActionGrid3D.js', - 'actions/CCActionTiledGrid.js', 'actions/CCActionCatmullRom.js', - 'actions/CCActionPageTurn3D.js', 'actions/CCActionTween.js', - 'layers_scenes_transitions_nodes/CCScene.js', - 'layers_scenes_transitions_nodes/CCLayer.js', - 'layers_scenes_transitions_nodes/CCTransition.js', - 'layers_scenes_transitions_nodes/CCTransitionProgress.js', - 'layers_scenes_transitions_nodes/CCTransitionPageTurn.js', - 'sprite_nodes/CCSprite.js', - 'sprite_nodes/CCAnimation.js', - 'sprite_nodes/CCAnimationCache.js', - 'sprite_nodes/CCSpriteFrame.js', - 'sprite_nodes/CCSpriteFrameCache.js', - 'sprite_nodes/CCSpriteBatchNode.js', + 'actions3d/CCActionGrid.js', + 'actions3d/CCActionGrid3D.js', + 'actions3d/CCActionTiledGrid.js', + 'actions3d/CCActionPageTurn3D.js', + 'progress_timer/CCProgressTimer.js', + 'progress_timer/CCActionProgressTimer.js', + 'transitions_nodes/CCTransition.js', + 'transitions_nodes/CCTransitionProgress.js', + 'transitions_nodes/CCTransitionPageTurn.js', 'label_nodes/CCLabelAtlas.js', 'label_nodes/CCLabelTTF.js', 'label_nodes/CCLabelBMFont.js', + 'compress/ZipUtils.js', + 'compress/base64.js', + 'compress/gzip.js', + 'compress/zlib.min.js', + 'particle_nodes/CCPNGReader.js', + 'particle_nodes/CCTIFFReader.js', 'particle_nodes/CCParticleSystem.js', 'particle_nodes/CCParticleExamples.js', 'particle_nodes/CCParticleBatchNode.js', @@ -119,26 +123,25 @@ 'touch_dispatcher/CCMouseDispatcher.js', 'keyboard_dispatcher/CCKeyboardDelegate.js', 'keyboard_dispatcher/CCKeyboardDispatcher.js', + 'accelerometer/CCAccelerometer.js', 'text_input_node/CCIMEDispatcher.js', 'text_input_node/CCTextFieldTTF.js', - 'CCConfiguration.js', - 'CCDirector.js', - 'CCCamera.js', - 'CCScheduler.js', - 'CCLoader.js', 'CCDrawingPrimitives.js', - 'platform/CCApplication.js', - 'platform/CCSAXParser.js', - 'platform/AppControl.js', 'menu_nodes/CCMenuItem.js', 'menu_nodes/CCMenu.js', - 'tileMap_parallax_nodes/CCTMXTiledMap.js', - 'tileMap_parallax_nodes/CCTMXXMLParser.js', - 'tileMap_parallax_nodes/CCTMXObjectGroup.js', - 'tileMap_parallax_nodes/CCTMXLayer.js', - 'tileMap_parallax_nodes/CCParallaxNode.js', - 'base_nodes/CCdomNode.js', - '../CocosDenshion/SimpleAudioEngine.js' + 'tileMap_nodes/CCTGAlib.js', + 'tileMap_nodes/CCTMXTiledMap.js', + 'tileMap_nodes/CCTMXXMLParser.js', + 'tileMap_nodes/CCTMXObjectGroup.js', + 'tileMap_nodes/CCTMXLayer.js', + 'parallax_nodes/CCParallaxNode.js', + 'audio/SimpleAudioEngine.js', + + // useless + 'CCUserDefault.js', + + 'CCImage.js' + ]; var d = document; @@ -173,8 +176,11 @@ '../extensions/CCBReader/CCBSequence.js', '../extensions/CCBReader/CCBRelativePositioning.js', '../extensions/CCBReader/CCBAnimationManager.js', - '../extensions/CCEditBox.js', + '../extensions/CCEditBox/CCdomNode.js', + '../extensions/CCEditBox/CCEditBox.js', + '../extensions/CocoStudio/Components/CCComponent.js', + '../extensions/CocoStudio/Components/CCComponentContainer.js', '../extensions/CocoStudio/CocoStudio.js', // CocoStudio Armature '../extensions/CocoStudio/Armature/utils/CCArmatureDefine.js', @@ -201,6 +207,7 @@ '../extensions/CocoStudio/Action/CCActionNode.js', '../extensions/CocoStudio/Action/CCActionObject.js', // CocoStudio Components + '../extensions/CocoStudio/Components/CCComAttribute.js', '../extensions/CocoStudio/Components/CCComAudio.js', '../extensions/CocoStudio/Components/CCComController.js', @@ -267,9 +274,9 @@ engine.push('physics_nodes/CCPhysicsSprite.js'); engine.push('physics_nodes/CCPhysicsDebugNode.js'); if (c.box2d === true) - engine.push('../box2d/box2d.js'); + engine.push('../external/box2d/box2d.js'); if (c.chipmunk === true) - engine.push('../chipmunk/chipmunk.js'); + engine.push('../external/chipmunk/chipmunk.js'); } engine.forEach(function (e, i) { engine[i] = c.engineDir + e; diff --git a/cocos2d/tileMap_parallax_nodes/CCParallaxNode.js b/cocos2d/parallax_nodes/CCParallaxNode.js similarity index 100% rename from cocos2d/tileMap_parallax_nodes/CCParallaxNode.js rename to cocos2d/parallax_nodes/CCParallaxNode.js diff --git a/cocos2d/support/CCPNGReader.js b/cocos2d/particle_nodes/CCPNGReader.js similarity index 100% rename from cocos2d/support/CCPNGReader.js rename to cocos2d/particle_nodes/CCPNGReader.js diff --git a/cocos2d/support/CCTIFFReader.js b/cocos2d/particle_nodes/CCTIFFReader.js similarity index 100% rename from cocos2d/support/CCTIFFReader.js rename to cocos2d/particle_nodes/CCTIFFReader.js diff --git a/cocos2d/actions/CCActionProgressTimer.js b/cocos2d/progress_timer/CCActionProgressTimer.js similarity index 100% rename from cocos2d/actions/CCActionProgressTimer.js rename to cocos2d/progress_timer/CCActionProgressTimer.js diff --git a/cocos2d/misc_nodes/CCProgressTimer.js b/cocos2d/progress_timer/CCProgressTimer.js similarity index 100% rename from cocos2d/misc_nodes/CCProgressTimer.js rename to cocos2d/progress_timer/CCProgressTimer.js diff --git a/cocos2d/support/CCTGAlib.js b/cocos2d/tileMap_nodes/CCTGAlib.js similarity index 100% rename from cocos2d/support/CCTGAlib.js rename to cocos2d/tileMap_nodes/CCTGAlib.js diff --git a/cocos2d/tileMap_parallax_nodes/CCTMXLayer.js b/cocos2d/tileMap_nodes/CCTMXLayer.js similarity index 100% rename from cocos2d/tileMap_parallax_nodes/CCTMXLayer.js rename to cocos2d/tileMap_nodes/CCTMXLayer.js diff --git a/cocos2d/tileMap_parallax_nodes/CCTMXObjectGroup.js b/cocos2d/tileMap_nodes/CCTMXObjectGroup.js similarity index 100% rename from cocos2d/tileMap_parallax_nodes/CCTMXObjectGroup.js rename to cocos2d/tileMap_nodes/CCTMXObjectGroup.js diff --git a/cocos2d/tileMap_parallax_nodes/CCTMXTiledMap.js b/cocos2d/tileMap_nodes/CCTMXTiledMap.js similarity index 100% rename from cocos2d/tileMap_parallax_nodes/CCTMXTiledMap.js rename to cocos2d/tileMap_nodes/CCTMXTiledMap.js diff --git a/cocos2d/tileMap_parallax_nodes/CCTMXXMLParser.js b/cocos2d/tileMap_nodes/CCTMXXMLParser.js similarity index 100% rename from cocos2d/tileMap_parallax_nodes/CCTMXXMLParser.js rename to cocos2d/tileMap_nodes/CCTMXXMLParser.js diff --git a/cocos2d/tileMap_parallax_nodes/CCTileMapAtlas.js b/cocos2d/tileMap_nodes/CCTileMapAtlas.js similarity index 100% rename from cocos2d/tileMap_parallax_nodes/CCTileMapAtlas.js rename to cocos2d/tileMap_nodes/CCTileMapAtlas.js diff --git a/cocos2d/layers_scenes_transitions_nodes/CCTransition.js b/cocos2d/transitions_nodes/CCTransition.js similarity index 100% rename from cocos2d/layers_scenes_transitions_nodes/CCTransition.js rename to cocos2d/transitions_nodes/CCTransition.js diff --git a/cocos2d/layers_scenes_transitions_nodes/CCTransitionPageTurn.js b/cocos2d/transitions_nodes/CCTransitionPageTurn.js similarity index 100% rename from cocos2d/layers_scenes_transitions_nodes/CCTransitionPageTurn.js rename to cocos2d/transitions_nodes/CCTransitionPageTurn.js diff --git a/cocos2d/layers_scenes_transitions_nodes/CCTransitionProgress.js b/cocos2d/transitions_nodes/CCTransitionProgress.js similarity index 100% rename from cocos2d/layers_scenes_transitions_nodes/CCTransitionProgress.js rename to cocos2d/transitions_nodes/CCTransitionProgress.js diff --git a/extensions/CCEditBox.js b/extensions/CCEditBox/CCEditBox.js similarity index 100% rename from extensions/CCEditBox.js rename to extensions/CCEditBox/CCEditBox.js diff --git a/cocos2d/base_nodes/CCdomNode.js b/extensions/CCEditBox/CCdomNode.js similarity index 100% rename from cocos2d/base_nodes/CCdomNode.js rename to extensions/CCEditBox/CCdomNode.js diff --git a/cocos2d/support/component/CCComponent.js b/extensions/CocoStudio/Components/CCComponent.js similarity index 100% rename from cocos2d/support/component/CCComponent.js rename to extensions/CocoStudio/Components/CCComponent.js diff --git a/cocos2d/support/component/CCComponentContainer.js b/extensions/CocoStudio/Components/CCComponentContainer.js similarity index 100% rename from cocos2d/support/component/CCComponentContainer.js rename to extensions/CocoStudio/Components/CCComponentContainer.js diff --git a/box2d/box2d.js b/external/box2d/box2d.js similarity index 100% rename from box2d/box2d.js rename to external/box2d/box2d.js diff --git a/chipmunk/chipmunk.js b/external/chipmunk/chipmunk.js similarity index 100% rename from chipmunk/chipmunk.js rename to external/chipmunk/chipmunk.js diff --git a/template/build.xml b/template/build.xml index e6483204d9..3357e63c45 100644 --- a/template/build.xml +++ b/template/build.xml @@ -159,7 +159,7 @@ - + diff --git a/template/cocos2d.js b/template/cocos2d.js index c21c5a771e..1cd293aace 100644 --- a/template/cocos2d.js +++ b/template/cocos2d.js @@ -80,7 +80,7 @@ loadJsImg.id = "cocos2d_loadJsImg"; } else if (c.engineDir && !c.SingleEngineFile) { - s.src = c.engineDir + 'platform/jsloader.js'; + s.src = c.engineDir + 'jsloader.js'; } else { alert('You must specify either the single engine file OR the engine directory in "cocos2d.js"');