pandamicro · pandamicro · May 26, 2014 · May 26, 2014 · May 26, 2014 · May 26, 2014
diff --git a/.gitmodules b/.gitmodules
@@ -3,7 +3,7 @@
         url = git://github.com/cocos2d/cocos2d-console.git
 [submodule "plugin"]
         path = plugin
-        url = https://github.com/cocos2d-x/plugin-x.git
+		url=https://github.com/cocos2d-x/plugin-x.git
 [submodule "tools/bindings-generator"]
         path = tools/bindings-generator
         url = git://github.com/cocos2d/bindings-generator.git

diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj
diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj
@@ -228,6 +228,8 @@
 		1A0EE57F18CDFBBE004CD58F /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37718CD9E180087CE3A /* StudioConstants.lua */; };
 		1A1645A6191B6281008C7C7F /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; };
 		1A1645A9191B6283008C7C7F /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; };
+		1A1AAACB192EE79200EFD411 /* Manifests in Resources */ = {isa = PBXBuildFile; fileRef = BA53B1B4192C4035002E0804 /* Manifests */; };
+		1A1AAACE192EE79500EFD411 /* Manifests in Resources */ = {isa = PBXBuildFile; fileRef = BA53B1B4192C4035002E0804 /* Manifests */; };
 		1A221C9C191771E300FD2BE4 /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; };
 		1A221C9D191771E400FD2BE4 /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; };
 		1A9F808D177E98A600D9A1CB /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; };
@@ -917,6 +919,10 @@
 		A07A52C31783B02C0073F6A7 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52C11783B01F0073F6A7 /* AVFoundation.framework */; };
 		B2507B6B192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; };
 		B2507B6C192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; };
+		BA53B19E192B556F002E0804 /* AssetsManagerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BA53B19C192B556F002E0804 /* AssetsManagerTest.cpp */; };
+		BA53B19F192B556F002E0804 /* AssetsManagerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BA53B19C192B556F002E0804 /* AssetsManagerTest.cpp */; };
+		BA53B1B5192C4035002E0804 /* Manifests in Resources */ = {isa = PBXBuildFile; fileRef = BA53B1B4192C4035002E0804 /* Manifests */; };
+		BA53B1B6192C4035002E0804 /* Manifests in Resources */ = {isa = PBXBuildFile; fileRef = BA53B1B4192C4035002E0804 /* Manifests */; };
 		C04F935A1941B05400E9FEAB /* TileMapTest2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C04F93581941B05400E9FEAB /* TileMapTest2.cpp */; };
 		C04F935B1941B05400E9FEAB /* TileMapTest2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C04F93581941B05400E9FEAB /* TileMapTest2.cpp */; };
 		C08689C118D370C90093E810 /* background.caf in Resources */ = {isa = PBXBuildFile; fileRef = C08689C018D370C90093E810 /* background.caf */; };
@@ -3175,6 +3181,9 @@
 		A07A52BB1783AEB80073F6A7 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; };
 		A07A52C11783B01F0073F6A7 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/AVFoundation.framework; sourceTree = DEVELOPER_DIR; };
 		B2507B6A192589AF00FA4972 /* Shaders3D */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Shaders3D; path = "../tests/cpp-tests/Resources/Shaders3D"; sourceTree = "<group>"; };
