From f76e2a5476a92f3cd86bd766700a51f5b7935125 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Fri, 23 May 2014 10:00:59 +0800 Subject: [PATCH] Readd the lua binding for `visit` and modify a requirement for IDE --- tests/lua-tests/src/controller.lua | 6 +++++- tools/tolua/cocos2dx.ini | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/lua-tests/src/controller.lua b/tests/lua-tests/src/controller.lua index 9a9d863513..9304229457 100644 --- a/tests/lua-tests/src/controller.lua +++ b/tests/lua-tests/src/controller.lua @@ -65,4 +65,8 @@ fileUtils:setSearchPaths(searchPaths) local scene = cc.Scene:create() scene:addChild(CreateTestMenu()) -cc.Director:getInstance():runWithScene(scene) +if cc.Director:getInstance():getRunningScene() then + cc.Director:getInstance():replaceScene(scene) +else + cc.Director:getInstance():runWithScene(scene) +end diff --git a/tools/tolua/cocos2dx.ini b/tools/tolua/cocos2dx.ini index 0e182c71e9..c4baaf5154 100644 --- a/tools/tolua/cocos2dx.ini +++ b/tools/tolua/cocos2dx.ini @@ -101,7 +101,7 @@ skip = Node::[setGLServerState description getUserObject .*UserData getGLServerS Scheduler::[pause resume unschedule schedule update isTargetPaused isScheduled performFunctionInCocosThread], TextureCache::[addPVRTCImage addImageAsync], Timer::[getSelector createWithScriptHandler], - *::[^visit$ copyWith.* onEnter.* onExit.* ^description$ getObjectType (g|s)etDelegate onTouch.* onAcc.* onKey.* onRegisterTouchListener], + *::[copyWith.* onEnter.* onExit.* ^description$ getObjectType (g|s)etDelegate onTouch.* onAcc.* onKey.* onRegisterTouchListener], FileUtils::[getFileData getDataFromFile getFullPathCache], Application::[^application.* ^run$], Camera::[getEyeXYZ getCenterXYZ getUpXYZ],