mirror of https://github.com/axmolengine/axmol.git
Merge pull request #7461 from joshuastray/fix_constructor_access
fix LabelAtlas constructor protected to CC_CONSTRUCTOR_ACCESS
This commit is contained in:
commit
9f51adfafa
|
@ -84,7 +84,7 @@ public:
|
|||
virtual ActionInstant* reverse() const override;
|
||||
virtual Show* clone() const override;
|
||||
|
||||
protected:
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
Show(){}
|
||||
virtual ~Show(){}
|
||||
|
||||
|
@ -108,7 +108,7 @@ public:
|
|||
virtual ActionInstant* reverse() const override;
|
||||
virtual Hide* clone() const override;
|
||||
|
||||
protected:
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
Hide(){}
|
||||
virtual ~Hide(){}
|
||||
|
||||
|
@ -131,7 +131,7 @@ public:
|
|||
virtual ToggleVisibility* reverse() const override;
|
||||
virtual ToggleVisibility* clone() const override;
|
||||
|
||||
protected:
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
ToggleVisibility(){}
|
||||
virtual ~ToggleVisibility(){}
|
||||
|
||||
|
|
|
@ -87,7 +87,7 @@ public:
|
|||
virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override;
|
||||
#endif
|
||||
|
||||
protected:
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
LabelAtlas()
|
||||
:_string("")
|
||||
{}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue