removed some warnings, as reported here:
http://code.google.com/p/bullet/issues/detail?id=123 Thanks sparkprime
This commit is contained in:
@@ -55,7 +55,7 @@ bool CHull::overlap(const CHull &h) const
|
|||||||
ConvexBuilder::ConvexBuilder(ConvexDecompInterface *callback)
|
ConvexBuilder::ConvexBuilder(ConvexDecompInterface *callback)
|
||||||
{
|
{
|
||||||
mCallback = callback;
|
mCallback = callback;
|
||||||
};
|
}
|
||||||
|
|
||||||
ConvexBuilder::~ConvexBuilder(void)
|
ConvexBuilder::~ConvexBuilder(void)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -374,4 +374,4 @@ void calcConvexDecomposition(unsigned int vcount,
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
};
|
}
|
||||||
|
|||||||
@@ -3232,4 +3232,4 @@ void HullLibrary::BringOutYourDead(const float *verts,unsigned int vcount, float
|
|||||||
free(used);
|
free(used);
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
}
|
||||||
|
|||||||
@@ -1172,14 +1172,14 @@ inline Vector3d operator * (float s, const Vector3d &v )
|
|||||||
{
|
{
|
||||||
Vector3d Scaled(v.x*s, v.y*s, v.z*s);
|
Vector3d Scaled(v.x*s, v.y*s, v.z*s);
|
||||||
return(Scaled);
|
return(Scaled);
|
||||||
};
|
}
|
||||||
|
|
||||||
inline Vector2d operator * (float s, const Vector2d &v )
|
inline Vector2d operator * (float s, const Vector2d &v )
|
||||||
{
|
{
|
||||||
Vector2d Scaled(v.x*s, v.y*s);
|
Vector2d Scaled(v.x*s, v.y*s);
|
||||||
return(Scaled);
|
return(Scaled);
|
||||||
};
|
}
|
||||||
|
|
||||||
};
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -857,4 +857,4 @@ unsigned int WavefrontObj::loadObj(const char *fname) // load a wavefront obj re
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
}
|
||||||
|
|||||||
@@ -57,6 +57,6 @@ public:
|
|||||||
float *mVertices;
|
float *mVertices;
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -792,4 +792,4 @@ float computeConcavity(unsigned int vcount,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
};
|
}
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ float computeConcavity(unsigned int vcount,
|
|||||||
float &volume);
|
float &volume);
|
||||||
|
|
||||||
|
|
||||||
};
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -303,4 +303,4 @@ bool computeSplitPlane(unsigned int vcount,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
};
|
}
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ btConvexTriangleCallback::~btConvexTriangleCallback()
|
|||||||
void btConvexTriangleCallback::clearCache()
|
void btConvexTriangleCallback::clearCache()
|
||||||
{
|
{
|
||||||
m_dispatcher->clearManifold(m_manifoldPtr);
|
m_dispatcher->clearManifold(m_manifoldPtr);
|
||||||
};
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ void btConvexInternalShape::getAabbSlow(const btTransform& trans,btVector3&minAa
|
|||||||
tmp = trans(localGetSupportingVertex(vec*trans.getBasis()));
|
tmp = trans(localGetSupportingVertex(vec*trans.getBasis()));
|
||||||
minAabb[i] = tmp[i]-margin;
|
minAabb[i] = tmp[i]-margin;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
|
|
||||||
btVector3 btConvexInternalShape::localGetSupportingVertex(const btVector3& vec)const
|
btVector3 btConvexInternalShape::localGetSupportingVertex(const btVector3& vec)const
|
||||||
|
|||||||
@@ -425,5 +425,5 @@ btScalar resolveSingleFrictionEmpty(
|
|||||||
|
|
||||||
|
|
||||||
return btScalar(0.);
|
return btScalar(0.);
|
||||||
};
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -500,7 +500,8 @@ struct eStatus { enum _ {
|
|||||||
OutOfVertices,
|
OutOfVertices,
|
||||||
AccuraryReached,
|
AccuraryReached,
|
||||||
FallBack,
|
FallBack,
|
||||||
Failed, };};
|
Failed
|
||||||
|
};};
|
||||||
/* Fields */
|
/* Fields */
|
||||||
eStatus::_ m_status;
|
eStatus::_ m_status;
|
||||||
GJK::sSimplex m_result;
|
GJK::sSimplex m_result;
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ struct sResults
|
|||||||
Separated, /* Shapes doesnt penetrate */
|
Separated, /* Shapes doesnt penetrate */
|
||||||
Penetrating, /* Shapes are penetrating */
|
Penetrating, /* Shapes are penetrating */
|
||||||
GJK_Failed, /* GJK phase fail, no big issue, shapes are probably just 'touching' */
|
GJK_Failed, /* GJK phase fail, no big issue, shapes are probably just 'touching' */
|
||||||
EPA_Failed, /* EPA phase fail, bigger problem, need to save parameters, and debug */
|
EPA_Failed /* EPA phase fail, bigger problem, need to save parameters, and debug */
|
||||||
} status;
|
} status;
|
||||||
btVector3 witnesses[2];
|
btVector3 witnesses[2];
|
||||||
btVector3 normal;
|
btVector3 normal;
|
||||||
|
|||||||
Reference in New Issue
Block a user