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

Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into pr4479 

Conflicts:
	cocos/2d/CCSpriteBatchNode.h
This commit is contained in:
James Chen 2013-12-13 16:44:22 +08:00
parent 7a8f2ae235 a52eafc3b8
commit bb5ef615dd
49 changed files with 300 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCAction.h
View File

@ -50,7 +50,7 @@ public:
* @js NA
* @lua NA
*/
std::string description() const;
virtual std::string description() const;
/** returns a clone of action */
virtual Action* clone() const = 0;

2
cocos/2d/CCCamera.cpp
View File

@ -44,7 +44,7 @@ Camera::~Camera(void)
{
}
const char* Camera::description(void) const
std::string Camera::getDescription() const
{
return String::createWithFormat("<Camera | center = (%.2f,%.2f,%.2f)>", _centerX, _centerY, _centerZ)->getCString();
}

2
cocos/2d/CCCamera.h
View File

@ -83,7 +83,7 @@ public:
* @js NA
* @lua NA
*/
const char* description() const;
virtual std::string getDescription() const;
/** sets the dirty value */
inline void setDirty(bool value) { _dirty = value; }

2
cocos/2d/CCGLProgram.cpp
View File

@ -153,7 +153,7 @@ bool GLProgram::initWithVertexShaderFilename(const char* vShaderFilename, const
return initWithVertexShaderByteArray(vertexSource, fragmentSource);
}
const char* GLProgram::description() const
std::string GLProgram::getDescription() const
{
return String::createWithFormat("<GLProgram = "
CC_FORMAT_PRINTF_SIZE_T

2
cocos/2d/CCGLProgram.h
View File

@ -227,7 +227,7 @@ public:
private:
bool updateUniformLocation(GLint location, GLvoid* data, unsigned int bytes);
const char* description() const;
virtual std::string getDescription() const;
bool compileShader(GLuint * shader, GLenum type, const GLchar* source);
std::string logForOpenGLObject(GLuint object, GLInfoFunction infoFunc, GLLogFunction logFunc) const;

5
cocos/2d/CCLabel.cpp
View File

@ -736,5 +736,10 @@ void Label::setCascadeColorEnabled(bool cascadeColorEnabled)
_cascadeColorEnabled = cascadeColorEnabled;
}
std::string Label::getDescription() const
{
return StringUtils::format("<Label | Tag = %d, Label = '%s'>", _tag, cc_utf16_to_utf8(_currentUTF16String,-1,NULL,NULL));
}
NS_CC_END

2
cocos/2d/CCLabel.h
View File

@ -116,6 +116,8 @@ public:
virtual const std::string& getString() const override { static std::string _ret("not implemented"); return _ret; }
void addChild(Node * child, int zOrder=0, int tag=0) override;
virtual std::string getDescription() const override;
private:
/**
* @js NA

5
cocos/2d/CCLabelAtlas.cpp
View File

@ -225,4 +225,9 @@ void LabelAtlas::draw()
}
#endif
std::string LabelAtlas::getDescription() const
{
return StringUtils::format("<LabelAtlas | Tag = %d, Label = '%s'>", _tag, _string.c_str());
}
NS_CC_END

3
cocos/2d/CCLabelAtlas.h
View File

@ -90,7 +90,8 @@ public:
virtual void setString(const std::string &label) override;
virtual const std::string& getString(void) const override;
virtual std::string getDescription() const override;
#if CC_LABELATLAS_DEBUG_DRAW
virtual void draw() override;
#endif

4
cocos/2d/CCLabelBMFont.cpp
View File

@ -1204,6 +1204,10 @@ const std::string& LabelBMFont::getFntFile() const
return _fntFile;
}
std::string LabelBMFont::getDescription() const
{
return StringUtils::format("<LabelBMFont | Tag = %d, Label = '%s'>", _tag, _initialStringUTF8.c_str());
}
//LabelBMFont - Debug draw
#if CC_LABELBMFONT_DEBUG_DRAW

6
cocos/2d/CCLabelBMFont.h
View File

@ -260,16 +260,18 @@ public:
void setFntFile(const std::string& fntFile);
const std::string& getFntFile() const;
virtual std::string getDescription() const override;
#if CC_LABELBMFONT_DEBUG_DRAW
virtual void draw();
#endif // CC_LABELBMFONT_DEBUG_DRAW
private:
protected:
char * atlasNameFromFntFile(const std::string& fntFile);
int kerningAmountForFirst(unsigned short first, unsigned short second);
float getLetterPosXLeft( Sprite* characterSprite );
float getLetterPosXRight( Sprite* characterSprite );
protected:
virtual void setString(unsigned short *newString, bool needUpdateLabel);
// string to render
unsigned short* _string;

4
cocos/2d/CCLabelTTF.cpp
View File

@ -185,9 +185,9 @@ const std::string& LabelTTF::getString() const
return _string;
}
std::string LabelTTF::description() const
std::string LabelTTF::getDescription() const
{
return StringUtils::format("<LabelTTF | FontName = %s, FontSize = %.1f>", _fontName.c_str(), _fontSize);
return StringUtils::format("<LabelTTF | FontName = %s, FontSize = %.1f, Label = '%s'>", _fontName.c_str(), _fontSize, _string.c_str());
}
TextHAlignment LabelTTF::getHorizontalAlignment() const

22
cocos/2d/CCLabelTTF.h
View File

@ -66,12 +66,7 @@ public:
* @lua NA
*/
virtual ~LabelTTF();
/**
* @js NA
* @lua NA
*/
std::string description() const;
/** creates a LabelTTF with a font name and font size in points
@since v2.0.1
*/
@ -161,11 +156,16 @@ public:
const std::string& getFontName() const;
void setFontName(const std::string& fontName);
private:
bool updateTexture();
/**
* @js NA
* @lua NA
*/
virtual std::string getDescription() const override;
protected:
bool updateTexture();
/** set the text definition for this label */
void _updateWithTextDefinition(const FontDefinition& textDefinition, bool mustUpdateTexture = true);
FontDefinition _prepareTextDefinition(bool adjustForResolution = false);
@ -197,8 +197,6 @@ protected:
/** font tint */
Color3B _textFillColor;
};

