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

Readd the lua binding for `visit` and modify a requirement for IDE

This commit is contained in:
samuele3hu 2014-05-23 10:00:59 +08:00
parent 6e76ca7945
commit f76e2a5476
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/lua-tests/src/controller.lua
View File

@ -65,4 +65,8 @@ fileUtils:setSearchPaths(searchPaths)
local scene = cc.Scene:create() local scene = cc.Scene:create()
scene:addChild(CreateTestMenu()) scene:addChild(CreateTestMenu())
if cc.Director:getInstance():getRunningScene() then
cc.Director:getInstance():replaceScene(scene)
else
cc.Director:getInstance():runWithScene(scene) cc.Director:getInstance():runWithScene(scene)
end

2
tools/tolua/cocos2dx.ini
View File

@ -101,7 +101,7 @@ skip = Node::[setGLServerState description getUserObject .*UserData getGLServerS
Scheduler::[pause resume unschedule schedule update isTargetPaused isScheduled performFunctionInCocosThread], Scheduler::[pause resume unschedule schedule update isTargetPaused isScheduled performFunctionInCocosThread],
TextureCache::[addPVRTCImage addImageAsync], TextureCache::[addPVRTCImage addImageAsync],
Timer::[getSelector createWithScriptHandler], 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], FileUtils::[getFileData getDataFromFile getFullPathCache],
Application::[^application.* ^run$], Application::[^application.* ^run$],
Camera::[getEyeXYZ getCenterXYZ getUpXYZ], Camera::[getEyeXYZ getCenterXYZ getUpXYZ],