Merge pull request #12433 from CocosRobot/update_lua_bindings_1434635998

[ci skip][AUTO]: updating luabinding & jsbinding automatically
This commit is contained in:
pandamicro 2015-06-18 22:07:14 +08:00
commit 86d2fa5abf
2 changed files with 14 additions and 14 deletions

View File

@ -1,12 +1,12 @@
/** /**
* @module cocos2dx_physics3d * @module cocos2dx_physics3d
*/ */
var cc = cc || {}; var jsb = jsb || {};
/** /**
* @class Physics3DShape * @class Physics3DShape
*/ */
cc.Physics3DShape = { jsb.Physics3DShape = {
/** /**
* @method getbtShape * @method getbtShape
@ -99,7 +99,7 @@ float
/** /**
* @class Physics3DObject * @class Physics3DObject
*/ */
cc.Physics3DObject = { jsb.Physics3DObject = {
/** /**
* @method setUserData * @method setUserData
@ -206,7 +206,7 @@ needCollisionCallback : function (
/** /**
* @class Physics3DRigidBody * @class Physics3DRigidBody
*/ */
cc.Physics3DRigidBody = { jsb.Physics3DRigidBody = {
/** /**
* @method setGravity * @method setGravity
@ -724,7 +724,7 @@ Physics3DRigidBody : function (
/** /**
* @class Physics3DComponent * @class Physics3DComponent
*/ */
cc.Physics3DComponent = { jsb.Physics3DComponent = {
/** /**
* @method syncNodeToPhysics * @method syncNodeToPhysics
@ -834,7 +834,7 @@ Physics3DComponent : function (
/** /**
* @class PhysicsSprite3D * @class PhysicsSprite3D
*/ */
cc.PhysicsSprite3D = { jsb.PhysicsSprite3D = {
/** /**
* @method syncNodeToPhysics * @method syncNodeToPhysics
@ -886,7 +886,7 @@ PhysicsSprite3D : function (
/** /**
* @class Physics3DWorld * @class Physics3DWorld
*/ */
cc.Physics3DWorld = { jsb.Physics3DWorld = {
/** /**
* @method setGravity * @method setGravity
@ -1092,7 +1092,7 @@ Physics3DWorld : function (
/** /**
* @class Physics3DConstraint * @class Physics3DConstraint
*/ */
cc.Physics3DConstraint = { jsb.Physics3DConstraint = {
/** /**
* @method setEnabled * @method setEnabled
@ -1219,7 +1219,7 @@ getbtContraint : function (
/** /**
* @class Physics3DPointToPointConstraint * @class Physics3DPointToPointConstraint
*/ */
cc.Physics3DPointToPointConstraint = { jsb.Physics3DPointToPointConstraint = {
/** /**
* @method getPivotPointInA * @method getPivotPointInA
@ -1293,7 +1293,7 @@ Physics3DPointToPointConstraint : function (
/** /**
* @class Physics3DHingeConstraint * @class Physics3DHingeConstraint
*/ */
cc.Physics3DHingeConstraint = { jsb.Physics3DHingeConstraint = {
/** /**
* @method getHingeAngle * @method getHingeAngle
@ -1563,7 +1563,7 @@ Physics3DHingeConstraint : function (
/** /**
* @class Physics3DSliderConstraint * @class Physics3DSliderConstraint
*/ */
cc.Physics3DSliderConstraint = { jsb.Physics3DSliderConstraint = {
/** /**
* @method setPoweredAngMotor * @method setPoweredAngMotor
@ -2241,7 +2241,7 @@ Physics3DSliderConstraint : function (
/** /**
* @class Physics3DConeTwistConstraint * @class Physics3DConeTwistConstraint
*/ */
cc.Physics3DConeTwistConstraint = { jsb.Physics3DConeTwistConstraint = {
/** /**
* @method getBFrame * @method getBFrame
@ -2461,7 +2461,7 @@ Physics3DConeTwistConstraint : function (
/** /**
* @class Physics3D6DofConstraint * @class Physics3D6DofConstraint
*/ */
cc.Physics3D6DofConstraint = { jsb.Physics3D6DofConstraint = {
/** /**
* @method setLinearLowerLimit * @method setLinearLowerLimit

View File

@ -6753,7 +6753,7 @@ void js_register_cocos2dx_physics3d_Physics3D6DofConstraint(JSContext *cx, JS::H
void register_all_cocos2dx_physics3d(JSContext* cx, JS::HandleObject obj) { void register_all_cocos2dx_physics3d(JSContext* cx, JS::HandleObject obj) {
// Get the ns // Get the ns
JS::RootedObject ns(cx); JS::RootedObject ns(cx);
get_or_create_js_obj(cx, obj, "cc", &ns); get_or_create_js_obj(cx, obj, "jsb", &ns);
js_register_cocos2dx_physics3d_Physics3DConstraint(cx, ns); js_register_cocos2dx_physics3d_Physics3DConstraint(cx, ns);
js_register_cocos2dx_physics3d_Physics3D6DofConstraint(cx, ns); js_register_cocos2dx_physics3d_Physics3D6DofConstraint(cx, ns);