diff options
author | Sebastian Parborg <darkdefende@gmail.com> | 2020-09-02 21:41:30 +0300 |
---|---|---|
committer | Sebastian Parborg <darkdefende@gmail.com> | 2020-09-02 21:41:30 +0300 |
commit | 4446c3a593c51603e135e38951607b9b668ddec5 (patch) | |
tree | 9552dbd903b4fd05ea740e1bba9b1b87d97414a1 /extern/bullet2/src/BulletDynamics/MLCPSolvers/btDantzigLCP.h | |
parent | 6f6f6ee18695dad66ad8aa0eb2bcab72501df597 (diff) |
Sync Bullet to upstream
This syncs Bullet to the latest upstream git version as of writing this.
(commit 47b0259b9700455022b5cf79b651cc1dc71dd59e).
Diffstat (limited to 'extern/bullet2/src/BulletDynamics/MLCPSolvers/btDantzigLCP.h')
-rw-r--r-- | extern/bullet2/src/BulletDynamics/MLCPSolvers/btDantzigLCP.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/extern/bullet2/src/BulletDynamics/MLCPSolvers/btDantzigLCP.h b/extern/bullet2/src/BulletDynamics/MLCPSolvers/btDantzigLCP.h index 903832770ae..8d9b2a13e99 100644 --- a/extern/bullet2/src/BulletDynamics/MLCPSolvers/btDantzigLCP.h +++ b/extern/bullet2/src/BulletDynamics/MLCPSolvers/btDantzigLCP.h @@ -41,7 +41,6 @@ to be implemented. the first `nub' variables are assumed to have findex < 0. */ - #ifndef _BT_LCP_H_ #define _BT_LCP_H_ @@ -49,7 +48,6 @@ to be implemented. the first `nub' variables are assumed to have findex < 0. #include <stdio.h> #include <assert.h> - #include "LinearMath/btScalar.h" #include "LinearMath/btAlignedObjectArray.h" @@ -62,16 +60,14 @@ struct btDantzigScratchMemory btAlignedObjectArray<btScalar> delta_x; btAlignedObjectArray<btScalar> Dell; btAlignedObjectArray<btScalar> ell; - btAlignedObjectArray<btScalar*> Arows; + btAlignedObjectArray<btScalar *> Arows; btAlignedObjectArray<int> p; btAlignedObjectArray<int> C; btAlignedObjectArray<bool> state; }; //return false if solving failed -bool btSolveDantzigLCP (int n, btScalar *A, btScalar *x, btScalar *b, btScalar *w, - int nub, btScalar *lo, btScalar *hi, int *findex,btDantzigScratchMemory& scratch); - - +bool btSolveDantzigLCP(int n, btScalar *A, btScalar *x, btScalar *b, btScalar *w, + int nub, btScalar *lo, btScalar *hi, int *findex, btDantzigScratchMemory &scratch); -#endif //_BT_LCP_H_ +#endif //_BT_LCP_H_ |