26
cocos/2d/CCLayer.cpp
View File

@ -405,6 +405,12 @@ void Layer::onTouchesCancelled(const std::vector<Touch*>& touches, Event *unused
CC_UNUSED_PARAM(unused_event);
}
std::string Layer::getDescription() const
{
return StringUtils::format("<Layer | Tag = %d>", _tag);
}
#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
#elif _MSC_VER >= 1400 //vs 2005 or higher
@ -547,6 +553,11 @@ void LayerRGBA::setCascadeColorEnabled(bool cascadeColorEnabled)
_cascadeColorEnabled = cascadeColorEnabled;
}
std::string LayerRGBA::getDescription() const
{
return StringUtils::format("<LayerRGBA | Tag = %d>", _tag);
}
/// LayerColor
LayerColor::LayerColor()
@ -725,6 +736,11 @@ void LayerColor::setOpacity(GLubyte opacity)
updateColor();
}
std::string LayerColor::getDescription() const
{
return StringUtils::format("<LayerColor | Tag = %d>", _tag);
}
//
// LayerGradient
//
@ -912,6 +928,11 @@ void LayerGradient::setCompressedInterpolation(bool compress)
updateColor();
}
std::string LayerGradient::getDescription() const
{
return StringUtils::format("<LayerGradient | Tag = %d>", _tag);
}
/// MultiplexLayer
LayerMultiplex::LayerMultiplex()
@ -1050,4 +1071,9 @@ void LayerMultiplex::switchToAndReleaseMe(int n)
this->addChild(_layers.at(n));
}
std::string LayerMultiplex::getDescription() const
{
return StringUtils::format("<LayerMultiplex | Tag = %d, Layers = %d", _tag, _children.size());
}
NS_CC_END

