diff options
author | over0219 <over0219@umn.edu> | 2020-07-09 23:33:56 +0300 |
---|---|---|
committer | over0219 <over0219@umn.edu> | 2020-07-09 23:33:56 +0300 |
commit | 4bab6e6d83cd64f2918430b003c96ffae08ecd85 (patch) | |
tree | 52e6267f7274ba3e6dc7403d12e4dac47307f4c5 /extern/softbody/src/admmpd_collision.h | |
parent | 24947f3a0226615d91ac7c6c88d466e8d6983cf7 (diff) |
better pin scalesoftbody-stable-v2
Diffstat (limited to 'extern/softbody/src/admmpd_collision.h')
-rw-r--r-- | extern/softbody/src/admmpd_collision.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/extern/softbody/src/admmpd_collision.h b/extern/softbody/src/admmpd_collision.h index baf92c28754..efde21db25e 100644 --- a/extern/softbody/src/admmpd_collision.h +++ b/extern/softbody/src/admmpd_collision.h @@ -33,10 +33,11 @@ public: struct Settings { double floor_z; bool test_floor; + bool self_collision; Settings() : - floor_z(-0.5), -// floor_z(-std::numeric_limits<double>::max()), - test_floor(true) + floor_z(-std::numeric_limits<double>::max()), + test_floor(false), + self_collision(false) {} } settings; |