allow multiple concave meshes, each with their own bvh

2013-04-19 23:30:29 -07:00
parent dd315d164d
commit fbd192f360
10 changed files with 161 additions and 59 deletions
--- a/opencl/gpu_narrowphase/host/b3ConvexHullContact.h
+++ b/opencl/gpu_narrowphase/host/b3ConvexHullContact.h
@@ -12,6 +12,7 @@
 #include "parallel_primitives/host/btInt2.h"
 #include "parallel_primitives/host/btInt4.h"
 #include "b3OptimizedBvh.h"
+#include "b3BvhInfo.h"

 //#include "../../dynamics/basic_demo/Stubs/ChNarrowPhase.h"

@@ -85,6 +86,7 @@ struct GpuSatCollision
 		   b3AlignedObjectArray<class b3OptimizedBvh*>& bvhData,
 		   btOpenCLArray<btQuantizedBvhNode>*	treeNodesGPU,
 			btOpenCLArray<btBvhSubtreeInfo>*	subTreesGPU,
+			btOpenCLArray<b3BvhInfo>*	bvhInfo,
 			int numObjects,
 			int maxTriConvexPairCapacity,
 			btOpenCLArray<btInt4>& triangleConvexPairs,