Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

revert sat contact kernels update

Browse Source
This commit is contained in:
Erwin Coumans
2016-05-25 17:14:30 -07:00
parent 535ee33e3b
commit c6bf3a7261
2 changed files with 10 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Bullet3OpenCL/NarrowphaseCollision/kernels/mprKernels.h
View File

@@ -404,33 +404,17 @@ static const char* mprKernelsCL= \
" int m_compoundBvhIndex;\n" " int m_compoundBvhIndex;\n"
" };\n" " };\n"
" int m_shapeType;\n" " int m_shapeType;\n"
" union\n" " int m_shapeIndex;\n"
" {\n"
" int m_shapeIndex;\n"
" float m_height;\n"
" };\n"
"};\n" "};\n"
"typedef struct b3GpuChildShape b3GpuChildShape_t;\n" "typedef struct b3GpuChildShape b3GpuChildShape_t;\n"
"struct b3GpuChildShape\n" "struct b3GpuChildShape\n"
"{\n" "{\n"
" b3Float4 m_childPosition;\n" " b3Float4 m_childPosition;\n"
" b3Quat m_childOrientation;\n" " b3Quat m_childOrientation;\n"
" union\n" " int m_shapeIndex;\n"
" {\n" " int m_unused0;\n"
" int m_shapeIndex;//used for SHAPE_COMPOUND_OF_CONVEX_HULLS\n" " int m_unused1;\n"
" int m_capsuleAxis;\n" " int m_unused2;\n"
" };\n"
" union \n"
" {\n"
" float m_radius;//used for childshape of SHAPE_COMPOUND_OF_SPHERES or SHAPE_COMPOUND_OF_CAPSULES\n"
" int m_numChildShapes;//used for compound shape\n"
" };\n"
" union \n"
" {\n"
" float m_height;//used for childshape of SHAPE_COMPOUND_OF_CAPSULES\n"
" int m_collidableShapeIndex;\n"
" };\n"
" int m_shapeType;\n"
"};\n" "};\n"
"struct b3CompoundOverlappingPair\n" "struct b3CompoundOverlappingPair\n"
"{\n" "{\n"

26
src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.h
View File

@@ -281,33 +281,17 @@ static const char* satClipKernelsCL= \
" int m_compoundBvhIndex;\n" " int m_compoundBvhIndex;\n"
" };\n" " };\n"
" int m_shapeType;\n" " int m_shapeType;\n"
" union\n" " int m_shapeIndex;\n"
" {\n"
" int m_shapeIndex;\n"
" float m_height;\n"
" };\n"
"};\n" "};\n"
"typedef struct b3GpuChildShape b3GpuChildShape_t;\n" "typedef struct b3GpuChildShape b3GpuChildShape_t;\n"
"struct b3GpuChildShape\n" "struct b3GpuChildShape\n"
"{\n" "{\n"
" b3Float4 m_childPosition;\n" " b3Float4 m_childPosition;\n"
" b3Quat m_childOrientation;\n" " b3Quat m_childOrientation;\n"
" union\n" " int m_shapeIndex;\n"
" {\n" " int m_unused0;\n"
" int m_shapeIndex;//used for SHAPE_COMPOUND_OF_CONVEX_HULLS\n" " int m_unused1;\n"
" int m_capsuleAxis;\n" " int m_unused2;\n"
" };\n"
" union \n"
" {\n"
" float m_radius;//used for childshape of SHAPE_COMPOUND_OF_SPHERES or SHAPE_COMPOUND_OF_CAPSULES\n"
" int m_numChildShapes;//used for compound shape\n"
" };\n"
" union \n"
" {\n"
" float m_height;//used for childshape of SHAPE_COMPOUND_OF_CAPSULES\n"
" int m_collidableShapeIndex;\n"
" };\n"
" int m_shapeType;\n"
"};\n" "};\n"
"struct b3CompoundOverlappingPair\n" "struct b3CompoundOverlappingPair\n"
"{\n" "{\n"