diff --git a/cocos/2d/CCTransition.h b/cocos/2d/CCTransition.h index a065dfc419..e86aa06394 100644 --- a/cocos/2d/CCTransition.h +++ b/cocos/2d/CCTransition.h @@ -153,7 +153,7 @@ public: // virtual void onEnter() override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionRotoZoom(); virtual ~TransitionRotoZoom(); @@ -175,7 +175,7 @@ public: // virtual void onEnter() override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionJumpZoom(); virtual ~TransitionJumpZoom(); @@ -201,10 +201,11 @@ public: // virtual void onEnter() override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionMoveInL(); virtual ~TransitionMoveInL(); +protected: /** initializes the scenes */ virtual void initScenes(); @@ -220,10 +221,11 @@ class CC_DLL TransitionMoveInR : public TransitionMoveInL public: static TransitionMoveInR* create(float t, Scene* scene); -protected: +CC_CONSTRUCTOR_ACCESS: TransitionMoveInR(); virtual ~TransitionMoveInR(); +protected: virtual void initScenes(); private: @@ -238,10 +240,11 @@ class CC_DLL TransitionMoveInT : public TransitionMoveInL public: static TransitionMoveInT* create(float t, Scene* scene); -protected: +CC_CONSTRUCTOR_ACCESS: TransitionMoveInT(); virtual ~TransitionMoveInT(); +protected: virtual void initScenes(); private: @@ -256,10 +259,11 @@ class CC_DLL TransitionMoveInB : public TransitionMoveInL public: static TransitionMoveInB* create(float t, Scene* scene); -protected: +CC_CONSTRUCTOR_ACCESS: TransitionMoveInB(); virtual ~TransitionMoveInB(); +protected: virtual void initScenes(); private: @@ -284,10 +288,11 @@ public: // virtual void onEnter() override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionSlideInL(); virtual ~TransitionSlideInL(); +protected: /** initializes the scenes */ virtual void initScenes(void); @@ -308,10 +313,11 @@ public: /** returns the action that will be performed by the incoming and outgoing scene */ virtual ActionInterval* action(void); -protected: +CC_CONSTRUCTOR_ACCESS: TransitionSlideInR(); virtual ~TransitionSlideInR(); +protected: /** initializes the scenes */ virtual void initScenes(void); @@ -332,10 +338,11 @@ public: /** returns the action that will be performed by the incoming and outgoing scene */ virtual ActionInterval* action(void); -protected: +CC_CONSTRUCTOR_ACCESS: TransitionSlideInB(); virtual ~TransitionSlideInB(); +protected: /** initializes the scenes */ virtual void initScenes(); @@ -356,10 +363,11 @@ public: /** returns the action that will be performed by the incoming and outgoing scene */ virtual ActionInterval* action(void); -protected: +CC_CONSTRUCTOR_ACCESS: TransitionSlideInT(); virtual ~TransitionSlideInT(); +protected: /** initializes the scenes */ virtual void initScenes(void); @@ -387,7 +395,7 @@ public: virtual void onEnter() override; virtual ActionInterval* easeActionWithAction(ActionInterval * action) override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionShrinkGrow(); virtual ~TransitionShrinkGrow(); @@ -414,7 +422,7 @@ public: */ virtual void onEnter() override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionFlipX(); virtual ~TransitionFlipX(); @@ -441,7 +449,7 @@ public: */ virtual void onEnter() override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionFlipY(); virtual ~TransitionFlipY(); @@ -468,7 +476,7 @@ public: */ virtual void onEnter() override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionFlipAngular(); virtual ~TransitionFlipAngular(); @@ -495,7 +503,7 @@ public: */ virtual void onEnter() override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionZoomFlipX(); virtual ~TransitionZoomFlipX(); @@ -522,7 +530,7 @@ public: */ virtual void onEnter() override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionZoomFlipY(); virtual ~TransitionZoomFlipY(); @@ -549,7 +557,7 @@ public: */ virtual void onEnter() override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionZoomFlipAngular(); virtual ~TransitionZoomFlipAngular(); @@ -625,7 +633,7 @@ public : */ virtual void onExit() override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionCrossFade(); virtual ~TransitionCrossFade(); @@ -653,10 +661,11 @@ public : virtual ActionInterval * easeActionWithAction(ActionInterval * action) override; virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionTurnOffTiles(); virtual ~TransitionTurnOffTiles(); +protected: virtual void sceneOrder() override; NodeGrid* _outSceneProxy; @@ -685,9 +694,12 @@ public: virtual ActionInterval * easeActionWithAction(ActionInterval * action) override; virtual void onExit() override; virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override; -protected: + +CC_CONSTRUCTOR_ACCESS: TransitionSplitCols(); virtual ~TransitionSplitCols(); + +protected: void switchTargetToInscene(); NodeGrid* _gridProxy; private: @@ -707,7 +719,7 @@ public: // virtual ActionInterval* action(void) override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionSplitRows(); virtual ~TransitionSplitRows(); @@ -736,10 +748,12 @@ public: virtual ActionInterval* easeActionWithAction(ActionInterval * action) override; virtual void onExit() override; virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override; -protected: + +CC_CONSTRUCTOR_ACCESS: TransitionFadeTR(); virtual ~TransitionFadeTR(); +protected: virtual void sceneOrder(); NodeGrid* _outSceneProxy; @@ -761,7 +775,7 @@ public: // virtual ActionInterval* actionWithSize(const Size& size) override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionFadeBL(); virtual ~TransitionFadeBL(); @@ -782,7 +796,7 @@ public: // virtual ActionInterval* actionWithSize(const Size& size) override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionFadeUp(); virtual ~TransitionFadeUp(); @@ -803,7 +817,7 @@ public: // virtual ActionInterval* actionWithSize(const Size& size) override; -protected: +CC_CONSTRUCTOR_ACCESS: TransitionFadeDown(); virtual ~TransitionFadeDown(); diff --git a/cocos/2d/CCTransitionPageTurn.h b/cocos/2d/CCTransitionPageTurn.h index a34fc19946..3291566d33 100644 --- a/cocos/2d/CCTransitionPageTurn.h +++ b/cocos/2d/CCTransitionPageTurn.h @@ -59,15 +59,6 @@ public: * scene is being turned from left over the outgoing scene. */ static TransitionPageTurn* create(float t,Scene* scene,bool backwards); - /** - * @js ctor - */ - TransitionPageTurn(); - /** - * @js NA - * @lua NA - */ - virtual ~TransitionPageTurn(); // // Overrides @@ -89,6 +80,17 @@ public: virtual void onEnter() override; virtual void onExit() override; +CC_CONSTRUCTOR_ACCESS: + /** + * @js ctor + */ + TransitionPageTurn(); + /** + * @js NA + * @lua NA + */ + virtual ~TransitionPageTurn(); + protected: virtual void sceneOrder() override; diff --git a/cocos/2d/CCTransitionProgress.h b/cocos/2d/CCTransitionProgress.h index 0f5f01a856..d4cfbe8deb 100644 --- a/cocos/2d/CCTransitionProgress.h +++ b/cocos/2d/CCTransitionProgress.h @@ -44,14 +44,16 @@ class CC_DLL TransitionProgress : public TransitionScene public: static TransitionProgress* create(float t, Scene* scene); - TransitionProgress(); - // // Overrides // virtual void onEnter() override; virtual void onExit() override; +CC_CONSTRUCTOR_ACCESS: + TransitionProgress(); + virtual ~TransitionProgress(){} + protected: virtual void sceneOrder() override; @@ -74,6 +76,13 @@ class CC_DLL TransitionProgressRadialCCW : public TransitionProgress public: static TransitionProgressRadialCCW* create(float t, Scene* scene); +CC_CONSTRUCTOR_ACCESS: + /** + * @js ctor + */ + TransitionProgressRadialCCW(){} + virtual ~TransitionProgressRadialCCW(){} + protected: // // Overrides @@ -91,6 +100,13 @@ class CC_DLL TransitionProgressRadialCW : public TransitionProgress public: static TransitionProgressRadialCW* create(float t, Scene* scene); +CC_CONSTRUCTOR_ACCESS: + /** + * @js ctor + */ + TransitionProgressRadialCW(){} + virtual ~TransitionProgressRadialCW(){} + protected: // // Overrides @@ -107,6 +123,13 @@ class CC_DLL TransitionProgressHorizontal : public TransitionProgress public: static TransitionProgressHorizontal* create(float t, Scene* scene); +CC_CONSTRUCTOR_ACCESS: + /** + * @js ctor + */ + TransitionProgressHorizontal(){} + virtual ~TransitionProgressHorizontal(){} + protected: // // Overrides @@ -119,6 +142,13 @@ class CC_DLL TransitionProgressVertical : public TransitionProgress public: static TransitionProgressVertical* create(float t, Scene* scene); +CC_CONSTRUCTOR_ACCESS: + /** + * @js ctor + */ + TransitionProgressVertical(){} + virtual ~TransitionProgressVertical(){} + protected: // // Overrides @@ -131,6 +161,13 @@ class CC_DLL TransitionProgressInOut : public TransitionProgress public: static TransitionProgressInOut* create(float t, Scene* scene); +CC_CONSTRUCTOR_ACCESS: + /** + * @js ctor + */ + TransitionProgressInOut(){} + virtual ~TransitionProgressInOut(){} + protected: // // Overrides @@ -145,6 +182,13 @@ class CC_DLL TransitionProgressOutIn : public TransitionProgress public: static TransitionProgressOutIn* create(float t, Scene* scene); +CC_CONSTRUCTOR_ACCESS: + /** + * @js ctor + */ + TransitionProgressOutIn(){} + virtual ~TransitionProgressOutIn(){} + protected: // // Overrides