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

use int instead of void to avoid 64bit error

Browse Source
This commit is contained in:
erwincoumans
2013-07-19 07:10:38 -07:00
parent 415c6cd24d
commit 01fbe80f8f
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bullet3OpenCL/RigidBody/b3GpuPgsJacobiSolver.cpp
View File

@@ -1067,7 +1067,7 @@ b3Scalar b3GpuPgsJacobiSolver::solveGroupCacheFriendlyFinish(b3OpenCLArray<b3Rig
for (int i=0;i<numRows;i++) for (int i=0;i<numRows;i++)
{ {
int rowIndex =constraintRowOffset+i; int rowIndex =constraintRowOffset+i;
int orgConstraintIndex = (int)m_gpuData->m_cpuConstraintRows[rowIndex].m_originalContactPoint; int orgConstraintIndex = m_gpuData->m_cpuConstraintRows[rowIndex].m_originalConstraintIndex;
float breakingThreshold = m_gpuData->m_cpuConstraints[orgConstraintIndex].m_breakingImpulseThreshold; float breakingThreshold = m_gpuData->m_cpuConstraints[orgConstraintIndex].m_breakingImpulseThreshold;
// printf("rows[%d].m_appliedImpulse=%f\n",rowIndex,rows[rowIndex].m_appliedImpulse); // printf("rows[%d].m_appliedImpulse=%f\n",rowIndex,rows[rowIndex].m_appliedImpulse);
if (b3Fabs((m_gpuData->m_cpuConstraintRows[rowIndex].m_appliedImpulse) >= breakingThreshold)) if (b3Fabs((m_gpuData->m_cpuConstraintRows[rowIndex].m_appliedImpulse) >= breakingThreshold))

1
src/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h
View File

@@ -56,6 +56,7 @@ B3_ATTRIBUTE_ALIGNED16 (struct) b3GpuSolverConstraint
union union
{ {
void* m_originalContactPoint; void* m_originalContactPoint;
int m_originalConstraintIndex;
b3Scalar m_unusedPadding4; b3Scalar m_unusedPadding4;
}; };