+		BA53B19C192B556F002E0804 /* AssetsManagerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AssetsManagerTest.cpp; path = ExtensionsTest/AssetsManagerTest/AssetsManagerTest.cpp; sourceTree = "<group>"; };
+		BA53B19D192B556F002E0804 /* AssetsManagerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AssetsManagerTest.h; path = ExtensionsTest/AssetsManagerTest/AssetsManagerTest.h; sourceTree = "<group>"; };
+		BA53B1B4192C4035002E0804 /* Manifests */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Manifests; path = "../tests/cpp-tests/Resources/Manifests"; sourceTree = "<group>"; };
 		C04F93581941B05400E9FEAB /* TileMapTest2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TileMapTest2.cpp; sourceTree = "<group>"; };
 		C04F93591941B05400E9FEAB /* TileMapTest2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TileMapTest2.h; sourceTree = "<group>"; };
 		C08689C018D370C90093E810 /* background.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = background.caf; path = "../tests/cpp-tests/Resources/background.caf"; sourceTree = "<group>"; };
@@ -6000,6 +6009,7 @@
 		1AC359B418CECF0B00F37B72 /* ExtensionsTest */ = {
 			isa = PBXGroup;
 			children = (
+				BA53B171192B07C1002E0804 /* AssetsManagerTest */,
 				38FA2E70194AEBE100FF2BE4 /* CocoStudioActionTimelineTest */,
 				1AC359B518CECF0B00F37B72 /* CocosBuilderTest */,
 				1AC359DC18CECF0B00F37B72 /* CocoStudioArmatureTest */,
@@ -6715,6 +6725,7 @@
 				1AC35CBA18CED84500F37B72 /* fonts */,
 				1AC35CBC18CED84500F37B72 /* hd */,
 				1AC35CBE18CED84500F37B72 /* Images */,
+				BA53B1B4192C4035002E0804 /* Manifests */,
 				1AC35CC118CED84500F37B72 /* Misc */,
 				1AC35CC318CED84500F37B72 /* Particles */,
 				1AC35CC618CED84500F37B72 /* Shaders */,
@@ -7361,6 +7372,16 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		BA53B171192B07C1002E0804 /* AssetsManagerTest */ = {
+			isa = PBXGroup;
+			children = (
+				BA53B19C192B556F002E0804 /* AssetsManagerTest.cpp */,
+				BA53B19D192B556F002E0804 /* AssetsManagerTest.h */,
+			);
+			name = AssetsManagerTest;
+			path = ..;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -7889,6 +7910,7 @@
 				1AC35DC818CEE65100F37B72 /* TileMaps in Resources */,
 				1ABCA37C18CD9E180087CE3A /* Cocos2d.lua in Resources */,
 				1AC35DBE18CEE65100F37B72 /* fonts in Resources */,
+				1A1AAACB192EE79200EFD411 /* Manifests in Resources */,
 				1AC35DDE18CEE65900F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */,
 				1AC35DBC18CEE65100F37B72 /* configs in Resources */,
 				1ABCA38818CD9E180087CE3A /* DeprecatedOpenglEnum.lua in Resources */,
@@ -8010,6 +8032,7 @@
 				1AC35D9C18CEE5D100F37B72 /* Icon-114.png in Resources */,
 				1ABCA38B18CD9E180087CE3A /* DrawPrimitives.lua in Resources */,
 				1ABCA39918CD9E180087CE3A /* OpenglConstants.lua in Resources */,
+				1A1AAACE192EE79500EFD411 /* Manifests in Resources */,
 				1ABCA37918CD9E180087CE3A /* AudioEngine.lua in Resources */,
 				1AC35D9F18CEE5D100F37B72 /* Icon-152.png in Resources */,
 				1AC35DEE18CEE65B00F37B72 /* background.mp3 in Resources */,
@@ -8040,6 +8063,7 @@
 				1AC35CEC18CED84500F37B72 /* fonts in Resources */,
 				1AC35CCA18CED84500F37B72 /* animations in Resources */,
 				1AC35CEA18CED84500F37B72 /* fileLookup.plist in Resources */,
+				BA53B1B5192C4035002E0804 /* Manifests in Resources */,
 				1A221C9C191771E300FD2BE4 /* ccs-res in Resources */,
 				1AC35CF018CED84500F37B72 /* hd in Resources */,
 				1AC35CFC18CED84500F37B72 /* music.mid in Resources */,
@@ -8105,6 +8129,7 @@
 				1AC35C9518CECF1400F37B72 /* Icon-72.png in Resources */,
 				1AC35D0B18CED84500F37B72 /* zwoptex in Resources */,
 				1AC35CF518CED84500F37B72 /* Images in Resources */,
+				BA53B1B6192C4035002E0804 /* Manifests in Resources */,
 				1AC35C9118CECF1400F37B72 /* Icon-40.png in Resources */,
 				1AC35C8B18CECF1400F37B72 /* Icon-100.png in Resources */,
 				1AC35D0118CED84500F37B72 /* pew-pew-lei.wav in Resources */,
@@ -8385,6 +8410,7 @@
 				29080DAB191B595E0066F8DF /* UIFocusTest.cpp in Sources */,
 				29080DD9191B595E0066F8DF /* UITextBMFontTest_Editor.cpp in Sources */,
 				1AC35B5918CECF0C00F37B72 /* controller.cpp in Sources */,
+				BA53B19E192B556F002E0804 /* AssetsManagerTest.cpp in Sources */,
 				1AC35C2918CECF0C00F37B72 /* PerformanceEventDispatcherTest.cpp in Sources */,
 				1AC35CA618CECF1E00F37B72 /* main.cpp in Sources */,
 				1AC35BE918CECF0C00F37B72 /* CCControlSceneManager.cpp in Sources */,
@@ -8468,6 +8494,7 @@
 				29080DBE191B595E0066F8DF /* UIPageViewTest.cpp in Sources */,
 				1AC35BDC18CECF0C00F37B72 /* SceneEditorTest.cpp in Sources */,
 				1AC35B4C18CECF0C00F37B72 /* BugsTest.cpp in Sources */,
+				BA53B19F192B556F002E0804 /* AssetsManagerTest.cpp in Sources */,
 				1AC35C5218CECF0C00F37B72 /* testBasic.cpp in Sources */,
 				1AC35B7A18CECF0C00F37B72 /* EnemyController.cpp in Sources */,
 				29080DE6191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp in Sources */,

diff --git a/cocos/2d/CCAction.h b/cocos/2d/CCAction.h
@@ -99,10 +99,11 @@ class CC_DLL Action : public Ref, public Clonable
     inline int getTag() const { return _tag; }
     inline void setTag(int tag) { _tag = tag; }
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     Action();
     virtual ~Action();
 
+protected:
     Node    *_originalTarget;
     /** The "target".
     The target will be set with the 'startWithTarget' method.
@@ -140,12 +141,13 @@ class CC_DLL FiniteTimeAction : public Action
     virtual FiniteTimeAction* reverse() const override = 0;
 	virtual FiniteTimeAction* clone() const override = 0;
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     FiniteTimeAction()
 	: _duration(0)
     {}
     virtual ~FiniteTimeAction(){}
 
+protected:
     //! duration in seconds
     float _duration;
 

diff --git a/cocos/2d/CCActionGrid.h b/cocos/2d/CCActionGrid.h
@@ -52,12 +52,13 @@ class CC_DLL GridAction : public ActionInterval
     virtual GridAction* reverse() const override;
     virtual void startWithTarget(Node *target) override;
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     GridAction() {}
     virtual ~GridAction() {}
     /** initializes the action with size and duration */
     bool initWithDuration(float duration, const Size& gridSize);
 
+protected:
     Size _gridSize;
 
     NodeGrid* _gridNodeTarget;
@@ -273,10 +274,11 @@ class CC_DLL StopGrid : public ActionInstant
 	virtual StopGrid* clone() const override;
 	virtual StopGrid* reverse() const override;
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     StopGrid() {}
     virtual ~StopGrid() {}
 
+protected:
     NodeGrid* _gridNodeTarget;
 
     void cacheTargetAsGridNode();

diff --git a/cocos/2d/CCActionGrid3D.h b/cocos/2d/CCActionGrid3D.h
@@ -108,7 +108,7 @@ class CC_DLL FlipY3D : public FlipX3D
     virtual void update(float time) override;
 	virtual FlipY3D* clone() const override;
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     FlipY3D() {}
     virtual ~FlipY3D() {}
 private:

diff --git a/cocos/2d/CCActionInstant.h b/cocos/2d/CCActionInstant.h
@@ -74,7 +74,7 @@ class CC_DLL Show : public ActionInstant
     virtual ActionInstant* reverse() const override;
 	virtual Show* clone() const override;
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     Show(){}
     virtual ~Show(){}
 
@@ -98,7 +98,7 @@ class CC_DLL Hide : public ActionInstant
 	virtual ActionInstant* reverse() const override;
 	virtual Hide* clone() const override;
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     Hide(){}
     virtual ~Hide(){}
 
@@ -121,7 +121,7 @@ class CC_DLL ToggleVisibility : public ActionInstant
 	virtual ToggleVisibility* reverse() const override;
 	virtual ToggleVisibility* clone() const override;
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     ToggleVisibility(){}
     virtual ~ToggleVisibility(){}
 
@@ -402,13 +402,14 @@ class CC_DLL  __CCCallFuncND : public CallFunc
 	virtual __CCCallFuncND* clone() const override;
     virtual void execute() override;
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     __CCCallFuncND() {}
     virtual ~__CCCallFuncND() {}
 
     /** initializes the action with the callback and the data to pass as an argument */
     bool initWithTarget(Ref* target, SEL_CallFuncND selector, void* d);
 
+protected:
     SEL_CallFuncND _callFuncND;
     void* _data;
 
@@ -441,7 +442,7 @@ class CC_DLL __CCCallFuncO : public CallFunc
     Ref* getObject() const;
     void setObject(Ref* obj);
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     __CCCallFuncO();
     virtual ~__CCCallFuncO();
     /** initializes the action with the callback
@@ -450,7 +451,7 @@ class CC_DLL __CCCallFuncO : public CallFunc
      */
     bool initWithTarget(Ref* target, SEL_CallFuncO selector, Ref* object);
 
-
+protected:
     /** object to be passed as argument */
     Ref* _object;
     SEL_CallFuncO _callFuncO;

diff --git a/cocos/2d/CCActionTiledGrid.h b/cocos/2d/CCActionTiledGrid.h
@@ -142,7 +142,7 @@ class CC_DLL FadeOutTRTiles : public TiledGrid3DAction
     virtual void update(float time) override;
 	virtual FadeOutTRTiles* clone() const override;
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     FadeOutTRTiles() {}
     virtual ~FadeOutTRTiles() {}
 
@@ -163,7 +163,7 @@ class CC_DLL FadeOutBLTiles : public FadeOutTRTiles
     virtual float testFunc(const Size& pos, float time) override;
 	virtual FadeOutBLTiles* clone() const override;
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     FadeOutBLTiles() {}
     virtual ~FadeOutBLTiles() {}
 
@@ -186,7 +186,7 @@ class CC_DLL FadeOutUpTiles : public FadeOutTRTiles
 	virtual FadeOutUpTiles* clone() const override;
     virtual float testFunc(const Size& pos, float time) override;
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     FadeOutUpTiles() {}
     virtual ~FadeOutUpTiles() {}
 
@@ -207,7 +207,7 @@ class CC_DLL FadeOutDownTiles : public FadeOutUpTiles
 	virtual FadeOutDownTiles* clone() const override;
     virtual float testFunc(const Size& pos, float time) override;
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     FadeOutDownTiles() {}
     virtual ~FadeOutDownTiles() {}
 

diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp
@@ -1102,10 +1102,6 @@ void Label::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t pare
     }
 
     director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
-
-    // FIX ME: Why need to set _orderOfArrival to 0??
-    // Please refer to https://github.com/cocos2d/cocos2d-x/pull/6920
-    // setOrderOfArrival(0);
 }
 
 void Label::setSystemFontName(const std::string& systemFont)

diff --git a/cocos/2d/CCLabel.h b/cocos/2d/CCLabel.h
@@ -275,6 +275,18 @@ class CC_DLL Label : public SpriteBatchNode, public LabelProtocol
 
     CC_DEPRECATED_ATTRIBUTE int getCommonLineHeight() const { return getLineHeight();}
 
+CC_CONSTRUCTOR_ACCESS:
+    /**
+     * @js NA
+     */
+    Label(FontAtlas *atlas = nullptr, TextHAlignment hAlignment = TextHAlignment::LEFT,
+      TextVAlignment vAlignment = TextVAlignment::TOP,bool useDistanceField = false,bool useA8Shader = false);
+    /**
+     * @js NA
+     * @lua NA
+     */
+    virtual ~Label();
+
 protected:
     void onDraw(const Mat4& transform, bool transformUpdated);
 
@@ -294,17 +306,6 @@ class CC_DLL Label : public SpriteBatchNode, public LabelProtocol
         STRING_TEXTURE
     };
 
