Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10873 from konopka/fix_compiler_override_warnings 

Fix compiler override warnings
This commit is contained in:
minggo 2015-03-17 10:38:19 +08:00
parent 9bdf758d5a 0387b13bb6
commit f7d5a16734
181 changed files with 675 additions and 675 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/2d/CCActionGrid.h
View File

@ -85,7 +85,7 @@ class CC_DLL Grid3DAction : public GridAction
public:
/** returns the grid */
virtual GridBase* getGrid();
virtual GridBase* getGrid() override;
/** returns the vertex than belongs to certain position in the grid
* @js NA
* @lua NA
@ -165,7 +165,7 @@ public:
void setTile(const Vec2& position, const Quad3& coords);
/** returns the grid */
virtual GridBase* getGrid();
virtual GridBase* getGrid() override;
// Override
virtual TiledGrid3DAction * clone() const override

2
cocos/2d/CCActionPageTurn3D.h
View File

@ -47,7 +47,7 @@ NS_CC_BEGIN
class CC_DLL PageTurn3D : public Grid3DAction
{
public:
virtual GridBase* getGrid();
virtual GridBase* getGrid() override;
/** create the action */
static PageTurn3D* create(float duration, const Size& gridSize);

2
cocos/2d/CCActionTiledGrid.h
View File

@ -217,7 +217,7 @@ public:
*/
static FadeOutUpTiles* create(float duration, const Size& gridSize);
virtual void transformTile(const Vec2& pos, float distance);
virtual void transformTile(const Vec2& pos, float distance) override;
// Overrides
virtual FadeOutUpTiles* clone() const override;

2
cocos/2d/CCClippingNode.h
View File

@ -115,7 +115,7 @@ CC_CONSTRUCTOR_ACCESS:
/** Initializes a clipping node without a stencil.
*/
virtual bool init();
virtual bool init() override;
/** Initializes a clipping node with an other node as its stencil.
The stencil node will be retained, and its parent will be set to this clipping node.

2
cocos/2d/CCDrawNode.h
View File

@ -134,7 +134,7 @@ public:
CC_CONSTRUCTOR_ACCESS:
DrawNode();
virtual ~DrawNode();
virtual bool init();
virtual bool init() override;
protected:
void ensureCapacity(int count);

2
cocos/2d/CCLabelAtlas.h
View File

@ -78,7 +78,7 @@ public:
bool initWithString(const std::string& string, Texture2D* texture, int itemWidth, int itemHeight, int startCharMap);
// super methods
virtual void updateAtlasValues();
virtual void updateAtlasValues() override;
virtual void setString(const std::string &label) override;
virtual const std::string& getString(void) const override;

4
cocos/2d/CCLabelBMFont.h
View File

@ -111,8 +111,8 @@ public:
virtual void setLineBreakWithoutSpace(bool breakWithoutSpace);
// RGBAProtocol
virtual bool isOpacityModifyRGB() const;
virtual void setOpacityModifyRGB(bool isOpacityModifyRGB);
virtual bool isOpacityModifyRGB() const override;
virtual void setOpacityModifyRGB(bool isOpacityModifyRGB) override;
void setFntFile(const std::string& fntFile, const Vec2& imageOffset = Vec2::ZERO);
const std::string& getFntFile() const;

6
cocos/2d/CCLayer.h
View File

@ -286,7 +286,7 @@ CC_CONSTRUCTOR_ACCESS:
LayerColor();
virtual ~LayerColor();
bool init();
bool init() override;
bool initWithColor(const Color4B& color, GLfloat width, GLfloat height);
bool initWithColor(const Color4B& color);
@ -378,7 +378,7 @@ CC_CONSTRUCTOR_ACCESS:
LayerGradient();
virtual ~LayerGradient();
virtual bool init();
virtual bool init() override;
/** Initializes the Layer with a gradient between start and end.
* @js init
* @lua init
@ -483,7 +483,7 @@ CC_CONSTRUCTOR_ACCESS:
*/
virtual ~LayerMultiplex();
virtual bool init();
virtual bool init() override;
/** initializes a MultiplexLayer with one or more layers using a variable argument list.
* @js NA
* @lua NA

10
cocos/2d/CCMenu.h
View File

@ -120,10 +120,10 @@ public:
virtual bool isEnabled() const { return _enabled; }
virtual void setEnabled(bool value) { _enabled = value; };
virtual bool onTouchBegan(Touch* touch, Event* event);
virtual void onTouchEnded(Touch* touch, Event* event);
virtual void onTouchCancelled(Touch* touch, Event* event);
virtual void onTouchMoved(Touch* touch, Event* event);
virtual bool onTouchBegan(Touch* touch, Event* event) override;
virtual void onTouchEnded(Touch* touch, Event* event) override;
virtual void onTouchCancelled(Touch* touch, Event* event) override;
virtual void onTouchMoved(Touch* touch, Event* event) override;
// overrides
virtual void removeChild(Node* child, bool cleanup) override;
@ -148,7 +148,7 @@ CC_CONSTRUCTOR_ACCESS:
virtual ~Menu();
/** initializes an empty Menu */
bool init();
bool init() override;
/** initializes a Menu with a NSArray of MenuItem objects */
bool initWithArray(const Vector<MenuItem*>& arrayOfItems);

2
cocos/2d/CCParticleBatchNode.h
View File

@ -79,7 +79,7 @@ public:
void insertChild(ParticleSystem* system, int index);
void removeChildAtIndex(int index, bool doCleanup);
void removeAllChildrenWithCleanup(bool doCleanup);
void removeAllChildrenWithCleanup(bool doCleanup) override;
/** disables a particle by inserting a 0'd quad into the texture atlas */
void disableParticle(int particleIndex);

2
cocos/2d/CCParticleExamples.h
View File

@ -54,7 +54,7 @@ CC_CONSTRUCTOR_ACCESS:
*/
virtual ~ParticleFire(){}
bool init(){ return initWithTotalParticles(250); }
bool init() override { return initWithTotalParticles(250); }
virtual bool initWithTotalParticles(int numberOfParticles) override;
private:

14
cocos/2d/CCParticleSystem.h
View File

@ -231,10 +231,10 @@ public:
virtual float getRotatePerSecondVar() const;
virtual void setRotatePerSecondVar(float degrees);
virtual void setScale(float s);
virtual void setRotation(float newRotation);
virtual void setScaleX(float newScaleX);
virtual void setScaleY(float newScaleY);
virtual void setScale(float s) override;
virtual void setRotation(float newRotation) override;
virtual void setScaleX(float newScaleX) override;
virtual void setScaleY(float newScaleY) override;
virtual bool isActive() const;
virtual bool isBlendAdditive() const;
@ -342,8 +342,8 @@ public:
virtual void setTotalParticles(int totalParticles);
/** does the alpha value modify color */
inline void setOpacityModifyRGB(bool opacityModifyRGB) { _opacityModifyRGB = opacityModifyRGB; };
inline bool isOpacityModifyRGB() const { return _opacityModifyRGB; };
inline void setOpacityModifyRGB(bool opacityModifyRGB) override { _opacityModifyRGB = opacityModifyRGB; };
inline bool isOpacityModifyRGB() const override { return _opacityModifyRGB; };
CC_DEPRECATED_ATTRIBUTE inline bool getOpacityModifyRGB() const { return isOpacityModifyRGB(); }
/** particles movement type: Free or Grouped
@ -384,7 +384,7 @@ CC_CONSTRUCTOR_ACCESS:
virtual ~ParticleSystem();
/** initializes a ParticleSystem*/
bool init();
bool init() override;
/** initializes a ParticleSystem from a plist file.
This plist files can be created manually or with Particle Designer:
http://particledesigner.71squared.com/

2
cocos/2d/CCScene.h
View File

@ -87,7 +87,7 @@ CC_CONSTRUCTOR_ACCESS:
Scene();
virtual ~Scene();
bool init();
bool init() override;
bool initWithSize(const Size& size);
void setCameraOrderDirty() { _cameraOrderDirty = true; }

6
cocos/2d/CCSprite.h
View File

@ -159,7 +159,7 @@ public:
/**
* Updates the quad according the rotation, position, scale values.
*/
virtual void updateTransform();
virtual void updateTransform() override;
/**
* Returns the batch node object if this sprite is rendered by SpriteBatchNode
@ -427,7 +427,7 @@ CC_CONSTRUCTOR_ACCESS:
virtual ~Sprite();
/* Initializes an empty sprite with nothing init. */
virtual bool init();
virtual bool init() override;
/**
* Initializes a sprite with a texture.
@ -515,7 +515,7 @@ CC_CONSTRUCTOR_ACCESS:
protected:
void updateColor();
void updateColor() override;
virtual void setTextureCoords(Rect rect);
virtual void updateBlendFunc();
virtual void setReorderChildDirtyRecursively();

2
cocos/2d/CCSpriteBatchNode.h
View File

@ -178,7 +178,7 @@ CC_CONSTRUCTOR_ACCESS:
* @lua init
*/
bool initWithFile(const std::string& fileImage, ssize_t capacity = DEFAULT_CAPACITY);
bool init();
bool init() override;
protected:
/** Updates a quad at a certain index into the texture atlas. The Sprite won't be added into the children array.

4
cocos/2d/CCTextFieldTTF.h
View File

@ -123,12 +123,12 @@ public:
/**
@brief Open keyboard and receive input text.
*/
virtual bool attachWithIME();
virtual bool attachWithIME() override;
/**
@brief End text input and close keyboard.
*/
virtual bool detachWithIME();
virtual bool detachWithIME() override;
//////////////////////////////////////////////////////////////////////////
// properties

18
cocos/2d/CCTransition.h
View File

@ -193,7 +193,7 @@ public:
/** returns the action that will be performed */
virtual ActionInterval* action(void);
virtual ActionInterval* easeActionWithAction(ActionInterval * action);
virtual ActionInterval* easeActionWithAction(ActionInterval * action) override;
//
// Overrides
@ -277,7 +277,7 @@ class CC_DLL TransitionSlideInL : public TransitionScene, public TransitionEaseS
public:
static TransitionSlideInL* create(float t, Scene* scene);
virtual ActionInterval* easeActionWithAction(ActionInterval * action);
virtual ActionInterval* easeActionWithAction(ActionInterval * action) override;
/** returns the action that will be performed by the incoming and outgoing scene */
virtual ActionInterval* action(void);
@ -310,7 +310,7 @@ public:
static TransitionSlideInR* create(float t, Scene* scene);
/** returns the action that will be performed by the incoming and outgoing scene */
virtual ActionInterval* action(void);
virtual ActionInterval* action(void) override;
CC_CONSTRUCTOR_ACCESS:
TransitionSlideInR();
@ -318,7 +318,7 @@ CC_CONSTRUCTOR_ACCESS:
protected:
/** initializes the scenes */
virtual void initScenes(void);
virtual void initScenes(void) override;
virtual void sceneOrder() override;
@ -335,7 +335,7 @@ public:
static TransitionSlideInB* create(float t, Scene* scene);
/** returns the action that will be performed by the incoming and outgoing scene */
virtual ActionInterval* action(void);
virtual ActionInterval* action(void) override;
CC_CONSTRUCTOR_ACCESS:
TransitionSlideInB();
@ -343,7 +343,7 @@ CC_CONSTRUCTOR_ACCESS:
protected:
/** initializes the scenes */
virtual void initScenes();
virtual void initScenes() override;
virtual void sceneOrder() override;
@ -360,7 +360,7 @@ public:
static TransitionSlideInT* create(float t, Scene* scene);
/** returns the action that will be performed by the incoming and outgoing scene */
virtual ActionInterval* action(void);
virtual ActionInterval* action(void) override;
CC_CONSTRUCTOR_ACCESS:
TransitionSlideInT();
@ -368,7 +368,7 @@ CC_CONSTRUCTOR_ACCESS:
protected:
/** initializes the scenes */
virtual void initScenes(void);
virtual void initScenes(void) override;
virtual void sceneOrder() override;
@ -753,7 +753,7 @@ CC_CONSTRUCTOR_ACCESS:
virtual ~TransitionFadeTR();
protected:
virtual void sceneOrder();
virtual void sceneOrder() override;
NodeGrid* _outSceneProxy;

2
cocos/3d/CCBillBoard.h
View File

@ -90,7 +90,7 @@ public:
//override
/** update billboard's transform and turn it towards camera */
virtual void visit(Renderer *renderer, const Mat4& parentTransform, uint32_t parentFlags);
virtual void visit(Renderer *renderer, const Mat4& parentTransform, uint32_t parentFlags) override;
/** draw BillBoard object */
virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override;

2
cocos/3d/CCSprite3D.h
View File

@ -165,7 +165,7 @@ CC_CONSTRUCTOR_ACCESS:
Sprite3D();
virtual ~Sprite3D();
bool init();
virtual bool init() override;
bool initWithFile(const std::string &path);

4
cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h
View File

@ -103,7 +103,7 @@ public:
TextureFrame();
virtual void setNode(cocos2d::Node* node);
virtual void setNode(cocos2d::Node* node) override;
virtual void onEnter(Frame *nextFrame, int currentFrameIndex) override;
virtual Frame* clone() override;
@ -341,7 +341,7 @@ public:
EventFrame();
virtual void setNode(cocos2d::Node* node);
virtual void setNode(cocos2d::Node* node) override;
virtual void onEnter(Frame *nextFrame, int currentFrameIndex) override;
virtual Frame* clone() override;

10
cocos/editor-support/cocostudio/CCArmatureAnimation.h
View File

@ -157,15 +157,15 @@ public:
/**
* Pause the Process
*/
virtual void pause();
virtual void pause() override;
/**
* Resume the Process
*/
virtual void resume();
virtual void resume() override;
/**
* Stop the Process
*/
virtual void stop();
virtual void stop() override;
/**
@ -173,7 +173,7 @@ public:
*/
ssize_t getMovementCount() const;
void update(float dt);
virtual void update(float dt) override;
/**
* Get current movementID
@ -242,7 +242,7 @@ protected:
* @js NA
* @lua NA
*/
void updateHandler();
void updateHandler() override;
/**
* Update current key frame, and process auto stop, pause

24
cocos/editor-support/cocostudio/CCSGUIReader.h
View File

@ -148,9 +148,9 @@ public:
WidgetPropertiesReader0250(){};
virtual ~WidgetPropertiesReader0250(){};
virtual cocos2d::ui::Widget* createWidget(const rapidjson::Value& dic, const char* fullPath, const char* fileName);
virtual cocos2d::ui::Widget* createWidget(const rapidjson::Value& dic, const char* fullPath, const char* fileName) override;
virtual cocos2d::ui::Widget* widgetFromJsonDictionary(const rapidjson::Value& dic);
virtual cocos2d::ui::Widget* widgetFromJsonDictionary(const rapidjson::Value& dic) override;
//added for binary parsing
virtual cocos2d::ui::Widget* createWidgetFromBinary(CocoLoader* cocoLoader,
@ -158,12 +158,12 @@ public:
const char* fileName)override{return nullptr;}
virtual cocos2d::ui::Widget* widgetFromBinary(CocoLoader* cocoLoader,
stExpCocoNode* pCocoNode){return nullptr;}
stExpCocoNode* pCocoNode) override {return nullptr;}
virtual void setPropsForAllWidgetFromBinary(WidgetReaderProtocol* reader,
cocos2d::ui::Widget* widget,
CocoLoader* cocoLoader,
stExpCocoNode* pCocoNode) {}
stExpCocoNode* pCocoNode) override {}
virtual void setPropsForWidgetFromJsonDictionary(cocos2d::ui::Widget* widget,const rapidjson::Value& options);
@ -181,10 +181,10 @@ public:
virtual void setPropsForLayoutFromJsonDictionary(cocos2d::ui::Widget* widget,const rapidjson::Value& options);
virtual void setPropsForScrollViewFromJsonDictionary(cocos2d::ui::Widget* widget,const rapidjson::Value& options);
virtual void setPropsForAllWidgetFromJsonDictionary(WidgetReaderProtocol* reader, cocos2d::ui::Widget* widget, const rapidjson::Value& options);
virtual void setPropsForAllWidgetFromJsonDictionary(WidgetReaderProtocol* reader, cocos2d::ui::Widget* widget, const rapidjson::Value& options) override;
virtual void setPropsForAllCustomWidgetFromJsonDictionary(const std::string& classType,
cocos2d::ui::Widget* widget,
const rapidjson::Value& customOptions);
const rapidjson::Value& customOptions) override;
};
class CC_STUDIO_DLL WidgetPropertiesReader0300 : public WidgetPropertiesReader
@ -197,7 +197,7 @@ public:
virtual cocos2d::ui::Widget* createWidget(const rapidjson::Value& dic,
const char* fullPath,
const char* fileName);
const char* fileName) override;
//add bin parse support
@ -206,12 +206,12 @@ public:
const char* fileName)override;
virtual cocos2d::ui::Widget* widgetFromBinary(CocoLoader* cocoLoader,
stExpCocoNode* pCocoNode);
stExpCocoNode* pCocoNode) override;
virtual void setPropsForAllWidgetFromBinary(WidgetReaderProtocol* reader,
cocos2d::ui::Widget* widget,
CocoLoader* cocoLoader,
stExpCocoNode* pCocoNode);
stExpCocoNode* pCocoNode) override;
virtual void setPropsForAllCustomWidgetFromBinary(const std::string& classType,
cocos2d::ui::Widget* widget,
@ -220,15 +220,15 @@ public:
//TODO: custom property
}
virtual cocos2d::ui::Widget* widgetFromJsonDictionary(const rapidjson::Value& dic);
virtual cocos2d::ui::Widget* widgetFromJsonDictionary(const rapidjson::Value& dic) override;
virtual void setPropsForAllWidgetFromJsonDictionary(WidgetReaderProtocol* reader,
cocos2d::ui::Widget* widget,
const rapidjson::Value& options);
const rapidjson::Value& options) override;
virtual void setPropsForAllCustomWidgetFromJsonDictionary(const std::string& classType,
cocos2d::ui::Widget* widget,
const rapidjson::Value& customOptions);
const rapidjson::Value& customOptions) override;
};

4
cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h
View File

@ -53,8 +53,8 @@ public:
static void purge();
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,
flatbuffers::FlatBufferBuilder* builder);
void setPropsWithFlatBuffers(cocos2d::Node* node, const flatbuffers::Table* textBMFontOptions);
flatbuffers::FlatBufferBuilder* builder) override;
void setPropsWithFlatBuffers(cocos2d::Node* node, const flatbuffers::Table* textBMFontOptions) override;
//CSArmatureNode
cocos2d::Node* createNodeWithFlatBuffers(const flatbuffers::Table* nodeOptions) override;

14
cocos/platform/desktop/CCGLViewImpl-desktop.h
View File

@ -67,15 +67,15 @@ public:
//void resize(int width, int height);
float getFrameZoomFactor() const;
float getFrameZoomFactor() const override;
//void centerWindow();
virtual void setViewPortInPoints(float x , float y , float w , float h);
virtual void setScissorInPoints(float x , float y , float w , float h);
virtual void setViewPortInPoints(float x , float y , float w , float h) override;
virtual void setScissorInPoints(float x , float y , float w , float h) override;
bool windowShouldClose();
void pollEvents();
bool windowShouldClose() override;
void pollEvents() override;
GLFWwindow* getWindow() const { return _mainWindow; }
/* override functions */
@ -88,7 +88,7 @@ public:
/*
* Set zoom factor for frame. This method is for debugging big resolution (e.g.new ipad) app on desktop.
*/
void setFrameZoomFactor(float zoomFactor);
void setFrameZoomFactor(float zoomFactor) override;
/**
* Hide or Show the mouse cursor if there is one.
*/
@ -101,7 +101,7 @@ public:
bool isRetinaEnabled() const { return _isRetinaEnabled; };
/** Get retina factor */
int getRetinaFactor() const { return _retinaFactor; }
int getRetinaFactor() const override { return _retinaFactor; }
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
HWND getWin32Window() { return glfwGetWin32Window(_mainWindow); }

16
cocos/scripting/lua-bindings/manual/CCLuaEngine.h
View File

@ -46,7 +46,7 @@ public:
CC_DEPRECATED_ATTRIBUTE static LuaEngine* defaultEngine(void) { return LuaEngine::getInstance(); }
virtual ~LuaEngine(void);
virtual ccScriptType getScriptType() {
virtual ccScriptType getScriptType() override {
return kScriptTypeLua;
};
@ -77,17 +77,17 @@ public:
@brief Remove Object from lua state
@param object to remove
*/
virtual void removeScriptObjectByObject(Ref* object);
virtual void removeScriptObjectByObject(Ref* object) override;
/**
@brief Remove Lua function reference
*/
virtual void removeScriptHandler(int nHandler);
virtual void removeScriptHandler(int nHandler) override;
/**
@brief Reallocate Lua function reference
*/
virtual int reallocateScriptHandler(int nHandler);
virtual int reallocateScriptHandler(int nHandler) override;
/**
@brief Execute script code contained in the given string.
@ -95,13 +95,13 @@ public:
@return 0 if the string is excuted correctly.
@return other if the string is excuted wrongly.
*/
virtual int executeString(const char* codes);
virtual int executeString(const char* codes) override;
/**
@brief Execute a script file.
@param filename String object holding the filename of the script file that is to be executed
*/
virtual int executeScriptFile(const char* filename);
virtual int executeScriptFile(const char* filename) override;
/**
@brief Execute a scripted global function.
@ -109,7 +109,7 @@ public:
@param functionName String object holding the name of the function, in the global script environment, that is to be executed.
@return The integer value returned from the script function.
*/
virtual int executeGlobalFunction(const char* functionName);
virtual int executeGlobalFunction(const char* functionName) override;
virtual int executeNodeEvent(Node* pNode, int nAction);
virtual int executeMenuItemEvent(MenuItem* pMenuItem);
@ -123,7 +123,7 @@ public:
virtual int executeAccelerometerEvent(Layer* pLayer, Acceleration* pAccelerationValue);
virtual int executeEvent(int nHandler, const char* pEventName, Ref* pEventSource = NULL, const char* pEventSourceClassName = NULL);
virtual bool handleAssert(const char *msg);
virtual bool handleAssert(const char *msg) override;
virtual bool parseConfig(ConfigType type, const std::string& str) override;
virtual int sendEvent(ScriptEvent* message) override;

2
cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h
View File

@ -74,7 +74,7 @@ public:
static LuaCallFunc* create(const std::function<void(void* self,Node*)>& func);
bool initWithFunction(const std::function<void(void* self,Node*)>& func);
virtual LuaCallFunc* clone() const;
virtual LuaCallFunc* clone() const override;
virtual void execute() override;
protected:
/**

2
cocos/ui/UICheckBox.h
View File

@ -230,7 +230,7 @@ protected:
void selectedEvent();
void unSelectedEvent();
virtual void releaseUpEvent();
virtual void releaseUpEvent() override;
virtual void onSizeChanged() override;

2
cocos/ui/UIEditBox/UIEditBox.h
View File

@ -444,7 +444,7 @@ namespace ui {
void touchDownAction(Ref *sender, TouchEventType controlEvent);
protected:
virtual void adaptRenderers();
virtual void adaptRenderers() override;
void updatePosition(float dt);
EditBoxImpl* _editBoxImpl;

2
cocos/ui/UIPageView.h
View File

@ -205,7 +205,7 @@ protected:
virtual void handleMoveLogic(Touch *touch) ;
virtual void handleReleaseLogic(Touch *touch) ;
virtual void interceptTouchEvent(TouchEventType event, Widget* sender,Touch *touch) ;
virtual void interceptTouchEvent(TouchEventType event, Widget* sender,Touch *touch) override;
virtual void onSizeChanged() override;

8
cocos/ui/UIRichText.h
View File

@ -105,19 +105,19 @@ public:
void removeElement(RichElement* element);
void setVerticalSpace(float space);
virtual void setAnchorPoint(const Vec2 &pt);
virtual void setAnchorPoint(const Vec2 &pt) override;
virtual Size getVirtualRendererSize() const override;
void formatText();
virtual void ignoreContentAdaptWithSize(bool ignore);
virtual void ignoreContentAdaptWithSize(bool ignore) override;
virtual std::string getDescription() const override;
CC_CONSTRUCTOR_ACCESS:
virtual bool init() override;
protected:
virtual void adaptRenderers();
virtual void adaptRenderers() override;
virtual void initRenderer();
virtual void initRenderer() override;
void pushToContainer(Node* renderer);
void handleTextRenderer(const std::string& text, const std::string& fontName, float fontSize, const Color3B& color, GLubyte opacity);
void handleImageRenderer(const std::string& fileParh, const Color3B& color, GLubyte opacity);

2
cocos/ui/UIScale9Sprite.h
View File

@ -237,7 +237,7 @@ namespace ui {
*/
virtual bool initWithSpriteFrameName(const std::string& spriteFrameName);
virtual bool init();
virtual bool init() override;
virtual bool init(Sprite* sprite, const Rect& rect, bool rotated, const Rect& capInsets);
virtual bool init(Sprite* sprite, const Rect& rect, const Rect& capInsets);
virtual bool init(Sprite* sprite, const Rect& rect, bool rotated, const Vec2 &offset, const Size &originalSize, const Rect& capInsets);

6
cocos/ui/UITextField.h
View File

@ -54,8 +54,8 @@ public:
virtual bool onTextFieldInsertText(TextFieldTTF * pSender, const char * text, size_t nLen) override;
virtual bool onTextFieldDeleteBackward(TextFieldTTF * pSender, const char * delText, size_t nLen) override;
void insertText(const char* text, size_t len);
void deleteBackward();
void insertText(const char* text, size_t len) override;
void deleteBackward() override;
void openIME();
void closeIME();
@ -131,7 +131,7 @@ public:
void setTouchSize(const Size &size);
Size getTouchSize()const;
void setTouchAreaEnabled(bool enable);
virtual bool hitTest(const Vec2 &pt);
virtual bool hitTest(const Vec2 &pt) override;
void setPlaceHolder(const std::string& value);
const std::string& getPlaceHolder()const;

8
extensions/GUI/CCControlExtension/CCControl.h
View File

@ -155,10 +155,10 @@ public:
*/
virtual Vec2 getTouchLocation(Touch* touch);
virtual bool onTouchBegan(Touch *touch, Event *event) { return false; };
virtual void onTouchMoved(Touch *touch, Event *event) {};
virtual void onTouchEnded(Touch *touch, Event *event) {};
virtual void onTouchCancelled(Touch *touch, Event *event) {};
virtual bool onTouchBegan(Touch *touch, Event *event) override { return false; };
virtual void onTouchMoved(Touch *touch, Event *event) override {};
virtual void onTouchEnded(Touch *touch, Event *event) override {};
virtual void onTouchCancelled(Touch *touch, Event *event) override {};
/**
* Returns a boolean value that indicates whether a touch is inside the bounds

8
extensions/GUI/CCControlExtension/CCControlButton.h
View File

@ -59,11 +59,11 @@ public:
static ControlButton* create(Node* label, cocos2d::ui::Scale9Sprite* backgroundSprite);
static ControlButton* create(const std::string& title, const std::string& fontName, float fontSize);
virtual void needsLayout(void);
virtual void needsLayout(void) override;
virtual void setEnabled(bool enabled);
virtual void setSelected(bool enabled);
virtual void setHighlighted(bool enabled);
virtual void setEnabled(bool enabled) override;
virtual void setSelected(bool enabled) override;
virtual void setHighlighted(bool enabled) override;
bool isPushed() const { return _isPushed; }

6
extensions/GUI/CCControlExtension/CCControlColourPicker.h
View File

@ -64,8 +64,8 @@ public:
virtual bool init() override;
virtual void setColor(const Color3B& colorValue);
virtual void setEnabled(bool bEnabled);
virtual void setColor(const Color3B& colorValue) override;
virtual void setEnabled(bool bEnabled) override;
//virtual ~ControlColourPicker();
void hueSliderValueChanged(Ref * sender, Control::EventType controlEvent);
@ -74,7 +74,7 @@ public:
protected:
void updateControlPicker();
void updateHueAndControlPicker();
virtual bool onTouchBegan(Touch* touch, Event* pEvent);
virtual bool onTouchBegan(Touch* touch, Event* pEvent) override;
HSV _hsv;
CC_SYNTHESIZE_RETAIN(ControlSaturationBrightnessPicker*, _colourPicker, colourPicker)

2
extensions/GUI/CCControlExtension/CCControlHuePicker.h
View File

@ -61,7 +61,7 @@ public:
virtual ~ControlHuePicker();
virtual bool initWithTargetAndPos(Node* target, Vec2 pos);
virtual void setEnabled(bool enabled);
virtual void setEnabled(bool enabled) override;
// overrides
virtual bool onTouchBegan(Touch* touch, Event* pEvent) override;

6
extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h
View File

@ -78,7 +78,7 @@ public:
static ControlSaturationBrightnessPicker* create(Node* target, Vec2 pos);
virtual void setEnabled(bool enabled);
virtual void setEnabled(bool enabled) override;
/**
* @js NA
* @lua NA
@ -94,8 +94,8 @@ protected:
void updateSliderPosition(Vec2 location);
bool checkSliderPosition(Vec2 location);
virtual bool onTouchBegan(Touch* touch, Event* pEvent);
virtual void onTouchMoved(Touch *pTouch, Event *pEvent);
virtual bool onTouchBegan(Touch* touch, Event* pEvent) override;
virtual void onTouchMoved(Touch *pTouch, Event *pEvent) override;
};
// end of GUI group

12
extensions/GUI/CCControlExtension/CCControlSlider.h
View File

@ -107,11 +107,11 @@ public:
virtual bool initWithSprites(Sprite * backgroundSprite, Sprite* progressSprite, Sprite* thumbSprite,
Sprite* selectedThumbSprite);
virtual void needsLayout();
virtual void needsLayout() override;
virtual void setMaximumValue(float val);
virtual void setEnabled(bool enabled);
virtual bool isTouchInside(Touch * touch);
virtual void setEnabled(bool enabled) override;
virtual bool isTouchInside(Touch * touch) override;
Vec2 locationFromTouch(Touch* touch);
virtual void setValue(float val);
virtual void setMinimumValue(float val);
@ -121,9 +121,9 @@ protected:
void sliderMoved(Vec2 location);
void sliderEnded(Vec2 location);
virtual bool onTouchBegan(Touch* touch, Event* pEvent);
virtual void onTouchMoved(Touch *pTouch, Event *pEvent);
virtual void onTouchEnded(Touch *pTouch, Event *pEvent);
virtual bool onTouchBegan(Touch* touch, Event* pEvent) override;
virtual void onTouchMoved(Touch *pTouch, Event *pEvent) override;
virtual void onTouchEnded(Touch *pTouch, Event *pEvent) override;
/** Returns the value for the given location. */
float valueForLocation(Vec2 location);

2
extensions/GUI/CCControlExtension/CCControlStepper.h
View File

@ -79,7 +79,7 @@ public:
virtual bool onTouchBegan(Touch *pTouch, Event *pEvent) override;
virtual void onTouchMoved(Touch *pTouch, Event *pEvent) override;
virtual void onTouchEnded(Touch *pTouch, Event *pEvent) override;
void update(float dt);
void update(float dt) override;
/** Update the layout of the stepper with the given touch location. */
void updateLayoutUsingTouchLocation(Vec2 location);

2
extensions/GUI/CCControlExtension/CCControlSwitch.h
View File

@ -80,7 +80,7 @@ public:
void setOn(bool isOn);
bool isOn(void) const { return _on; }
bool hasMoved() const { return _moved; }
virtual void setEnabled(bool enabled);
virtual void setEnabled(bool enabled) override;
Vec2 locationFromTouch(Touch* touch);

12
extensions/GUI/CCScrollView/CCScrollView.h
View File

@ -101,7 +101,7 @@ public:
*/
virtual ~ScrollView();
bool init();
bool init() override;
/**
* Returns a scroll view object
*
@ -234,10 +234,10 @@ public:
bool isClippingToBounds() { return _clippingToBounds; }
void setClippingToBounds(bool bClippingToBounds) { _clippingToBounds = bClippingToBounds; }
virtual bool onTouchBegan(Touch *touch, Event *event);
virtual void onTouchMoved(Touch *touch, Event *event);
virtual void onTouchEnded(Touch *touch, Event *event);
virtual void onTouchCancelled(Touch *touch, Event *event);
virtual bool onTouchBegan(Touch *touch, Event *event) override;
virtual void onTouchMoved(Touch *touch, Event *event) override;
virtual void onTouchEnded(Touch *touch, Event *event) override;
virtual void onTouchCancelled(Touch *touch, Event *event) override;
// Overrides
virtual void setContentSize(const Size & size) override;
@ -255,7 +255,7 @@ public:
/**
* CCActionTweenDelegate
*/
void updateTweenAction(float value, const std::string& key);
void updateTweenAction(float value, const std::string& key) override;
bool hasVisibleParents() const;
protected:

4
extensions/Particle3D/CCParticle3DRender.h
View File

@ -93,8 +93,8 @@ public:
virtual void render(Renderer* renderer, const Mat4 &transform, ParticleSystem3D* particleSystem) override;
virtual void setDepthTest(bool isDepthTest);
virtual void setDepthWrite(bool isDepthWrite);
virtual void setDepthTest(bool isDepthTest) override;
virtual void setDepthWrite(bool isDepthWrite) override;
CC_CONSTRUCTOR_ACCESS:
Particle3DQuadRender();

2
extensions/Particle3D/PU/CCPUAlignAffector.h
View File

@ -51,7 +51,7 @@ public:
*/
void setResize(bool resize);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUAlignAffector();

2
extensions/Particle3D/PU/CCPUBaseCollider.h
View File

@ -116,7 +116,7 @@ public:
*/
void calculateRotationSpeedAfterCollision(PUParticle3D* particle);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUBaseCollider();

2
extensions/Particle3D/PU/CCPUBaseForceAffector.h
View File

@ -55,7 +55,7 @@ public:
ForceApplication getForceApplication() const;
void setForceApplication(ForceApplication forceApplication);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUBaseForceAffector();

10
extensions/Particle3D/PU/CCPUBeamRender.h
View File

@ -91,9 +91,9 @@ public:
static PUBeamRender* create(const std::string &texFile = "");
virtual void prepare();
virtual void unPrepare();
virtual void updateRender(PUParticle3D *particle, float deltaTime, bool firstParticle);
virtual void prepare() override;
virtual void unPrepare() override;
virtual void updateRender(PUParticle3D *particle, float deltaTime, bool firstParticle) override;
virtual void render(Renderer* renderer, const Mat4 &transform, ParticleSystem3D* particleSystem) override;
virtual void particleEmitted(PUParticleSystem3D* particleSystem, PUParticle3D* particle) override;
@ -126,8 +126,8 @@ public:
*/
void destroyAll(void);
virtual PUBeamRender* clone();
virtual void copyAttributesTo (PURender *render);
virtual PUBeamRender* clone() override;
virtual void copyAttributesTo (PURender *render) override;
CC_CONSTRUCTOR_ACCESS:
PUBeamRender();

2
extensions/Particle3D/PU/CCPUBoxCollider.h
View File

@ -83,7 +83,7 @@ public:
*/
void calculateDirectionAfterCollision(PUParticle3D* particle);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUBoxCollider();

4
extensions/Particle3D/PU/CCPUBoxEmitter.h
View File

@ -56,8 +56,8 @@ public:
const float getDepth(void) const;
void setDepth(const float depth);
virtual CCPUBoxEmitter* clone();
virtual void copyAttributesTo (PUEmitter* emitter);
virtual CCPUBoxEmitter* clone() override;
virtual void copyAttributesTo (PUEmitter* emitter) override;
CC_CONSTRUCTOR_ACCESS:
CCPUBoxEmitter(void);

8
extensions/Particle3D/PU/CCPUCircleEmitter.h
View File

@ -73,8 +73,8 @@ public:
*/
virtual void notifyStart(void) override;
virtual PUCircleEmitter* clone();
virtual void copyAttributesTo (PUEmitter* emitter);
virtual PUCircleEmitter* clone() override;
virtual void copyAttributesTo (PUEmitter* emitter) override;
CC_CONSTRUCTOR_ACCESS:
PUCircleEmitter(void);
@ -84,11 +84,11 @@ protected:
/** Determine a particle position on the circle.
*/
virtual void initParticlePosition(PUParticle3D* particle);
virtual void initParticlePosition(PUParticle3D* particle) override;
/** Determine the particle direction.
*/
virtual void initParticleDirection(PUParticle3D* particle);
virtual void initParticleDirection(PUParticle3D* particle) override;
Quaternion getRotationTo(const Vec3 &src, const Vec3& dest,
const Vec3& fallbackAxis = Vec3::ZERO) const;

2
extensions/Particle3D/PU/CCPUCollisionAvoidanceAffector.h
View File

@ -49,7 +49,7 @@ public:
*/
void setRadius(float radius);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUCollisionAvoidanceAffector();

2
extensions/Particle3D/PU/CCPUColorAffector.h
View File

@ -70,7 +70,7 @@ public:
*/
void setColorOperation (const ColorOperation& colorOperation);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUColorAffector();

2
extensions/Particle3D/PU/CCPUDoAffectorEventHandler.h
View File

@ -70,7 +70,7 @@ public:
*/
virtual void handle (PUParticleSystem3D* particleSystem, PUParticle3D* particle, float timeElapsed) override;
virtual void copyAttributesTo (PUEventHandler* eventHandler);
virtual void copyAttributesTo (PUEventHandler* eventHandler) override;
CC_CONSTRUCTOR_ACCESS:
PUDoAffectorEventHandler(void);

2
extensions/Particle3D/PU/CCPUDoEnableComponentEventHandler.h
View File

@ -77,7 +77,7 @@ public:
*/
virtual void handle (PUParticleSystem3D* particleSystem, PUParticle3D* particle, float timeElapsed) override;
virtual void copyAttributesTo (PUEventHandler* eventHandler);
virtual void copyAttributesTo (PUEventHandler* eventHandler) override;
CC_CONSTRUCTOR_ACCESS:
PUDoEnableComponentEventHandler(void);

2
extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h
View File

@ -128,7 +128,7 @@ public:
*/
virtual void particleExpired(PUParticleSystem3D* particleSystem, PUParticle3D* particle) override {};
virtual void copyAttributesTo (PUEventHandler* eventHandler);
virtual void copyAttributesTo (PUEventHandler* eventHandler) override;
CC_CONSTRUCTOR_ACCESS:
PUDoPlacementParticleEventHandler(void);

2
extensions/Particle3D/PU/CCPUDoScaleEventHandler.h
View File

@ -73,7 +73,7 @@ public:
*/
virtual void handle (PUParticleSystem3D* particleSystem, PUParticle3D* particle, float timeElapsed) override;
virtual void copyAttributesTo (PUEventHandler* eventHandler);
virtual void copyAttributesTo (PUEventHandler* eventHandler) override;
CC_CONSTRUCTOR_ACCESS:
PUDoScaleEventHandler(void);

16
extensions/Particle3D/PU/CCPUDynamicAttribute.h
View File

@ -125,14 +125,14 @@ class CC_DLL PUDynamicAttributeFixed : public PUDynamicAttribute
/** Todo
*/
virtual float getValue (float x = 0);
virtual float getValue (float x = 0) override;
/** Todo
*/
virtual void setValue (float value);
virtual PUDynamicAttributeFixed* clone() override;
virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute);
virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute) override;
protected:
float _value;
@ -157,7 +157,7 @@ class CC_DLL PUDynamicAttributeRandom : public PUDynamicAttribute
/** Todo
*/
virtual float getValue (float x = 0);
virtual float getValue (float x = 0) override;
/** Todo
*/
@ -168,7 +168,7 @@ class CC_DLL PUDynamicAttributeRandom : public PUDynamicAttribute
void setMinMax (float min, float max);
virtual PUDynamicAttributeRandom* clone() override;
virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute);
virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute) override;
protected:
float _min, _max;
@ -205,7 +205,7 @@ class CC_DLL PUDynamicAttributeCurved : public PUDynamicAttribute
/** Todo
*/
virtual float getValue (float x = 0);
virtual float getValue (float x = 0) override;
/** Todo
*/
@ -228,7 +228,7 @@ class CC_DLL PUDynamicAttributeCurved : public PUDynamicAttribute
void removeAllControlPoints(void);
virtual PUDynamicAttributeCurved* clone() override;
virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute);
virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute) override;
protected:
@ -283,7 +283,7 @@ class CC_DLL PUDynamicAttributeOscillate : public PUDynamicAttribute
/** Todo
*/
virtual float getValue (float x = 0);
virtual float getValue (float x = 0) override;
/** Get and set the OscillationType
*/
@ -311,7 +311,7 @@ class CC_DLL PUDynamicAttributeOscillate : public PUDynamicAttribute
void setAmplitude (float amplitude);
virtual PUDynamicAttributeOscillate* clone() override;
virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute);
virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute) override;
protected:
OscillationType _oscillationType;

