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

recover the physics3DShape initHeightfield api

This commit is contained in:
jianglong0156 2015-08-01 18:29:48 +08:00
parent 69040ef472
commit 5d281d45ef
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/physics3d/CCPhysics3DShape.h
View File

@ -144,7 +144,7 @@ CC_CONSTRUCTOR_ACCESS:
, const void* heightfieldData, float heightScale , const void* heightfieldData, float heightScale
, float minHeight, float maxHeight , float minHeight, float maxHeight
, bool useFloatDatam, bool flipQuadEdges , bool useFloatDatam, bool flipQuadEdges
, bool useDiamondSubdivision = false); , bool useDiamondSubdivision);
bool initCompoundShape(const std::vector<std::pair<Physics3DShape *, Mat4>> &shapes); bool initCompoundShape(const std::vector<std::pair<Physics3DShape *, Mat4>> &shapes);
protected: protected:

2
cocos/scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.cpp
View File

@ -322,7 +322,7 @@ bool js_cocos2dx_physics3d_Physics3dShape_initHeightfield(JSContext *cx, uint32_
bool ret = false; bool ret = false;
if (argc == 8) if (argc == 8)
ret = cobj->initHeightfield(arg0, arg1, &arg2[0], arg3, arg4, arg5, arg6, arg7); ret = cobj->initHeightfield(arg0, arg1, &arg2[0], arg3, arg4, arg5, arg6, arg7, false);
else if (argc == 9) else if (argc == 9)
ret = cobj->initHeightfield(arg0, arg1, &arg2[0], arg3, arg4, arg5, arg6, arg7, arg8); ret = cobj->initHeightfield(arg0, arg1, &arg2[0], arg3, arg4, arg5, arg6, arg7, arg8);