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:
@@ -95,7 +95,7 @@ void SpuCollisionTaskProcess::initialize2(bool useEpa)
|
||||
|
||||
#ifdef DEBUG_SpuCollisionTaskProcess
|
||||
m_initialized = true;
|
||||
assert(MIDPHASE_NUM_WORKUNITS_PER_TASK*sizeof(SpuGatherAndProcessWorkUnitInput) <= MIDPHASE_WORKUNIT_TASK_SIZE);
|
||||
btAssert(MIDPHASE_NUM_WORKUNITS_PER_TASK*sizeof(SpuGatherAndProcessWorkUnitInput) <= MIDPHASE_WORKUNIT_TASK_SIZE);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -173,8 +173,8 @@ void SpuCollisionTaskProcess::addWorkToTask(void* pairArrayPtr,int startIndex,in
|
||||
#endif //DEBUG_SPU_TASK_SCHEDULING
|
||||
|
||||
#ifdef DEBUG_SpuCollisionTaskProcess
|
||||
assert(m_initialized);
|
||||
assert(m_workUnitTaskBuffers);
|
||||
btAssert(m_initialized);
|
||||
btAssert(m_workUnitTaskBuffers);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -25,7 +25,6 @@ subject to the following restrictions:
|
||||
|
||||
|
||||
#include "SpuVoronoiSimplexSolver.h"
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#define VERTA 0
|
||||
@@ -37,7 +36,7 @@ subject to the following restrictions:
|
||||
void SpuVoronoiSimplexSolver::removeVertex(int index)
|
||||
{
|
||||
|
||||
assert(m_numVertices>0);
|
||||
btAssert(m_numVertices>0);
|
||||
m_numVertices--;
|
||||
m_simplexVectorW[index] = m_simplexVectorW[m_numVertices];
|
||||
m_simplexPointsP[index] = m_simplexPointsP[m_numVertices];
|
||||
|
||||
Reference in New Issue
Block a user