kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

updated scons file, case-sensititivy problem fixed

Browse Source
This commit is contained in:
Erwin Coumans 2006-02-21 05:57:46 +00:00
parent 90e5a9aa14
commit 730c02f3fe
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extern/bullet/Bullet/CollisionDispatch/CollisionDispatcher.cpp vendored
View File

@ -17,7 +17,7 @@
#include "CollisionDispatch/EmptyCollisionAlgorithm.h"
#include "CollisionDispatch/ConvexConcaveCollisionAlgorithm.h"
#include "NarrowphaseCollision/CollisionObject.h"
#include "NarrowPhaseCollision/CollisionObject.h"
#include <algorithm>
void CollisionDispatcher::FindUnions()
@ -221,4 +221,4 @@ bool CollisionDispatcher::NeedsCollision(BroadphaseProxy& proxy0,BroadphaseProxy
return needsCollision ;
}
}

4
extern/bullet/Bullet/CollisionDispatch/CollisionWorld.cpp vendored
View File

@ -11,7 +11,7 @@
#include "CollisionWorld.h"
#include "CollisionDispatcher.h"
#include "NarrowphaseCollision/CollisionObject.h"
#include "NarrowPhaseCollision/CollisionObject.h"
#include "CollisionShapes/CollisionShape.h"
#include "BroadphaseCollision/BroadphaseInterface.h"
@ -120,4 +120,4 @@ void CollisionWorld::RemoveCollisionObject(CollisionObject* collisionObject)
std::swap(*i, m_collisionObjects.back());
m_collisionObjects.pop_back();
}
}
}

16
extern/bullet/SConscript vendored
View File

@ -35,7 +35,7 @@ else:
sources = [ 'Bullet/BroadphaseCollision/BroadphaseProxy.cpp',
'Bullet/BroadphaseCollision/CollisionAlgorithm.cpp',
'Bullet/BroadphaseCollision/CollisionDispatcher.cpp',
'Bullet/BroadphaseCollision/Dispatcher.cpp',
'Bullet/BroadphaseCollision/SimpleBroadphase.cpp',
'Bullet/CollisionShapes/BoxShape.cpp',
@ -76,12 +76,14 @@ sources = [ 'Bullet/BroadphaseCollision/BroadphaseProxy.cpp',
'Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.cpp',
'Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp',
'BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp',
'BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp',
'BulletDynamics/CollisionDispatch/EmptyCollisionAlgorithm.cpp',
'BulletDynamics/CollisionDispatch/ManifoldResult.cpp',
'BulletDynamics/CollisionDispatch/ToiContactDispatcher.cpp',
'BulletDynamics/CollisionDispatch/UnionFind.cpp',
'Bullet/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp',
'Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp',
'Bullet/CollisionDispatch/EmptyCollisionAlgorithm.cpp',
'Bullet/CollisionDispatch/ManifoldResult.cpp',
'Bullet/CollisionDispatch/CollisionDispatcher.cpp',
'Bullet/CollisionDispatch/UnionFind.cpp',
'Bullet/NarrowPhaseCollision/CollisionObject.cpp',
'Bullet/CollisionDispatch/CollisionWorld.cpp',
'BulletDynamics/ConstraintSolver/ContactConstraint.cpp',
'BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp',