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

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

Browse Source 
add b3Assert to make sure m_maxShapeCapacityInBytes is not exceeded in GLInstancingRenderer
prepare for CpuSoftClothDemo
This commit is contained in:
erwincoumans
2013-09-02 22:31:48 -07:00
parent d0da37f3dd
commit 181a323631
8 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bullet3OpenCL/Raycast/b3GpuRaycast.h
View File

@@ -5,7 +5,7 @@
#include "Bullet3OpenCL/Initialize/b3OpenCLInclude.h"
#include "Bullet3Common/b3AlignedObjectArray.h"
#include "b3RaycastInfo.h"
#include "Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h"

24
src/Bullet3OpenCL/Raycast/b3RaycastInfo.h
View File

@@ -1,24 +0,0 @@
#ifndef B3_RAYCAST_INFO_H
#define B3_RAYCAST_INFO_H
#include "Bullet3Common/b3Vector3.h"
B3_ATTRIBUTE_ALIGNED16(struct) b3RayInfo
{
b3Vector3 m_from;
b3Vector3 m_to;
};
B3_ATTRIBUTE_ALIGNED16(struct) b3RayHit
{
b3Scalar m_hitFraction;
int m_hitBody;
int m_hitResult1;
int m_hitResult2;
b3Vector3 m_hitPoint;
b3Vector3 m_hitNormal;
};
#endif //B3_RAYCAST_INFO_H

2
src/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.h
View File

@@ -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
{