Fixes for broadphase/paircache determinism.
Revert definition for ATTRIBUTE_ALIGNED16, and try to force sizeof(btSolverConstraint) by using unions with btScalar, for non-btScalar data types. Use btAssert and not assert. Don't access btAlignedObjectArray elements, for zero sets
This commit is contained in:
@@ -179,7 +179,7 @@ public:
|
||||
plane.setValue(btScalar(0.),btScalar(0.),btScalar(-1.),-halfExtents.z());
|
||||
break;
|
||||
default:
|
||||
assert(0);
|
||||
btAssert(0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -306,7 +306,7 @@ public:
|
||||
penetrationVector.setValue(btScalar(0.),btScalar(0.),btScalar(-1.));
|
||||
break;
|
||||
default:
|
||||
assert(0);
|
||||
btAssert(0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ void btConeShape::setConeUpIndex(int upIndex)
|
||||
m_coneIndices[2] = 1;
|
||||
break;
|
||||
default:
|
||||
assert(0);
|
||||
btAssert(0);
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -181,7 +181,7 @@ void btConvexHullShape::getPlane(btVector3& ,btVector3& ,int ) const
|
||||
//not yet
|
||||
bool btConvexHullShape::isInside(const btVector3& ,btScalar ) const
|
||||
{
|
||||
assert(0);
|
||||
btAssert(0);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -150,7 +150,7 @@ void btConvexPointCloudShape::getPlane(btVector3& ,btVector3& ,int ) const
|
||||
//not yet
|
||||
bool btConvexPointCloudShape::isInside(const btVector3& ,btScalar ) const
|
||||
{
|
||||
assert(0);
|
||||
btAssert(0);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -35,13 +35,13 @@ m_weldingThreshold(0.0)
|
||||
if (m_use32bitIndices)
|
||||
{
|
||||
m_indexedMeshes[0].m_numTriangles = m_32bitIndices.size()/3;
|
||||
m_indexedMeshes[0].m_triangleIndexBase = (unsigned char*) &m_32bitIndices[0];
|
||||
m_indexedMeshes[0].m_triangleIndexBase = 0;
|
||||
m_indexedMeshes[0].m_indexType = PHY_INTEGER;
|
||||
m_indexedMeshes[0].m_triangleIndexStride = 3*sizeof(int);
|
||||
} else
|
||||
{
|
||||
m_indexedMeshes[0].m_numTriangles = m_16bitIndices.size()/3;
|
||||
m_indexedMeshes[0].m_triangleIndexBase = (unsigned char*) &m_16bitIndices[0];
|
||||
m_indexedMeshes[0].m_triangleIndexBase = 0;
|
||||
m_indexedMeshes[0].m_indexType = PHY_SHORT;
|
||||
m_indexedMeshes[0].m_triangleIndexStride = 3*sizeof(short int);
|
||||
}
|
||||
@@ -49,12 +49,12 @@ m_weldingThreshold(0.0)
|
||||
if (m_use4componentVertices)
|
||||
{
|
||||
m_indexedMeshes[0].m_numVertices = m_4componentVertices.size();
|
||||
m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_4componentVertices[0];
|
||||
m_indexedMeshes[0].m_vertexBase = 0;
|
||||
m_indexedMeshes[0].m_vertexStride = sizeof(btVector3);
|
||||
} else
|
||||
{
|
||||
m_indexedMeshes[0].m_numVertices = m_3componentVertices.size()/3;
|
||||
m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_3componentVertices[0];
|
||||
m_indexedMeshes[0].m_vertexBase = 0;
|
||||
m_indexedMeshes[0].m_vertexStride = 3*sizeof(btScalar);
|
||||
}
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ public:
|
||||
|
||||
virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec)const
|
||||
{
|
||||
assert(0);
|
||||
btAssert(0);
|
||||
return localGetSupportingVertex(vec);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user