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

Cleanup some trivial compilation warnings.

Browse Source
This commit is contained in:
sjbaker
2007-03-19 04:27:59 +00:00
parent b8ce13adb1
commit 6b102c65b3
6 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Demos/ColladaDemo/ColladaConverter.cpp
View File

@@ -119,8 +119,8 @@ ColladaConverter::ColladaConverter()
:m_collada(0), :m_collada(0),
m_dom(0), m_dom(0),
m_filename(0), m_filename(0),
m_numObjects(0), m_unitMeterScaling(1.f),
m_unitMeterScaling(1.f) m_numObjects(0)
{ {
//Collada-m_dom //Collada-m_dom
m_collada = new DAE; m_collada = new DAE;
@@ -973,11 +973,11 @@ void ColladaConverter::ConvertRigidBodyRef( btRigidBodyInput& rbInput,btRigidBod
daeString elemName = elemRef->getElementName(); daeString elemName = elemRef->getElementName();
if (elemName && !strcmp(elemName,"kinematic")) 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? //how can I make this cast safe?
const domAny* myAny = (const domAny*)elemRef.cast(); const domAny* myAny = (const domAny*)elemRef.cast();
daeString myVal = myAny->getValue(); daeString myVal = myAny->getValue();
@@ -1195,10 +1195,10 @@ void ColladaConverter::ConvertRigidBodyRef( btRigidBodyInput& rbInput,btRigidBod
{ {
const domListOfFloats& listFloats = flArray->getValue(); const domListOfFloats& listFloats = flArray->getValue();
int vertexStride = 3;//instead of hardcoded stride, should use the 'accessor' 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) for (vertIndex = 0;vertIndex < listFloats.getCount();vertIndex+=vertexStride)
{ {
btVector3 verts[3]; //btVector3 verts[3];
domFloat fl0 = listFloats.get(vertIndex); domFloat fl0 = listFloats.get(vertIndex);
domFloat fl1 = listFloats.get(vertIndex+1); domFloat fl1 = listFloats.get(vertIndex+1);
domFloat fl2 = listFloats.get(vertIndex+2); domFloat fl2 = listFloats.get(vertIndex+2);

12
Extras/GIMPACTBullet/btGIMPACTMeshShape.cpp
View File

@@ -43,7 +43,7 @@ void decrease_gimpact_reference()
void btGIMPACTMeshData::clearMeshParts() void btGIMPACTMeshData::clearMeshParts()
{ {
for(size_t i = 0;i<m_meshes.size();i++) for(int i = 0;i<m_meshes.size();i++)
{ {
gim_trimesh_data_dec_ref(m_meshes[i]); gim_trimesh_data_dec_ref(m_meshes[i]);
} }
@@ -161,7 +161,7 @@ btGIMPACTMeshData::~btGIMPACTMeshData()
void btGIMPACTMeshShape::clearMeshParts() void btGIMPACTMeshShape::clearMeshParts()
{ {
GIM_TRIMESH * ptrimesh; GIM_TRIMESH * ptrimesh;
for(size_t i = 0;i<m_gim_trimesh_parts.size();i++) for(int i = 0;i<m_gim_trimesh_parts.size();i++)
{ {
ptrimesh = (GIM_TRIMESH * )m_gim_trimesh_parts[i]; ptrimesh = (GIM_TRIMESH * )m_gim_trimesh_parts[i];
gim_trimesh_destroy(ptrimesh); gim_trimesh_destroy(ptrimesh);
@@ -179,7 +179,7 @@ void btGIMPACTMeshShape::processMeshParts(btGIMPACTMeshData * meshdata)
BT_GIMPACT_TRIMESH_HANDLE gimhandle; BT_GIMPACT_TRIMESH_HANDLE gimhandle;
GIM_TRIMESH * ptrimesh; GIM_TRIMESH * ptrimesh;
for(size_t i = 0;i<m_meshdata->m_meshes.size();i++) for(int i = 0;i<m_meshdata->m_meshes.size();i++)
{ {
ptrimesh = (GIM_TRIMESH *)gim_alloc(sizeof(GIM_TRIMESH)); ptrimesh = (GIM_TRIMESH *)gim_alloc(sizeof(GIM_TRIMESH));
gim_trimesh_create(ptrimesh,m_meshdata->m_meshes[i],1,0); 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; GIM_TRIMESH * ptrimesh;
for(size_t i = 0;i<m_gim_trimesh_parts.size();i++) for(int i = 0;i<m_gim_trimesh_parts.size();i++)
{ {
ptrimesh = (GIM_TRIMESH * )m_gim_trimesh_parts[i]; ptrimesh = (GIM_TRIMESH * )m_gim_trimesh_parts[i];
gim_trimesh_set_tranform(ptrimesh, gim_trans); gim_trimesh_set_tranform(ptrimesh, gim_trans);
@@ -233,7 +233,7 @@ void btGIMPACTMeshShape::getAabb(const btTransform& t,btVector3& aabbMin,btVecto
GIM_TRIMESH * ptrimesh; GIM_TRIMESH * ptrimesh;
for(size_t i = 0;i<m_gim_trimesh_parts.size();i++) for(int i = 0;i<m_gim_trimesh_parts.size();i++)
{ {
ptrimesh = (GIM_TRIMESH * )m_gim_trimesh_parts[i]; ptrimesh = (GIM_TRIMESH * )m_gim_trimesh_parts[i];
gim_trimesh_get_aabb(ptrimesh,&meshbox); gim_trimesh_get_aabb(ptrimesh,&meshbox);
@@ -299,7 +299,7 @@ void btGIMPACTMeshShape::processAllTriangles(btTriangleCallback* callback,const
GDYNAMIC_ARRAY collision_result; GDYNAMIC_ARRAY collision_result;
GIM_TRIMESH * ptrimesh; GIM_TRIMESH * ptrimesh;
size_t i,j; int i,j;
vec3f trivec[3]; vec3f trivec[3];
btVector3 btrivec[3]; btVector3 btrivec[3];
GUINT * boxesresult; GUINT * boxesresult;

24
configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for bullet 2.41. # Generated by GNU Autoconf 2.59 for bullet 2.47.
# #
# Report bugs to <bullet@erwincoumans.com>. # Report bugs to <bullet@erwincoumans.com>.
# #
@@ -271,8 +271,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='bullet' PACKAGE_NAME='bullet'
PACKAGE_TARNAME='bullet' PACKAGE_TARNAME='bullet'
PACKAGE_VERSION='2.41' PACKAGE_VERSION='2.47'
PACKAGE_STRING='bullet 2.41' PACKAGE_STRING='bullet 2.47'
PACKAGE_BUGREPORT='bullet@erwincoumans.com' PACKAGE_BUGREPORT='bullet@erwincoumans.com'
ac_unique_file="mk/jam/build.jam" 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. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF 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]... Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -855,7 +855,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of bullet 2.41:";; short | recursive ) echo "Configuration of bullet 2.47:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@@ -980,7 +980,7 @@ fi
test -n "$ac_init_help" && exit 0 test -n "$ac_init_help" && exit 0
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
bullet configure 2.41 bullet configure 2.47
generated by GNU Autoconf 2.59 generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc. Copyright (C) 2003 Free Software Foundation, Inc.
@@ -994,7 +994,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. 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 generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@ $ $0 $@
@@ -1331,8 +1331,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
PACKAGE_LONGNAME="Bullet Continuous Collision Detection and Physics Library" PACKAGE_LONGNAME="Bullet Continuous Collision Detection and Physics Library"
PACKAGE_COPYRIGHT="Copyright (c) 2005-2006 Erwin Coumans" PACKAGE_COPYRIGHT="Copyright (c) 2005-2007 Erwin Coumans"
PACKAGE_HOMEPAGE="http://www.continuousphysics.com/Bullet/" PACKAGE_HOMEPAGE="http://www.bulletphysics.com"
ac_aux_dir= 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\" ; 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\" ; cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_VERSION_LIST += \"$cs_veritem\" ;
" "
done done
@@ -10275,7 +10275,7 @@ _ASBOX
} >&5 } >&5
cat >&5 <<_CSEOF 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 generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@@ -10338,7 +10338,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\ ac_cs_version="\\
bullet config.status 2.41 bullet config.status 2.47
configured by $0, generated by GNU Autoconf 2.59, configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

7
src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
View File

@@ -32,12 +32,12 @@
#define BP_MAX_HANDLES 1500000 //arbitrary maximum number of handles #define BP_MAX_HANDLES 1500000 //arbitrary maximum number of handles
#define BP_HANDLE_SENTINEL 0xffffffff #define BP_HANDLE_SENTINEL 0xffffffff
#define BP_HANDLE_MASK 0xfffffffc #define BP_HANDLE_MASK 0xfffffffc
#else BP_USE_FIXEDPOINT_INT_32 #else
#define BP_FP_INT_TYPE unsigned short int #define BP_FP_INT_TYPE unsigned short int
#define BP_MAX_HANDLES 32767 #define BP_MAX_HANDLES 32767
#define BP_HANDLE_SENTINEL 0xffff #define BP_HANDLE_SENTINEL 0xffff
#define BP_HANDLE_MASK 0xfffe #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. /// btAxisSweep3 is an efficient implementation of the 3d axis sweep and prune broadphase.
@@ -129,4 +129,5 @@ public:
}; };
#endif //AXIS_SWEEP_3_H #endif

9
src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
View File

@@ -16,10 +16,10 @@ subject to the following restrictions:
#include <BulletCollision/CollisionShapes/btPolyhedralConvexShape.h> #include <BulletCollision/CollisionShapes/btPolyhedralConvexShape.h>
btPolyhedralConvexShape::btPolyhedralConvexShape() btPolyhedralConvexShape::btPolyhedralConvexShape()
:m_optionalHull(0), :m_localAabbMin(1,1,1),
m_localAabbMin(1,1,1),
m_localAabbMax(-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; m_localAabbMin[i] = tmp[i]-m_collisionMargin;
} }
} }

6
src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
View File

@@ -369,8 +369,8 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisio
BEGIN_PROFILE("gatherSolverData"); BEGIN_PROFILE("gatherSolverData");
int sizeofSB = sizeof(btSolverBody); //int sizeofSB = sizeof(btSolverBody);
int sizeofSC = sizeof(btSolverConstraint); //int sizeofSC = sizeof(btSolverConstraint);
if (1) 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( btScalar impulse = resolveSingleCollisionCombined(
*body0,*body1, *body0,*body1,
cp, cp,