[Orxonox-commit 3293] r7982 - code/branches/kicklib/src/external/bullet/BulletCollision

rgrieder at orxonox.net rgrieder at orxonox.net
Sun Feb 27 06:58:54 CET 2011


Author: rgrieder
Date: 2011-02-27 06:58:54 +0100 (Sun, 27 Feb 2011)
New Revision: 7982

Removed:
   code/branches/kicklib/src/external/bullet/BulletCollision/Gimpact/
Modified:
   code/branches/kicklib/src/external/bullet/BulletCollision/CMakeLists.txt
Log:
We don't seem to use GIMPACT shipped with Bullet. If we do, we can always add it.

Modified: code/branches/kicklib/src/external/bullet/BulletCollision/CMakeLists.txt
===================================================================
--- code/branches/kicklib/src/external/bullet/BulletCollision/CMakeLists.txt	2011-02-27 05:56:57 UTC (rev 7981)
+++ code/branches/kicklib/src/external/bullet/BulletCollision/CMakeLists.txt	2011-02-27 05:58:54 UTC (rev 7982)
@@ -68,14 +68,6 @@
 	CollisionShapes/btTriangleMeshShape.cpp
 	CollisionShapes/btUniformScalingShape.cpp
 
-	Gimpact/btContactProcessing.cpp
-	Gimpact/btGImpactShape.cpp
-	Gimpact/btGImpactBvh.cpp
-	Gimpact/btGenericPoolAllocator.cpp
-	Gimpact/btGImpactCollisionAlgorithm.cpp
-	Gimpact/btTriangleShapeEx.cpp
-	Gimpact/btGImpactQuantizedBvh.cpp
-
 	NarrowPhaseCollision/btContinuousConvexCollision.cpp
 	NarrowPhaseCollision/btGjkEpa2.cpp
 	NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
@@ -90,13 +82,6 @@
 
 COMPILATION_END
 
-COMPILATION_BEGIN BulletGImpactCompilation.cpp
-	Gimpact/gim_contact.cpp
-	Gimpact/gim_memory.cpp
-	Gimpact/gim_tri_collision.cpp
-	Gimpact/gim_box_set.cpp
-COMPILATION_END
-
 	# Headers
 	BroadphaseCollision/btAxisSweep3.h
 	BroadphaseCollision/btBroadphaseInterface.h
@@ -170,17 +155,6 @@
 	CollisionShapes/btTriangleMeshShape.h
 	CollisionShapes/btUniformScalingShape.h
 
-	Gimpact/btGImpactShape.h
-	Gimpact/gim_contact.h
-	Gimpact/btGImpactBvh.h
-	Gimpact/btGenericPoolAllocator.h
-	Gimpact/gim_memory.h
-	Gimpact/btGImpactCollisionAlgorithm.h
-	Gimpact/btTriangleShapeEx.h
-	Gimpact/gim_tri_collision.h
-	Gimpact/btGImpactQuantizedBvh.h
-	Gimpact/gim_box_set.h
-
 	NarrowPhaseCollision/btContinuousConvexCollision.h
 	NarrowPhaseCollision/btConvexCast.h
 	NarrowPhaseCollision/btConvexPenetrationDepthSolver.h




More information about the Orxonox-commit mailing list