15
cocos/2d/CCLayer.h
View File

@ -157,7 +157,10 @@ public:
CC_DEPRECATED_ATTRIBUTE virtual void keyBackClicked() final {};
CC_DEPRECATED_ATTRIBUTE virtual void keyMenuClicked() final {};
protected:
// Overrides
virtual std::string getDescription() const override;
protected:
Layer();
virtual ~Layer();
virtual bool init();
@ -214,10 +217,12 @@ public:
virtual void updateDisplayedColor(const Color3B& parentColor) override;
virtual bool isCascadeColorEnabled() const override;
virtual void setCascadeColorEnabled(bool cascadeColorEnabled) override;
virtual std::string getDescription() const override;
virtual void setOpacityModifyRGB(bool bValue) override {CC_UNUSED_PARAM(bValue);}
virtual bool isOpacityModifyRGB() const override { return false; }
protected:
LayerRGBA();
virtual ~LayerRGBA();
@ -284,6 +289,8 @@ public:
*/
virtual void setBlendFunc(const BlendFunc& blendFunc) override;
virtual std::string getDescription() const override;
protected:
LayerColor();
virtual ~LayerColor();
@ -382,6 +389,8 @@ public:
/** Returns the directional vector used for the gradient */
const Point& getVector() const;
virtual std::string getDescription() const override;
protected:
virtual void updateColor() override;
@ -443,6 +452,8 @@ public:
*/
void switchToAndReleaseMe(int n);
virtual std::string getDescription() const override;
protected:
/**

6
cocos/2d/CCMenu.cpp
View File

@ -29,6 +29,7 @@ THE SOFTWARE.
#include "CCStdC.h"
#include "CCInteger.h"
#include "CCEventListenerTouch.h"
#include "CCString.h"
#include <vector>
#include <stdarg.h>
@ -567,4 +568,9 @@ MenuItem* Menu::getItemForTouch(Touch *touch)
return NULL;
}
std::string Menu::getDescription() const
{
return StringUtils::format("<Menu | Tag = %d>", _tag);
}
NS_CC_END

2
cocos/2d/CCMenu.h
View File

@ -119,6 +119,8 @@ public:
virtual void setOpacityModifyRGB(bool bValue) override {CC_UNUSED_PARAM(bValue);}
virtual bool isOpacityModifyRGB(void) const override { return false;}
virtual std::string getDescription() const override;
protected:
/**
* @js ctor

4
cocos/2d/CCMenuItem.cpp
View File

@ -163,6 +163,10 @@ void MenuItem::setCallback(const ccMenuCallback& callback)
_callback = callback;
}
std::string MenuItem::getDescription() const
{
return StringUtils::format("<MenuItem | tag = %d>", _tag);
}
//
//CCMenuItemLabel

3
cocos/2d/CCMenuItem.h
View File

@ -94,6 +94,9 @@ public:
*/
CC_DEPRECATED_ATTRIBUTE void setTarget(Object *rec, SEL_MenuHandler selector);
virtual std::string getDescription() const override;
protected:
/**
* @js ctor

2
cocos/2d/CCNode.cpp
View File

@ -581,7 +581,7 @@ void Node::cleanup()
}
std::string Node::description() const
std::string Node::getDescription() const
{
return StringUtils::format("<Node | Tag = %d", _tag);
}

4
cocos/2d/CCNode.h
View File

@ -151,11 +151,11 @@ public:
/**
* Gets the description string. It makes debugging easier.
* @return A string terminated with '\0'
* @return A string
* @js NA
* @lua NA
*/
std::string description(void) const;
virtual std::string getDescription() const;
/// @} end of initializers

5
cocos/2d/CCParticleSystemQuad.cpp
View File

@ -627,4 +627,9 @@ ParticleSystemQuad * ParticleSystemQuad::create() {
return NULL;
}
std::string ParticleSystemQuad::getDescription() const
{
return StringUtils::format("<ParticleSystemQuad | Tag = %d, Total Particles = %d>", _tag, _totalParticles);
}
NS_CC_END