2
extensions/Particle3D/PU/CCPUFlockCenteringAffector.h
View File

@ -40,7 +40,7 @@ public:
virtual void preUpdateAffector(float deltaTime) override;
virtual void updatePUAffector(PUParticle3D *particle, float deltaTime) override;
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUFlockCenteringAffector();

2
extensions/Particle3D/PU/CCPUForceFieldAffector.h
View File

@ -126,7 +126,7 @@ public:
*/
void suppressGeneration(bool suppress);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUForceFieldAffector();

2
extensions/Particle3D/PU/CCPUGeometryRotator.h
View File

@ -76,7 +76,7 @@ public:
*/
void resetRotationAxis(void);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUGeometryRotator();

2
extensions/Particle3D/PU/CCPUGravityAffector.h
View File

@ -48,7 +48,7 @@ public:
float getGravity(void) const;
void setGravity(float gravity);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUGravityAffector(void);

2
extensions/Particle3D/PU/CCPUInterParticleCollider.h
View File

@ -68,7 +68,7 @@ public:
*/
void setInterParticleCollisionResponse(InterParticleCollisionResponse interParticleCollisionResponse);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUParticle3DInterParticleCollider(void);

2
extensions/Particle3D/PU/CCPUJetAffector.h
View File

@ -48,7 +48,7 @@ public:
PUDynamicAttribute* getDynAcceleration(void) const {return _dynAcceleration;};
void setDynAcceleration(PUDynamicAttribute* dynAcceleration);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUJetAffector(void);

