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

various fixes

Browse Source 
move btSimulationIslandManagerMt.cpp from BulletCollision to BulletDynamics
This commit is contained in:
Erwin Coumans
2016-11-10 16:18:20 -08:00
parent fd90589cc2
commit 3b5d0f444b
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BulletCollision/CMakeLists.txt
View File

@@ -33,7 +33,6 @@ SET(BulletCollision_SRCS
CollisionDispatch/btInternalEdgeUtility.h
CollisionDispatch/btManifoldResult.cpp
CollisionDispatch/btSimulationIslandManager.cpp
CollisionDispatch/btSimulationIslandManagerMt.cpp
CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
@@ -141,7 +140,6 @@ SET(CollisionDispatch_HDRS
CollisionDispatch/btHashedSimplePairCache.h
CollisionDispatch/btManifoldResult.h
CollisionDispatch/btSimulationIslandManager.h
CollisionDispatch/btSimulationIslandManagerMt.h
CollisionDispatch/btSphereBoxCollisionAlgorithm.h
CollisionDispatch/btSphereSphereCollisionAlgorithm.h
CollisionDispatch/btSphereTriangleCollisionAlgorithm.h

2
src/BulletDynamics/CMakeLists.txt
View File

@@ -22,6 +22,7 @@ SET(BulletDynamics_SRCS
ConstraintSolver/btUniversalConstraint.cpp
Dynamics/btDiscreteDynamicsWorld.cpp
Dynamics/btDiscreteDynamicsWorldMt.cpp
Dynamics/btSimulationIslandManagerMt.cpp
Dynamics/btRigidBody.cpp
Dynamics/btSimpleDynamicsWorld.cpp
# Dynamics/Bullet-C-API.cpp
@@ -72,6 +73,7 @@ SET(Dynamics_HDRS
Dynamics/btActionInterface.h
Dynamics/btDiscreteDynamicsWorld.h
Dynamics/btDiscreteDynamicsWorldMt.h
Dynamics/btSimulationIslandManagerMt.h
Dynamics/btDynamicsWorld.h
Dynamics/btSimpleDynamicsWorld.h
Dynamics/btRigidBody.h

2
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp
View File

@@ -21,7 +21,7 @@ subject to the following restrictions:
#include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h"
#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
#include "BulletCollision/CollisionShapes/btCollisionShape.h"
#include "BulletCollision/CollisionDispatch/btSimulationIslandManagerMt.h"
#include "btSimulationIslandManagerMt.h"
#include "LinearMath/btTransformUtil.h"
#include "LinearMath/btQuickprof.h"

0
src/BulletCollision/CollisionDispatch/btSimulationIslandManagerMt.cpp → src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.cpp
View File

2
src/BulletCollision/CollisionDispatch/btSimulationIslandManagerMt.h → src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h
View File

@@ -16,7 +16,7 @@ subject to the following restrictions:
#ifndef BT_SIMULATION_ISLAND_MANAGER_MT_H
#define BT_SIMULATION_ISLAND_MANAGER_MT_H
#include "btSimulationIslandManager.h"
#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
class btTypedConstraint;