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

Fixed warnings in Bullet/src core library

Browse Source 
Thanks Martijn Reuvers from Two Tribes B.V. (www.twotribes.com) for the patch

To make this work more visible, suppress warnings in external libraries in Extras (COLLADA_DOM, libxml and glui contain many warnings)
Added PreprocessorDefinitions: _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE to vcproj files
This commit is contained in:
erwin.coumans
2008-05-10 18:00:21 +00:00
parent 739d09a7af
commit bd97c5e569
285 changed files with 11554 additions and 11205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/BulletCollision/CollisionShapes/btShapeHull.cpp
View File

@@ -81,7 +81,7 @@ btShapeHull::~btShapeHull ()
}
bool
btShapeHull::buildHull (btScalar margin)
btShapeHull::buildHull (btScalar /*margin*/)
{
int numSampleDirections = NUM_UNITSPHERE_POINTS;
{
@@ -107,7 +107,7 @@ btShapeHull::buildHull (btScalar margin)
HullDesc hd;
hd.mFlags = QF_TRIANGLES;
hd.mVcount = numSampleDirections;
hd.mVcount = static_cast<unsigned int>(numSampleDirections);
#ifdef BT_USE_DOUBLE_PRECISION
hd.mVertices = &supportPoints[0];
@@ -124,16 +124,16 @@ btShapeHull::buildHull (btScalar margin)
return false;
}
m_vertices.resize (hr.mNumOutputVertices);
m_vertices.resize (static_cast<int>(hr.mNumOutputVertices));
for (i = 0; i < hr.mNumOutputVertices; i++)
for (i = 0; i < static_cast<int>(hr.mNumOutputVertices); i++)
{
m_vertices[i] = hr.m_OutputVertices[i];
}
m_numIndices = hr.mNumIndices;
m_indices.resize(m_numIndices);
for (i = 0; i < m_numIndices; i++)
m_indices.resize(static_cast<int>(m_numIndices));
for (i = 0; i < static_cast<int>(m_numIndices); i++)
{
m_indices[i] = hr.m_Indices[i];
}
@@ -147,7 +147,7 @@ btShapeHull::buildHull (btScalar margin)
int
btShapeHull::numTriangles () const
{
return m_numIndices / 3;
return static_cast<int>(m_numIndices / 3);
}
int
@@ -159,6 +159,6 @@ btShapeHull::numVertices () const
int
btShapeHull::numIndices () const
{
return m_numIndices;
return static_cast<int>(m_numIndices);
}