2
extensions/Particle3D/PU/CCPULineAffector.h
View File

@ -70,7 +70,7 @@ public:
float getDrift(void) const;
void setDrift(float drift);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PULineAffector(void);

12
extensions/Particle3D/PU/CCPULineEmitter.h
View File

@ -44,7 +44,7 @@ public:
static PULineEmitter* create();
/**
*/
virtual void notifyStart (void);
virtual void notifyStart (void) override;
/** Override the default implementation, to allow that no particles are emitted if there
is an incremental emission of particles (along a path), and the end of the line has
@ -77,18 +77,18 @@ public:
/**
*/
virtual void notifyRescaled(const Vec3& scale);
virtual void notifyRescaled(const Vec3& scale) override;
/**
*/
virtual void initParticlePosition(PUParticle3D* particle);
virtual void initParticlePosition(PUParticle3D* particle) override;
/**
*/
virtual void initParticleDirection(PUParticle3D* particle);
virtual void initParticleDirection(PUParticle3D* particle) override;
virtual PULineEmitter* clone();
virtual void copyAttributesTo (PUEmitter* emitter);
virtual PULineEmitter* clone() override;
virtual void copyAttributesTo (PUEmitter* emitter) override;
CC_CONSTRUCTOR_ACCESS:
PULineEmitter(void);