2
cocos/2d/CCParticleSystemQuad.h
View File

@ -119,6 +119,8 @@ public:
*/
virtual void setTotalParticles(int tp) override;
virtual std::string getDescription() const override;
protected:
/**
* @js ctor

4
cocos/2d/CCProfiling.cpp
View File

@ -90,7 +90,7 @@ void Profiler::displayTimers()
for (auto iter = _activeTimers.begin(); iter != _activeTimers.end(); ++iter)
{
ProfilingTimer* timer = iter->second;
log("%s", timer->description());
log("%s", timer->getDescription().c_str());
}
}
@ -117,7 +117,7 @@ ProfilingTimer::~ProfilingTimer(void)
}
const char* ProfilingTimer::description() const
std::string ProfilingTimer::getDescription() const
{
static char s_desciption[512] = {0};

2
cocos/2d/CCProfiling.h
View File

@ -119,7 +119,7 @@ public:
* @js NA
* @lua NA
*/
const char* description(void) const;
virtual std::string getDescription() const;
/**
* @js NA
* @lua NA

5
cocos/2d/CCScene.cpp
View File

@ -78,6 +78,11 @@ Scene *Scene::create()
}
}
std::string Scene::getDescription() const
{
return StringUtils::format("<Scene | tag = %d>", _tag);
}
#ifdef CC_USE_PHYSICS
Scene *Scene::createWithPhysics()
{

1
cocos/2d/CCScene.h
View File

@ -66,6 +66,7 @@ public:
virtual void addChild(Node* child, int zOrder) override;
virtual void addChild(Node* child, int zOrder, int tag) override;
virtual void update(float delta) override;
virtual std::string getDescription() const override;
protected:
bool initWithPhysics();

10
cocos/2d/CCSprite.cpp
View File

@ -1137,4 +1137,14 @@ void Sprite::updateBlendFunc(void)
}
}
std::string Sprite::getDescription() const
{
int texture_id = -1;
if( _batchNode )
texture_id = _batchNode->getTextureAtlas()->getTexture()->getName();
else
texture_id = _texture->getName();
return StringUtils::format("<Sprite | Tag = %d, TextureID = %d>", _tag, texture_id );
}
NS_CC_END

2
cocos/2d/CCSprite.h
View File

@ -391,6 +391,8 @@ public:
inline const BlendFunc& getBlendFunc() const override { return _blendFunc; }
/// @}
virtual std::string getDescription() const override;
/// @{
/// @name Functions inherited from Node
virtual void setScaleX(float scaleX) override;

5
cocos/2d/CCSpriteBatchNode.cpp
View File

@ -701,4 +701,9 @@ SpriteBatchNode * SpriteBatchNode::addSpriteWithoutQuad(Sprite*child, int z, int
return this;
}
std::string SpriteBatchNode::getDescription() const
{
return StringUtils::format("<SpriteBatchNode | tag = %d>", _tag);
}
NS_CC_END

2
cocos/2d/CCSpriteBatchNode.h
View File

@ -162,7 +162,7 @@ public:
virtual void removeChild(Node *child, bool cleanup) override;
virtual void removeAllChildrenWithCleanup(bool cleanup) override;
virtual void sortAllChildren() override;
virtual void draw() override;
virtual void draw(void) override;
protected:
/** Inserts a quad at a certain index into the texture atlas. The Sprite won't be added into the children array.

6
cocos/2d/CCTMXLayer.cpp
View File

@ -704,5 +704,11 @@ int TMXLayer::getVertexZForPos(const Point& pos)
return ret;
}
std::string TMXLayer::getDescription() const
{
return StringUtils::format("<TMXLayer | tag = %d, size = %d,%d>", (int)_tag,_mapTileSize.width, (int)_mapTileSize.height);
}
NS_CC_END

2
cocos/2d/CCTMXLayer.h
View File

@ -188,7 +188,7 @@ public:
virtual void addChild(Node * child, int zOrder, int tag) override;
// super method
void removeChild(Node* child, bool cleanup) override;
virtual std::string getDescription() const override;
private:
Point getPositionForIsoAt(const Point& pos);

7
cocos/2d/CCTMXTiledMap.cpp
View File

@ -243,7 +243,12 @@ Value TMXTiledMap::getPropertiesForGID(int GID) const
return Value();
}
std::string TMXTiledMap::getDescription() const
{
return StringUtils::format("<TMXTiledMap | Tag = %d, Layers = %d", _tag, _children.size());
}
NS_CC_END

4
cocos/2d/CCTMXTiledMap.h
View File

@ -168,7 +168,9 @@ public:
inline void setProperties(const ValueMap& properties) {
_properties = properties;
};
virtual std::string getDescription() const override;
protected:
/**
* @js ctor

2
cocos/2d/CCTexture2D.cpp
View File

@ -671,7 +671,7 @@ bool Texture2D::initWithMipmaps(MipmapInfo* mipmaps, int mipmapsNum, PixelFormat
}
const char* Texture2D::description(void) const
std::string Texture2D::getDescription() const
{
return String::createWithFormat("<Texture2D | Name = %u | Dimensions = %ld x %ld | Coordinates = (%.2f, %.2f)>", _name, (long)_pixelsWide, (long)_pixelsHigh, _maxS, _maxT)->getCString();
}

2
cocos/2d/CCTexture2D.h
View File

@ -200,7 +200,7 @@ public:
* @js NA
* @lua NA
*/
const char* description(void) const;
virtual std::string getDescription() const;
/** These functions are needed to create mutable textures
* @js NA

2
cocos/2d/CCTextureAtlas.cpp
View File

@ -222,7 +222,7 @@ void TextureAtlas::listenBackToForeground(Object *obj)
_dirty = true;
}
const char* TextureAtlas::description() const
std::string TextureAtlas::getDescription() const
{
return String::createWithFormat("<TextureAtlas | totalQuads = %zd>", _totalQuads)->getCString();
}

2
cocos/2d/CCTextureAtlas.h
View File

@ -194,7 +194,7 @@ public:
* @js NA
* @lua NA
*/
const char* description() const;
virtual std::string getDescription() const;
/** Gets the quantity of quads that are going to be drawn */
ssize_t getTotalQuads() const;

