reorganize files and add btgui
This commit is contained in:
@@ -25,7 +25,7 @@ subject to the following restrictions:
|
||||
#include "btConvexPolyhedronCL.h"
|
||||
|
||||
typedef btAlignedObjectArray<btVector3> btVertexArray;
|
||||
#include "parallel_primitives/host/btQuickprof.h"
|
||||
#include "BulletCommon/btQuickprof.h"
|
||||
|
||||
#include <float.h> //for FLT_MAX
|
||||
#include "../basic_initialize/btOpenCLUtils.h"
|
||||
@@ -34,7 +34,7 @@ typedef btAlignedObjectArray<btVector3> btVertexArray;
|
||||
|
||||
#include "../kernels/satKernels.h"
|
||||
#include "../kernels/satClipHullContacts.h"
|
||||
#include "parallel_primitives/host/btAabbUtil2.h"
|
||||
#include "BulletGeometry/btAabbUtil2.h"
|
||||
|
||||
#define dot3F4 btDot
|
||||
|
||||
@@ -52,7 +52,7 @@ m_totalContactsOut(m_context, m_queue)
|
||||
if (1)
|
||||
{
|
||||
const char* src = satKernelsCL;
|
||||
cl_program satProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,src,&errNum,"","opencl/gpu_rigidbody_pipeline2/sat.cl");
|
||||
cl_program satProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,src,&errNum,"","opencl/gpu_sat/kernels/sat.cl");
|
||||
btAssert(errNum==CL_SUCCESS);
|
||||
|
||||
m_findSeparatingAxisKernel = btOpenCLUtils::compileCLKernelFromString(m_context, m_device,src, "findSeparatingAxisKernel",&errNum,satProg );
|
||||
@@ -67,7 +67,7 @@ m_totalContactsOut(m_context, m_queue)
|
||||
if (1)
|
||||
{
|
||||
const char* srcClip = satClipKernelsCL;
|
||||
cl_program satClipContactsProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,srcClip,&errNum,"","opencl/gpu_rigidbody_pipeline2/satClipHullContacts.cl");
|
||||
cl_program satClipContactsProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,srcClip,&errNum,"","opencl/gpu_sat/kernels/satClipHullContacts.cl");
|
||||
btAssert(errNum==CL_SUCCESS);
|
||||
|
||||
m_clipHullHullKernel = btOpenCLUtils::compileCLKernelFromString(m_context, m_device,srcClip, "clipHullHullKernel",&errNum,satClipContactsProg);
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "parallel_primitives/host/btOpenCLArray.h"
|
||||
#include "btRigidBodyCL.h"
|
||||
#include "parallel_primitives/host/btAlignedObjectArray.h"
|
||||
#include "BulletCommon/btAlignedObjectArray.h"
|
||||
#include "btConvexUtility.h"
|
||||
#include "btConvexPolyhedronCL.h"
|
||||
#include "btCollidable.h"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef BT_CONTACT4_H
|
||||
#define BT_CONTACT4_H
|
||||
|
||||
#include "parallel_primitives/host/btVector3.h"
|
||||
#include "BulletCommon/btVector3.h"
|
||||
|
||||
|
||||
ATTRIBUTE_ALIGNED16(struct) btContact4
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef CONVEX_POLYHEDRON_CL
|
||||
#define CONVEX_POLYHEDRON_CL
|
||||
|
||||
#include "parallel_primitives/host/btTransform.h"
|
||||
#include "BulletCommon/btTransform.h"
|
||||
|
||||
struct btGpuFace
|
||||
{
|
||||
|
||||
@@ -17,8 +17,8 @@ subject to the following restrictions:
|
||||
#ifndef _BT_CONVEX_UTILITY_H
|
||||
#define _BT_CONVEX_UTILITY_H
|
||||
|
||||
#include "parallel_primitives/host/btAlignedObjectArray.h"
|
||||
#include "parallel_primitives/host/btTransform.h"
|
||||
#include "BulletCommon/btAlignedObjectArray.h"
|
||||
#include "BulletCommon/btTransform.h"
|
||||
|
||||
#include "btConvexPolyhedronCL.h"
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#ifndef BT_RIGID_BODY_CL
|
||||
#define BT_RIGID_BODY_CL
|
||||
|
||||
#include "parallel_primitives/host/btScalar.h"
|
||||
#include "parallel_primitives/host/btMatrix3x3.h"
|
||||
#include "BulletCommon/btScalar.h"
|
||||
#include "BulletCommon/btMatrix3x3.h"
|
||||
|
||||
ATTRIBUTE_ALIGNED16(struct) btRigidBodyCL
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user