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

Merge pull request #201 from bgossage/fix_pointer_cast

Browse Source 
-- Corrected cast of 32-bit int to 64-bit pointer
This commit is contained in:
erwincoumans
2014-08-21 11:19:45 -07:00
parent ed637a6942 d58857f06b
commit 590504bf72
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/BulletCollision/CollisionShapes/btCompoundShape.cpp
View File

@@ -77,8 +77,8 @@ void btCompoundShape::addChildShape(const btTransform& localTransform,btCollisio
if (m_dynamicAabbTree) if (m_dynamicAabbTree)
{ {
const btDbvtVolume bounds=btDbvtVolume::FromMM(localAabbMin,localAabbMax); const btDbvtVolume bounds=btDbvtVolume::FromMM(localAabbMin,localAabbMax);
int index = m_children.size(); size_t index = m_children.size();
child.m_node = m_dynamicAabbTree->insert(bounds,(void*)index); child.m_node = m_dynamicAabbTree->insert(bounds,reinterpret_cast<void*>(index) );
} }
m_children.push_back(child); m_children.push_back(child);
@@ -303,7 +303,7 @@ void btCompoundShape::createAabbTreeFromChildren()
m_dynamicAabbTree = new(mem) btDbvt(); m_dynamicAabbTree = new(mem) btDbvt();
btAssert(mem==m_dynamicAabbTree); btAssert(mem==m_dynamicAabbTree);
for ( int index = 0; index < m_children.size(); index++ ) for ( size_t index = 0; index < m_children.size(); index++ )
{ {
btCompoundShapeChild &child = m_children[index]; btCompoundShapeChild &child = m_children[index];
@@ -312,7 +312,7 @@ void btCompoundShape::createAabbTreeFromChildren()
child.m_childShape->getAabb(child.m_transform,localAabbMin,localAabbMax); child.m_childShape->getAabb(child.m_transform,localAabbMin,localAabbMax);
const btDbvtVolume bounds=btDbvtVolume::FromMM(localAabbMin,localAabbMax); const btDbvtVolume bounds=btDbvtVolume::FromMM(localAabbMin,localAabbMax);
child.m_node = m_dynamicAabbTree->insert(bounds,(void*)index); child.m_node = m_dynamicAabbTree->insert(bounds, reinterpret_cast<void*>(index) );
} }
} }
} }