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

Merge pull request #259 from AlexanderPolyakov/master

Browse Source 
Fix for use of uninitialized variables.
This commit is contained in:
erwincoumans
2017-03-13 21:57:03 -07:00
committed by GitHub
parent ef9afd39f7 b7699024e2
commit 11975ec60b
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/BulletCollision/CollisionShapes/btBox2dShape.h
View File

@@ -103,11 +103,12 @@ public:
btScalar minDimension = boxHalfExtents.getX(); btScalar minDimension = boxHalfExtents.getX();
if (minDimension>boxHalfExtents.getY()) if (minDimension>boxHalfExtents.getY())
minDimension = boxHalfExtents.getY(); minDimension = boxHalfExtents.getY();
setSafeMargin(minDimension);
m_shapeType = BOX_2D_SHAPE_PROXYTYPE; m_shapeType = BOX_2D_SHAPE_PROXYTYPE;
btVector3 margin(getMargin(),getMargin(),getMargin()); btVector3 margin(getMargin(),getMargin(),getMargin());
m_implicitShapeDimensions = (boxHalfExtents * m_localScaling) - margin; m_implicitShapeDimensions = (boxHalfExtents * m_localScaling) - margin;
setSafeMargin(minDimension);
}; };
virtual void setMargin(btScalar collisionMargin) virtual void setMargin(btScalar collisionMargin)

4
src/BulletCollision/CollisionShapes/btBoxShape.cpp
View File

@@ -19,10 +19,10 @@ btBoxShape::btBoxShape( const btVector3& boxHalfExtents)
{ {
m_shapeType = BOX_SHAPE_PROXYTYPE; m_shapeType = BOX_SHAPE_PROXYTYPE;
setSafeMargin(boxHalfExtents);
btVector3 margin(getMargin(),getMargin(),getMargin()); btVector3 margin(getMargin(),getMargin(),getMargin());
m_implicitShapeDimensions = (boxHalfExtents * m_localScaling) - margin; m_implicitShapeDimensions = (boxHalfExtents * m_localScaling) - margin;
setSafeMargin(boxHalfExtents);
}; };

5
src/BulletCollision/CollisionShapes/btCylinderShape.cpp
View File

@@ -19,10 +19,11 @@ btCylinderShape::btCylinderShape (const btVector3& halfExtents)
:btConvexInternalShape(), :btConvexInternalShape(),
m_upAxis(1) m_upAxis(1)
{ {
setSafeMargin(halfExtents);
btVector3 margin(getMargin(),getMargin(),getMargin()); btVector3 margin(getMargin(),getMargin(),getMargin());
m_implicitShapeDimensions = (halfExtents * m_localScaling) - margin; m_implicitShapeDimensions = (halfExtents * m_localScaling) - margin;
setSafeMargin(halfExtents);
m_shapeType = CYLINDER_SHAPE_PROXYTYPE; m_shapeType = CYLINDER_SHAPE_PROXYTYPE;
} }