rename gpu_sat -> gpu_narrowphase

This commit is contained in:
erwin coumans
2013-04-15 12:43:46 -07:00
parent ecf1752d68
commit 76e74523f6
38 changed files with 25 additions and 25 deletions

View File

@@ -19,8 +19,8 @@ subject to the following restrictions:
#include "../../parallel_primitives/host/btOpenCLArray.h"
#include "../host/btGpuConstraint4.h"
#include "../../gpu_sat/host/btRigidBodyCL.h"
#include "../../gpu_sat/host/btContact4.h"
#include "../../gpu_narrowphase/host/btRigidBodyCL.h"
#include "../../gpu_narrowphase/host/btContact4.h"
#include "../host/btGpuConstraint4.h"
#include "../../parallel_primitives/host/btPrefixScanCL.h"

View File

@@ -4,8 +4,8 @@
#include "../../basic_initialize/btOpenCLInclude.h"
#include "../../parallel_primitives/host/btOpenCLArray.h"
#include "../../gpu_sat/host/btRigidBodyCL.h"
#include "../../gpu_sat/host/btContact4.h"
#include "../../gpu_narrowphase/host/btRigidBodyCL.h"
#include "../../gpu_narrowphase/host/btContact4.h"
#include "btGpuConstraint4.h"
class btGpuBatchingPgsSolver

View File

@@ -3,8 +3,8 @@
#define BT_GPU_JACOBI_SOLVER_H
#include "../../basic_initialize/btOpenCLUtils.h"
#include "../../gpu_sat/host/btRigidBodyCL.h"
#include "../../gpu_sat/host/btContact4.h"
#include "../../gpu_narrowphase/host/btRigidBodyCL.h"
#include "../../gpu_narrowphase/host/btContact4.h"
#include "../../parallel_primitives/host/btOpenCLArray.h"
class btTypedConstraint;

View File

@@ -2,13 +2,13 @@
#include "parallel_primitives/host/btOpenCLArray.h"
#include "../../gpu_sat/host/btConvexPolyhedronCL.h"
#include "../../gpu_sat/host/ConvexHullContact.h"
#include "../../gpu_narrowphase/host/btConvexPolyhedronCL.h"
#include "../../gpu_narrowphase/host/ConvexHullContact.h"
#include "../../gpu_broadphase/host/btSapAabb.h"
#include <string.h>
#include "btConfig.h"
#include "../../gpu_sat/host/btOptimizedBvh.h"
#include "../../gpu_sat/host/btTriangleIndexVertexArray.h"
#include "../../gpu_narrowphase/host/btOptimizedBvh.h"
#include "../../gpu_narrowphase/host/btTriangleIndexVertexArray.h"
#include "BulletGeometry/btAabbUtil2.h"
struct btGpuNarrowPhaseInternalData

View File

@@ -1,7 +1,7 @@
#ifndef BT_GPU_NARROWPHASE_H
#define BT_GPU_NARROWPHASE_H
#include "../../gpu_sat/host/btCollidable.h"
#include "../../gpu_narrowphase/host/btCollidable.h"
#include "basic_initialize/btOpenCLInclude.h"
#include "BulletCommon/btAlignedObjectArray.h"
#include "BulletCommon/btVector3.h"

View File

@@ -10,8 +10,8 @@
#include "../../gpu_broadphase/host/btGpuSapBroadphase.h"
#include "parallel_primitives/host/btLauncherCL.h"
#include "btPgsJacobiSolver.h"
#include "../../gpu_sat/host/btRigidBodyCL.h"
#include "../../gpu_sat/host/btContact4.h"
#include "../../gpu_narrowphase/host/btRigidBodyCL.h"
#include "../../gpu_narrowphase/host/btContact4.h"
#include "btGpuBatchingPgsSolver.h"
#include "Solver.h"
#include "btGpuJacobiSolver.h"

View File

@@ -5,7 +5,7 @@
#include "BulletCommon/btAlignedObjectArray.h"
#include "../../parallel_primitives/host/btOpenCLArray.h"
#include "../../gpu_sat/host/btCollidable.h"
#include "../../gpu_narrowphase/host/btCollidable.h"
struct btGpuRigidBodyPipelineInternalData

View File

@@ -31,14 +31,14 @@ subject to the following restrictions:
#include "BulletCommon/btAlignedObjectArray.h"
#include <string.h> //for memset
//#include "../../dynamics/basic_demo/Stubs/AdlContact4.h"
#include "../../gpu_sat/host/btContact4.h"
#include "../../gpu_narrowphase/host/btContact4.h"
bool usePgs = false;//true;
int gNumSplitImpulseRecoveries2 = 0;
#include "btRigidBody.h"
//#include "../../dynamics/basic_demo/Stubs/AdlRigidBody.h"
#include "../../gpu_sat/host/btRigidBodyCL.h"
#include "../../gpu_narrowphase/host/btRigidBodyCL.h"
btTransform getWorldTransform(btRigidBodyCL* rb)
{