diff options
| author | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-09-15 15:41:57 -0500 |
|---|---|---|
| committer | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-09-15 15:41:57 -0500 |
| commit | d1c812f1162e5fdb13c215792725b2591d7428f5 (patch) | |
| tree | 407056c45c7e9320c48fca6a3697d81a061c4ea0 /PhysX_3.4/Source/GeomUtils/src/gjk/GuVecShrunkBox.h | |
| parent | PhysX 3.4, APEX 1.4 patch release @22121272 (diff) | |
| download | physx-3.4-d1c812f1162e5fdb13c215792725b2591d7428f5.tar.xz physx-3.4-d1c812f1162e5fdb13c215792725b2591d7428f5.zip | |
PhysX 3.4.1, APEX 1.4.1 Release @22845541v3.4.1
Diffstat (limited to 'PhysX_3.4/Source/GeomUtils/src/gjk/GuVecShrunkBox.h')
| -rw-r--r-- | PhysX_3.4/Source/GeomUtils/src/gjk/GuVecShrunkBox.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/PhysX_3.4/Source/GeomUtils/src/gjk/GuVecShrunkBox.h b/PhysX_3.4/Source/GeomUtils/src/gjk/GuVecShrunkBox.h index f8a214d1..4f3686a6 100644 --- a/PhysX_3.4/Source/GeomUtils/src/gjk/GuVecShrunkBox.h +++ b/PhysX_3.4/Source/GeomUtils/src/gjk/GuVecShrunkBox.h @@ -77,6 +77,7 @@ namespace Gu { } + //this is used by CCD system PX_INLINE ShrunkBoxV(const PxGeometry& geom) : BoxV(geom) { margin = minExtent * BOX_MARGIN_CCD_RATIO; @@ -90,8 +91,8 @@ namespace Gu \param extent Extents/radii of the obb. */ - PX_FORCE_INLINE ShrunkBoxV(const Ps::aos::Vec3VArg origin, const Ps::aos::Vec3VArg extent) : - BoxV(origin, extent) + PX_FORCE_INLINE ShrunkBoxV(const Ps::aos::Vec3VArg origin, const Ps::aos::Vec3VArg extent) + : BoxV(origin, extent) { //calculate margin margin = minExtent * BOX_MARGIN_RATIO; @@ -105,6 +106,13 @@ namespace Gu { } + PX_FORCE_INLINE void resetMargin(const PxReal toleranceLength) + { + BoxV::resetMargin(toleranceLength); + margin = PxMin(toleranceLength * BOX_MARGIN_RATIO, margin); + initialiseMarginDif(); + } + //! Assignment operator PX_INLINE const ShrunkBoxV& operator=(const ShrunkBoxV& other) { |