mirror of https://github.com/axmolengine/axmol.git
Add override keywords
This commit is contained in:
parent
6661f702ce
commit
4600c41f9b
|
@ -99,19 +99,19 @@ public:
|
||||||
* Gets the script type, for ScriptingCore, it will return `cocos2d::kScriptTypeJavascript`
|
* Gets the script type, for ScriptingCore, it will return `cocos2d::kScriptTypeJavascript`
|
||||||
* @return `cocos2d::kScriptTypeJavascript`
|
* @return `cocos2d::kScriptTypeJavascript`
|
||||||
*/
|
*/
|
||||||
virtual cocos2d::ccScriptType getScriptType() { return cocos2d::kScriptTypeJavascript; };
|
virtual cocos2d::ccScriptType getScriptType() override { return cocos2d::kScriptTypeJavascript; };
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief @~english Removes the C++ object's linked JavaScript proxy object from JavaScript context
|
* @brief @~english Removes the C++ object's linked JavaScript proxy object from JavaScript context
|
||||||
* @param obj @~english Object to be removed
|
* @param obj @~english Object to be removed
|
||||||
*/
|
*/
|
||||||
virtual void removeScriptObjectByObject(cocos2d::Ref* obj);
|
virtual void removeScriptObjectByObject(cocos2d::Ref* obj) override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief @~english Useless in ScriptingCore, please use evalString
|
* @brief @~english Useless in ScriptingCore, please use evalString
|
||||||
* @see evalString
|
* @see evalString
|
||||||
*/
|
*/
|
||||||
virtual int executeString(const char* codes) { return 0; }
|
virtual int executeString(const char* codes) override { return 0; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief @~english Pause scheduled tasks and actions for an object proxy.
|
* @brief @~english Pause scheduled tasks and actions for an object proxy.
|
||||||
|
@ -133,14 +133,14 @@ public:
|
||||||
@brief Useless in ScriptingCore, please use runScript
|
@brief Useless in ScriptingCore, please use runScript
|
||||||
@param filename String object holding the filename of the script file that is to be executed
|
@param filename String object holding the filename of the script file that is to be executed
|
||||||
*/
|
*/
|
||||||
virtual int executeScriptFile(const char* filename) { return 0; }
|
virtual int executeScriptFile(const char* filename) override { return 0; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@brief @~english Useless in ScriptingCore, please use executeFunctionWithOwner
|
@brief @~english Useless in ScriptingCore, please use executeFunctionWithOwner
|
||||||
@param functionName String object holding the name of the function, in the global script environment, that is to be executed.
|
@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.
|
@return The integer value returned from the script function.
|
||||||
*/
|
*/
|
||||||
virtual int executeGlobalFunction(const char* functionName) { return 0; }
|
virtual int executeGlobalFunction(const char* functionName) override { return 0; }
|
||||||
|
|
||||||
virtual int sendEvent(cocos2d::ScriptEvent* message) override;
|
virtual int sendEvent(cocos2d::ScriptEvent* message) override;
|
||||||
|
|
||||||
|
@ -149,10 +149,10 @@ public:
|
||||||
* @brief @~english Useless in ScriptingCore
|
* @brief @~english Useless in ScriptingCore
|
||||||
* @return @~english false
|
* @return @~english false
|
||||||
*/
|
*/
|
||||||
virtual bool handleAssert(const char *msg) { return false; }
|
virtual bool handleAssert(const char *msg) override { return false; }
|
||||||
|
|
||||||
virtual void setCalledFromScript(bool callFromScript) { _callFromScript = callFromScript; };
|
virtual void setCalledFromScript(bool callFromScript) override { _callFromScript = callFromScript; };
|
||||||
virtual bool isCalledFromScript() { return _callFromScript; };
|
virtual bool isCalledFromScript() override { return _callFromScript; };
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief @~english Execute a js function with a JavaScript object as parameter.
|
* @brief @~english Execute a js function with a JavaScript object as parameter.
|
||||||
|
|
|
@ -75,11 +75,11 @@ public:
|
||||||
virtual float getTrailLength(void) const { return _trailLength; }
|
virtual float getTrailLength(void) const { return _trailLength; }
|
||||||
|
|
||||||
/** @copydoc BillboardChain::setMaxChainElements */
|
/** @copydoc BillboardChain::setMaxChainElements */
|
||||||
void setMaxChainElements(size_t maxElements);
|
void setMaxChainElements(size_t maxElements) override;
|
||||||
/** @copydoc BillboardChain::setNumberOfChains */
|
/** @copydoc BillboardChain::setNumberOfChains */
|
||||||
virtual void setNumberOfChains(size_t numChains) override;
|
virtual void setNumberOfChains(size_t numChains) override;
|
||||||
/** @copydoc BillboardChain::clearChain */
|
/** @copydoc BillboardChain::clearChain */
|
||||||
void clearChain(size_t chainIndex);
|
void clearChain(size_t chainIndex) override;
|
||||||
|
|
||||||
/** Set the starting ribbon colour for a given segment.
|
/** Set the starting ribbon colour for a given segment.
|
||||||
@param chainIndex The index of the chain
|
@param chainIndex The index of the chain
|
||||||
|
|
|
@ -20,19 +20,19 @@ public:
|
||||||
@return true Initialize success, app continue.
|
@return true Initialize success, app continue.
|
||||||
@return false Initialize failed, app terminate.
|
@return false Initialize failed, app terminate.
|
||||||
*/
|
*/
|
||||||
virtual bool applicationDidFinishLaunching();
|
virtual bool applicationDidFinishLaunching() override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@brief The function be called when the application enter background
|
@brief The function be called when the application enter background
|
||||||
@param the pointer of the application
|
@param the pointer of the application
|
||||||
*/
|
*/
|
||||||
virtual void applicationDidEnterBackground();
|
virtual void applicationDidEnterBackground() override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@brief The function be called when the application enter foreground
|
@brief The function be called when the application enter foreground
|
||||||
@param the pointer of the application
|
@param the pointer of the application
|
||||||
*/
|
*/
|
||||||
virtual void applicationWillEnterForeground();
|
virtual void applicationWillEnterForeground() override;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // _APP_DELEGATE_H_
|
#endif // _APP_DELEGATE_H_
|
||||||
|
|
|
@ -82,7 +82,7 @@ public:
|
||||||
CC_CONSTRUCTOR_ACCESS:
|
CC_CONSTRUCTOR_ACCESS:
|
||||||
DrawNode3D();
|
DrawNode3D();
|
||||||
virtual ~DrawNode3D();
|
virtual ~DrawNode3D();
|
||||||
virtual bool init();
|
virtual bool init() override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
struct V3F_C4B
|
struct V3F_C4B
|
||||||
|
|
Loading…
Reference in New Issue