2
extensions/Particle3D/PU/CCPULinearForceAffector.h
View File

@ -41,7 +41,7 @@ public:
virtual void preUpdateAffector(float deltaTime) override;
virtual void updatePUAffector(PUParticle3D *particle, float deltaTime) override;
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PULinearForceAffector(void){};

4
extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.h
View File

@ -238,8 +238,8 @@ public:
*/
virtual void initParticleDirection(PUParticle3D* particle) override;
virtual PUMeshSurfaceEmitter* clone();
virtual void copyAttributesTo (PUEmitter* emitter);
virtual PUMeshSurfaceEmitter* clone() override;
virtual void copyAttributesTo (PUEmitter* emitter) override;
CC_CONSTRUCTOR_ACCESS:
PUMeshSurfaceEmitter(void);

2
extensions/Particle3D/PU/CCPUOnClearObserver.h
View File

@ -44,7 +44,7 @@ public:
/**
*/
virtual void notifyStart ();
virtual void notifyStart () override;
/**
*/

2
extensions/Particle3D/PU/CCPUOnCountObserver.h
View File

@ -69,7 +69,7 @@ public:
const PUComparisionOperator getCompare(void) const {return _compare;};
void setCompare(PUComparisionOperator op){_compare = op;};
virtual void copyAttributesTo (PUObserver* observer);
virtual void copyAttributesTo (PUObserver* observer) override;
CC_CONSTRUCTOR_ACCESS:
PUOnCountObserver(void);

