diff options
Diffstat (limited to 'PhysX_3.4/Source/SimulationController/src/cloth')
6 files changed, 12 insertions, 6 deletions
diff --git a/PhysX_3.4/Source/SimulationController/src/cloth/ScClothCore.cpp b/PhysX_3.4/Source/SimulationController/src/cloth/ScClothCore.cpp index dfd6760d..a67b0200 100644 --- a/PhysX_3.4/Source/SimulationController/src/cloth/ScClothCore.cpp +++ b/PhysX_3.4/Source/SimulationController/src/cloth/ScClothCore.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. diff --git a/PhysX_3.4/Source/SimulationController/src/cloth/ScClothFabricCore.cpp b/PhysX_3.4/Source/SimulationController/src/cloth/ScClothFabricCore.cpp index 46f06366..be2226ca 100644 --- a/PhysX_3.4/Source/SimulationController/src/cloth/ScClothFabricCore.cpp +++ b/PhysX_3.4/Source/SimulationController/src/cloth/ScClothFabricCore.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. diff --git a/PhysX_3.4/Source/SimulationController/src/cloth/ScClothShape.cpp b/PhysX_3.4/Source/SimulationController/src/cloth/ScClothShape.cpp index f06c9f04..fa078320 100644 --- a/PhysX_3.4/Source/SimulationController/src/cloth/ScClothShape.cpp +++ b/PhysX_3.4/Source/SimulationController/src/cloth/ScClothShape.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -105,7 +105,13 @@ void Sc::ClothShape::createLowLevelVolume() { PX_ASSERT(getWorldBounds().isFinite()); getScene().getBoundsArray().setBounds(getWorldBounds(), getElementID()); +#ifdef BP_FILTERING_USES_TYPE_IN_GROUP + const PxU32 group = Bp::FilterGroup::eCLOTH_NO_PARTICLE_INTERACTION; + const PxU32 type = Bp::FilterType::DYNAMIC; + addToAABBMgr(0, Bp::FilterGroup::Enum((group<<2)|type), false); +#else addToAABBMgr(0, Bp::FilterGroup::eCLOTH_NO_PARTICLE_INTERACTION, false); +#endif } /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/PhysX_3.4/Source/SimulationController/src/cloth/ScClothShape.h b/PhysX_3.4/Source/SimulationController/src/cloth/ScClothShape.h index 32453f16..6e0da37c 100644 --- a/PhysX_3.4/Source/SimulationController/src/cloth/ScClothShape.h +++ b/PhysX_3.4/Source/SimulationController/src/cloth/ScClothShape.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. diff --git a/PhysX_3.4/Source/SimulationController/src/cloth/ScClothSim.cpp b/PhysX_3.4/Source/SimulationController/src/cloth/ScClothSim.cpp index 9edabed1..95e65eea 100644 --- a/PhysX_3.4/Source/SimulationController/src/cloth/ScClothSim.cpp +++ b/PhysX_3.4/Source/SimulationController/src/cloth/ScClothSim.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. diff --git a/PhysX_3.4/Source/SimulationController/src/cloth/ScClothSim.h b/PhysX_3.4/Source/SimulationController/src/cloth/ScClothSim.h index df0ca5ed..6fc824e6 100644 --- a/PhysX_3.4/Source/SimulationController/src/cloth/ScClothSim.h +++ b/PhysX_3.4/Source/SimulationController/src/cloth/ScClothSim.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. |