fix padding in btSolverConstraint, see Issue 650
fix some warnings
This commit is contained in:
@@ -12,6 +12,10 @@ GLDebugDrawer::GLDebugDrawer()
|
||||
|
||||
}
|
||||
|
||||
GLDebugDrawer::~GLDebugDrawer()
|
||||
{
|
||||
}
|
||||
|
||||
void GLDebugDrawer::drawLine(const btVector3& from,const btVector3& to,const btVector3& fromColor, const btVector3& toColor)
|
||||
{
|
||||
glBegin(GL_LINES);
|
||||
|
||||
@@ -12,7 +12,7 @@ class GLDebugDrawer : public btIDebugDraw
|
||||
public:
|
||||
|
||||
GLDebugDrawer();
|
||||
|
||||
virtual ~GLDebugDrawer();
|
||||
|
||||
virtual void drawLine(const btVector3& from,const btVector3& to,const btVector3& fromColor, const btVector3& toColor);
|
||||
|
||||
|
||||
@@ -34,6 +34,10 @@ GL_Simplex1to4::GL_Simplex1to4()
|
||||
{
|
||||
}
|
||||
|
||||
GL_Simplex1to4::~GL_Simplex1to4()
|
||||
{
|
||||
}
|
||||
|
||||
///
|
||||
/// Debugging method calcClosest calculates the closest point to the origin, using m_simplexSolver
|
||||
///
|
||||
|
||||
@@ -28,6 +28,7 @@ class GL_Simplex1to4 : public btBU_Simplex1to4
|
||||
public:
|
||||
|
||||
GL_Simplex1to4();
|
||||
virtual ~GL_Simplex1to4();
|
||||
|
||||
void calcClosest(btScalar* m);
|
||||
|
||||
|
||||
@@ -1402,7 +1402,6 @@ static uint8 *resample_row_generic(uint8 *out, uint8 *in_near, uint8 *in_far, in
|
||||
{
|
||||
// resample with nearest-neighbor
|
||||
int i,j;
|
||||
in_far = in_far;
|
||||
for (i=0; i < w; ++i)
|
||||
for (j=0; j < hs; ++j)
|
||||
out[i*hs+j] = in_near[i];
|
||||
|
||||
Reference in New Issue
Block a user