more updates, added SliderConstraintDemo to AllBulletDemos
This commit is contained in:
@@ -53,7 +53,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOUR
|
|||||||
)
|
)
|
||||||
|
|
||||||
LINK_LIBRARIES(
|
LINK_LIBRARIES(
|
||||||
LibBulletColladaConverter LibGLUI LibGIMPACTUtils LibGIMPACT LibConvexDecomposition LibColladaDom LibXML LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
|
LibBulletColladaConverter LibGLUI LibGIMPACTUtils LibGIMPACT LibConvexDecomposition LibColladaDom LibXML LibOpenGLSupport LibBulletSoftBody LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_EXECUTABLE(AllBulletDemos
|
ADD_EXECUTABLE(AllBulletDemos
|
||||||
@@ -70,6 +70,7 @@ ADD_EXECUTABLE(AllBulletDemos
|
|||||||
../ConcaveRaycastDemo/ConcaveRaycastDemo.cpp
|
../ConcaveRaycastDemo/ConcaveRaycastDemo.cpp
|
||||||
../ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp
|
../ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp
|
||||||
../ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
|
../ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
|
||||||
|
../SliderConstraintDemo/SliderConstraintDemo.cpp
|
||||||
../RagdollDemo/RagdollDemo.cpp
|
../RagdollDemo/RagdollDemo.cpp
|
||||||
../GimpactTestDemo/GimpactTestDemo.cpp
|
../GimpactTestDemo/GimpactTestDemo.cpp
|
||||||
../Raytracer/Raytracer.cpp
|
../Raytracer/Raytracer.cpp
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ subject to the following restrictions:
|
|||||||
#include "../ConcaveConvexcastDemo/ConcaveConvexcastDemo.h"
|
#include "../ConcaveConvexcastDemo/ConcaveConvexcastDemo.h"
|
||||||
#include "../ConvexDecompositionDemo/ConvexDecompositionDemo.h"
|
#include "../ConvexDecompositionDemo/ConvexDecompositionDemo.h"
|
||||||
#include "../DynamicControlDemo/MotorDemo.h"
|
#include "../DynamicControlDemo/MotorDemo.h"
|
||||||
|
#include "../SliderConstraintDemo/SliderConstraintDemo.h"
|
||||||
#include "../RagdollDemo/RagdollDemo.h"
|
#include "../RagdollDemo/RagdollDemo.h"
|
||||||
#include "../GimpactTestDemo/GimpactTestDemo.h"
|
#include "../GimpactTestDemo/GimpactTestDemo.h"
|
||||||
#include "../Raytracer/Raytracer.h"
|
#include "../Raytracer/Raytracer.h"
|
||||||
@@ -119,6 +120,7 @@ btDemoEntry g_demoEntries[] =
|
|||||||
{"SoftBody Bunny Match",SoftDemo16::Create},
|
{"SoftBody Bunny Match",SoftDemo16::Create},
|
||||||
{"DynamicControlDemo",MotorDemo::Create},
|
{"DynamicControlDemo",MotorDemo::Create},
|
||||||
{"RagdollDemo",RagdollDemo::Create},
|
{"RagdollDemo",RagdollDemo::Create},
|
||||||
|
{"SliderConstraint",SliderConstraintDemo::Create},
|
||||||
{"BasicDemo", BasicDemo::Create},
|
{"BasicDemo", BasicDemo::Create},
|
||||||
{"CcdPhysicsDemo", CcdPhysicsDemo::Create},
|
{"CcdPhysicsDemo", CcdPhysicsDemo::Create},
|
||||||
{"ConcaveDemo",ConcaveDemo::Create},
|
{"ConcaveDemo",ConcaveDemo::Create},
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ FrameWorkDemo AllBulletDemos :
|
|||||||
../ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp
|
../ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp
|
||||||
../ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
|
../ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
|
||||||
../RagdollDemo/RagdollDemo.cpp
|
../RagdollDemo/RagdollDemo.cpp
|
||||||
|
../SliderConstraintDemo/SliderConstraintDemo.cpp
|
||||||
../GimpactTestDemo/GimpactTestDemo.cpp
|
../GimpactTestDemo/GimpactTestDemo.cpp
|
||||||
../Raytracer/Raytracer.cpp
|
../Raytracer/Raytracer.cpp
|
||||||
../GjkConvexCastDemo/LinearConvexCastDemo.cpp
|
../GjkConvexCastDemo/LinearConvexCastDemo.cpp
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
|
|||||||
)
|
)
|
||||||
|
|
||||||
LINK_LIBRARIES(
|
LINK_LIBRARIES(
|
||||||
LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
|
LibOpenGLSupport LibBulletSoftBody LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_EXECUTABLE(SoftBodyDemo
|
ADD_EXECUTABLE(SoftBodyDemo
|
||||||
|
|||||||
Reference in New Issue
Block a user