diff --git a/Demos/ColladaDemo/ColladaConverter.cpp b/Demos/ColladaDemo/ColladaConverter.cpp index 323e8fcb8..7b72d6adc 100644 --- a/Demos/ColladaDemo/ColladaConverter.cpp +++ b/Demos/ColladaDemo/ColladaConverter.cpp @@ -119,8 +119,8 @@ ColladaConverter::ColladaConverter() :m_collada(0), m_dom(0), m_filename(0), -m_numObjects(0), -m_unitMeterScaling(1.f) +m_unitMeterScaling(1.f), +m_numObjects(0) { //Collada-m_dom m_collada = new DAE; @@ -973,11 +973,11 @@ void ColladaConverter::ConvertRigidBodyRef( btRigidBodyInput& rbInput,btRigidBod daeString elemName = elemRef->getElementName(); if (elemName && !strcmp(elemName,"kinematic")) { - daeMemoryRef memRef = elemRef->getValuePointer(); + //daeMemoryRef memRef = elemRef->getValuePointer(); - daeBool hasVal = elemRef->hasValue(); + //daeBool hasVal = elemRef->hasValue(); - COLLADA_TYPE::TypeEnum mytype = elemRef->getElementType(); + //COLLADA_TYPE::TypeEnum mytype = elemRef->getElementType(); //how can I make this cast safe? const domAny* myAny = (const domAny*)elemRef.cast(); daeString myVal = myAny->getValue(); @@ -1195,10 +1195,10 @@ void ColladaConverter::ConvertRigidBodyRef( btRigidBodyInput& rbInput,btRigidBod { const domListOfFloats& listFloats = flArray->getValue(); int vertexStride = 3;//instead of hardcoded stride, should use the 'accessor' - int vertIndex = 0; + unsigned int vertIndex = 0; for (vertIndex = 0;vertIndex < listFloats.getCount();vertIndex+=vertexStride) { - btVector3 verts[3]; + //btVector3 verts[3]; domFloat fl0 = listFloats.get(vertIndex); domFloat fl1 = listFloats.get(vertIndex+1); domFloat fl2 = listFloats.get(vertIndex+2); diff --git a/Extras/GIMPACTBullet/btGIMPACTMeshShape.cpp b/Extras/GIMPACTBullet/btGIMPACTMeshShape.cpp index af0e0c8e7..886346338 100644 --- a/Extras/GIMPACTBullet/btGIMPACTMeshShape.cpp +++ b/Extras/GIMPACTBullet/btGIMPACTMeshShape.cpp @@ -43,7 +43,7 @@ void decrease_gimpact_reference() void btGIMPACTMeshData::clearMeshParts() { - for(size_t i = 0;im_meshes.size();i++) + for(int i = 0;im_meshes.size();i++) { ptrimesh = (GIM_TRIMESH *)gim_alloc(sizeof(GIM_TRIMESH)); gim_trimesh_create(ptrimesh,m_meshdata->m_meshes[i],1,0); @@ -213,7 +213,7 @@ void btGIMPACTMeshShape::prepareMeshes(const btTransform & trans) const GIM_TRIMESH * ptrimesh; - for(size_t i = 0;i. # @@ -271,8 +271,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='bullet' PACKAGE_TARNAME='bullet' -PACKAGE_VERSION='2.41' -PACKAGE_STRING='bullet 2.41' +PACKAGE_VERSION='2.47' +PACKAGE_STRING='bullet 2.47' PACKAGE_BUGREPORT='bullet@erwincoumans.com' ac_unique_file="mk/jam/build.jam" @@ -790,7 +790,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures bullet 2.41 to adapt to many kinds of systems. +\`configure' configures bullet 2.47 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -855,7 +855,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bullet 2.41:";; + short | recursive ) echo "Configuration of bullet 2.47:";; esac cat <<\_ACEOF @@ -980,7 +980,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -bullet configure 2.41 +bullet configure 2.47 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -994,7 +994,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bullet $as_me 2.41, which was +It was created by bullet $as_me 2.47, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1331,8 +1331,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu PACKAGE_LONGNAME="Bullet Continuous Collision Detection and Physics Library" - PACKAGE_COPYRIGHT="Copyright (c) 2005-2006 Erwin Coumans" - PACKAGE_HOMEPAGE="http://www.continuousphysics.com/Bullet/" + PACKAGE_COPYRIGHT="Copyright (c) 2005-2007 Erwin Coumans" + PACKAGE_HOMEPAGE="http://www.bulletphysics.com" ac_aux_dir= @@ -9898,7 +9898,7 @@ cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_NAME ?= \"$PACKAGE_NAME\" ; " cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_COPYRIGHT ?= \"$PACKAGE_COPYRIGHT\" ; " - for cs_veritem in 2 41; do + for cs_veritem in 2 47; do cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_VERSION_LIST += \"$cs_veritem\" ; " done @@ -10275,7 +10275,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by bullet $as_me 2.41, which was +This file was extended by bullet $as_me 2.47, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10338,7 +10338,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -bullet config.status 2.41 +bullet config.status 2.47 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h b/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h index 28d6a1fa0..834e159ba 100644 --- a/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h +++ b/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h @@ -32,12 +32,12 @@ #define BP_MAX_HANDLES 1500000 //arbitrary maximum number of handles #define BP_HANDLE_SENTINEL 0xffffffff #define BP_HANDLE_MASK 0xfffffffc -#else BP_USE_FIXEDPOINT_INT_32 +#else #define BP_FP_INT_TYPE unsigned short int #define BP_MAX_HANDLES 32767 #define BP_HANDLE_SENTINEL 0xffff #define BP_HANDLE_MASK 0xfffe -#endif //BP_USE_FIXEDPOINT_INT_32 +#endif /// btAxisSweep3 is an efficient implementation of the 3d axis sweep and prune broadphase. @@ -129,4 +129,5 @@ public: }; -#endif //AXIS_SWEEP_3_H +#endif + diff --git a/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp index 58306dce4..c959666cd 100644 --- a/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp +++ b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp @@ -16,10 +16,10 @@ subject to the following restrictions: #include btPolyhedralConvexShape::btPolyhedralConvexShape() -:m_optionalHull(0), -m_localAabbMin(1,1,1), +:m_localAabbMin(1,1,1), m_localAabbMax(-1,-1,-1), -m_isLocalAabbValid(false) +m_isLocalAabbValid(false), +m_optionalHull(0) { } @@ -163,4 +163,5 @@ void btPolyhedralConvexShape::recalcLocalAabb() m_localAabbMin[i] = tmp[i]-m_collisionMargin; } } - \ No newline at end of file + + diff --git a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp index bb4b5d54a..3658530b0 100644 --- a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp +++ b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp @@ -369,8 +369,8 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisio BEGIN_PROFILE("gatherSolverData"); - int sizeofSB = sizeof(btSolverBody); - int sizeofSC = sizeof(btSolverConstraint); + //int sizeofSB = sizeof(btSolverBody); + //int sizeofSC = sizeof(btSolverConstraint); if (1) @@ -1069,7 +1069,7 @@ btScalar btSequentialImpulseConstraintSolver::solveCombinedContactFriction(btRig { - btConstraintPersistentData* cpd = (btConstraintPersistentData*) cp.m_userPersistentData; + //btConstraintPersistentData* cpd = (btConstraintPersistentData*) cp.m_userPersistentData; btScalar impulse = resolveSingleCollisionCombined( *body0,*body1, cp,