-    /**
-    * @js NA
-    */
-    Label(FontAtlas *atlas = nullptr, TextHAlignment hAlignment = TextHAlignment::LEFT, 
-        TextVAlignment vAlignment = TextVAlignment::TOP,bool useDistanceField = false,bool useA8Shader = false);
-    /**
-    * @js NA
-    * @lua NA
-    */
-    virtual ~Label();
-
     virtual void setFontAtlas(FontAtlas* atlas,bool distanceFieldEnabled = false, bool useA8Shader = false);
 
     bool recordLetterInfo(const cocos2d::Vec2& point,const FontLetterDefinition& letterDef, int spriteIndex);

diff --git a/cocos/2d/CCLabelAtlas.h b/cocos/2d/CCLabelAtlas.h
@@ -87,7 +87,7 @@ class CC_DLL LabelAtlas : public AtlasNode, public LabelProtocol
     virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override;
 #endif
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     LabelAtlas()
     :_string("")
     {}
@@ -96,6 +96,8 @@ class CC_DLL LabelAtlas : public AtlasNode, public LabelProtocol
     {
         _string.clear();
     }
+
+protected:
     virtual void updateColor() override;
 
 #if CC_LABELATLAS_DEBUG_DRAW

diff --git a/cocos/2d/CCLayer.h b/cocos/2d/CCLayer.h
@@ -228,7 +228,7 @@ class CC_DLL __LayerRGBA : public Layer, public __RGBAProtocol
     virtual void setOpacityModifyRGB(bool bValue) override { return Layer::setOpacityModifyRGB(bValue); }
     virtual bool isOpacityModifyRGB() const override { return Layer::isOpacityModifyRGB(); }
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     __LayerRGBA();
     virtual ~__LayerRGBA() {}
 

