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

fixes in ray-convex for GPU

Browse Source
This commit is contained in:
erwincoumans
2013-06-20 16:27:36 -07:00
parent 47403c7e6f
commit d935eb2520
5 changed files with 133 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Demos3/GpuDemos/rigidbody/GpuConvexScene.cpp
View File

@@ -234,8 +234,8 @@ GpuRaytraceScene::GpuRaytraceScene()
m_raytraceData = new GpuRaytraceInternalData; m_raytraceData = new GpuRaytraceInternalData;
m_raytraceData->m_texId = new GLuint; m_raytraceData->m_texId = new GLuint;
m_raytraceData->textureWidth = 1024;//1024; m_raytraceData->textureWidth = 256;//1024;//1024;
m_raytraceData->textureHeight = 1024; m_raytraceData->textureHeight = 256;//1024;
//create new texture //create new texture
glGenTextures(1, m_raytraceData->m_texId); glGenTextures(1, m_raytraceData->m_texId);
@@ -471,9 +471,9 @@ void GpuRaytraceScene::renderScene()
if (hit) if (hit)
{ {
m_raytraceData->m_texels[(i)*3+0] = 255; m_raytraceData->m_texels[(i)*3+0] = 128+128.f*hits[i].m_hitNormal.x;
m_raytraceData->m_texels[(i)*3+1] = 0; m_raytraceData->m_texels[(i)*3+1] = 128+128.f*hits[i].m_hitNormal.y;
m_raytraceData->m_texels[(i)*3+2] = 0; m_raytraceData->m_texels[(i)*3+2] = 128+128.f*hits[i].m_hitNormal.z;
} else } else
{ {
m_raytraceData->m_texels[(i)*3+0] = 0; m_raytraceData->m_texels[(i)*3+0] = 0;

4
src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp
View File

@@ -610,7 +610,7 @@ cl_program b3OpenCLUtils_compileCLProgramFromString(cl_context clContext, cl_dev
int fileUpToDate = 0; int fileUpToDate = 0;
int binaryFileValid=0; int binaryFileValid=0;
if (clFileNameForCaching) if (!disableBinaryCaching && clFileNameForCaching)
{ {
clGetDeviceInfo(device, CL_DEVICE_NAME, 256, &deviceName, NULL); clGetDeviceInfo(device, CL_DEVICE_NAME, 256, &deviceName, NULL);
clGetDeviceInfo(device, CL_DRIVER_VERSION, 256, &driverVersion, NULL); clGetDeviceInfo(device, CL_DRIVER_VERSION, 256, &driverVersion, NULL);
@@ -918,7 +918,7 @@ cl_program b3OpenCLUtils_compileCLProgramFromString(cl_context clContext, cl_dev
} }
if( clFileNameForCaching ) if( !disableBinaryCaching && clFileNameForCaching )
{ // write to binary { // write to binary
cl_uint numAssociatedDevices; cl_uint numAssociatedDevices;

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

@@ -209,6 +209,8 @@ void b3GpuRaycast::castRays(const b3AlignedObjectArray<b3RayInfo>& rays, b3Align
int numBodies,const struct b3RigidBodyCL* bodies, int numCollidables, const struct b3Collidable* collidables, const struct b3GpuNarrowPhaseInternalData* narrowphaseData) int numBodies,const struct b3RigidBodyCL* bodies, int numCollidables, const struct b3Collidable* collidables, const struct b3GpuNarrowPhaseInternalData* narrowphaseData)
{ {
//castRaysHost(rays,hitResults,numBodies,bodies,numCollidables,collidables,narrowphaseData);
B3_PROFILE("castRaysGPU"); B3_PROFILE("castRaysGPU");
b3OpenCLArray<b3RayInfo> gpuRays(m_data->m_context,m_data->m_q); b3OpenCLArray<b3RayInfo> gpuRays(m_data->m_context,m_data->m_q);

94
src/Bullet3OpenCL/Raycast/kernels/rayCastKernels.cl
View File

@@ -87,8 +87,6 @@ Quaternion qtMul(Quaternion a, Quaternion b);
__inline __inline
Quaternion qtNormalize(Quaternion in); Quaternion qtNormalize(Quaternion in);
__inline
float4 qtRotate(Quaternion q, float4 vec);
__inline __inline
Quaternion qtInvert(Quaternion q); Quaternion qtInvert(Quaternion q);
@@ -127,7 +125,8 @@ float4 qtRotate(Quaternion q, float4 vec)
Quaternion qInv = qtInvert( q ); Quaternion qInv = qtInvert( q );
float4 vcpy = vec; float4 vcpy = vec;
vcpy.w = 0.f; vcpy.w = 0.f;
float4 out = qtMul(qtMul(q,vcpy),qInv); float4 out = qtMul(q,vcpy);
out = qtMul(out,qInv);
return out; return out;
} }
@@ -143,11 +142,7 @@ float4 qtInvRotate(const Quaternion q, float4 vec)
return qtRotate( qtInvert( q ), vec ); return qtRotate( qtInvert( q ), vec );
} }
__inline
float4 transform(const float4* p, const float4* translation, const Quaternion* orientation)
{
return qtRotate( *orientation, *p ) + (*translation);
}
void trInverse(float4 translationIn, Quaternion orientationIn, void trInverse(float4 translationIn, Quaternion orientationIn,
float4* translationOut, Quaternion* orientationOut) float4* translationOut, Quaternion* orientationOut)
@@ -156,13 +151,7 @@ void trInverse(float4 translationIn, Quaternion orientationIn,
*translationOut = qtRotate(*orientationOut, -translationIn); *translationOut = qtRotate(*orientationOut, -translationIn);
} }
void trMul(float4 translationA, Quaternion orientationA,
float4 translationB, Quaternion orientationB,
float4* translationOut, Quaternion* orientationOut)
{
*orientationOut = qtMul(orientationA,orientationB);
*translationOut = transform(&translationB,&translationA,&orientationA);
}
@@ -173,8 +162,8 @@ bool rayConvex(float4 rayFromLocal, float4 rayToLocal, int numFaces, int faceOff
rayToLocal.w = 0.f; rayToLocal.w = 0.f;
bool result = true; bool result = true;
float exitFraction = *hitFraction; float exitFraction = hitFraction[0];
float enterFraction = -0.1f; float enterFraction = -0.3f;
float4 curHitNormal = (float4)(0,0,0,0); float4 curHitNormal = (float4)(0,0,0,0);
for (int i=0;i<numFaces && result;i++) for (int i=0;i<numFaces && result;i++)
{ {
@@ -211,12 +200,15 @@ bool rayConvex(float4 rayFromLocal, float4 rayToLocal, int numFaces, int faceOff
result = false; result = false;
} }
result = result && (enterFraction < 0.f); if (enterFraction < 0.f)
{
result = false;
}
if (result) if (result)
{ {
*hitFraction = enterFraction; hitFraction[0] = enterFraction;
*hitNormal = curHitNormal; hitNormal[0] = curHitNormal;
} }
return result; return result;
} }
@@ -238,7 +230,7 @@ bool sphere_intersect(float4 spherePos, float radius, float4 rayFrom, float4 ra
float D = B * B - A*C; float D = B * B - A*C;
if (D > 0.0) if (D > 0.0f)
{ {
float t = (-B - sqrt(D))/A; float t = (-B - sqrt(D))/A;
@@ -272,8 +264,9 @@ __kernel void rayCastKernel(
{ {
int i = get_global_id(0); int i = get_global_id(0);
if (i<numRays) if (i>=numRays)
{ return;
hitResults[i].m_hitFraction = 1.f; hitResults[i].m_hitFraction = 1.f;
float4 rayFrom = rays[i].m_from; float4 rayFrom = rays[i].m_from;
@@ -289,14 +282,37 @@ __kernel void rayCastKernel(
for (int b=0;b<numBodies;b++) for (int b=0;b<numBodies;b++)
{ {
float4 pos = bodies[b].m_pos; Body body = bodies[b];
float4 orn = bodies[b].m_quat; float4 pos = body.m_pos;
if (cachedCollidableIndex !=bodies[b].m_collidableIdx) float4 orn = body.m_quat;
if (cachedCollidableIndex != body.m_collidableIdx)
{ {
cachedCollidableIndex = bodies[b].m_collidableIdx; cachedCollidableIndex = body.m_collidableIdx;
cachedCollidable = collidables[cachedCollidableIndex]; cachedCollidable = collidables[cachedCollidableIndex];
} }
if (cachedCollidable.m_shapeType == SHAPE_CONVEX_HULL)
{
float4 invPos = (float4)(0,0,0,0);
float4 invOrn = (float4)(0,0,0,0);
float4 rayFromLocal = (float4)(0,0,0,0);
float4 rayToLocal = (float4)(0,0,0,0);
invOrn = qtInvert(orn);
invPos = qtRotate(invOrn, -pos);
rayFromLocal = qtRotate( invOrn, rayFrom ) + invPos;
rayToLocal = qtRotate( invOrn, rayTo) + invPos;
rayFromLocal.w = 0.f;
rayToLocal.w = 0.f;
int numFaces = convexShapes[cachedCollidable.m_shapeIndex].m_numFaces;
int faceOffset = convexShapes[cachedCollidable.m_shapeIndex].m_faceOffset;
if (numFaces)
{
if (rayConvex(rayFromLocal, rayToLocal, numFaces, faceOffset,faces, &hitFraction, &hitNormal))
{
hitBodyIndex = b;
}
}
}
if (cachedCollidable.m_shapeType == SHAPE_SPHERE) if (cachedCollidable.m_shapeType == SHAPE_SPHERE)
{ {
float radius = cachedCollidable.m_radius; float radius = cachedCollidable.m_radius;
@@ -308,28 +324,6 @@ __kernel void rayCastKernel(
hitNormal = (float4) (hitPoint-bodies[b].m_pos); hitNormal = (float4) (hitPoint-bodies[b].m_pos);
} }
} }
if (cachedCollidable.m_shapeType == SHAPE_CONVEX_HULL)
{
float4 invPos = (float4)(0,0,0,0);
float4 invOrn = (float4)(0,0,0,0);
float4 rayFromLocal = (float4)(0,0,0,0);
float4 rayToLocal = (float4)(0,0,0,0);
trInverse(pos,orn, &invPos, &invOrn);
rayFromLocal = transform(&rayFrom, &invPos, &invOrn);
rayToLocal = transform(&rayTo, &invPos, &invOrn);
int numFaces = convexShapes[cachedCollidable.m_shapeIndex].m_numFaces;
int faceOffset = convexShapes[cachedCollidable.m_shapeIndex].m_faceOffset;
if (rayConvex(rayFromLocal, rayToLocal, numFaces, faceOffset,faces, &hitFraction, &hitNormal))
{
hitBodyIndex = b;
}
}
} }
if (hitBodyIndex>=0) if (hitBodyIndex>=0)
@@ -339,5 +333,5 @@ __kernel void rayCastKernel(
hitResults[i].m_hitNormal = normalize(hitNormal); hitResults[i].m_hitNormal = normalize(hitNormal);
hitResults[i].m_hitResult0 = hitBodyIndex; hitResults[i].m_hitResult0 = hitBodyIndex;
} }
}
} }

14
src/Bullet3OpenCL/Raycast/kernels/rayCastKernels.h
View File

@@ -176,7 +176,7 @@ static const char* rayCastKernelCL= \
" bool result = true;\n" " bool result = true;\n"
" \n" " \n"
" float exitFraction = *hitFraction;\n" " float exitFraction = *hitFraction;\n"
" float enterFraction = -0.1f;\n" " float enterFraction = -0.3f;\n"
" float4 curHitNormal = (float4)(0,0,0,0);\n" " float4 curHitNormal = (float4)(0,0,0,0);\n"
" for (int i=0;i<numFaces && result;i++)\n" " for (int i=0;i<numFaces && result;i++)\n"
" {\n" " {\n"
@@ -285,19 +285,17 @@ static const char* rayCastKernelCL= \
" float4 hitNormal;\n" " float4 hitNormal;\n"
" int hitBodyIndex= -1;\n" " int hitBodyIndex= -1;\n"
" \n" " \n"
" int cachedCollidableIndex = -1; \n" " \n"
" Collidable cachedCollidable;\n" " \n"
" \n" " \n"
" for (int b=0;b<numBodies;b++)\n" " for (int b=0;b<numBodies;b++)\n"
" {\n" " {\n"
" \n" " \n"
" float4 pos = bodies[b].m_pos;\n" " float4 pos = bodies[b].m_pos;\n"
" float4 orn = bodies[b].m_quat;\n" " float4 orn = bodies[b].m_quat;\n"
" if (cachedCollidableIndex !=bodies[b].m_collidableIdx)\n" " \n"
" {\n" " int cachedCollidableIndex = bodies[b].m_collidableIdx; \n"
" cachedCollidableIndex = bodies[b].m_collidableIdx;\n" " Collidable cachedCollidable = collidables[cachedCollidableIndex];\n"
" cachedCollidable = collidables[cachedCollidableIndex];\n"
" }\n"
" \n" " \n"
" if (cachedCollidable.m_shapeType == SHAPE_SPHERE)\n" " if (cachedCollidable.m_shapeType == SHAPE_SPHERE)\n"
" {\n" " {\n"