Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

iMSTK
- Activity
- Members
- Labels
- Releases
- Model registry
- Model experiments

Snippets Groups Projects

Admin message

System updates will be applied on Mar 24th between 7am and 9am, EST (UTC-05:00). This site will have intermittent downtime during that time.

0b4868ae

Commit 0b4868ae authored 7 years ago by Alexis Girault

Downloads
- Plain Diff

Merge branch 'master' into 'master'

BUG: Fixed bug with PBD collision

See merge request !156

parents c3cb1d93 3c1b3f76

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Base/DynamicalModels/ObjectModels/imstkPbdModel.cpp 1 addition, 1 deletion

Base/DynamicalModels/ObjectModels/imstkPbdModel.cpp
Base/DynamicalModels/ObjectModels/imstkPbdModel.h 1 addition, 1 deletion

Base/DynamicalModels/ObjectModels/imstkPbdModel.h
Base/SceneElements/Objects/imstkPbdObject.cpp 2 additions, 2 deletions

Base/SceneElements/Objects/imstkPbdObject.cpp
Base/SceneElements/Objects/imstkPbdObject.h 1 addition, 1 deletion

Base/SceneElements/Objects/imstkPbdObject.h
Base/SimulationManager/imstkSceneManager.cpp 9 additions, 0 deletions

Base/SimulationManager/imstkSceneManager.cpp
Base/Solvers/imstkPbdSolver.h 0 additions, 1 deletion

Base/Solvers/imstkPbdSolver.h
Examples/Sandbox/main.cpp 2 additions, 2 deletions

Examples/Sandbox/main.cpp

with 16 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment