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

Merge pull request #4465 from samuele3hu/developConversion 

issue #2790:Resolve some errors of basical conversion functions
This commit is contained in:
James Chen 2013-12-10 03:21:02 -08:00
parent c130da3d6f cc2323b636
commit dcbd693fec
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/scripting/lua/bindings/LuaBasicConversions.cpp
View File

@ -1093,7 +1093,7 @@ bool luaval_to_ccvalue(lua_State* L, int lo, cocos2d::Value* ret)
if (tolua_istable(L, lo, 0, &tolua_err))
{
lua_pushnumber(L,1);
lua_gettable(L,-2);
lua_gettable(L,lo);
if (lua_isnil(L, -1) ) /** if table[1] = nil,we don't think it is a pure array */
{

6
cocos/scripting/lua/bindings/LuaBasicConversions.h
View File

@ -91,8 +91,10 @@ bool luaval_to_ccvector(lua_State* L, int lo , cocos2d::Vector<T>* ret)
size_t len = lua_objlen(L, lo);
for (int i = 0; i < len; i++)
{
lua_gettable(L, i + 1);
if (lua_isnil(L, -1) || lua_isuserdata(L, -1))
lua_pushnumber(L, i + 1);
lua_gettable(L, lo);
if (lua_isnil(L, -1) || !lua_isuserdata(L, -1))
{
lua_pop(L, 1);
continue;

2
tools/tolua/cocos2dx_extension.ini
View File

@ -37,7 +37,7 @@ classes = AssetsManager.* CCBReader.* CCBAnimationManager.* Scale9Sprite Control
# functions from all classes.
skip = CCBReader::[^CCBReader$ addOwnerCallbackName isJSControlled readByte getCCBMemberVariableAssigner readFloat getCCBSelectorResolver toLowerCase lastPathComponent deletePathExtension endsWith concat getResolutionScale getAnimatedProperties readBool readInt addOwnerCallbackNode addDocumentCallbackName readCachedString readNodeGraphFromData addDocumentCallbackNode getLoadedSpriteSheet initWithData readFileWithCleanUp getOwner$ readNodeGraphFromFile createSceneWithNodeGraphFromFile getAnimationManagers$ setAnimationManagers],
CCBAnimationManager::[setAnimationCompletedCallback setCallFunc],
CCBAnimationManager::[setAnimationCompletedCallback setCallFunc addNode],
ScrollView::[(g|s)etDelegate$],
.*Delegate::[*],
.*Loader.*::[*],

10
tools/travis-scripts/run-script.sh
View File

@ -50,7 +50,7 @@ elif [ "$PLATFORM"x = "android"x ]; then
# Build all samples
echo "Building all samples ..."
cd $COCOS2DX_ROOT/build
./android-build.py -n "NDK_BUG=0 -j10" hellocpp testcpp simplegame testjavascript
./android-build.py -n "NDK_BUG=0 -j10" all
# Build template
# echo "Building template ..."
@ -74,14 +74,14 @@ elif [ "$PLATFORM"x = "linux"x ]; then
cd $COCOS2DX_ROOT/build
mkdir -p linux-build
cd linux-build
cmake ../.. -DBUILD_LIBS_LUA=OFF -DBUILD_HelloLua=OFF -DBUILD_TestLua=OFF
cmake ../..
make -j10
cd ../../template/multi-platform-cpp
cmake .
make -j10
# cd ../multi-platform-lua
# cmake .
# make -j10
cd ../multi-platform-lua
cmake .
make -j10
elif [ "$PLATFORM"x = "emscripten"x ]; then
# Generate binding glue codes