2
extensions/Particle3D/PU/CCPUOnEventFlagObserver.h
View File

@ -57,7 +57,7 @@ public:
unsigned int getEventFlag(void) const {return _eventFlag;};
void setEventFlag(unsigned int eventFlag){_eventFlag = eventFlag;};
virtual void copyAttributesTo (PUObserver* observer);
virtual void copyAttributesTo (PUObserver* observer) override;
CC_CONSTRUCTOR_ACCESS:
PUOnEventFlagObserver(void);

2
extensions/Particle3D/PU/CCPUOnPositionObserver.h
View File

@ -84,7 +84,7 @@ public:
const PUComparisionOperator getComparePositionY(void) const {return _comparePositionY;};
const PUComparisionOperator getComparePositionZ(void) const {return _comparePositionZ;};
virtual void copyAttributesTo (PUObserver* observer);
virtual void copyAttributesTo (PUObserver* observer) override;
CC_CONSTRUCTOR_ACCESS:
PUOnPositionObserver(void);

2
extensions/Particle3D/PU/CCPUOnRandomObserver.h
View File

@ -61,7 +61,7 @@ public:
float getThreshold(void) const {return _threshold;};
void setThreshold(float threshold){_threshold = threshold;};
virtual void copyAttributesTo (PUObserver* observer);
virtual void copyAttributesTo (PUObserver* observer) override;
CC_CONSTRUCTOR_ACCESS:
PUOnRandomObserver(void);

