merge cocos

build/cocos2d-win32.vc2012.sln

@@ -1,8 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests", "..\tests\cpp-tests\proj.win32\cpp-tests.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-tests", "..\tests\lua-tests\project\proj.win32\lua-tests.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}"
@@ -11,14 +9,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-empty-test", "..\tests\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-empty-test", "..\tests\lua-empty-test\project\proj.win32\lua-empty-test.vcxproj", "{13E55395-94A2-4CD9-BFC2-1A051F80C17D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspine", "..\cocos\editor-support\spine\proj.win32\libspine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosbuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libcocosbuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos2d", "..\cocos\scripting\lua-bindings\proj.win32\libluacocos2d.vcxproj", "{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}"
 EndProject
 Global
@@ -27,10 +19,6 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.ActiveCfg = Debug|Win32
-		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32
-		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32
-		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32
 		{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.Build.0 = Debug|Win32
 		{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.ActiveCfg = Release|Win32
@@ -47,22 +35,10 @@ Global
 		{13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Debug|Win32.Build.0 = Debug|Win32
 		{13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|Win32.ActiveCfg = Release|Win32
 		{13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|Win32.Build.0 = Release|Win32
-		{929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32
-		{929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32
-		{929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32
-		{929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32
 		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32
 		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32
 		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32
-		{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32
-		{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32
-		{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32
-		{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.Build.0 = Debug|Win32
-		{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.ActiveCfg = Release|Win32
-		{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.Build.0 = Release|Win32
 		{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.Build.0 = Debug|Win32
 		{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.ActiveCfg = Release|Win32

build/cocos2d_libs.xcodeproj/project.pbxproj

@@ -2346,8 +2346,6 @@
 		3EA3EDBB1991CDFA00645534 /* CCCamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCCamera.h; path = ../base/CCCamera.h; sourceTree = "<group>"; };
 		464AD6E3197EBB1400E502D8 /* pvr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pvr.cpp; path = ../base/pvr.cpp; sourceTree = "<group>"; };
 		464AD6E4197EBB1400E502D8 /* pvr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pvr.h; path = ../base/pvr.h; sourceTree = "<group>"; };
-		46633BC2199DDB2F00F6E838 /* CCModuleManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCModuleManager.cpp; path = ../base/CCModuleManager.cpp; sourceTree = "<group>"; };
-		46633BC3199DDB2F00F6E838 /* CCModuleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCModuleManager.h; path = ../base/CCModuleManager.h; sourceTree = "<group>"; };
 		46A15FCC1807A544005B8026 /* AUTHORS */ = {isa = PBXFileReference; lastKnownFileType = text; name = AUTHORS; path = ../AUTHORS; sourceTree = "<group>"; };
 		46A15FCE1807A544005B8026 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = "<group>"; };
 		46A15FE11807A56F005B8026 /* Export.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Export.h; sourceTree = "<group>"; };
@@ -3075,8 +3073,6 @@
 		1A570095180BC5B00088DEC7 /* base-nodes */ = {
 			isa = PBXGroup;
 			children = (
-				46633BC2199DDB2F00F6E838 /* CCModuleManager.cpp */,
-				46633BC3199DDB2F00F6E838 /* CCModuleManager.h */,
 				15EFA20F198A2BB5000C57D3 /* CCProtectedNode.cpp */,
 				15EFA210198A2BB5000C57D3 /* CCProtectedNode.h */,
 				1A57009C180BC5D20088DEC7 /* CCNode.cpp */,

cocos/2d/CCActionCatmullRom.cpp

@@ -31,6 +31,7 @@
  */
 #include "base/ccMacros.h"
 #include "2d/CCActionCatmullRom.h"
+#include "2d/CCNode.h"
 
 using namespace std;
 

cocos/2d/CCActionCatmullRom.h

@@ -38,11 +38,12 @@
 #include <vector>
 
 #include "2d/CCActionInterval.h"
-#include "2d/CCNode.h"
 #include "math/CCGeometry.h"
 
 NS_CC_BEGIN;
 
+class Node;
+
 /**
  * @addtogroup actions
  * @{

cocos/2d/CCActionGrid3D.cpp

@@ -25,7 +25,6 @@ THE SOFTWARE.
 ****************************************************************************/
 #include "2d/CCActionGrid3D.h"
 #include "base/CCDirector.h"
-#include <stdlib.h>
 
 NS_CC_BEGIN
 // implementation of Waves3D

cocos/2d/CCActionInstant.cpp

@@ -28,7 +28,6 @@
 #include "2d/CCActionInstant.h"
 #include "2d/CCNode.h"
 #include "2d/CCSprite.h"
-#include "base/CCScriptSupport.h"
 
 #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"

cocos/2d/CCActionInstant.h

@@ -28,10 +28,7 @@ THE SOFTWARE.
 #ifndef __CCINSTANT_ACTION_H__
 #define __CCINSTANT_ACTION_H__
 
-#include <string>
 #include <functional>
-
-#include "CCStdC.h"
 #include "2d/CCAction.h"
 
 NS_CC_BEGIN

cocos/2d/CCActionInterval.cpp

@@ -28,10 +28,12 @@ THE SOFTWARE.
 #include "2d/CCActionInterval.h"
 #include "2d/CCSprite.h"
 #include "2d/CCNode.h"
+#include "2d/CCSpriteFrame.h"
 #include "CCStdC.h"
 #include "2d/CCActionInstant.h"
 #include "base/CCDirector.h"
 #include "base/CCEventCustom.h"
+#include "base/CCEventDispatcher.h"
 
 #include <stdarg.h>
 

cocos/2d/CCActionInterval.h

@@ -30,15 +30,17 @@ THE SOFTWARE.
 
 #include <vector>
 
-#include "2d/CCNode.h"
 #include "2d/CCAction.h"
-#include "2d/CCSpriteFrame.h"
 #include "2d/CCAnimation.h"
 #include "base/CCProtocols.h"
 #include "base/CCVector.h"
 
 NS_CC_BEGIN
 
+class Node;
+class SpriteFrame;
+class EventCustom;
+
 /**
  * @addtogroup actions
  * @{

cocos/2d/CCActionManager.cpp

@@ -28,6 +28,7 @@ THE SOFTWARE.
 
 #include "2d/CCActionManager.h"
 #include "2d/CCNode.h"
+#include "2d/CCAction.h"
 #include "base/CCScheduler.h"
 #include "base/ccMacros.h"
 #include "base/ccCArray.h"

cocos/2d/CCActionManager.h

@@ -35,6 +35,8 @@ THE SOFTWARE.
 
 NS_CC_BEGIN
 
+class Action;
+
 struct _hashElement;
 
 /**

cocos/2d/CCActionTiledGrid.cpp

@@ -28,7 +28,6 @@ THE SOFTWARE.
 #include "2d/CCNodeGrid.h"
 #include "base/CCDirector.h"
 #include "base/ccMacros.h"
-#include <stdlib.h>
 
 NS_CC_BEGIN
 

cocos/2d/CCAtlasNode.cpp

@@ -32,9 +32,6 @@ THE SOFTWARE.
 #include "renderer/CCTextureCache.h"
 #include "renderer/CCRenderer.h"
 #include "renderer/CCGLProgram.h"
-#include "renderer/CCGLProgramState.h"
-#include "renderer/ccGLStateCache.h"
-#include "math/TransformUtils.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCDrawNode.cpp

@@ -25,9 +25,8 @@
 #include "CCGL.h"
 #include "base/CCEventType.h"
 #include "base/CCConfiguration.h"
-#include "renderer/CCCustomCommand.h"
 #include "renderer/CCRenderer.h"
-#include "renderer/CCGLProgramState.h"
+#include "renderer/ccGLStateCache.h"
 #include "base/CCDirector.h"
 #include "base/CCEventListenerCustom.h"
 #include "base/CCEventDispatcher.h"

cocos/2d/CCDrawingPrimitives.cpp

@@ -41,13 +41,10 @@ THE SOFTWARE.
 #include <string.h>
 #include <cmath>
 
-#include "base/ccTypes.h"
-#include "base/ccMacros.h"
 #include "CCGL.h"
 #include "base/CCDirector.h"
 #include "renderer/ccGLStateCache.h"
 #include "renderer/CCGLProgramCache.h"
-#include "renderer/CCGLProgram.h"
 #include "2d/CCActionCatmullRom.h"
 #include "renderer/CCRenderer.h"
 

cocos/2d/CCFastTMXLayer.cpp

@@ -40,6 +40,7 @@ THE SOFTWARE.
 #include "2d/CCSprite.h"
 #include "renderer/CCTextureCache.h"
 #include "renderer/CCGLProgramCache.h"
+#include "renderer/ccGLStateCache.h"
 #include "renderer/CCGLProgram.h"
 #include "base/CCDirector.h"
 #include "base/CCConfiguration.h"

cocos/2d/CCFont.h

@@ -27,11 +27,12 @@
 #define _CCFont_h_
 
 #include <string>
-
 #include "2d/CCLabel.h"
 
 NS_CC_BEGIN
 
+class FontAtlas;
+
 // fwd
 class FontAtlas;
 

cocos/2d/CCFontAtlas.h

@@ -27,7 +27,7 @@
 
 #include "base/CCPlatformMacros.h"
 #include "base/CCRef.h"
-#include "CCStdC.h"
+#include "CCStdC.h" // ssize_t on windows
 #include <string>
 #include <unordered_map>
 

cocos/2d/CCFontAtlasCache.cpp

@@ -29,7 +29,8 @@
 
 #include "2d/CCFontFNT.h"
 #include "2d/CCFontFreeType.h"
-#include "CCFontCharMap.h"
+#include "2d/CCFontAtlas.h"
+#include "2d/CCFontCharMap.h"
 #include "base/CCDirector.h"
 
 NS_CC_BEGIN

cocos/2d/CCFontAtlasCache.h

@@ -28,11 +28,12 @@
 
 #include <unordered_map>
 
-#include "2d/CCFontAtlas.h"
 #include "2d/CCLabel.h"
 
 NS_CC_BEGIN
 
+class FontAtlas;
+
 class CC_DLL FontAtlasCache
 {  
 public:

cocos/2d/CCFontCharMap.cpp

@@ -23,10 +23,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCFontCharMap.h"
+#include "2d/CCFontCharMap.h"
 #include "2d/CCFontAtlas.h"
 #include "platform/CCFileUtils.h"
-#include "base/ccUTF8.h"
 #include "base/CCDirector.h"
 #include "renderer/CCTextureCache.h"
 

cocos/2d/CCFontCharMap.h

@@ -26,7 +26,7 @@
 #ifndef _CCFontCharMap_h_
 #define _CCFontCharMap_h_
 
-#include "CCFont.h"
+#include "2d/CCFont.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCFontFNT.cpp

@@ -26,7 +26,6 @@
 #include "2d/CCFontFNT.h"
 #include "base/uthash.h"
 #include "2d/CCFontAtlas.h"
-#include "base/ccUTF8.h"
 #include "platform/CCFileUtils.h"
 #include "base/CCConfiguration.h"
 #include "base/CCDirector.h"

cocos/2d/CCFontFreeType.cpp

@@ -25,8 +25,6 @@ THE SOFTWARE.
 
 #include "2d/CCFontFreeType.h"
 
-#include <stdio.h>
-#include <algorithm>
 #include "base/CCDirector.h"
 #include "base/ccUTF8.h"
 #include "platform/CCFileUtils.h"

cocos/2d/CCFontFreeType.h

@@ -27,7 +27,6 @@
 #define _FontFreetype_h_
 
 #include "CCFont.h"
-#include "base/CCData.h"
 
 #include <string>
 #include <ft2build.h>

cocos/2d/CCGrabber.h

@@ -26,7 +26,6 @@ THE SOFTWARE.
 #ifndef __EFFECTS_CCGRABBER_H__
 #define __EFFECTS_CCGRABBER_H__
 
-#include "base/CCConfiguration.h"
 #include "base/CCRef.h"
 #include "CCGL.h"
 

cocos/2d/CCGrid.cpp

@@ -23,18 +23,18 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
+#include "2d/CCGrid.h"
 
 #include "base/ccMacros.h"
-#include "base/CCDirector.h"
-#include "2d/CCGrabber.h"
 #include "base/ccUtils.h"
-#include "2d/CCGrid.h"
+#include "2d/CCNode.h"
+#include "2d/CCGrabber.h"
 #include "renderer/CCGLProgram.h"
 #include "renderer/CCGLProgramCache.h"
 #include "renderer/ccGLStateCache.h"
 #include "renderer/CCRenderer.h"
+#include "renderer/CCTexture2D.h"
 #include "CCGL.h"
-#include "math/TransformUtils.h"
 
 NS_CC_BEGIN
 // implementation of GridBase
@@ -321,21 +321,7 @@ void Grid3D::blit(void)
     //
     // Attributes
     //
-#ifdef EMSCRIPTEN
-    // Size calculations from calculateVertexPoints().
-    unsigned int numOfPoints = (_gridSize.width+1) * (_gridSize.height+1);
 
-    // position
-    setGLBufferData(_vertices, numOfPoints * sizeof(Vec3), 0);
-    glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, 0, 0);
-
-    // texCoords
-    setGLBufferData(_texCoordinates, numOfPoints * sizeof(Vec2), 1);
-    glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, 0);
-
-    setGLIndexData(_indices, n * 12, 0);
-    glDrawElements(GL_TRIANGLES, (GLsizei) n*6, GL_UNSIGNED_SHORT, 0);
-#else
     // position
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, 0, _vertices);
 
@@ -343,8 +329,6 @@ void Grid3D::blit(void)
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, _texCoordinates);
 
     glDrawElements(GL_TRIANGLES, (GLsizei) n*6, GL_UNSIGNED_SHORT, _indices);
-#endif // EMSCRIPTEN
-    CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1,n*6);
 }
 
 void Grid3D::calculateVertexPoints(void)
@@ -537,20 +521,7 @@ void TiledGrid3D::blit(void)
     // Attributes
     //
     GL::enableVertexAttribs( GL::VERTEX_ATTRIB_FLAG_POSITION | GL::VERTEX_ATTRIB_FLAG_TEX_COORD );
-#ifdef EMSCRIPTEN
-    int numQuads = _gridSize.width * _gridSize.height;
 
-    // position
-    setGLBufferData(_vertices, (numQuads*4*sizeof(Vec3)), 0);
-    glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, 0, 0);
-
-    // texCoords
-    setGLBufferData(_texCoordinates, (numQuads*4*sizeof(Vec2)), 1);
-    glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, 0);
-
-    setGLIndexData(_indices, n * 12, 0);
-    glDrawElements(GL_TRIANGLES, (GLsizei) n*6, GL_UNSIGNED_SHORT, 0);
-#else
     // position
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, 0, _vertices);
 
@@ -558,8 +529,6 @@ void TiledGrid3D::blit(void)
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, _texCoordinates);
 
     glDrawElements(GL_TRIANGLES, (GLsizei)n*6, GL_UNSIGNED_SHORT, _indices);
-#endif // EMSCRIPTEN
-
 
     CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1,n*6);
 }

cocos/2d/CCGrid.h

@@ -29,17 +29,13 @@ THE SOFTWARE.
 #include "base/CCRef.h"
 #include "base/ccTypes.h"
 #include "base/CCDirector.h"
-#include "2d/CCNode.h"
-#include "renderer/CCTexture2D.h"
-#ifdef EMSCRIPTEN
-#include "CCGLBufferedNode.h"
-#endif // EMSCRIPTEN
 
 NS_CC_BEGIN
 
 class Texture2D;
 class Grabber;
 class GLProgram;
+class Node;
 
 /**
  * @addtogroup effects
@@ -108,9 +104,6 @@ protected:
  Grid3D is a 3D grid implementation. Each vertex has 3 dimensions: x,y,z
  */
 class CC_DLL Grid3D : public GridBase
-#ifdef EMSCRIPTEN
-, public GLBufferedNode
-#endif // EMSCRIPTEN
 {
 public:
     /** create one Grid */
@@ -171,9 +164,6 @@ protected:
  the tiles can be separated from the grid.
 */
 class CC_DLL TiledGrid3D : public GridBase
-#ifdef EMSCRIPTEN
-, public GLBufferedNode
-#endif // EMSCRIPTEN
 {
 public:
     /** create one Grid */

cocos/2d/CCLabel.cpp

@@ -28,17 +28,14 @@
 #include "2d/CCSprite.h"
 #include "2d/CCLabelTextFormatter.h"
 #include "base/ccUTF8.h"
-#include "2d/CCSpriteFrame.h"
 #include "platform/CCFileUtils.h"
 #include "2d/CCFont.h"
-#include "renderer/CCGLProgramState.h"
 #include "renderer/CCRenderer.h"
+#include "renderer/ccGLStateCache.h"
 #include "base/CCDirector.h"
 #include "base/CCEventListenerCustom.h"
 #include "base/CCEventDispatcher.h"
-#include "base/CCEventType.h"
 #include "base/CCEventCustom.h"
-#include "base/CCProfiling.h"
 
 #include "deprecated/CCString.h"
 

cocos/2d/CCLabel.h

@@ -28,7 +28,6 @@
 #define _COCOS2D_CCLABEL_H_
 
 #include "2d/CCSpriteBatchNode.h"
-#include "base/ccTypes.h"
 #include "renderer/CCCustomCommand.h"
 #include "2d/CCFontAtlas.h"
 

cocos/2d/CCLabelAtlas.cpp

@@ -24,17 +24,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
-#include "CCLabelAtlas.h"
+#include "2d/CCLabelAtlas.h"
 #include "renderer/CCTextureAtlas.h"
-#include "2d/CCDrawingPrimitives.h"
 #include "platform/CCFileUtils.h"
-#include "base/ccConfig.h"
 #include "base/CCDirector.h"
 #include "renderer/CCTextureCache.h"
-#include "renderer/CCGLProgramCache.h"
-#include "renderer/CCGLProgram.h"
-#include "renderer/ccGLStateCache.h"
-#include "math/TransformUtils.h"
 
 #include "deprecated/CCString.h"
 

cocos/2d/CCLabelBMFont.cpp

@@ -31,8 +31,7 @@ http://slick.cokeandcode.com/demos/hiero.jnlp (Free, Java)
 http://www.angelcode.com/products/bmfont/ (Free, Windows only)
 
 ****************************************************************************/
-#include "CCLabelBMFont.h"
+#include "2d/CCLabelBMFont.h"
-#include "2d/CCDrawingPrimitives.h"
 #include "deprecated/CCString.h"
 #include "2d/CCSprite.h"
 

cocos/2d/CCLabelTTF.cpp

@@ -23,7 +23,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
-#include "CCLabelTTF.h"
+#include "2d/CCLabelTTF.h"
 #include "2d/CCLabel.h"
 #include "deprecated/CCString.h"
 

cocos/2d/CCLayer.cpp

@@ -29,10 +29,6 @@ THE SOFTWARE.
 #include "2d/CCLayer.h"
 #include "base/CCScriptSupport.h"
 #include "platform/CCDevice.h"
-#include "2d/CCScene.h"
-#include "renderer/CCGLProgramState.h"
-#include "renderer/CCGLProgram.h"
-#include "renderer/CCCustomCommand.h"
 #include "renderer/CCRenderer.h"
 #include "renderer/ccGLStateCache.h"
 #include "base/CCDirector.h"
@@ -43,7 +39,7 @@ THE SOFTWARE.
 #include "base/CCEventListenerKeyboard.h"
 #include "base/CCEventAcceleration.h"
 #include "base/CCEventListenerAcceleration.h"
-#include "math/TransformUtils.h"
+
 
 #include "deprecated/CCString.h"
 

cocos/2d/CCLayer.h

@@ -30,15 +30,8 @@ THE SOFTWARE.
 
 #include "2d/CCNode.h"
 #include "base/CCProtocols.h"
-#include "base/CCEventTouch.h"
-#ifdef EMSCRIPTEN
-#include "CCGLBufferedNode.h"
-#endif // EMSCRIPTEN
-
-#include "base/CCEventKeyboard.h"
 #include "renderer/CCCustomCommand.h"
 
-#include "physics/CCPhysicsWorld.h"
 
 NS_CC_BEGIN
 
@@ -54,6 +47,8 @@ class EventListenerTouch;
 class EventListenerKeyboard;
 class EventListenerAcceleration;
 
+class Touch;
+
 //
 // Layer
 //
@@ -246,9 +241,6 @@ All features from Layer are valid, plus the following new features:
 - RGB colors
 */
 class CC_DLL LayerColor : public Layer, public BlendProtocol
-#ifdef EMSCRIPTEN
-, public GLBufferedNode
-#endif // EMSCRIPTEN
 {
 public:
     /** creates a fullscreen black layer */

cocos/2d/CCMenu.cpp

@@ -28,6 +28,7 @@ THE SOFTWARE.
 #include "base/CCTouch.h"
 #include "CCStdC.h"
 #include "base/CCEventListenerTouch.h"
+#include "base/CCEventDispatcher.h"
 #include "deprecated/CCString.h"
 
 #include <vector>

cocos/2d/CCMenu.h

@@ -28,11 +28,10 @@ THE SOFTWARE.
 
 #include "2d/CCMenuItem.h"
 #include "2d/CCLayer.h"
-#include "base/CCVector.h"
-#include "base/CCEventTouch.h"
 #include "base/CCValue.h"
 
 NS_CC_BEGIN
+class Touch;
 
 /**
  * @addtogroup GUI

cocos/2d/CCNode.cpp

@@ -1,3 +1,5 @@
+
+
 /****************************************************************************
 Copyright (c) 2008-2010 Ricardo Quesada
 Copyright (c) 2009      Valentin Milea
@@ -34,26 +36,20 @@ THE SOFTWARE.
 
 #include "base/CCDirector.h"
 #include "base/CCScheduler.h"
-#include "base/CCTouch.h"
 #include "base/CCEventDispatcher.h"
-#include "base/CCEvent.h"
-#include "base/CCEventTouch.h"
-#include "base/ccCArray.h"
 #include "base/CCCamera.h"
-#include "2d/CCGrid.h"
 #include "2d/CCActionManager.h"
-#include "base/CCScriptSupport.h"
 #include "2d/CCScene.h"
 #include "2d/CCComponent.h"
 #include "2d/CCComponentContainer.h"
 #include "renderer/CCGLProgram.h"
-#include "renderer/CCGLProgramState.h"
 #include "math/TransformUtils.h"
 
 #include "deprecated/CCString.h"
 
 #if CC_USE_PHYSICS
 #include "physics/CCPhysicsBody.h"
+#include "physics/CCPhysicsWorld.h"
 #endif
 
 

cocos/2d/CCNode.h

@@ -30,14 +30,11 @@
 #define __CCNODE_H__
 
 #include "base/ccMacros.h"
-#include "base/CCEventDispatcher.h"
 #include "base/CCVector.h"
-#include "base/CCScriptSupport.h"
 #include "base/CCProtocols.h"
+#include "base/CCScriptSupport.h"
 #include "math/CCAffineTransform.h"
 #include "math/CCMath.h"
-#include "renderer/ccGLStateCache.h"
-#include "CCGL.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCScene.cpp

@@ -30,12 +30,12 @@ THE SOFTWARE.
 #include "base/CCCamera.h"
 #include "base/CCEventDispatcher.h"
 #include "base/CCEventListenerCustom.h"
-#include "2d/CCLayer.h"
-#include "2d/CCSprite.h"
-#include "2d/CCSpriteBatchNode.h"
-#include "physics/CCPhysicsWorld.h"
 #include "deprecated/CCString.h"
 
+#if CC_USE_PHYSICS
+#include "physics/CCPhysicsWorld.h"
+#endif
+
 NS_CC_BEGIN
 
 Scene::Scene()
@@ -116,6 +116,24 @@ Scene* Scene::getScene() const
     return const_cast<Scene*>(this);
 }
 
+void Scene::onProjectionChanged(EventCustom* event)
+{
+    if (_defaultCamera)
+    {
+        _defaultCamera->initDefault();
+    }
+}
+
+void Scene::setAmbientColor( const Color4F &color )
+{
+    _ambientColor = color;
+}
+
+const Color4F& Scene::getAmbientColor() const
+{
+    return _ambientColor;
+}
+
 #if CC_USE_PHYSICS
 void Scene::addChild(Node* child, int zOrder, int tag)
 {
@@ -193,24 +211,6 @@ void Scene::addChildToPhysicsWorld(Node* child)
     }
 }
 
-void Scene::onProjectionChanged(EventCustom* event)
-{
-    if (_defaultCamera)
-    {
-        _defaultCamera->initDefault();
-    }
-}
-
-void Scene::setAmbientColor( const Color4F &color )
-{
-    _ambientColor = color;
-}
-
-const Color4F& Scene::getAmbientColor() const
-{
-    return _ambientColor;
-}
-
 #endif
 
 NS_CC_END

cocos/2d/CCScene.h

@@ -30,12 +30,16 @@ THE SOFTWARE.
 
 #include <string>
 #include "2d/CCNode.h"
-#include "physics/CCPhysicsWorld.h"
 
 NS_CC_BEGIN
 
 class Camera;
 class Light3D;
+class EventListenerCustom;
+class EventCustom;
+#if CC_USE_PHYSICS
+class PhysicsWorld;
+#endif
 /**
  * @addtogroup scene
  * @{
@@ -101,6 +105,7 @@ protected:
     friend class Camera;
     friend class Director;
     friend class Light3D;
+    friend class Renderer;
     
     std::vector<Camera*> _cameras; //weak ref to Camera
     Camera*              _defaultCamera; //weak ref, default camera created by scene, _cameras[0], Caution that the default camera can not be added to _cameras before onEnter is called

cocos/2d/CCTransition.cpp

@@ -26,7 +26,6 @@ THE SOFTWARE.
 ****************************************************************************/
 
 #include "2d/CCTransition.h"
-#include "base/CCDirector.h"
 #include "2d/CCActionInterval.h"
 #include "2d/CCActionInstant.h"
 #include "2d/CCActionEase.h"
@@ -36,6 +35,8 @@ THE SOFTWARE.
 #include "2d/CCLayer.h"
 #include "2d/CCRenderTexture.h"
 #include "2d/CCNodeGrid.h"
+#include "base/CCDirector.h"
+#include "base/CCEventDispatcher.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCTransition.h

@@ -29,7 +29,6 @@ THE SOFTWARE.
 #define __CCTRANSITION_H__
 
 #include "2d/CCScene.h"
-#include "base/ccTypes.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCTransitionPageTurn.cpp

@@ -26,9 +26,6 @@ THE SOFTWARE.
 
 #include "2d/CCTransitionPageTurn.h"
 #include "base/CCDirector.h"
-#include "2d/CCActionInterval.h"
-#include "2d/CCActionInstant.h"
-#include "2d/CCActionGrid.h"
 #include "2d/CCActionPageTurn3D.h"
 #include "2d/CCNodeGrid.h"
 #include "renderer/CCRenderer.h"

cocos/2d/CCTransitionProgress.cpp

@@ -30,7 +30,6 @@ THE SOFTWARE.
 #include "base/CCDirector.h"
 #include "2d/CCRenderTexture.h"
 #include "2d/CCProgressTimer.h"
-#include "2d/CCLayer.h"
 #include "2d/CCActionInstant.h"
 #include "2d/CCActionProgressTimer.h"
 

cocos/2d/CCTweenFunction.cpp

@@ -24,6 +24,10 @@ THE SOFTWARE.
 
 #include "2d/CCTweenFunction.h"
 
+#define _USE_MATH_DEFINES // needed for M_PI and M_PI2
+#include <math.h> // M_PI
+#undef _USE_MATH_DEFINES
+
 NS_CC_BEGIN
 
 namespace tweenfunc {

cocos/2d/CCTweenFunction.h

@@ -26,8 +26,6 @@ THE SOFTWARE.
 #define __CCTWEENFUNCTION_H__
 
 #include "base/CCPlatformMacros.h"
-#include "base/ccMacros.h"
-#include <math.h>
 
 NS_CC_BEGIN
 

cocos/2d/cocos2dx.props

@@ -7,7 +7,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalDependencies>opengl32.lib;glew32.lib;libzlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;libwebp.lib;libiconv.lib;glfw3.lib;freetype250.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;glew32.lib;libzlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;libwebp.lib;libiconv.lib;glfw3.lib;freetype250.lib;winmm.lib;ws2_32.lib;libchipmunk.lib;libbox2d.lib;libspine.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
     </Link>

cocos/2d/libcocos2d.vcxproj

@@ -104,7 +104,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\zlib\prebuilt\*.*" "$(Ou
 xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\icon\prebuilt\*.*" "$(OutDir)"
 xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(OutDir)"
 xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)"
-</Command>
+xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\chipmunk\prebuilt\debug-lib\*.*" "$(OutDir)"
+xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\box2d\prebuilt\debug-lib\*.*" "$(OutDir)"
+xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\spine\prebuilt\debug-lib\*.*" "$(OutDir)"</Command>
     </PreLinkEvent>
     <Link>
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
@@ -116,7 +118,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)
       <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
       <ModuleDefinitionFile>cocos2d.def</ModuleDefinitionFile>
-      <AdditionalDependencies>libchipmunk.lib;sqlite3.lib;libcurl_imp.lib;libBox2D.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>sqlite3.lib;libcurl_imp.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>
@@ -129,7 +131,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)
       </Command>
     </PreBuildEvent>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\Box2d;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\Box2d;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32\;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_USRDLL;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -155,10 +157,12 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDi
 xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\zlib\prebuilt\*.*" "$(OutDir)"
 xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\icon\prebuilt\*.*" "$(OutDir)"
 xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(OutDir)"
-</Command>
+xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\chipmunk\prebuilt\release-lib\*.*" "$(OutDir)"
+xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\box2d\prebuilt\release-lib\*.*" "$(OutDir)"
+xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\spine\prebuilt\release-lib\*.*" "$(OutDir)"</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>libchipmunk.lib;sqlite3.lib;libcurl_imp.lib;libBox2D.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>sqlite3.lib;libcurl_imp.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries> ;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -274,6 +278,28 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
     <ClCompile Include="..\deprecated\CCNotificationCenter.cpp" />
     <ClCompile Include="..\deprecated\CCSet.cpp" />
     <ClCompile Include="..\deprecated\CCString.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCBAnimationManager.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCBFileLoader.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCBKeyframe.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCBReader.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCBSequence.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCBSequenceProperty.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCControlButtonLoader.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCControlLoader.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCLabelBMFontLoader.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCLabelTTFLoader.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCLayerColorLoader.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCLayerGradientLoader.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCLayerLoader.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCMenuItemImageLoader.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCMenuItemLoader.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCNode+CCBRelativePositioning.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCNodeLoader.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCNodeLoaderLibrary.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCParticleSystemQuadLoader.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCScale9SpriteLoader.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCScrollViewLoader.cpp" />
+    <ClCompile Include="..\editor-support\cocosbuilder\CCSpriteLoader.cpp" />
     <ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCActionTimeline.cpp" />
     <ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCActionTimelineCache.cpp" />
     <ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCFrame.cpp" />
@@ -609,6 +635,33 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
     <ClInclude Include="..\deprecated\CCNotificationCenter.h" />
     <ClInclude Include="..\deprecated\CCSet.h" />
     <ClInclude Include="..\deprecated\CCString.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBAnimationManager.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBFileLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBKeyframe.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBMemberVariableAssigner.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBReader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBSelectorResolver.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBSequence.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBSequenceProperty.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCControlButtonLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCControlLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCLabelBMFontLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCLabelTTFLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCLayerColorLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCLayerGradientLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCLayerLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCMenuItemImageLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCMenuItemLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCMenuLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCNode+CCBRelativePositioning.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCNodeLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCNodeLoaderLibrary.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCNodeLoaderListener.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCParticleSystemQuadLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCScale9SpriteLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCScrollViewLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CCSpriteLoader.h" />
+    <ClInclude Include="..\editor-support\cocosbuilder\CocosBuilder.h" />
     <ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCActionTimeline.h" />
     <ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCActionTimelineCache.h" />
     <ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCFrame.h" />
@@ -836,24 +889,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
     <None Include="..\math\Vec4.inl" />
     <None Include="cocos2d.def" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\external\Box2D\proj.win32\libbox2d.vcxproj">
-      <Project>{929480e7-23c0-4df6-8456-096d71547116}</Project>
-      <Private>false</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <ProjectReference Include="..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
-      <Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
-      <Private>false</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

cocos/2d/libcocos2d.vcxproj.filters

@@ -202,6 +202,15 @@
     <Filter Include="cocostudio\action">
       <UniqueIdentifier>{d48c8016-e933-48dd-a5c0-202b0a84b82a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="cocosbuilder">
+      <UniqueIdentifier>{e25a6c9d-eaf2-446f-b9b2-d89fd21a9bdd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="cocosbuilder\Header Files">
+      <UniqueIdentifier>{bbba68d3-e519-4e06-8a01-d8ee89b544f2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="cocosbuilder\Source Files">
+      <UniqueIdentifier>{8579ed15-b266-4f80-818d-a3a9251c4248}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\physics\CCPhysicsBody.cpp">
@@ -1093,6 +1102,72 @@
     <ClCompile Include="..\3d\CCLight.cpp">
       <Filter>3d</Filter>
     </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCBAnimationManager.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCBFileLoader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCBKeyframe.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCBReader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCBSequence.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCBSequenceProperty.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCControlButtonLoader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCControlLoader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCLabelBMFontLoader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCLabelTTFLoader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCLayerColorLoader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCLayerGradientLoader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCLayerLoader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCMenuItemImageLoader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCMenuItemLoader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCNode+CCBRelativePositioning.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCNodeLoader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCNodeLoaderLibrary.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCParticleSystemQuadLoader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCScale9SpriteLoader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCScrollViewLoader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\editor-support\cocosbuilder\CCSpriteLoader.cpp">
+      <Filter>cocosbuilder\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\physics\CCPhysicsBody.h">
@@ -2140,6 +2215,87 @@
     <ClInclude Include="..\3d\CCLight.h">
       <Filter>3d</Filter>
     </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBAnimationManager.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBFileLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBKeyframe.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBMemberVariableAssigner.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBReader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBSelectorResolver.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBSequence.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCBSequenceProperty.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCControlButtonLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCControlLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCLabelBMFontLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCLabelTTFLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCLayerColorLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCLayerGradientLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCLayerLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCMenuItemImageLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCMenuItemLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCMenuLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCNode+CCBRelativePositioning.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCNodeLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCNodeLoaderLibrary.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCNodeLoaderListener.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCParticleSystemQuadLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCScale9SpriteLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCScrollViewLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CCSpriteLoader.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\editor-support\cocosbuilder\CocosBuilder.h">
+      <Filter>cocosbuilder\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\math\Mat4.inl">

cocos/3d/Android.mk

@@ -1,32 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := cocos3d_static
-
-LOCAL_MODULE_FILENAME := libcocos3d
-
-LOCAL_SRC_FILES := \
-CCRay.cpp \
-CCAABB.cpp \
-CCOBB.cpp \
-CCAnimate3D.cpp \
-CCAnimation3D.cpp \
-CCAttachNode.cpp \
-CCBundle3D.cpp \
-CCBundleReader.cpp \
-CCMesh.cpp \
-CCMeshSkin.cpp \
-CCMeshVertexIndexData.cpp \
-CCSprite3DMaterial.cpp \
-CCObjLoader.cpp \
-CCSkeleton3D.cpp \
-CCSprite3D.cpp \
-
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. \
-                    $(LOCAL_PATH)/../../external \
-
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
-
-include $(BUILD_STATIC_LIBRARY)

cocos/3d/CCAnimate3D.cpp

@@ -96,17 +96,19 @@ void Animate3D::startWithTarget(Node *target)
     
     _boneCurves.clear();
     auto skin = sprite->getSkeleton();
+    bool hasCurve = false;
     for (unsigned int  i = 0; i < skin->getBoneCount(); i++) {
         auto bone = skin->getBoneByIndex(i);
         auto curve = _animation->getBoneCurveByName(bone->getName());
         if (curve)
         {
             _boneCurves[bone] = curve;
+            hasCurve = true;
         }
-        else
+    }
-        {
+    if (!hasCurve)
-            CCLOG("warning: bone %s not find in animation", bone->getName().c_str());
+    {
-        }
+        CCLOG("warning: no animation finde for the skeleton");
     }
 }
 

cocos/3d/CCBundle3D.cpp

@@ -1202,6 +1202,10 @@ bool Bundle3D::loadAnimationDataJson(Animation3DData* animationdata)
         {
             const rapidjson::Value& bone_keyframes =  bone[KEYFRAMES];
             rapidjson::SizeType keyframe_size = bone_keyframes.Size();
+            animationdata->_rotationKeys[bone_name].reserve(keyframe_size);
+            animationdata->_scaleKeys[bone_name].reserve(keyframe_size);
+            animationdata->_translationKeys[bone_name].reserve(keyframe_size);
+            
             for (rapidjson::SizeType j = 0; j < keyframe_size; j++)
             {
                 const rapidjson::Value&  bone_keyframe =  bone_keyframes[j];
@@ -1627,6 +1631,10 @@ bool Bundle3D::loadAnimationDataBinary(Animation3DData* animationdata)
             CCLOGINFO("Failed to read AnimationData: keyframeNum '%s'.", _path.c_str());
             return false;
         }
+        
+        animationdata->_rotationKeys[boneName].reserve(keyframeNum);
+        animationdata->_scaleKeys[boneName].reserve(keyframeNum);
+        animationdata->_translationKeys[boneName].reserve(keyframeNum);
 
         for (unsigned int j = 0; j < keyframeNum; ++j)
         {

cocos/3d/proj.win32/libcocos3d.vcxproj

@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\2d\libcocos2d.vcxproj">
-      <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\CCAABB.cpp" />
-    <ClCompile Include="..\CCAnimate3D.cpp" />
-    <ClCompile Include="..\CCAnimation3D.cpp" />
-    <ClCompile Include="..\CCAttachNode.cpp" />
-    <ClCompile Include="..\CCBundle3D.cpp" />
-    <ClCompile Include="..\CCBundleReader.cpp" />
-    <ClCompile Include="..\CCMesh.cpp" />
-    <ClCompile Include="..\CCMeshSkin.cpp" />
-    <ClCompile Include="..\CCMeshVertexIndexData.cpp" />
-    <ClCompile Include="..\CCOBB.cpp" />
-    <ClCompile Include="..\CCObjLoader.cpp" />
-    <ClCompile Include="..\CCRay.cpp" />
-    <ClCompile Include="..\CCSkeleton3D.cpp" />
-    <ClCompile Include="..\CCSprite3D.cpp" />
-    <ClCompile Include="..\CCSprite3DMaterial.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\3dExport.h" />
-    <ClInclude Include="..\CCAABB.h" />
-    <ClInclude Include="..\CCAnimate3D.h" />
-    <ClInclude Include="..\CCAnimation3D.h" />
-    <ClInclude Include="..\CCAnimationCurve.h" />
-    <ClInclude Include="..\CCAttachNode.h" />
-    <ClInclude Include="..\CCBundle3D.h" />
-    <ClInclude Include="..\CCBundle3DData.h" />
-    <ClInclude Include="..\CCBundleReader.h" />
-    <ClInclude Include="..\CCMesh.h" />
-    <ClInclude Include="..\CCMeshSkin.h" />
-    <ClInclude Include="..\CCMeshVertexIndexData.h" />
-    <ClInclude Include="..\CCOBB.h" />
-    <ClInclude Include="..\CCObjLoader.h" />
-    <ClInclude Include="..\CCRay.h" />
-    <ClInclude Include="..\CCSkeleton3D.h" />
-    <ClInclude Include="..\CCSprite3D.h" />
-    <ClInclude Include="..\CCSprite3DMaterial.h" />
-    <ClInclude Include="..\cocos3d.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E24950FA-5BC1-4AEE-A900-4F0259354BF0}</ProjectGuid>
-    <RootNamespace>libcocos3d</RootNamespace>
-    <ProjectName>libcocos3d</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir>$(Configuration).win32\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir>$(Configuration).win32\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>
-      </SDLCheck>
-      <AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>opengl32.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MinSpace</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>
-      </SDLCheck>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>opengl32.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

cocos/3d/proj.win32/libcocos3d.vcxproj.filters

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="3d">
-      <UniqueIdentifier>{6107c94d-579b-488f-86b7-c191d4c3b9aa}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\CCAABB.cpp">
-      <Filter>3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCAnimate3D.cpp">
-      <Filter>3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCAnimation3D.cpp">
-      <Filter>3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCAttachNode.cpp">
-      <Filter>3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBundle3D.cpp">
-      <Filter>3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBundleReader.cpp">
-      <Filter>3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCMesh.cpp">
-      <Filter>3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCMeshSkin.cpp">
-      <Filter>3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCOBB.cpp">
-      <Filter>3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCObjLoader.cpp">
-      <Filter>3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCRay.cpp">
-      <Filter>3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCSkeleton3D.cpp">
-      <Filter>3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCSprite3D.cpp">
-      <Filter>3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCSprite3DMaterial.cpp">
-      <Filter>3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCMeshVertexIndexData.cpp">
-      <Filter>3d</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\CCAABB.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCAnimate3D.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCAnimation3D.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCAnimationCurve.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCAttachNode.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBundle3D.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBundle3DData.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBundleReader.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCMesh.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCMeshSkin.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCOBB.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCObjLoader.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCRay.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCSkeleton3D.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCSprite3D.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCSprite3DMaterial.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\cocos3d.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\3dExport.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCMeshVertexIndexData.h">
-      <Filter>3d</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

cocos/3d/proj.win32/libcocos3d.vcxproj.user

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>

cocos/Android.mk

@@ -6,6 +6,8 @@ LOCAL_MODULE := cocos2dx_static
 
 LOCAL_MODULE_FILENAME := libcocos2d
 
+LOCAL_SHORT_COMMANDS := true
+
 LOCAL_SRC_FILES := \
 cocos2d.cpp \
 2d/CCAction.cpp \
@@ -196,7 +198,6 @@ LOCAL_SRC_FILES += 3d/CCRay.cpp \
                    3d/CCMesh.cpp \
                    3d/CCMeshSkin.cpp \
                    3d/CCMeshVertexIndexData.cpp \
-                   3d/CCSprite3DMaterial.cpp \
                    3d/CCObjLoader.cpp \
                    3d/CCSkeleton3D.cpp \
                    3d/CCSprite3D.cpp \

cocos/audio/android/Android.mk

@@ -1,18 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := cocosdenshion_static
-
-LOCAL_MODULE_FILENAME := libcocosdenshion
-
-LOCAL_SRC_FILES := cddSimpleAudioEngine.cpp \
-                   ccdandroidUtils.cpp \
-                   jni/cddandroidAndroidJavaEngine.cpp
-
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../include
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include \
-                    $(LOCAL_PATH)/../.. \
-                    $(LOCAL_PATH)/../../platform/android
-
-include $(BUILD_STATIC_LIBRARY)

cocos/audio/proj.win32/libcocosdenshion.vcxproj

@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>libcocosdenshion</ProjectName>
-    <ProjectGuid>{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}</ProjectGuid>
-    <RootNamespace>CocosDenshion.win32</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\2d\cocos2dx.props" />
-    <Import Project="..\..\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\2d\cocos2dx.props" />
-    <Import Project="..\..\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_EXPORT_DLL_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4251</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>winmm.lib;libcocos2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_EXPORT_DLL_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <DisableSpecificWarnings>4251</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MinSpace</Optimization>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>winmm.lib;libcocos2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\2d\libcocos2d.vcxproj">
-      <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

cocos/audio/proj.win32/libcocosdenshion.vcxproj.filters

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
-    </Filter>
-  </ItemGroup>
-</Project>

cocos/audio/proj.win32/libcocosdenshion.vcxproj.user

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>

cocos/base/CCDirector.cpp

@@ -1166,9 +1166,15 @@ void Director::getFPSImageData(unsigned char** datapointer, ssize_t* length)
 void Director::createStatsLabel()
 {
     Texture2D *texture = nullptr;
-
+    std::string fpsString = "00.0";
+    std::string drawBatchString = "000";
+    std::string drawVerticesString = "00000";
     if (_FPSLabel)
     {
+        fpsString = _FPSLabel->getString();
+        drawBatchString = _drawnBatchesLabel->getString();
+        drawVerticesString = _drawnVerticesLabel->getString();
+        
         CC_SAFE_RELEASE_NULL(_FPSLabel);
         CC_SAFE_RELEASE_NULL(_drawnBatchesLabel);
         CC_SAFE_RELEASE_NULL(_drawnVerticesLabel);
@@ -1205,19 +1211,19 @@ void Director::createStatsLabel()
     _FPSLabel = LabelAtlas::create();
     _FPSLabel->retain();
     _FPSLabel->setIgnoreContentScaleFactor(true);
-    _FPSLabel->initWithString("00.0", texture, 12, 32 , '.');
+    _FPSLabel->initWithString(fpsString, texture, 12, 32 , '.');
     _FPSLabel->setScale(scaleFactor);
 
     _drawnBatchesLabel = LabelAtlas::create();
     _drawnBatchesLabel->retain();
     _drawnBatchesLabel->setIgnoreContentScaleFactor(true);
-    _drawnBatchesLabel->initWithString("000", texture, 12, 32, '.');
+    _drawnBatchesLabel->initWithString(drawBatchString, texture, 12, 32, '.');
     _drawnBatchesLabel->setScale(scaleFactor);
 
     _drawnVerticesLabel = LabelAtlas::create();
     _drawnVerticesLabel->retain();
     _drawnVerticesLabel->setIgnoreContentScaleFactor(true);
-    _drawnVerticesLabel->initWithString("00000", texture, 12, 32, '.');
+    _drawnVerticesLabel->initWithString(drawVerticesString, texture, 12, 32, '.');
     _drawnVerticesLabel->setScale(scaleFactor);
 
 

cocos/cocos2d-prefix.pch

@@ -5,3 +5,7 @@
 #ifdef __OBJC__
     #import <Foundation/Foundation.h>
 #endif
+
+#ifdef __cplusplus
+#include "cocos2d.h"
+#endif

cocos/cocos2d.h

@@ -278,6 +278,9 @@ THE SOFTWARE.
 // CCDeprecated.h must be included at the end
 #include "deprecated/CCDeprecated.h"
 
+//3d
+#include "3d/cocos3d.h"
+
 
 NS_CC_BEGIN
 

cocos/editor-support/cocosbuilder/Android.mk

@@ -1,43 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := cocosbuilder_static
-
-LOCAL_MODULE_FILENAME := libcocosbuilder
-
-LOCAL_SRC_FILES := CCBAnimationManager.cpp \
-CCBFileLoader.cpp \
-CCBKeyframe.cpp \
-CCBReader.cpp \
-CCBSequence.cpp \
-CCBSequenceProperty.cpp \
-CCControlButtonLoader.cpp \
-CCControlLoader.cpp \
-CCLabelBMFontLoader.cpp \
-CCLabelTTFLoader.cpp \
-CCLayerColorLoader.cpp \
-CCLayerGradientLoader.cpp \
-CCLayerLoader.cpp \
-CCMenuItemImageLoader.cpp \
-CCMenuItemLoader.cpp \
-CCNode+CCBRelativePositioning.cpp \
-CCNodeLoader.cpp \
-CCNodeLoaderLibrary.cpp \
-CCParticleSystemQuadLoader.cpp \
-CCScale9SpriteLoader.cpp \
-CCScrollViewLoader.cpp \
-CCSpriteLoader.cpp
-
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \
-$(LOCAL_PATH)/../../..
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d \
-$(LOCAL_PATH) \
-$(LOCAL_PATH)/../../.. 
-
-
-LOCAL_STATIC_LIBRARIES := cocos_extension_static
-
-include $(BUILD_STATIC_LIBRARY)
-
-$(call import-module,extensions)

cocos/editor-support/cocosbuilder/CCBAnimationManager.h

@@ -13,14 +13,14 @@
 
 namespace cocosbuilder {
 
-class CCBAnimationManagerDelegate
+class CC_DLL CCBAnimationManagerDelegate
 {
 public:
     virtual ~CCBAnimationManagerDelegate() {}
     virtual void completedAnimationSequenceNamed(const char *name) = 0;
 };
 
-class CCBAnimationManager : public cocos2d::Ref
+class CC_DLL CCBAnimationManager : public cocos2d::Ref
 {
 public:
     bool _jsControlled;
@@ -160,7 +160,7 @@ private:
     
 };
 
-class CCBSetSpriteFrame : public cocos2d::ActionInstant
+class CC_DLL CCBSetSpriteFrame : public cocos2d::ActionInstant
 {
 public:
     /** creates a Place action with a position */
@@ -183,7 +183,7 @@ private:
 };
 
 
-class CCBSoundEffect : public cocos2d::ActionInstant
+class CC_DLL CCBSoundEffect : public cocos2d::ActionInstant
 {
 public:
     static CCBSoundEffect* actionWithSoundFile(const std::string &file, float pitch, float pan, float gain);
@@ -205,7 +205,7 @@ private:
 };
 
 
-class CCBRotateTo : public cocos2d::ActionInterval
+class CC_DLL CCBRotateTo : public cocos2d::ActionInterval
 {
 public:
     static CCBRotateTo* create(float fDuration, float fAngle);
@@ -224,7 +224,7 @@ private:
 };
 
 
-class CCBRotateXTo: public cocos2d::ActionInterval
+class CC_DLL CCBRotateXTo: public cocos2d::ActionInterval
 {
 public:
     static CCBRotateXTo* create(float fDuration, float fAngle);
@@ -243,7 +243,7 @@ private:
 };
 
 
-class CCBRotateYTo: public cocos2d::ActionInterval
+class CC_DLL CCBRotateYTo: public cocos2d::ActionInterval
 {
 public:
     static CCBRotateYTo* create(float fDuration, float fAngle);
@@ -262,7 +262,7 @@ private:
 };
 
 
-class CCBEaseInstant : public cocos2d::ActionEase
+class CC_DLL CCBEaseInstant : public cocos2d::ActionEase
 {
 public:
     static CCBEaseInstant* create(cocos2d::ActionInterval *pAction);

cocos/editor-support/cocosbuilder/CCBFileLoader.h

@@ -9,7 +9,7 @@ namespace cocosbuilder {
 /* Forward declaration. */
 class CCBReader;
 
-class CCBFileLoader : public NodeLoader {
+class CC_DLL CCBFileLoader : public NodeLoader {
     public:
         /**
          * @js NA

cocos/editor-support/cocosbuilder/CCBKeyframe.h

@@ -7,7 +7,7 @@
 
 namespace cocosbuilder {
 
-class CCBKeyframe : public cocos2d::Ref
+class CC_DLL CCBKeyframe : public cocos2d::Ref
 {
 public:
     enum class EasingType

cocos/editor-support/cocosbuilder/CCBMemberVariableAssigner.h

@@ -23,7 +23,7 @@ namespace cocosbuilder {
         return true; \
     }
 
-class CCBMemberVariableAssigner {
+class CC_DLL CCBMemberVariableAssigner {
     public:
         /**
          * @js NA

cocos/editor-support/cocosbuilder/CCBReader.h

@@ -8,6 +8,7 @@
 #include "base/CCMap.h"
 #include "CCBSequence.h"
 #include "extensions/GUI/CCControlExtension/CCControl.h"
+#include "cocosbuilder/CCBAnimationManager.h"
 
 #define CCB_STATIC_NEW_AUTORELEASE_OBJECT_METHOD(T, METHOD) static T * METHOD() { \
     T * ptr = new T(); \
@@ -64,7 +65,7 @@ class CCBKeyframe;
 /**
  * @brief Parse CCBI file which is generated by CocosBuilder
  */
-class CCBReader : public cocos2d::Ref 
+class CC_DLL CCBReader : public cocos2d::Ref 
 {
 public:
     enum class PropertyType {

cocos/editor-support/cocosbuilder/CCBSelectorResolver.h

@@ -18,7 +18,7 @@ namespace cocosbuilder {
     return callfuncN_selector(METHOD); \
 }
 
-class CCBSelectorResolver {
+class CC_DLL CCBSelectorResolver {
     public:
     /**
      * @js NA
@@ -31,7 +31,7 @@ class CCBSelectorResolver {
 };
 
 
-class CCBScriptOwnerProtocol {
+class CC_DLL CCBScriptOwnerProtocol {
 public:
     /**
      * @js NA

cocos/editor-support/cocosbuilder/CCBSequence.h

@@ -8,7 +8,7 @@
 
 namespace cocosbuilder {
 
-class CCBSequence : public cocos2d::Ref
+class CC_DLL CCBSequence : public cocos2d::Ref
 {
 public:
     CCBSequence();

cocos/editor-support/cocosbuilder/CCBSequenceProperty.h

@@ -7,7 +7,7 @@
 
 namespace cocosbuilder {
 
-class CCBSequenceProperty : public cocos2d::Ref
+class CC_DLL CCBSequenceProperty : public cocos2d::Ref
 {
 public:
     /**

cocos/editor-support/cocosbuilder/CCControlButtonLoader.h

@@ -9,7 +9,7 @@ namespace cocosbuilder {
 /* Forward declaration. */
 class CCBReader;
 
-class ControlButtonLoader : public ControlLoader {
+class CC_DLL ControlButtonLoader : public ControlLoader {
     public:
         /**
          * @js NA

cocos/editor-support/cocosbuilder/CCControlLoader.h

@@ -9,7 +9,7 @@ namespace cocosbuilder {
 /* Forward declaration. */
 class CCBReader;
 
-class ControlLoader : public NodeLoader {
+class CC_DLL ControlLoader : public NodeLoader {
 public:
     /**
     * @js NA

cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h

@@ -11,7 +11,7 @@ namespace cocosbuilder {
 /* Forward declaration. */
 class CCBReader;
 
-class LabelBMFontLoader : public NodeLoader {
+class CC_DLL LabelBMFontLoader : public NodeLoader {
 public:
     /**
      * @js NA

cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h

@@ -11,7 +11,7 @@ namespace cocosbuilder {
 /* Forward declaration. */
 class CCBReader;
 
-class LabelTTFLoader : public NodeLoader {
+class CC_DLL LabelTTFLoader : public NodeLoader {
 public:
     /**
      * @js NA

cocos/editor-support/cocosbuilder/CCLayerColorLoader.h

@@ -8,7 +8,7 @@ namespace cocosbuilder {
 /* Forward declaration. */
 class CCBReader;
 
-class LayerColorLoader : public LayerLoader {
+class CC_DLL LayerColorLoader : public LayerLoader {
 public:
     /**
      * @js NA

cocos/editor-support/cocosbuilder/CCLayerGradientLoader.h

@@ -8,7 +8,7 @@ namespace cocosbuilder {
 /* Forward declaration. */
 class CCBReader;
 
-class LayerGradientLoader : public LayerLoader {
+class CC_DLL LayerGradientLoader : public LayerLoader {
 public:
     /**
      * @js NA

cocos/editor-support/cocosbuilder/CCLayerLoader.h

@@ -8,7 +8,7 @@ namespace cocosbuilder {
 /* Forward declaration. */
 class CCBReader;
 
-class LayerLoader : public NodeLoader {
+class CC_DLL LayerLoader : public NodeLoader {
 public:
     /**
      * @js NA

cocos/editor-support/cocosbuilder/CCMenuItemImageLoader.h

@@ -8,7 +8,7 @@ namespace cocosbuilder {
 /* Forward declaration. */
 class CCBReader;
 
-class MenuItemImageLoader : public MenuItemLoader {
+class CC_DLL MenuItemImageLoader : public MenuItemLoader {
 public:
     /**
      * @js NA

cocos/editor-support/cocosbuilder/CCMenuItemLoader.h

@@ -11,7 +11,7 @@ namespace cocosbuilder {
 /* Forward declaration. */
 class CCBReader;
 
-class MenuItemLoader : public NodeLoader {
+class CC_DLL MenuItemLoader : public NodeLoader {
 public:
     /**
      * @js NA

cocos/editor-support/cocosbuilder/CCMenuLoader.h

@@ -10,7 +10,7 @@ namespace cocosbuilder {
 /* Forward declaration. */
 class CCBReader;
 
-class MenuLoader : public LayerLoader {
+class CC_DLL MenuLoader : public LayerLoader {
 public:
     /**
      * @js NA

cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.cpp

@@ -5,7 +5,7 @@ using namespace cocos2d;
 
 namespace cocosbuilder {
 
-Vec2 getAbsolutePosition(const Vec2 &pt, CCBReader::PositionType type, const Size &containerSize, const std::string& propName)
+CC_DLL Vec2 getAbsolutePosition(const Vec2 &pt, CCBReader::PositionType type, const Size &containerSize, const std::string& propName)
 {
     Vec2 absPt = Vec2(0,0);
     if (type == CCBReader::PositionType::RELATIVE_BOTTOM_LEFT)
@@ -43,7 +43,7 @@ Vec2 getAbsolutePosition(const Vec2 &pt, CCBReader::PositionType type, const Siz
     return absPt;
 }
 
-void setRelativeScale(Node *pNode, float scaleX, float scaleY, CCBReader::ScaleType type, const std::string& propName)
+CC_DLL void setRelativeScale(Node *pNode, float scaleX, float scaleY, CCBReader::ScaleType type, const std::string& propName)
 {
     CCASSERT(pNode, "pNode should not be null");
     

cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.h

@@ -5,9 +5,9 @@
 
 namespace cocosbuilder {
 
-extern cocos2d::Vec2 getAbsolutePosition(const cocos2d::Vec2 &pt, CCBReader::PositionType type, const cocos2d::Size &containerSize, const std::string&propName);
+extern CC_DLL cocos2d::Vec2 getAbsolutePosition(const cocos2d::Vec2 &pt, CCBReader::PositionType type, const cocos2d::Size &containerSize, const std::string&propName);
 
-extern void setRelativeScale(cocos2d::Node *node, float scaleX, float scaleY, CCBReader::ScaleType type, const std::string& propName);
+extern CC_DLL void setRelativeScale(cocos2d::Node *node, float scaleX, float scaleY, CCBReader::ScaleType type, const std::string& propName);
 
 }
 

cocos/editor-support/cocosbuilder/CCNodeLoader.h

@@ -42,7 +42,7 @@ struct BlockControlData {
 /* Forward declaration. */
 class CCBReader;
 
-class NodeLoader : public cocos2d::Ref {
+class CC_DLL NodeLoader : public cocos2d::Ref {
     public:
         /**
          * @js NA

cocos/editor-support/cocosbuilder/CCNodeLoaderLibrary.h

@@ -10,7 +10,7 @@ class NodeLoader;
 typedef std::map<std::string, NodeLoader *> NodeLoaderMap;
 typedef std::pair<std::string, NodeLoader *> NodeLoaderMapEntry;
 
-class NodeLoaderLibrary : public cocos2d::Ref
+class CC_DLL NodeLoaderLibrary : public cocos2d::Ref
 {
 public:
     /**

cocos/editor-support/cocosbuilder/CCNodeLoaderListener.h

@@ -4,7 +4,7 @@
 
 namespace cocosbuilder {
 
-class NodeLoaderListener {
+class CC_DLL NodeLoaderListener {
     public:
         /**
          * @js NA

cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h

@@ -11,7 +11,7 @@ namespace cocosbuilder {
 /* Forward declaration. */
 class CCBReader;
 
-class ParticleSystemQuadLoader : public NodeLoader {
+class CC_DLL ParticleSystemQuadLoader : public NodeLoader {
 public:
     /**
      * @js NA

cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.h

@@ -10,7 +10,7 @@ namespace cocosbuilder {
 /* Forward declaration. */
 class CCBReader;
 
-class Scale9SpriteLoader : public NodeLoader {
+class CC_DLL Scale9SpriteLoader : public NodeLoader {
 public:
     /**
      * @js NA

cocos/editor-support/cocosbuilder/CCScrollViewLoader.h

@@ -9,7 +9,7 @@ namespace cocosbuilder {
 /* Forward declaration. */
 class CCBReader;
 
-class ScrollViewLoader : public NodeLoader {
+class CC_DLL ScrollViewLoader : public NodeLoader {
 public:
     /**
      * @js NA

cocos/editor-support/cocosbuilder/CCSpriteLoader.h

@@ -8,7 +8,7 @@ namespace cocosbuilder {
 /* Forward declaration. */
 class CCBReader;
 
-class SpriteLoader : public NodeLoader {
+class CC_DLL SpriteLoader : public NodeLoader {
 public:
     /**
      * @js NA

cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.filters

@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{e4e3b3ff-6d85-4408-bbdf-38f296363698}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{e79db1b4-c859-48c0-ab1e-a31200c09923}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\CCBAnimationManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBFileLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBKeyframe.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBMemberVariableAssigner.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBReader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBSelectorResolver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBSequence.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCBSequenceProperty.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCControlButtonLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCControlLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCLabelBMFontLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCLabelTTFLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCLayerColorLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCLayerGradientLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCLayerLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCMenuItemImageLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCMenuItemLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCMenuLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCNode+CCBRelativePositioning.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCNodeLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCNodeLoaderLibrary.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCNodeLoaderListener.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCParticleSystemQuadLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCScale9SpriteLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCScrollViewLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CCSpriteLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CocosBuilder.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\CCBAnimationManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBFileLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBKeyframe.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBSequence.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCBSequenceProperty.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCControlButtonLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCControlLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCLabelBMFontLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCLabelTTFLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCLayerColorLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCLayerGradientLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCLayerLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCMenuItemImageLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCMenuItemLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCNode+CCBRelativePositioning.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCNodeLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCNodeLoaderLibrary.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCParticleSystemQuadLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCScale9SpriteLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCScrollViewLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\CCSpriteLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>

cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.user

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>

cocos/editor-support/cocosbuilder/proj.win32/libcocosbuilder.vcxproj

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}</ProjectGuid>
-    <RootNamespace>libcocosbuilder</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir>$(Configuration).win32\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir>$(Configuration).win32\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>
-      </SDLCheck>
-      <AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MinSpace</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>
-      </SDLCheck>
-      <AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\2d\libcocos2d.vcxproj">
-      <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\CCBAnimationManager.h" />
-    <ClInclude Include="..\CCBFileLoader.h" />
-    <ClInclude Include="..\CCBKeyframe.h" />
-    <ClInclude Include="..\CCBMemberVariableAssigner.h" />
-    <ClInclude Include="..\CCBReader.h" />
-    <ClInclude Include="..\CCBSelectorResolver.h" />
-    <ClInclude Include="..\CCBSequence.h" />
-    <ClInclude Include="..\CCBSequenceProperty.h" />
-    <ClInclude Include="..\CCControlButtonLoader.h" />
-    <ClInclude Include="..\CCControlLoader.h" />
-    <ClInclude Include="..\CCLabelBMFontLoader.h" />
-    <ClInclude Include="..\CCLabelTTFLoader.h" />
-    <ClInclude Include="..\CCLayerColorLoader.h" />
-    <ClInclude Include="..\CCLayerGradientLoader.h" />
-    <ClInclude Include="..\CCLayerLoader.h" />
-    <ClInclude Include="..\CCMenuItemImageLoader.h" />
-    <ClInclude Include="..\CCMenuItemLoader.h" />
-    <ClInclude Include="..\CCMenuLoader.h" />
-    <ClInclude Include="..\CCNode+CCBRelativePositioning.h" />
-    <ClInclude Include="..\CCNodeLoader.h" />
-    <ClInclude Include="..\CCNodeLoaderLibrary.h" />
-    <ClInclude Include="..\CCNodeLoaderListener.h" />
-    <ClInclude Include="..\CCParticleSystemQuadLoader.h" />
-    <ClInclude Include="..\CCScale9SpriteLoader.h" />
-    <ClInclude Include="..\CCScrollViewLoader.h" />
-    <ClInclude Include="..\CCSpriteLoader.h" />
-    <ClInclude Include="..\CocosBuilder.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\CCBAnimationManager.cpp" />
-    <ClCompile Include="..\CCBFileLoader.cpp" />
-    <ClCompile Include="..\CCBKeyframe.cpp" />
-    <ClCompile Include="..\CCBReader.cpp" />
-    <ClCompile Include="..\CCBSequence.cpp" />
-    <ClCompile Include="..\CCBSequenceProperty.cpp" />
-    <ClCompile Include="..\CCControlButtonLoader.cpp" />
-    <ClCompile Include="..\CCControlLoader.cpp" />
-    <ClCompile Include="..\CCLabelBMFontLoader.cpp" />
-    <ClCompile Include="..\CCLabelTTFLoader.cpp" />
-    <ClCompile Include="..\CCLayerColorLoader.cpp" />
-    <ClCompile Include="..\CCLayerGradientLoader.cpp" />
-    <ClCompile Include="..\CCLayerLoader.cpp" />
-    <ClCompile Include="..\CCMenuItemImageLoader.cpp" />
-    <ClCompile Include="..\CCMenuItemLoader.cpp" />
-    <ClCompile Include="..\CCNode+CCBRelativePositioning.cpp" />
-    <ClCompile Include="..\CCNodeLoader.cpp" />
-    <ClCompile Include="..\CCNodeLoaderLibrary.cpp" />
-    <ClCompile Include="..\CCParticleSystemQuadLoader.cpp" />
-    <ClCompile Include="..\CCScale9SpriteLoader.cpp" />
-    <ClCompile Include="..\CCScrollViewLoader.cpp" />
-    <ClCompile Include="..\CCSpriteLoader.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

cocos/editor-support/cocostudio/Android.mk

@@ -1,81 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := cocostudio_static
-
-LOCAL_MODULE_FILENAME := libcocostudio
-
-LOCAL_SRC_FILES := CCActionFrame.cpp \
-CCActionFrameEasing.cpp \
-CCActionManagerEx.cpp \
-CCActionNode.cpp \
-CCActionObject.cpp \
-CCArmature.cpp \
-CCBone.cpp \
-CCArmatureAnimation.cpp \
-CCProcessBase.cpp \
-CCTween.cpp \
-CCDatas.cpp \
-CCBatchNode.cpp \
-CCDecorativeDisplay.cpp \
-CCDisplayFactory.cpp \
-CCDisplayManager.cpp \
-CCSkin.cpp \
-CCColliderDetector.cpp \
-CCArmatureDataManager.cpp \
-CCArmatureDefine.cpp \
-CCDataReaderHelper.cpp \
-CCSpriteFrameCacheHelper.cpp \
-CCTransformHelp.cpp \
-CCUtilMath.cpp \
-CCComAttribute.cpp \
-CCComAudio.cpp \
-CCComController.cpp \
-CCComRender.cpp \
-CCInputDelegate.cpp \
-DictionaryHelper.cpp \
-CCSGUIReader.cpp \
-CCSSceneReader.cpp \
-TriggerBase.cpp \
-TriggerMng.cpp \
-TriggerObj.cpp \
-CocoLoader.cpp \
-WidgetReader/WidgetReader.cpp \
-WidgetReader/ButtonReader/ButtonReader.cpp \
-WidgetReader/CheckBoxReader/CheckBoxReader.cpp \
-WidgetReader/ImageViewReader/ImageViewReader.cpp \
-WidgetReader/LayoutReader/LayoutReader.cpp \
-WidgetReader/ListViewReader/ListViewReader.cpp \
-WidgetReader/LoadingBarReader/LoadingBarReader.cpp \
-WidgetReader/PageViewReader/PageViewReader.cpp \
-WidgetReader/ScrollViewReader/ScrollViewReader.cpp \
-WidgetReader/SliderReader/SliderReader.cpp \
-WidgetReader/TextAtlasReader/TextAtlasReader.cpp \
-WidgetReader/TextBMFontReader/TextBMFontReader.cpp \
-WidgetReader/TextFieldReader/TextFieldReader.cpp \
-WidgetReader/TextReader/TextReader.cpp \
-ActionTimeline/CCNodeReader.cpp \
-ActionTimeline/CCActionTimelineCache.cpp \
-ActionTimeline/CCFrame.cpp \
-ActionTimeline/CCTimeLine.cpp \
-ActionTimeline/CCActionTimeline.cpp
-
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \
-$(LOCAL_PATH)/../../../external
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. \
-$(LOCAL_PATH)/../../../external \
-$(LOCAL_PATH)/.. \
-$(LOCAL_PATH)/../.. \
-$(LOCAL_PATH)/WidgetReader
-
-LOCAL_CFLAGS += -fexceptions
-
-
-LOCAL_STATIC_LIBRARIES := cocos_ui_static
-LOCAL_STATIC_LIBRARIES += cocosdenshion_static
-
-include $(BUILD_STATIC_LIBRARY)
-
-$(call import-module,ui)
-$(call import-module,audio/android)

cocos/editor-support/cocostudio/CCInputDelegate.cpp

@@ -28,6 +28,7 @@ THE SOFTWARE.
 #include "base/CCEventListenerTouch.h"
 #include "base/CCEventListenerAcceleration.h"
 #include "base/CCEventListenerKeyboard.h"
+#include "base/CCEventDispatcher.h"
 
 using namespace cocos2d;
 

cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj

@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\2d\libcocos2d.vcxproj">
-      <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\ui\proj.win32\libui.vcxproj">
-      <Project>{7e06e92c-537a-442b-9e4a-4761c84f8a1a}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B57CF53F-2E49-4031-9822-047CC0E6BDE2}</ProjectGuid>
-    <RootNamespace>libcocostudio</RootNamespace>
-    <ProjectName>libcocostudio</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir>$(Configuration).win32\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir>$(Configuration).win32\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>
-      </SDLCheck>
-      <AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\win32-specific\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRSTUDIODLL;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;COCOS2DXWIN32_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libzlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MinSpace</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>
-      </SDLCheck>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USRSTUDIODLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\win32-specific\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>libzlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.filters

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />

cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.user

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>