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

fix build system problems, Dynamica build for Mac OSX, buyoancy demo

Browse Source
This commit is contained in:
erwin.coumans
2009-01-12 23:26:07 +00:00
parent 1320b5f2f6
commit ab879b0528
5 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/HeightFieldFluidDemo/HfFluidDemo.cpp
View File

@@ -168,7 +168,7 @@ void Init_Bowl (HfFluidDemo* fluidDemo)
{ {
btScalar y = btScalar(j - fluid->getNumNodesLength()/2)/btScalar(fluid->getNumNodesLength()*2); btScalar y = btScalar(j - fluid->getNumNodesLength()/2)/btScalar(fluid->getNumNodesLength()*2);
btScalar yh = amplitude * (y * y) + btScalar(5.0); btScalar yh = amplitude * (y * y) + btScalar(5.0);
btScalar gHeight = max(xh,yh); btScalar gHeight = btMax(xh,yh);
int index = fluid->arrayIndex (i, j); int index = fluid->arrayIndex (i, j);
ground[index] = gHeight; ground[index] = gHeight;
btScalar wHeight = btScalar(0.0f); btScalar wHeight = btScalar(0.0f);

4
Demos/HeightFieldFluidDemo/Jamfile
View File

@@ -1,3 +1,5 @@
SubDir TOP Demos HeightFieldFluidDemo ; SubDir TOP Demos HeightFieldFluidDemo ;
BulletDemo HeightFieldFluidDemo : [ Wildcard *.h *.cpp BulletHfFluid/*.h BulletHfFluid/*.cpp ] ; BulletDemo HeightFieldFluidDemo : [ Wildcard *.cpp *.h ]
[ Wildcard BulletHfFluid : *.h *.cpp ]
;

8
Extras/MayaPlugin/Makefile.mac
View File

@@ -28,9 +28,9 @@ CPPFLAGS = -DMAC_PLUGIN -DOSMac_MachO_ -DBits32_ -m32 -DUNIX -D_BOOL -DOSMac_ -D
LDFLAGS =-bundle -ldl -shared LDFLAGS =-bundle -ldl -shared
BULLET_INCLUDE=-I$(BULLET)/src -I$(BULLET)/Extras/GIMPACT/include BULLET_INCLUDE=-I$(BULLET)/src
BULLET_LIB=-L$(BULLET)/out/macosxx86/optimize/libs -L$(BULLET)/src \ BULLET_LIB=-L$(BULLET)/out/macosxx86/optimize/libs -L$(BULLET)/src \
-lBulletColladaConverter -lcolladadom -llibxml -lGIMPACT -lGIMPACTUtils -lbulletdynamics \ -lBulletColladaConverter -lcolladadom -llibxml -lGIMPACTUtils -lbulletdynamics \
-lbulletcollision -lbulletmath -lbulletcollision -lbulletmath
GL_LIB=-framework OpenGL GL_LIB=-framework OpenGL
@@ -40,7 +40,7 @@ MAYA_LIB=-L/Applications/Autodesk/maya2008/Maya.app/Contents/MacOS -lOpenMaya -l
SOURCES = pluginMain.cpp colladaExport.cpp rigidBodyNode.cpp rigidBodyArrayNode.cpp collisionShapeNode.cpp \ SOURCES = pluginMain.cpp colladaExport.cpp rigidBodyNode.cpp rigidBodyArrayNode.cpp collisionShapeNode.cpp \
solver.cpp bt_solver.cpp dSolverNode.cpp dSolverCmd.cpp dRigidBodyCmd.cpp dRigidBodyArrayCmd.cpp \ solver.cpp bt_solver.cpp dSolverNode.cpp dSolverCmd.cpp dRigidBodyCmd.cpp dRigidBodyArrayCmd.cpp \
pdbIO.cpp drawUtils.cpp pdbIO.cpp drawUtils.cpp nailConstraintNode.cpp dNailConstraintCmd.cpp
HEADERS = box_shape.h bt_sphere_shape.h dSolverNode.h rigid_body_impl.h \ HEADERS = box_shape.h bt_sphere_shape.h dSolverNode.h rigid_body_impl.h \
box_shape_impl.h collision_shape.h mathUtils.h rigidBodyNode.h \ box_shape_impl.h collision_shape.h mathUtils.h rigidBodyNode.h \
@@ -51,7 +51,7 @@ HEADERS = box_shape.h bt_sphere_shape.h dSolverNode.h
bt_plane_shape.h dRigidBodyArrayCmd.h plane_shape_impl.h \ bt_plane_shape.h dRigidBodyArrayCmd.h plane_shape_impl.h \
bt_rigid_body.h dRigidBodyCmd.h rigidBodyArrayNode.h \ bt_rigid_body.h dRigidBodyCmd.h rigidBodyArrayNode.h \
bt_solver.h dSolverCmd.h rigid_body.h pdbIO.h \ bt_solver.h dSolverCmd.h rigid_body.h pdbIO.h \
shared_ptr.h drawUtils.h shared_ptr.h drawUtils.h nailConstraintNode.h
INCLUDE_FLAGS= $(GL_INCLUDE) $(BULLET_INCLUDE) $(MAYA_INCLUDE) INCLUDE_FLAGS= $(GL_INCLUDE) $(BULLET_INCLUDE) $(MAYA_INCLUDE)

2
Extras/iff/Jamfile
View File

@@ -29,4 +29,4 @@ InstallHeader [ Wildcard *.h ] : iff ;
SubInclude TOP Extras iff iffCheck ; SubInclude TOP Extras iff iffCheck ;
SubInclude TOP Extras iff iffCreateTest ; SubInclude TOP Extras iff iffCreateTest ;
SubInclude TOP Extras iff BulletIffConverter ; #SubInclude TOP Extras iff BulletIffConverter ;

4
config.h.in
View File

@@ -60,10 +60,6 @@
/* Define to 1 if you have the <windows.h> header file. */ /* Define to 1 if you have the <windows.h> header file. */
#undef HAVE_WINDOWS_H #undef HAVE_WINDOWS_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Name of package */ /* Name of package */
#undef PACKAGE #undef PACKAGE