2
cocos/2d/CCTextureCache.cpp
View File

@ -87,7 +87,7 @@ void TextureCache::purgeSharedTextureCache()
{
}
const char* TextureCache::description() const
std::string TextureCache::getDescription() const
{
return String::createWithFormat("<TextureCache | Number of textures = %lu>", _textures.size() )->getCString();
}

2
cocos/2d/CCTextureCache.h
View File

@ -96,7 +96,7 @@ public:
* @js NA
* @lua NA
*/
const char* description(void) const;
virtual std::string getDescription() const;
// Dictionary* snapshotTextures();

13
cocos/base/CCConsole.cpp
View File

@ -69,23 +69,26 @@ static ssize_t mydprintf(int sock, const char *format, ...)
return write(sock, buf, strlen(buf));
}
static void printSceneGraph(int fd, Node* node, int level)
static int printSceneGraph(int fd, Node* node, int level)
{
int total = 1;
for(int i=0; i<level; ++i)
write(fd, "-", 1);
mydprintf(fd, " %s: z=%d, tag=%d\n", node->description().c_str(), node->getZOrder(), node->getTag());
mydprintf(fd, " %s\n", node->getDescription().c_str());
for(const auto& child: node->getChildren())
printSceneGraph(fd, child, level+1);
total += printSceneGraph(fd, child, level+1);
return total;
}
static void printSceneGraphBoot(int fd)
{
write(fd,"\n",1);
auto scene = Director::getInstance()->getRunningScene();
printSceneGraph(fd, scene, 0);
write(fd,"\n",1);
int total = printSceneGraph(fd, scene, 0);
mydprintf(fd, "Total Nodes: %d\n", total);
}

