Split lua bindings for 3D from cocos2d

tools/tolua/cocos2dx.ini

@@ -22,11 +22,11 @@ cxxgenerator_headers =
 extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s 
 
 # what headers to parse
-headers = %(cocosdir)s/cocos/cocos2d.h %(cocosdir)s/cocos/2d/CCProtectedNode.h %(cocosdir)s/cocos/3d/CCAnimation3D.h %(cocosdir)s/cocos/3d/CCAnimate3D.h
+headers = %(cocosdir)s/cocos/cocos2d.h %(cocosdir)s/cocos/2d/CCProtectedNode.h
 
 # what classes to produce code for. You can use regular expressions here. When testing the regular
 # expression, it will be enclosed in "^$", like this: "^Menu*$".
-classes = New.* Sprite.* Scene Node.* Director Layer.* Menu.* Touch .*Action.* Move.* Rotate.* Blink.* Tint.* Sequence Repeat.* Fade.* Ease.* Scale.* Transition.* Spawn Animat.* Flip.* Delay.* Skew.* Jump.* Place.* Show.* Progress.* PointArray ToggleVisibility.* RemoveSelf Hide Particle.* Label.* Atlas.* TextureCache.* Texture2D Cardinal.* CatmullRom.* ParallaxNode TileMap.* .*TMX.* CallFunc RenderTexture GridAction Grid3DAction GridBase$ .+Grid Shaky3D Waves3D FlipX3D FlipY3D Speed ActionManager Set Scheduler Timer Orbit.* Follow.* Bezier.* CardinalSpline.* Camera.* DrawNode .*3D$ Liquid$ Waves$ ShuffleTiles$ TurnOffTiles$ Split.* Twirl$ FileUtils$ GLProgram ShaderCache Application ClippingNode MotionStreak ^Ref$ UserDefault GLViewImpl GLView Image Event(?!.*(Physics).*).* Component ProtectedNode Console Mesh GLProgramCache GLProgramState SubMeshState AttachNode Camera Ray AABB OBB
+classes = New.* Sprite.* Scene Node.* Director Layer.* Menu.* Touch .*Action.* Move.* Rotate.* Blink.* Tint.* Sequence Repeat.* Fade.* Ease.* Scale.* Transition.* Spawn Animat.* Flip.* Delay.* Skew.* Jump.* Place.* Show.* Progress.* PointArray ToggleVisibility.* RemoveSelf Hide Particle.* Label.* Atlas.* TextureCache.* Texture2D Cardinal.* CatmullRom.* ParallaxNode TileMap.* .*TMX.* CallFunc RenderTexture GridAction Grid3DAction GridBase$ .+Grid Shaky3D Waves3D FlipX3D FlipY3D Speed ActionManager Set Scheduler Timer Orbit.* Follow.* Bezier.* CardinalSpline.* Camera.* DrawNode .*3D$ Liquid$ Waves$ ShuffleTiles$ TurnOffTiles$ Split.* Twirl$ FileUtils$ GLProgram ShaderCache Application ClippingNode MotionStreak ^Ref$ UserDefault GLViewImpl GLView Image Event(?!.*(Physics).*).* Component ProtectedNode Console GLProgramCache GLProgramState Camera
 
 # what should we skip? in the format ClassName::[function function]
 # ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also
@@ -126,17 +126,7 @@ skip = Node::[setGLServerState description getUserObject .*UserData getGLServerS
         TurnOffTiles::[shuffle],
         LabelTTF::[*],
         LabelBMFont::[*],
-        Mesh::[create getOriginAABB],
-        SubMeshState::[getSkin setSkin create],
-        Sprite3D::[getSkin getSubMeshState getAABB],
-        Animation3D::[getBoneCurveByName],
-        Animation3DCache::[*],
-        Sprite3DMaterialCache::[*],
-        Bone3D::[*],
-        Scene::[getCameras],
-        Ray::[*],
-        AABB::[*],
-        OBB::[*]
+        Scene::[getCameras]
 
 rename_functions = SpriteFrameCache::[addSpriteFramesWithFile=addSpriteFrames getSpriteFrameByName=getSpriteFrame],
     ProgressTimer::[setReverseProgress=setReverseDirection],

tools/tolua/cocos2dx_3d.ini

@@ -0,0 +1,68 @@
+[cocos2dx_3d]
+# the prefix to be added to the generated functions. You might or might not use this in your own
+# templates
+prefix = cocos2dx_3d
+
+# create a target namespace (in javascript, this would create some code like the equiv. to `ns = ns || {}`)
+# all classes will be embedded in that namespace
+target_namespace = cc
+
+android_headers = -I%(androidndkdir)s/platforms/android-14/arch-arm/usr/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/include
+android_flags = -D_SIZE_T_DEFINED_ 
+
+clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include 
+clang_flags = -nostdinc -x c++ -std=c++11
+
+cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android
+cocos_flags = -DANDROID
+
+cxxgenerator_headers = 
+
+# extra arguments for clang
+extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s 
+
+# what headers to parse
+headers = %(cocosdir)s/cocos/3d/cocos3d.h
+
+# what classes to produce code for. You can use regular expressions here. When testing the regular
+# expression, it will be enclosed in "^$", like this: "^Menu*$".
+classes = .*3D$ Mesh SubMeshState AttachNode
+
+# what should we skip? in the format ClassName::[function function]
+# ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also
+# regular expressions, they will not be surrounded by "^$". If you want to skip a whole class, just
+# add a single "*" as functions. See bellow for several examples. A special class name is "*", which
+# will apply to all class names. This is a convenience wildcard to be able to skip similar named
+# functions from all classes.
+
+skip = Mesh::[create getOriginAABB],
+       SubMeshState::[getSkin setSkin create],
+       Sprite3D::[getSkin getSubMeshState getAABB],
+       Animation3D::[getBoneCurveByName],
+       Animation3DCache::[*],
+       Sprite3DMaterialCache::[*],
+       Bone3D::[*],
+       Ray::[*],
+       AABB::[*],
+       OBB::[*]
+
+rename_functions = 
+
+rename_classes = 
+
+# for all class names, should we remove something when registering in the target VM?
+remove_prefix = 
+
+# classes for which there will be no "parent" lookup
+classes_have_no_parents = 
+
+# base classes which will be skipped when their sub-classes found them.
+base_classes_to_skip = Clonable
+
+# classes that create no constructor
+# Set is special and we will use a hand-written constructor
+abstract_classes = 
+
+# Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'.
+script_control_cpp = no
+

tools/tolua/genbindings.py

@@ -137,6 +137,7 @@ def main():
                     'cocos2dx_controller.ini' : ('cocos2dx_controller', 'lua_cocos2dx_controller_auto'), \
                     'cocos2dx_cocosbuilder.ini': ('cocos2dx_cocosbuilder', 'lua_cocos2dx_cocosbuilder_auto'), \
                     'cocos2dx_cocosdenshion.ini': ('cocos2dx_cocosdenshion', 'lua_cocos2dx_cocosdenshion_auto'), \
+                    'cocos2dx_3d.ini': ('cocos2dx_3d', 'lua_cocos2dx_3d_auto'), \
                     }
         target = 'lua'
         generator_py = '%s/generator.py' % cxx_generator_root