Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

c880f974

Commit c880f974 authored 7 years ago by Sreekanth Arikatla

Downloads
- Plain Diff

Merge branch 'sphereToCylinderCD' into 'master'

ENH: Add collision between cylinder and sphere

See merge request !185

parents c4390700 51c270ce

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Base/Collision/CollisionDetection/imstkCollisionDetection.cpp 16 additions, 0 deletions

.../Collision/CollisionDetection/imstkCollisionDetection.cpp
Base/Collision/CollisionDetection/imstkCollisionDetection.h 1 addition, 0 deletions

Base/Collision/CollisionDetection/imstkCollisionDetection.h
Base/Collision/CollisionDetection/imstkSphereCylinderCD.h 72 additions, 0 deletions

Base/Collision/CollisionDetection/imstkSphereCylinderCD.h
Base/Collision/CollisionDetection/imstkSphererCylinderCD.cpp 63 additions, 0 deletions

Base/Collision/CollisionDetection/imstkSphererCylinderCD.cpp
Base/Collision/CollisionHandling/imstkVirtualCouplingCH.cpp 10 additions, 1 deletion

Base/Collision/CollisionHandling/imstkVirtualCouplingCH.cpp
Base/Collision/CollisionHandling/imstkVirtualCouplingCH.h 6 additions, 0 deletions

Base/Collision/CollisionHandling/imstkVirtualCouplingCH.h
Base/Geometry/Analytic/imstkCylinder.h 4 additions, 4 deletions

Base/Geometry/Analytic/imstkCylinder.h
Examples/Sandbox/main.cpp 84 additions, 4 deletions

Examples/Sandbox/main.cpp

with 256 additions and 9 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