From 1ad947925bd3c39a0d5c56b488ebe0dfbe8a1ae7 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Mon, 24 Oct 2016 02:49:18 +0800 Subject: [PATCH] Unify function name of Texture2D::releaseTexture --- native/cocos/scripting/js-bindings/manual/ScriptingCore.cpp | 4 ++-- .../cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp | 2 +- native/tools/tojs/cocos2dx.ini | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/native/cocos/scripting/js-bindings/manual/ScriptingCore.cpp b/native/cocos/scripting/js-bindings/manual/ScriptingCore.cpp index 4dc2da37d4..5f817696d9 100644 --- a/native/cocos/scripting/js-bindings/manual/ScriptingCore.cpp +++ b/native/cocos/scripting/js-bindings/manual/ScriptingCore.cpp @@ -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; diff --git a/native/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp b/native/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp index 9e7105ad2f..136ce9815b 100644 --- a/native/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp +++ b/native/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp @@ -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) { diff --git a/native/tools/tojs/cocos2dx.ini b/native/tools/tojs/cocos2dx.ini index 7b21ff7197..d95b336531 100644 --- a/native/tools/tojs/cocos2dx.ini +++ b/native/tools/tojs/cocos2dx.ini @@ -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,