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

Merge pull request #501 from antarespilot/dbvt_memmove_fix2

Browse Source 
fix for broken memmove used in btDbvt.h, issue 347.
This commit is contained in:
erwincoumans
2015-10-27 11:04:38 -07:00
parent bd55f6b058 75207c4839
commit 87cedbd40f
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/BulletCollision/BroadphaseCollision/btDbvt.h
View File

@@ -1196,23 +1196,32 @@ inline void btDbvt::collideOCL( const btDbvtNode* root,
//void * memmove ( void * destination, const void * source, size_t num ); //void * memmove ( void * destination, const void * source, size_t num );
//#if DBVT_USE_MEMMOVE #if DBVT_USE_MEMMOVE
// memmove(&stack[j],&stack[j-1],sizeof(int)*(stack.size()-j-1)); {
//#else int num_items_to_move = stack.size()-1-j;
for(int k=stack.size()-1;k>j;--k) if(num_items_to_move > 0)
{ memmove(&stack[j+1],&stack[j],sizeof(int)*num_items_to_move);
}
#else
for(int k=stack.size()-1;k>j;--k) {
stack[k]=stack[k-1]; stack[k]=stack[k-1];
} }
//#endif #endif
stack[j]=allocate(ifree,stock,nes[q]); stack[j]=allocate(ifree,stock,nes[q]);
/* Insert 1 */ /* Insert 1 */
j=nearest(&stack[0],&stock[0],nes[1-q].value,j,stack.size()); j=nearest(&stack[0],&stock[0],nes[1-q].value,j,stack.size());
stack.push_back(0); stack.push_back(0);
//#if DBVT_USE_MEMMOVE #if DBVT_USE_MEMMOVE
// memmove(&stack[j],&stack[j-1],sizeof(int)*(stack.size()-j-1)); {
//#else int num_items_to_move = stack.size()-1-j;
for(int k=stack.size()-1;k>j;--k) stack[k]=stack[k-1]; if(num_items_to_move > 0)
//#endif memmove(&stack[j+1],&stack[j],sizeof(int)*num_items_to_move);
}
#else
for(int k=stack.size()-1;k>j;--k) {
stack[k]=stack[k-1];
}
#endif
stack[j]=allocate(ifree,stock,nes[1-q]); stack[j]=allocate(ifree,stock,nes[1-q]);
} }
else else