diff options
| author | over0219 <over0219@umn.edu> | 2020-06-23 04:19:25 +0300 |
|---|---|---|
| committer | over0219 <over0219@umn.edu> | 2020-06-23 04:19:25 +0300 |
| commit | 0d317dddc9c3a9277fc559f18f28d958cff72a30 (patch) | |
| tree | b012733a69f86c7548f22b7dffd09c4ad773fefb /extern/softbody/src/admmpd_solver.h | |
| parent | 88ab1c138dcb370829ae0362ad6ee8a462d8a6ca (diff) | |
working on collision
Diffstat (limited to 'extern/softbody/src/admmpd_solver.h')
| -rw-r--r-- | extern/softbody/src/admmpd_solver.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/extern/softbody/src/admmpd_solver.h b/extern/softbody/src/admmpd_solver.h index d26da293bc8..23d79931202 100644 --- a/extern/softbody/src/admmpd_solver.h +++ b/extern/softbody/src/admmpd_solver.h @@ -5,6 +5,7 @@ #define ADMMPD_SOLVER_H_ #include "admmpd_types.h" +#include "admmpd_collision.h" namespace admmpd { @@ -21,15 +22,18 @@ public: // Solve a single time step. // Returns number of iterations. + // Collision ptr can be null. int solve( const Options *options, - SolverData *data); + SolverData *data, + Collision *collision); protected: void update_constraints( const Options *options, - SolverData *data); + SolverData *data, + Collision *collision); void init_solve( const Options *options, |