2
cocos/scripting/auto-generated

@ -1 +1 @@
Subproject commit dc780f0ca828c53d31c3daddf10606e187b197d6
Subproject commit a9af1cbc151fdc39a619e92180e43d1f8cf04f83

2
cocos/scripting/lua/bindings/LuaBasicConversions.h
View File

@ -149,7 +149,7 @@ void ccvector_to_luaval(lua_State* L,const cocos2d::Vector<T>& inValue)
{
long typeId = typeid(*obj).hash_code();
auto iter = g_luaType.find(typeId);
if (g_luaType.end() == iter)
if (g_luaType.end() != iter)
{
lua_pushnumber(L, (lua_Number)indexTable);
int ID = (obj) ? (int)obj->_ID : -1;

2
cocos/scripting/lua/bindings/LuaOpengl.cpp.REMOVED.git-id
View File

@ -1 +1 @@
cdda759b3fa681ecf395a93e2e45fe2e2fac9ec9
9104cc5ff14c7548ea6924a2785400db7526c1e1

2
cocos/scripting/lua/bindings/LuaOpengl.h
View File

@ -16,8 +16,6 @@ class GLNode:public cocos2d::Node
virtual void draw();
};
TOLUA_API int tolua_Cocos2d_CCDrawNode_drawPolygon00(lua_State* tolua_S);
TOLUA_API int tolua_opengl_open(lua_State* tolua_S);
TOLUA_API int register_glnode_manual(lua_State* tolua_S);

99
cocos/scripting/lua/bindings/LuaScriptHandlerMgr.cpp
View File

@ -219,6 +219,7 @@ static void tolua_reg_script_handler_mgr_type(lua_State* tolua_S)
tolua_usertype(tolua_S, "ScheduleHandlerDelegate");
tolua_usertype(tolua_S, "ScriptHandlerMgr");
}
/* method: getInstance of class ScriptHandlerMgr */
#ifndef TOLUA_DISABLE_tolua_Cocos2d_ScriptHandlerMgr_getInstance00
static int tolua_Cocos2d_ScriptHandlerMgr_getInstance00(lua_State* tolua_S)
@ -243,6 +244,101 @@ tolua_lerror:
}
#endif //#ifndef TOLUA_DISABLE
/* method: registerScriptHandler of class ScriptHandlerMgr */
static int tolua_Cocos2d_ScriptHandlerMgr_registerScriptHandler00(lua_State* tolua_S)
{
#ifndef TOLUA_RELEASE
tolua_Error tolua_err;
if (!tolua_isusertype(tolua_S,1,"ScriptHandlerMgr",0,&tolua_err) ||
!tolua_isusertype(tolua_S, 2, "Object", 0, &tolua_err) ||
!toluafix_isfunction(tolua_S, 3, "LUA_FUNCTION", 0, &tolua_err) ||
!tolua_isnumber(tolua_S, 4, 0, &tolua_err) ||
!tolua_isnoobj(tolua_S,5,&tolua_err) )
goto tolua_lerror;
else
#endif
{
cocos2d::ScriptHandlerMgr* scriptHanlderMgr = static_cast<cocos2d::ScriptHandlerMgr*>(tolua_tousertype(tolua_S,1,0));
#ifndef TOLUA_RELEASE
if (nullptr == scriptHanlderMgr)
{
tolua_error(tolua_S,"invalid 'scriptHanlderMgr' in function 'tolua_Cocos2d_ScriptHandlerMgr_registerScriptHandler00'\n", NULL);
return 0;
}
#endif
LUA_FUNCTION handler = toluafix_ref_function(tolua_S,3,0);
ScriptHandlerMgr::HandlerType handlerType = (ScriptHandlerMgr::HandlerType)tolua_tonumber(tolua_S, 4, 0);
scriptHanlderMgr->addObjectHandler(tolua_tousertype(tolua_S, 2, 0), handler,handlerType);
}
return 1;
#ifndef TOLUA_RELEASE
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err);
return 0;
#endif
}
/* method: unregisterScriptHandler of class ScriptHandlerMgr */
static int tolua_Cocos2d_ScriptHandlerMgr_unregisterScriptHandler00(lua_State* tolua_S)
{
#ifndef TOLUA_RELEASE
tolua_Error tolua_err;
if (!tolua_isusertype(tolua_S,1,"ScriptHandlerMgr",0,&tolua_err) ||
!tolua_isusertype(tolua_S, 2, "Object", 0, &tolua_err) ||
!tolua_isnumber(tolua_S, 3, 0, &tolua_err) ||
!tolua_isnoobj(tolua_S,4,&tolua_err) )
goto tolua_lerror;
else
#endif
{
cocos2d::ScriptHandlerMgr* scriptHanlderMgr = static_cast<cocos2d::ScriptHandlerMgr*>(tolua_tousertype(tolua_S,1,0));
#ifndef TOLUA_RELEASE
if (nullptr == scriptHanlderMgr)
{
tolua_error(tolua_S,"invalid 'scriptHanlderMgr' in function 'tolua_Cocos2d_ScriptHandlerMgr_unregisterScriptHandler00'\n", NULL);
return 0;
}
#endif
ScriptHandlerMgr::HandlerType handlerType = (ScriptHandlerMgr::HandlerType)tolua_tonumber(tolua_S, 3, 0);
scriptHanlderMgr->removeObjectHandler(tolua_tousertype(tolua_S, 2, 0), handlerType);
}
return 1;
#ifndef TOLUA_RELEASE
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'unregisterScriptHandler'.",&tolua_err);
return 0;
#endif
}
/* method: removeObjectAllHandlers of class ScriptHandlerMgr */
static int tolua_Cocos2d_ScriptHandlerMgr_removeObjectAllHandlers00(lua_State* tolua_S)
{
#ifndef TOLUA_RELEASE
tolua_Error tolua_err;
if (!tolua_isusertype(tolua_S,1,"ScriptHandlerMgr",0,&tolua_err) ||
!tolua_isusertype(tolua_S, 2, "Object", 0, &tolua_err) ||
!tolua_isnoobj(tolua_S,3,&tolua_err) )
goto tolua_lerror;
else
#endif
{
cocos2d::ScriptHandlerMgr* scriptHanlderMgr = static_cast<cocos2d::ScriptHandlerMgr*>(tolua_tousertype(tolua_S,1,0));
#ifndef TOLUA_RELEASE
if (nullptr == scriptHanlderMgr)
{
tolua_error(tolua_S,"invalid 'scriptHanlderMgr' in function 'tolua_Cocos2d_ScriptHandlerMgr_removeObjectAllHandlers00'\n", NULL);
return 0;
}
#endif
scriptHanlderMgr->removeObjectAllHandlers(tolua_tousertype(tolua_S, 2, 0));
}
return 1;
#ifndef TOLUA_RELEASE
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'removeObjectAllHandlers'.",&tolua_err);
return 0;
#endif
}
TOLUA_API int tolua_script_handler_mgr_open(lua_State* tolua_S)
{
@ -253,6 +349,9 @@ TOLUA_API int tolua_script_handler_mgr_open(lua_State* tolua_S)
tolua_cclass(tolua_S,"ScriptHandlerMgr","ScriptHandlerMgr","",NULL);
tolua_beginmodule(tolua_S, "ScriptHandlerMgr");
tolua_function(tolua_S, "getInstance", tolua_Cocos2d_ScriptHandlerMgr_getInstance00);
tolua_function(tolua_S, "registerScriptHandler", tolua_Cocos2d_ScriptHandlerMgr_registerScriptHandler00);
tolua_function(tolua_S, "unregisterScriptHandler", tolua_Cocos2d_ScriptHandlerMgr_unregisterScriptHandler00);
tolua_function(tolua_S, "removeObjectAllHandlers", tolua_Cocos2d_ScriptHandlerMgr_removeObjectAllHandlers00);
tolua_endmodule(tolua_S);
tolua_endmodule(tolua_S);
return 1;

3
cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
View File

@ -134,9 +134,6 @@ private:
NS_CC_END
TOLUA_API int tolua_Cocos2d_GLNode_registerScriptDrawHandler00(lua_State* tolua_S);
TOLUA_API int tolua_Cocos2d_GLNode_unregisterScriptDrawHandler00(lua_State* tolua_S);
TOLUA_API int tolua_script_handler_mgr_open(lua_State* tolua_S);
#endif //__LUA_SCRIPT_HANDLER_MGR_H__

38
cocos/scripting/lua/script/Cocos2dConstants.lua
View File

@ -288,4 +288,42 @@ cc.ASSETSMANAGER_UNCOMPRESS = 3
cc.ASSETSMANAGER_PROTOCOL_PROGRESS = 0
cc.ASSETSMANAGER_PROTOCOL_SUCCESS = 1
cc.ASSETSMANAGER_PROTOCOL_ERROR = 2
cc.HANDLERTYPE_NODE = 0
cc.HANDLERTYPE_MENU_CLICKED = 1
cc.HANDLERTYPE_NOTIFICATION = 2
cc.HANDLERTYPE_CALLFUNC = 3
cc.HANDLERTYPE_SCHEDULE = 4
cc.HANDLERTYPE_TOUCHES = 5
cc.HANDLERTYPE_KEYPAD = 6
cc.HANDLERTYPE_ACCELEROMETER = 7
cc.HANDLERTYPE_CONTROL_TOUCH_DOWN = 8
cc.HANDLERTYPE_CONTROL_TOUCH_DRAG_INSIDE = 9
cc.HANDLERTYPE_CONTROL_TOUCH_DRAG_OUTSIDE = 10
cc.HANDLERTYPE_CONTROL_TOUCH_DRAG_ENTER = 11
cc.HANDLERTYPE_CONTROL_TOUCH_DRAG_EXIT = 12
cc.HANDLERTYPE_CONTROL_TOUCH_UP_INSIDE = 13
cc.HANDLERTYPE_CONTROL_TOUCH_UP_OUTSIDE = 14
cc.HANDLERTYPE_CONTROL_TOUCH_UP_CANCEL = 15
cc.HANDLERTYPE_CONTROL_VALUE_CHANGED = 16
cc.HANDLERTYPE_WEBSOCKET_OPEN = 17
cc.HANDLERTYPE_WEBSOCKET_MESSAGE = 18
cc.HANDLERTYPE_WEBSOCKET_CLOSE = 19
cc.HANDLERTYPE_WEBSOCKET_ERROR = 20
cc.HANDLERTYPE_GL_NODE_DRAW = 21
cc.HANDLERTYPE_SCROLLVIEW_SCROLL = 22
cc.HANDLERTYPE_SCROLLVIEW_ZOOM = 23
cc.HANDLERTYPE_TABLECELL_TOUCHED = 24
cc.HANDLERTYPE_TABLECELL_HIGHLIGHT = 25
cc.HANDLERTYPE_TABLECELL_UNHIGHLIGHT = 26
cc.HANDLERTYPE_TABLECELL_WILL_RECYCLE = 27
cc.HANDLERTYPE_TABLECELL_SIZE_FOR_INDEX = 28
cc.HANDLERTYPE_TABLECELL_AT_INDEX = 29
cc.HANDLERTYPE_TABLEVIEW_NUMS_OF_CELLS = 30
cc.HANDLERTYPE_XMLHTTPREQUEST_READY_STATE_CHANGE = 31
cc.HANDLERTYPE_ASSETSMANAGER_PROGRESS = 32
cc.HANDLERTYPE_ASSETSMANAGER_SUCCESS = 33
cc.HANDLERTYPE_ASSETSMANAGER_ERROR = 34
cc.HANDLERTYPE_EVENT_LISTENER = 35
cc.HANDLERTYPE_ARMATURE_EVENT = 36