From da9563f6233b69623b4dd3adcd4ca65dd5f8e50d Mon Sep 17 00:00:00 2001 From: joshuastray Date: Tue, 15 Jul 2014 15:26:37 +0800 Subject: [PATCH 1/3] fix LabelAtlas constructor to CC_CONSTRUCTOR_ACCESS --- cocos/2d/CCLabelAtlas.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos/2d/CCLabelAtlas.h b/cocos/2d/CCLabelAtlas.h index 2c373fe76e..13db8b0ed1 100644 --- a/cocos/2d/CCLabelAtlas.h +++ b/cocos/2d/CCLabelAtlas.h @@ -87,7 +87,7 @@ public: virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override; #endif -protected: +CC_CONSTRUCTOR_ACCESS: LabelAtlas() :_string("") {} From 190460018f03f06274f10b3a2a78f3befdfd5ce4 Mon Sep 17 00:00:00 2001 From: joshuastray Date: Wed, 16 Jul 2014 11:40:09 +0800 Subject: [PATCH 2/3] use CC_CONSTRUCTOR_ACCESS in ParallaxNode --- cocos/2d/CCParallaxNode.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cocos/2d/CCParallaxNode.h b/cocos/2d/CCParallaxNode.h index df584f2f63..cc1f12e146 100644 --- a/cocos/2d/CCParallaxNode.h +++ b/cocos/2d/CCParallaxNode.h @@ -70,7 +70,7 @@ public: virtual void removeAllChildrenWithCleanup(bool cleanup) override; virtual void visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) override; -protected: +CC_CONSTRUCTOR_ACCESS: /** Adds a child to the container with a z-order, a parallax ratio and a position offset It returns self, so you can chain several addChilds. @since v0.8 @@ -83,6 +83,7 @@ protected: */ virtual ~ParallaxNode(); +protected: Vec2 absolutePosition(); Vec2 _lastPosition; From 012f5403d922e4d9d4bf4d11daa5bcbc7d5a60a7 Mon Sep 17 00:00:00 2001 From: Jialong Zhai Date: Mon, 21 Jul 2014 11:17:58 +0800 Subject: [PATCH 3/3] protected -> CC_CONSTRUCTOR_ACCESS --- cocos/2d/CCActionInstant.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos/2d/CCActionInstant.h b/cocos/2d/CCActionInstant.h index c74d6f0378..61ed569372 100644 --- a/cocos/2d/CCActionInstant.h +++ b/cocos/2d/CCActionInstant.h @@ -74,7 +74,7 @@ public: virtual ActionInstant* reverse() const override; virtual Show* clone() const override; -protected: +CC_CONSTRUCTOR_ACCESS: Show(){} virtual ~Show(){} @@ -98,7 +98,7 @@ public: virtual ActionInstant* reverse() const override; virtual Hide* clone() const override; -protected: +CC_CONSTRUCTOR_ACCESS: Hide(){} virtual ~Hide(){} @@ -121,7 +121,7 @@ public: virtual ToggleVisibility* reverse() const override; virtual ToggleVisibility* clone() const override; -protected: +CC_CONSTRUCTOR_ACCESS: ToggleVisibility(){} virtual ~ToggleVisibility(){}