2
extensions/Particle3D/PU/CCPUOnTimeObserver.h
View File

@ -69,7 +69,7 @@ public:
bool isSinceStartSystem(void) const {return _sinceStartSystem;};
void setSinceStartSystem(bool sinceStartSystem){_sinceStartSystem = sinceStartSystem;};
virtual void copyAttributesTo (PUObserver* observer);
virtual void copyAttributesTo (PUObserver* observer) override;
CC_CONSTRUCTOR_ACCESS:
PUOnTimeObserver(void);

2
extensions/Particle3D/PU/CCPUOnVelocityObserver.h
View File

@ -58,7 +58,7 @@ public:
const PUComparisionOperator getCompare(void) const {return _compare;};
void setCompare(PUComparisionOperator op){_compare = op;};
virtual void copyAttributesTo (PUObserver* observer);
virtual void copyAttributesTo (PUObserver* observer) override;
CC_CONSTRUCTOR_ACCESS:
PUOnVelocityObserver(void);

2
extensions/Particle3D/PU/CCPUParticleFollower.h
View File

@ -54,7 +54,7 @@ public:
float getMinDistance(void) const;
void setMinDistance(float minDistance);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUParticleFollower(void);

2
extensions/Particle3D/PU/CCPUParticleSystem3DTranslator.h
View File