diff --git a/cocos/2d/CCNode.cpp b/cocos/2d/CCNode.cpp
@@ -1664,10 +1664,11 @@ const Mat4& Node::getNodeToParentTransform() const
         // If skew is needed, apply skew and then anchor point
         if (needsSkewMatrix)
         {
-            Mat4 skewMatrix(1, (float)tanf(CC_DEGREES_TO_RADIANS(_skewY)), 0, 0,
-                              (float)tanf(CC_DEGREES_TO_RADIANS(_skewX)), 1, 0, 0,
-                              0,  0,  1, 0,
-                              0,  0,  0, 1);
+            const float mat4[16] = {1, (float)tanf(CC_DEGREES_TO_RADIANS(_skewY)), 0, 0,
+                (float)tanf(CC_DEGREES_TO_RADIANS(_skewX)), 1, 0, 0,
+                0,  0,  1, 0,
+                0,  0,  0, 1};
+            Mat4 skewMatrix(mat4);
 
             _transform = _transform * skewMatrix;
 

diff --git a/cocos/2d/CCNodeGrid.cpp b/cocos/2d/CCNodeGrid.cpp
@@ -152,9 +152,6 @@ void NodeGrid::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t p
         this->draw(renderer, _modelViewTransform, dirty);
     }
 
-    // reset for next frame
-    _orderOfArrival = 0;
-
     if(_nodeGrid && _nodeGrid->isActive())
     {
         // restore projection

diff --git a/cocos/2d/CCNodeGrid.h b/cocos/2d/CCNodeGrid.h
@@ -56,10 +56,11 @@ class NodeGrid : public Node
     // overrides
     virtual void visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) override;
 
-protected:
+CC_CONSTRUCTOR_ACCESS:
     NodeGrid();
     virtual ~NodeGrid();
-
+
+protected:
     void onGridBeginDraw();
     void onGridEndDraw();