Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3

2014-06-17 10:53:47 +08:00 · 2014-06-17 10:53:47 +08:00 · 020d6da43c
parent ae5965f05f 07ec5970fb
commit 020d6da43c
2 changed files with 6 additions and 2 deletions
--- a/cocos/3d/CCBundle3D.h
+++ b/cocos/3d/CCBundle3D.h
@ -34,7 +34,7 @@
 #include "3d/CCMesh.h"
 #include "3d/CCBundle3DData.h"

-#include "document.h"
+#include "external/json/document.h"

 NS_CC_BEGIN

--- a/cocos/3d/CMakeLists.txt
+++ b/cocos/3d/CMakeLists.txt
@ -2,6 +2,10 @@ set(COCOS_3D_SRC
  3d/CCMesh.cpp
  3d/CCObjLoader.cpp
  3d/CCSprite3D.cpp
-  3d/CCSprite3DDataCache.cpp
+  3d/CCSprite3DMaterial.cpp
+  3d/CCAnimate3D.cpp
+  3d/CCAnimation3D.cpp
+  3d/CCBundle3D.cpp
+  3d/CCMeshSkin.cpp
 )