@ -45,7 +45,7 @@ public:
public:
virtual void translate(PUScriptCompiler* compiler, PUAbstractNode *node);
virtual void translate(PUScriptCompiler* compiler, PUAbstractNode *node) override;
protected:

2
extensions/Particle3D/PU/CCPUPathFollower.h
View File

@ -56,7 +56,7 @@ public:
*/
const Vec3& getPoint(unsigned short index) const {return _spline.getPoint(index);};
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUPathFollower(void);

2
extensions/Particle3D/PU/CCPUPlaneCollider.h
View File

@ -56,7 +56,7 @@ public:
*/
void calculateDirectionAfterCollision(PUParticle3D* particle, float timeElapsed);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUPlaneCollider(void);

4
extensions/Particle3D/PU/CCPUPointEmitter.h
View File

@ -36,8 +36,8 @@ class CC_DLL PUPointEmitter : public PUEmitter
public:
static PUPointEmitter* create();
virtual PUPointEmitter* clone();
virtual void copyAttributesTo (PUEmitter* emitter);
virtual PUPointEmitter* clone() override;
virtual void copyAttributesTo (PUEmitter* emitter) override;
CC_CONSTRUCTOR_ACCESS:
PUPointEmitter(void);

4
extensions/Particle3D/PU/CCPUPositionEmitter.h
View File

@ -70,8 +70,8 @@ public:
*/
virtual void initParticlePosition(PUParticle3D* particle) override;
virtual PUPositionEmitter* clone();
virtual void copyAttributesTo (PUEmitter* emitter);
virtual PUPositionEmitter* clone() override;
virtual void copyAttributesTo (PUEmitter* emitter) override;
CC_CONSTRUCTOR_ACCESS:
PUPositionEmitter(void);

2
extensions/Particle3D/PU/CCPURandomiser.h
View File

@ -70,7 +70,7 @@ public:
bool isRandomDirection(void) const;
void setRandomDirection(bool randomDirection);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PURandomiser(void);

20
extensions/Particle3D/PU/CCPURender.h
View File

@ -63,10 +63,10 @@ class CC_DLL PUParticle3DEntityRender : public PURender
{
public:
virtual void setDepthTest(bool isDepthTest);
virtual void setDepthWrite(bool isDepthWrite);
virtual void setDepthTest(bool isDepthTest) override;
virtual void setDepthWrite(bool isDepthWrite) override;
virtual void copyAttributesTo (PURender *render);
virtual void copyAttributesTo (PURender *render) override;
CC_CONSTRUCTOR_ACCESS:
PUParticle3DEntityRender();
@ -150,8 +150,8 @@ public:
virtual void render(Renderer* renderer, const Mat4 &transform, ParticleSystem3D* particleSystem) override;
virtual PUParticle3DQuadRender* clone();
virtual void copyAttributesTo (PURender *render);
virtual PUParticle3DQuadRender* clone() override;
virtual void copyAttributesTo (PURender *render) override;
CC_CONSTRUCTOR_ACCESS:
PUParticle3DQuadRender();
@ -186,8 +186,8 @@ public:
virtual void render(Renderer* renderer, const Mat4 &transform, ParticleSystem3D* particleSystem) override;
virtual PUParticle3DModelRender* clone();
virtual void copyAttributesTo (PURender *render);
virtual PUParticle3DModelRender* clone() override;
virtual void copyAttributesTo (PURender *render) override;
CC_CONSTRUCTOR_ACCESS:
PUParticle3DModelRender();
@ -209,7 +209,7 @@ public:
virtual void render(Renderer* renderer, const Mat4 &transform, ParticleSystem3D* particleSystem) override;
virtual PUParticle3DBoxRender* clone();
virtual PUParticle3DBoxRender* clone() override;
CC_CONSTRUCTOR_ACCESS:
PUParticle3DBoxRender();
@ -228,8 +228,8 @@ public:
virtual void render(Renderer* renderer, const Mat4 &transform, ParticleSystem3D* particleSystem) override;
virtual PUSphereRender* clone();
virtual void copyAttributesTo (PURender *render);
virtual PUSphereRender* clone() override;
virtual void copyAttributesTo (PURender *render) override;
CC_CONSTRUCTOR_ACCESS:
PUSphereRender();

12
extensions/Particle3D/PU/CCPURibbonTrailRender.h
View File

@ -89,10 +89,10 @@ public:
static PURibbonTrailRender* create(const std::string &texFile = "");
virtual void notifyRescaled(const Vec3& scale);
virtual void prepare();
virtual void unPrepare();
virtual void updateRender(PUParticle3D *particle, float deltaTime, bool firstParticle);
virtual void notifyRescaled(const Vec3& scale) override;
virtual void prepare() override;
virtual void unPrepare() override;
virtual void updateRender(PUParticle3D *particle, float deltaTime, bool firstParticle) override;
virtual void render(Renderer* renderer, const Mat4 &transform, ParticleSystem3D* particleSystem) override;
virtual void particleEmitted(PUParticleSystem3D* particleSystem, PUParticle3D* particle) override;
@ -125,8 +125,8 @@ public:
*/
void destroyAll(void);
virtual PURibbonTrailRender* clone();
virtual void copyAttributesTo (PURender *render);
virtual PURibbonTrailRender* clone() override;
virtual void copyAttributesTo (PURender *render) override;
CC_CONSTRUCTOR_ACCESS:
PURibbonTrailRender();

2
extensions/Particle3D/PU/CCPUScaleAffector.h
View File

@ -75,7 +75,7 @@ public:
bool isSinceStartSystem(void) const {return _sinceStartSystem;};
void setSinceStartSystem(bool sinceStartSystem){_sinceStartSystem = sinceStartSystem;};
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUScaleAffector(void);

2
extensions/Particle3D/PU/CCPUScaleVelocityAffector.h
View File

@ -59,7 +59,7 @@ public:
bool isStopAtFlip(void) const {return _stopAtFlip;};
void setStopAtFlip(bool stopAtFlip){_stopAtFlip = stopAtFlip;};
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUScaleVelocityAffector(void);

2
extensions/Particle3D/PU/CCPUSineForceAffector.h
View File

@ -54,7 +54,7 @@ public:
const float getFrequencyMax(void) const;
void setFrequencyMax(const float frequencyMax);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUSineForceAffector(void);

4
extensions/Particle3D/PU/CCPUSlaveEmitter.h
View File

@ -82,8 +82,8 @@ public:
*/
void setMasterEmitterName(const std::string& masterEmitterName);
virtual PUSlaveEmitter* clone();
virtual void copyAttributesTo (PUEmitter* emitter);
virtual PUSlaveEmitter* clone() override;
virtual void copyAttributesTo (PUEmitter* emitter) override;
CC_CONSTRUCTOR_ACCESS:
PUSlaveEmitter(void);

2
extensions/Particle3D/PU/CCPUSphereCollider.h
View File

@ -68,7 +68,7 @@ public:
*/
void calculateDirectionAfterCollision(PUParticle3D* particle, Vec3 distance, float distanceLength);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUSphereCollider(void);

8
extensions/Particle3D/PU/CCPUSphereSurfaceEmitter.h
View File

@ -45,14 +45,14 @@ public:
/**
*/
virtual void initParticlePosition(PUParticle3D* particle);
virtual void initParticlePosition(PUParticle3D* particle) override;
/**
*/
virtual void initParticleDirection(PUParticle3D* particle);
virtual void initParticleDirection(PUParticle3D* particle) override;
virtual PUSphereSurfaceEmitter* clone();
virtual void copyAttributesTo (PUEmitter* emitter);
virtual PUSphereSurfaceEmitter* clone() override;
virtual void copyAttributesTo (PUEmitter* emitter) override;
CC_CONSTRUCTOR_ACCESS:
PUSphereSurfaceEmitter(void);

2
extensions/Particle3D/PU/CCPUTextureAnimator.h
View File

@ -85,7 +85,7 @@ public:
/** Todo */
void setStartRandom(bool startRandom);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUTextureAnimator(void);

4
extensions/Particle3D/PU/CCPUTextureRotator.h
View File

@ -79,9 +79,9 @@ public:
float calculateRotationSpeed (PUParticle3D* particle);
/** @copydoc ParticleAffector::_initParticleForEmission */
virtual void initParticleForEmission(PUParticle3D* particle);
virtual void initParticleForEmission(PUParticle3D* particle) override;
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUTextureRotator(void);

2
extensions/Particle3D/PU/CCPUVelocityMatchingAffector.h
View File

@ -49,7 +49,7 @@ public:
*/
void setRadius(float radius);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
/** @copydoc ParticleAffector::_prepare */
//virtual void _prepare(ParticleTechnique* particleTechnique);

2
extensions/Particle3D/PU/CCPUVortexAffector.h
View File

@ -60,7 +60,7 @@ public:
*/
void setRotationSpeed(PUDynamicAttribute* dynRotationSpeed);
virtual void copyAttributesTo (PUAffector* affector);
virtual void copyAttributesTo (PUAffector* affector) override;
CC_CONSTRUCTOR_ACCESS:
PUVortexAffector(void);

2
extensions/physics-nodes/CCPhysicsSprite.h
View File

@ -85,7 +85,7 @@ public:
PhysicsSprite();
virtual bool isDirty() const;
virtual bool isDirty() const override;
/** Keep the sprite's rotation separate from the body. */
bool isIgnoreBodyRotation() const;

2
tests/cpp-empty-test/Classes/HelloWorldScene.h
View File

@ -7,7 +7,7 @@ class HelloWorld : public cocos2d::Layer
{
public:
// Here's a difference. Method 'init' in cocos2d-x returns bool, instead of returning 'id' in cocos2d-iphone
virtual bool init();
virtual bool init() override;
// there's no 'id' in cpp, so we recommend returning the class instance pointer
static cocos2d::Scene* scene();

6
tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.h
View File

@ -17,9 +17,9 @@ public:
virtual std::string title() const override;
virtual std::string subtitle() const override;
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);
void backCallback(Ref* sender);
void restartCallback(Ref* sender) override;
void nextCallback(Ref* sender) override;
void backCallback(Ref* sender) override;
};
class CrashTest : public ActionManagerTest

