issue cocos2d#2768:Modify armature test sample and skip some function…

…s to lua
angeltown · Oct 8, 2013 · 5086547 · 5086547
1 parent 4c1bd82
commit 5086547
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/samples/Lua/TestLua/Resources/luaScript/ExtensionTest/ArmatureTest.lua b/samples/Lua/TestLua/Resources/luaScript/ExtensionTest/ArmatureTest.lua
@@ -32,7 +32,7 @@ end
 
 function ArmatureTestScene:runThisTest()
     cc.ArmatureDataManager:getInstance():addArmatureFileInfo("armature/TestBone0.png", "armature/TestBone0.plist", "armature/TestBone.json")
-    cc.ArmatureDataManager:getInstance():addArmatureFileInfo("armature/Cowboy0.png", "armature/Cowboy0.plist", "armature/Cowboy.json")
+    cc.ArmatureDataManager:getInstance():addArmatureFileInfo("armature/Cowboy0.png", "armature/Cowboy0.plist", "armature/Cowboy.ExportJson")
     cc.ArmatureDataManager:getInstance():addArmatureFileInfo("armature/knight.png", "armature/knight.plist", "armature/knight.xml")
     cc.ArmatureDataManager:getInstance():addArmatureFileInfo("armature/weapon.png", "armature/weapon.plist", "armature/weapon.xml")
     cc.ArmatureDataManager:getInstance():addArmatureFileInfo("armature/robot.png", "armature/robot.plist", "armature/robot.xml")

diff --git a/tools/tolua/cocos2dx_extension.ini b/tools/tolua/cocos2dx_extension.ini
@@ -47,7 +47,7 @@ skip = CCBReader::[^CCBReader$ addOwnerCallbackName isJSControlled readByte getC
         ControlUtils::[*],
         ControlSwitchSprite::[*],
         ArmatureDataManager::[CCArmatureDataManager ~CCArmatureDataManager],
-        Armature::[createBone updateBlendType getCPBody setCPBody (s|g)etBlendFunc],
+        Armature::[createBone updateBlendType getCPBody setCPBody (s|g)etBlendFunc getShapeList ^getBody$],
         Skin::[getSkinData setSkinData],
         ArmatureAnimation::[updateHandler updateFrameData frameEvent],
         Bone::[(s|g)etIgnoreMovementBoneData]