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

Merge pull request #4247 from samuele3hu/developCCS 

[ci skip]Add deprecated functions of class TextureCache
This commit is contained in:
minggo 2013-11-13 23:25:49 -08:00
parent f528126d5a a20620c185
commit e2c4c18e3b
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp
View File

@ -186,7 +186,7 @@ static int tolua_cocos2d_ScrollView_unregisterScriptHandler(lua_State* tolua_S)
return 0; return 0;
} }
CCLOG("'unregisterScriptHandler' function of ScrollView has wrong number of arguments: %d, was expecting %d\n", argc, 0); CCLOG("'unregisterScriptHandler' function of ScrollView has wrong number of arguments: %d, was expecting %d\n", argc, 1);
return 0; return 0;
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
@ -313,7 +313,7 @@ static int tolua_cocos2d_control_unregisterControlEventHandler(lua_State* tolua_
return 0; return 0;
} }
CCLOG("'unregisterControlEventHandler' function of Control has wrong number of arguments: %d, was expecting %d\n", argc, 0); CCLOG("'unregisterControlEventHandler' function of Control has wrong number of arguments: %d, was expecting %d\n", argc, 1);
return 0; return 0;
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
@ -1190,7 +1190,7 @@ static int lua_cocos2dx_TableView_create(lua_State* L)
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(L,3,"Node",0,&tolua_err)) goto tolua_lerror; if (!tolua_isusertype(L,3,"Node",0,&tolua_err)) goto tolua_lerror;
#endif #endif
Node* node = static_cast<Node*>(tolua_tousertype(L, 2, nullptr)); Node* node = static_cast<Node*>(tolua_tousertype(L, 3, nullptr));
ret = TableView::create(dataSource, size, node); ret = TableView::create(dataSource, size, node);
} }

13
cocos/scripting/lua/script/Deprecated.lua
View File

@ -16,6 +16,19 @@ rawset(CCDirector,"sharedDirector",CCDirectorDeprecated.sharedDirector)
--functions of CCTextureCache will be deprecated begin --functions of CCTextureCache will be deprecated begin
local TextureCacheDeprecated = {}
function TextureCacheDeprecated.getInstance(self)
deprecatedTip("cc.TextureCache:getInstance","cc.Director:getInstance():getTextureCache")
return cc.Director:getInstance():getTextureCache()
end
rawset(cc.TextureCache,"getInstance",TextureCacheDeprecated.getInstance)
function TextureCacheDeprecated.destroyInstance(self)
deprecatedTip("cc.TextureCache:destroyInstance","cc.Director:getInstance():destroyTextureCache")
return cc.Director:getInstance():destroyTextureCache()
end
rawset(cc.TextureCache,"destroyInstance",TextureCacheDeprecated.destroyInstance)
local CCTextureCacheDeprecated = { } local CCTextureCacheDeprecated = { }
function CCTextureCacheDeprecated.sharedTextureCache() function CCTextureCacheDeprecated.sharedTextureCache()
deprecatedTip("CCTextureCache:sharedTextureCache","CCTextureCache:getInstance") deprecatedTip("CCTextureCache:sharedTextureCache","CCTextureCache:getInstance")