54
tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.h
View File

@ -50,9 +50,9 @@ public:
void centerSprites(unsigned int numberOfSprites);
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);
void backCallback(Ref* sender);
void restartCallback(Ref* sender) override;
void nextCallback(Ref* sender) override;
void backCallback(Ref* sender) override;
void positionForTwo();
};
@ -60,7 +60,7 @@ public:
class SpriteEase : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
void testStopAction(float dt);
@ -69,126 +69,126 @@ public:
class SpriteEaseInOut : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseExponential : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseExponentialInOut : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseSine : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseSineInOut : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseElastic : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseElasticInOut : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseBounce : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseBounceInOut : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseBack : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseBackInOut : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseBezier : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseQuadratic : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseQuadraticInOut : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseQuartic : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseQuarticInOut : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseQuintic : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseQuinticInOut : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
@ -196,34 +196,34 @@ public:
class SpriteEaseCircle : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseCircleInOut : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseCubic : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteEaseCubicInOut : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string title() const override;
};
class SpeedTest : public EaseSpriteDemo
{
public:
void onEnter();
void onEnter() override;
virtual std::string subtitle() const override;
void altertime(float dt);

6
tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.h
View File

@ -39,9 +39,9 @@ public:
virtual std::string subtitle() const override;
virtual void onEnter() override;
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);
void backCallback(Ref* sender);
void restartCallback(Ref* sender) override;
void nextCallback(Ref* sender) override;
void backCallback(Ref* sender) override;
};
class SpriteProgressToRadial : public SpriteDemo

14
tests/cpp-tests/Classes/ActionsTest/ActionsTest.h
View File

@ -57,9 +57,9 @@ public:
virtual std::string title() const override;
virtual std::string subtitle() const override;
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);
void backCallback(Ref* sender);
void restartCallback(Ref* sender) override;
void nextCallback(Ref* sender) override;
void backCallback(Ref* sender) override;
};
class ActionManual : public ActionsDemo
@ -421,7 +421,7 @@ public:
virtual std::string subtitle() const override;
virtual void addNewSpriteWithCoords(Vec2 p);
virtual void runActionsInSprite(Sprite* sprite);
void onTouchesEnded(const std::vector<Touch*>& touches, Event* event);
void onTouchesEnded(const std::vector<Touch*>& touches, Event* event) override;
};
class ActionMoveStacked : public ActionStacked
@ -430,7 +430,7 @@ public:
CREATE_FUNC(ActionMoveStacked);
virtual std::string title() const override;
virtual void runActionsInSprite(Sprite* sprite);
virtual void runActionsInSprite(Sprite* sprite) override;
};
class ActionMoveJumpStacked : public ActionStacked
@ -439,7 +439,7 @@ public:
CREATE_FUNC(ActionMoveJumpStacked);
virtual std::string title() const override;
virtual void runActionsInSprite(Sprite* sprite);
virtual void runActionsInSprite(Sprite* sprite) override;
};
class ActionMoveBezierStacked : public ActionStacked
@ -448,7 +448,7 @@ public:
CREATE_FUNC(ActionMoveBezierStacked);
virtual std::string title() const override;
virtual void runActionsInSprite(Sprite* sprite);
virtual void runActionsInSprite(Sprite* sprite) override;
};
class ActionCatmullRomStacked : public ActionsDemo

12
tests/cpp-tests/Classes/AllocatorTest/AllocatorTest.h
View File

@ -76,17 +76,17 @@ namespace AllocatorTestNS
AllocatorTest();
virtual ~AllocatorTest();
virtual std::string title() const;
virtual std::string subtitle() const;
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void restartCallback(Ref* sender);
virtual void nextCallback(Ref* sender);
virtual void backCallback(Ref* sender);
virtual void restartCallback(Ref* sender) override;
virtual void nextCallback(Ref* sender) override;
virtual void backCallback(Ref* sender) override;
virtual void onEnter() override;
virtual void onExit() override;
virtual void update(float delta);
virtual void update(float delta) override;
};
class AllocatorTestScene : public TestScene

2
tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.h
View File

@ -62,7 +62,7 @@ public:
void addNewBillBoradWithCoords(Vec3 p);
void addNewAniBillBoradWithCoords(Vec3 p);
void rotateCameraCallback(Ref* sender,float value);
void onTouchesMoved(const std::vector<Touch*>& touches, Event* event);
void onTouchesMoved(const std::vector<Touch*>& touches, Event* event) override;
void menuCallback_orientedPoint(Ref* sender);
void menuCallback_orientedPlane(Ref* sender);

Some files were not shown because too many files have changed in this diff Show More