From 3da8dbce1c0fb51ac8671aec5494a3a420983e30 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Mon, 4 May 2015 17:03:37 -0700 Subject: [PATCH] disable memmove in btDbvt forgot to reset clock --- examples/ExampleBrowser/main.cpp | 4 +++- src/BulletCollision/BroadphaseCollision/btDbvt.h | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/examples/ExampleBrowser/main.cpp b/examples/ExampleBrowser/main.cpp index 8e3501b3a..4fff81689 100644 --- a/examples/ExampleBrowser/main.cpp +++ b/examples/ExampleBrowser/main.cpp @@ -12,7 +12,7 @@ #include "../Utils/b3Clock.h" #include "ExampleEntries.h" - +#include "Bullet3Common/b3Logging.h" int main(int argc, char* argv[]) { b3CommandLineArgs args(argc,argv); @@ -24,11 +24,13 @@ int main(int argc, char* argv[]) ExampleBrowserInterface* exampleBrowser = new DefaultBrowser(&examples); bool init = exampleBrowser->init(argc,argv); + clock.reset(); if (init) { do { float deltaTimeInSeconds = clock.getTimeMicroseconds()/1000000.f; + clock.reset(); exampleBrowser->update(deltaTimeInSeconds); } while (!exampleBrowser->requestedExit()); diff --git a/src/BulletCollision/BroadphaseCollision/btDbvt.h b/src/BulletCollision/BroadphaseCollision/btDbvt.h index f578aae01..e05e1de27 100644 --- a/src/BulletCollision/BroadphaseCollision/btDbvt.h +++ b/src/BulletCollision/BroadphaseCollision/btDbvt.h @@ -1196,23 +1196,23 @@ inline void btDbvt::collideOCL( const btDbvtNode* root, //void * memmove ( void * destination, const void * source, size_t num ); -#if DBVT_USE_MEMMOVE - memmove(&stack[j],&stack[j-1],sizeof(int)*(stack.size()-j-1)); -#else +//#if DBVT_USE_MEMMOVE +// memmove(&stack[j],&stack[j-1],sizeof(int)*(stack.size()-j-1)); +//#else for(int k=stack.size()-1;k>j;--k) { stack[k]=stack[k-1]; } -#endif +//#endif stack[j]=allocate(ifree,stock,nes[q]); /* Insert 1 */ j=nearest(&stack[0],&stock[0],nes[1-q].value,j,stack.size()); stack.push_back(0); -#if DBVT_USE_MEMMOVE - memmove(&stack[j],&stack[j-1],sizeof(int)*(stack.size()-j-1)); -#else +//#if DBVT_USE_MEMMOVE +// memmove(&stack[j],&stack[j-1],sizeof(int)*(stack.size()-j-1)); +//#else for(int k=stack.size()-1;k>j;--k) stack[k]=stack[k-1]; -#endif +//#endif stack[j]=allocate(ifree,stock,nes[1-q]); } else