move b3RaycastInfo.h so it can be used without OpenCL dependency

add b3Assert to make sure m_maxShapeCapacityInBytes is not exceeded in GLInstancingRenderer prepare for CpuSoftClothDemo
2013-09-02 22:31:48 -07:00
parent d0da37f3dd
commit 181a323631
8 changed files with 11 additions and 6 deletions
--- a/src/Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h
+++ b/src/Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h
--- a/src/Bullet3Dynamics/b3CpuRigidBodyPipeline.h
+++ b/src/Bullet3Dynamics/b3CpuRigidBodyPipeline.h
@@ -19,7 +19,7 @@ subject to the following restrictions:


 #include "Bullet3Common/b3AlignedObjectArray.h"
-#include "Bullet3OpenCL/Raycast/b3RaycastInfo.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h"

 class b3CpuRigidBodyPipeline
 {
--- a/src/Bullet3OpenCL/Raycast/b3GpuRaycast.h
+++ b/src/Bullet3OpenCL/Raycast/b3GpuRaycast.h
@@ -5,7 +5,7 @@
 #include "Bullet3OpenCL/Initialize/b3OpenCLInclude.h"

 #include "Bullet3Common/b3AlignedObjectArray.h"
-#include "b3RaycastInfo.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h"



--- a/src/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.h
+++ b/src/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.h
@@ -20,7 +20,7 @@ subject to the following restrictions:
 #include "Bullet3Collision/NarrowPhaseCollision/b3Config.h"

 #include "Bullet3Common/b3AlignedObjectArray.h"
-#include "Bullet3OpenCL/Raycast/b3RaycastInfo.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h"

 class b3GpuRigidBodyPipeline
 {