Merge pull request #359 from pandamicro/v1.3

Unify function name of Texture2D::releaseTexture
This commit is contained in:
pandamicro
2016-10-24 02:49:54 +08:00
committed by GitHub
3 changed files with 4 additions and 4 deletions
@@ -2300,7 +2300,7 @@ JSObject* jsb_create_weak_jsobject(JSContext *cx, void *native, js_type_class_t
#else
#if COCOS2D_DEBUG > 1
CC_UNUSED_PARAM(proxy);
CCLOG("++++++WEAK_REF++++++ Cpp(%s): %p - JS: %p", debug, native, jsObj.get());
// CCLOG("++++++WEAK_REF++++++ Cpp(%s): %p - JS: %p", debug, native, jsObj.get());
#endif // COCOS2D_DEBUG
#endif // CC_ENABLE_GC_FOR_NATIVE_OBJECTS
return jsObj;
@@ -2373,7 +2373,7 @@ JSObject* jsb_get_or_create_weak_jsobject(JSContext *cx, void *native, js_type_c
JS::AddNamedObjectRoot(cx, &proxy->obj, debug);
#else
#if COCOS2D_DEBUG > 1
CCLOG("++++++WEAK_REF++++++ Cpp(%s): %p - JS: %p", debug, native, jsObj.get());
// CCLOG("++++++WEAK_REF++++++ Cpp(%s): %p - JS: %p", debug, native, jsObj.get());
#endif // COCOS2D_DEBUG
#endif // CC_ENABLE_GC_FOR_NATIVE_OBJECTS
return jsObj;
@@ -1340,7 +1340,7 @@ bool js_CCNode_unschedule(JSContext *cx, uint32_t argc, jsval *vp)
auto targetArray = JSScheduleWrapper::getTargetForSchedule(args.get(0));
if (targetArray) {
CCLOGINFO("unschedule target number: %d", targetArray->size());
CCLOGINFO("unschedule target number: %zd", targetArray->size());
for (const auto& tmp : *targetArray)
{
+1 -1
View File
@@ -150,7 +150,7 @@ rename_functions = SpriteFrameCache::[addSpriteFramesWithFile=addSpriteFrames ge
LayerColor::[initWithColor=init],
GLProgramCache::[getGLProgram=getProgram addGLProgram=addProgram reloadDefaultGLPrograms=reloadDefaultShaders loadDefaultGLPrograms=loadDefaultShaders],
TextFieldTTF::[textFieldWithPlaceHolder=create],
Texture2D::[getGLProgram=getShaderProgram setGLProgram=setShaderProgram],
Texture2D::[getGLProgram=getShaderProgram setGLProgram=setShaderProgram releaseGLTexture=releaseTexture],
Speed::[setSpeed=_setSpeed getSpeed=_getSpeed]
rename_classes = ParticleSystemQuad::ParticleSystem,