diff --git a/build_visual_studio_vr_pybullet_double.bat b/build_visual_studio_vr_pybullet_double.bat index e3e8a4dc5..f8b2184b9 100644 --- a/build_visual_studio_vr_pybullet_double.bat +++ b/build_visual_studio_vr_pybullet_double.bat @@ -18,7 +18,7 @@ rem SET myvar=c:\python-3.5.2 cd build3 -premake4 --double --enable_multithreading --midi --enable_static_vr_plugin --enable_openvr --enable_pybullet --python_include_dir="%myvar%/include" --python_lib_dir="%myvar%/libs" --targetdir="../bin" vs2010 +premake4 --enable_physx --double --enable_multithreading --midi --enable_static_vr_plugin --enable_openvr --enable_pybullet --python_include_dir="%myvar%/include" --python_lib_dir="%myvar%/libs" --targetdir="../bin" vs2010 rem premake4 --double --enable_multithreading --midi --enable_static_vr_plugin --enable_openvr --enable_pybullet --python_include_dir="%myvar%/include" --python_lib_dir="%myvar%/libs" --targetdir="../binserver" vs2010 rem premake4 --double --enable_grpc --enable_multithreading --midi --enable_static_vr_plugin --enable_openvr --enable_pybullet --python_include_dir="%myvar%/include" --python_lib_dir="%myvar%/libs" --targetdir="../binserver" vs2010 diff --git a/examples/SharedMemory/physx/PhysXServerCommandProcessor.cpp b/examples/SharedMemory/physx/PhysXServerCommandProcessor.cpp index c3a287f0d..ce57e23ee 100644 --- a/examples/SharedMemory/physx/PhysXServerCommandProcessor.cpp +++ b/examples/SharedMemory/physx/PhysXServerCommandProcessor.cpp @@ -1057,7 +1057,7 @@ bool PhysXServerCommandProcessor::processCommand(const struct SharedMemoryComman int sz = sizeof(SharedMemoryStatus); int sz2 = sizeof(SharedMemoryCommand); - bool hasStatus = false; + bool hasStatus = true; serverStatusOut.m_type = CMD_INVALID_STATUS; serverStatusOut.m_numDataStreamBytes = 0; @@ -1111,15 +1111,6 @@ bool PhysXServerCommandProcessor::processCommand(const struct SharedMemoryComman break; } - default: - { - BT_PROFILE("CMD_UNKNOWN"); - printf("Unknown command encountered: %d", clientCmd.m_type); - SharedMemoryStatus& serverCmd = serverStatusOut; - serverCmd.m_type = CMD_UNKNOWN_COMMAND_FLUSHED; - hasStatus = true; - } - case CMD_LOAD_URDF: { hasStatus = processLoadURDFCommand(clientCmd, serverStatusOut, bufferServerToClient, bufferSizeInBytes); @@ -1433,6 +1424,15 @@ bool PhysXServerCommandProcessor::processCommand(const struct SharedMemoryComman break; } #endif + + default: + { + BT_PROFILE("CMD_UNKNOWN"); + printf("Unknown command encountered: %d", clientCmd.m_type); + SharedMemoryStatus& serverCmd = serverStatusOut; + serverCmd.m_type = CMD_UNKNOWN_COMMAND_FLUSHED; + hasStatus = true; + } }; return hasStatus; diff --git a/src/PhysX/physx/include/PxActor.h b/src/PhysX/physx/include/PxActor.h index 6e3306ca9..b5d48b10e 100644 --- a/src/PhysX/physx/include/PxActor.h +++ b/src/PhysX/physx/include/PxActor.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxAggregate.h b/src/PhysX/physx/include/PxAggregate.h index 3c0b97700..ad9307ea0 100644 --- a/src/PhysX/physx/include/PxAggregate.h +++ b/src/PhysX/physx/include/PxAggregate.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxArticulation.h b/src/PhysX/physx/include/PxArticulation.h index fd4bc3e82..a3727ec08 100644 --- a/src/PhysX/physx/include/PxArticulation.h +++ b/src/PhysX/physx/include/PxArticulation.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxArticulationBase.h b/src/PhysX/physx/include/PxArticulationBase.h index 596ee4c5a..ac9fa8712 100644 --- a/src/PhysX/physx/include/PxArticulationBase.h +++ b/src/PhysX/physx/include/PxArticulationBase.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -41,7 +41,6 @@ namespace physx { #endif - class PxArticulationImpl; /** @@ -241,15 +240,12 @@ namespace physx @see PxArticulationLink */ - - virtual PxArticulationLink* createLink(PxArticulationLink* parent, const PxTransform& pose) = 0; - + virtual PxArticulationLink* createLink(PxArticulationLink* parent, const PxTransform& pose) = 0; /** \brief returns the number of links in the articulation */ - - virtual PxU32 getNbLinks() const = 0; + virtual PxU32 getNbLinks() const = 0; /** \brief returns the set of links in the articulation @@ -263,9 +259,7 @@ namespace physx @see ArticulationLink */ - - virtual PxU32 getLinks(PxArticulationLink** userBuffer, PxU32 bufferSize, PxU32 startIndex = 0) const = 0; - + virtual PxU32 getLinks(PxArticulationLink** userBuffer, PxU32 bufferSize, PxU32 startIndex = 0) const = 0; /** \brief Sets a name string for the object that can be retrieved with getName(). @@ -277,7 +271,7 @@ namespace physx @see getName() */ - virtual void setName(const char* name) = 0; + virtual void setName(const char* name) = 0; /** \brief Retrieves the name string set with setName(). @@ -286,7 +280,7 @@ namespace physx @see setName() */ - virtual const char* getName() const = 0; + virtual const char* getName() const = 0; /** \brief Retrieves the axis aligned bounding box enclosing the articulation. @@ -297,7 +291,7 @@ namespace physx @see PxBounds3 */ - virtual PxBounds3 getWorldBounds(float inflation = 1.01f) const = 0; + virtual PxBounds3 getWorldBounds(float inflation = 1.01f) const = 0; /** \brief Retrieves the aggregate the articulation might be a part of. @@ -306,12 +300,10 @@ namespace physx @see PxAggregate */ - virtual PxAggregate* getAggregate() const = 0; - - virtual PxArticulationImpl* getImpl() = 0; - - virtual const PxArticulationImpl* getImpl() const = 0; + virtual PxAggregate* getAggregate() const = 0; + virtual PxArticulationImpl* getImpl() = 0; + virtual const PxArticulationImpl* getImpl() const = 0; virtual PxArticulationBase::Enum getType() const = 0; void* userData; //!< user can assign this to whatever, usually to create a 1:1 relationship with a user object. @@ -319,13 +311,10 @@ namespace physx virtual ~PxArticulationBase() {} protected: - PX_INLINE PxArticulationBase(PxType concreteType, PxBaseFlags baseFlags) : PxBase(concreteType, baseFlags) {} + PX_INLINE PxArticulationBase(PxType concreteType, PxBaseFlags baseFlags) : PxBase(concreteType, baseFlags), userData(NULL) {} PX_INLINE PxArticulationBase(PxBaseFlags baseFlags) : PxBase(baseFlags) {} public: - virtual PxArticulationJointBase* createArticulationJoint(PxArticulationLink& parent, - const PxTransform& parentFrame, - PxArticulationLink& child, - const PxTransform& childFrame) = 0; + virtual PxArticulationJointBase* createArticulationJoint(PxArticulationLink& parent, const PxTransform& parentFrame, PxArticulationLink& child, const PxTransform& childFrame) = 0; virtual void releaseArticulationJoint(PxArticulationJointBase* joint) = 0; }; diff --git a/src/PhysX/physx/include/PxArticulationJoint.h b/src/PhysX/physx/include/PxArticulationJoint.h index 295c19fbe..c51a3c1fa 100644 --- a/src/PhysX/physx/include/PxArticulationJoint.h +++ b/src/PhysX/physx/include/PxArticulationJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -106,7 +106,6 @@ struct PxArticulationJointType }; }; - class PxArticulationJointBase : public PxBase { public: @@ -125,7 +124,6 @@ public: @see getParentPose() */ - virtual void setParentPose(const PxTransform& pose) = 0; /** @@ -135,7 +133,6 @@ public: @see setParentPose() */ - virtual PxTransform getParentPose() const = 0; /** @@ -145,7 +142,6 @@ public: */ virtual PxArticulationLink& getChildArticulationLink() const = 0; - /** \brief set the joint pose in the child frame @@ -154,7 +150,6 @@ public: @see getChildPose() */ - virtual void setChildPose(const PxTransform& pose) = 0; /** @@ -205,7 +200,6 @@ public: @see getTargetOrientation() */ - virtual void setTargetOrientation(const PxQuat& orientation) = 0; /** @@ -238,7 +232,6 @@ public: */ virtual PxVec3 getTargetVelocity() const = 0; - /** \brief set the drive type @@ -259,8 +252,6 @@ public: virtual PxArticulationJointDriveType::Enum getDriveType() const = 0; - - /** \brief set the drive strength of the joint acceleration spring. @@ -285,7 +276,6 @@ public: */ virtual PxReal getStiffness() const = 0; - /** \brief set the damping of the joint acceleration spring @@ -306,7 +296,6 @@ public: @see setDamping() */ - virtual PxReal getDamping() const = 0; /** @@ -327,10 +316,8 @@ public: @see getInternalCompliance() */ - virtual void setInternalCompliance(PxReal compliance) = 0; - /** \brief get the internal compliance @@ -358,7 +345,6 @@ public: @see getExternalCompliance() */ - virtual void setExternalCompliance(PxReal compliance) = 0; /** @@ -370,8 +356,6 @@ public: */ virtual PxReal getExternalCompliance() const = 0; - - /** \brief set the extents of the cone limit. The extents are measured in the frame of the parent. @@ -387,7 +371,6 @@ public: */ virtual void setSwingLimit(PxReal zLimit, PxReal yLimit) = 0; - /** \brief get the extents for the swing limit cone @@ -400,17 +383,13 @@ public: */ virtual void getSwingLimit(PxReal& zLimit, PxReal& yLimit) const = 0; - - /** \brief set the tangential spring for the limit cone Range: ([0, PX_MAX_F32), [0, PX_MAX_F32)) Default: (0.0, 0.0) */ - virtual void setTangentialStiffness(PxReal spring) = 0; - /** \brief get the tangential spring for the swing limit cone @@ -420,16 +399,13 @@ public: */ virtual PxReal getTangentialStiffness() const = 0; - /** \brief set the tangential damping for the limit cone Range: ([0, PX_MAX_F32), [0, PX_MAX_F32)) Default: (0.0, 0.0) */ - virtual void setTangentialDamping(PxReal damping) = 0; - /** \brief get the tangential damping for the swing limit cone @@ -439,7 +415,6 @@ public: */ virtual PxReal getTangentialDamping() const = 0; - /** \brief set the contact distance for the swing limit @@ -450,10 +425,8 @@ public: @see getSwingLimitContactDistance() */ - virtual void setSwingLimitContactDistance(PxReal contactDistance) = 0; - /** \brief get the contact distance for the swing limit @@ -463,8 +436,6 @@ public: */ virtual PxReal getSwingLimitContactDistance() const = 0; - - /** \brief set the flag which enables the swing limit @@ -482,10 +453,8 @@ public: @see setSwingLimitEnabled() */ - virtual bool getSwingLimitEnabled() const = 0; - /** \brief set the bounds of the twistLimit @@ -508,7 +477,6 @@ public: @see setTwistLimit() */ - virtual void getTwistLimit(PxReal &lower, PxReal &upper) const = 0; /** @@ -528,10 +496,8 @@ public: @see setTwistLimitEnabled() */ - virtual bool getTwistLimitEnabled() const = 0; - /** \brief set the contact distance for the swing limit @@ -542,10 +508,8 @@ public: @see getTwistLimitContactDistance() */ - virtual void setTwistLimitContactDistance(PxReal contactDistance) = 0; - /** \brief get the contact distance for the swing limit @@ -555,13 +519,13 @@ public: */ virtual PxReal getTwistLimitContactDistance() const = 0; - virtual const char* getConcreteTypeName() const { return "PxArticulationJoint"; } + virtual const char* getConcreteTypeName() const { return "PxArticulationJoint"; } protected: PX_INLINE PxArticulationJoint(PxType concreteType, PxBaseFlags baseFlags) : PxArticulationJointBase(concreteType, baseFlags) {} PX_INLINE PxArticulationJoint(PxBaseFlags baseFlags) : PxArticulationJointBase(baseFlags) {} virtual ~PxArticulationJoint() {} - virtual bool isKindOf(const char* name) const { return !::strcmp("PxArticulationJoint", name) || PxArticulationJointBase::isKindOf(name); } + virtual bool isKindOf(const char* name) const { return !::strcmp("PxArticulationJoint", name) || PxArticulationJointBase::isKindOf(name); } }; #if !PX_DOXYGEN diff --git a/src/PhysX/physx/include/PxArticulationJointReducedCoordinate.h b/src/PhysX/physx/include/PxArticulationJointReducedCoordinate.h index 2397da8d5..f2fd59683 100644 --- a/src/PhysX/physx/include/PxArticulationJointReducedCoordinate.h +++ b/src/PhysX/physx/include/PxArticulationJointReducedCoordinate.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxArticulationLink.h b/src/PhysX/physx/include/PxArticulationLink.h index 9b3faae68..a6f1ab8d4 100644 --- a/src/PhysX/physx/include/PxArticulationLink.h +++ b/src/PhysX/physx/include/PxArticulationLink.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -66,8 +66,7 @@ public: @see PxArticulation::createLink() */ - virtual void release() = 0; - + virtual void release() = 0; /** \brief get the articulation to which this articulation link belongs. This returns the base class. The application should @@ -75,8 +74,7 @@ public: \return the articulation to which this link belongs */ - virtual PxArticulationBase& getArticulation() const = 0; - + virtual PxArticulationBase& getArticulation() const = 0; /** \brief Get the joint which connects this link to its parent. @@ -94,7 +92,7 @@ public: @see PxArticulationJoint */ - virtual PxU32 getInboundJointDof() const = 0; + virtual PxU32 getInboundJointDof() const = 0; /** \brief Get number of child links. @@ -103,15 +101,14 @@ public: @see getChildren() */ - virtual PxU32 getNbChildren() const = 0; - + virtual PxU32 getNbChildren() const = 0; /** \brief Get low-level link index \return low-level index */ - virtual PxU32 getLinkIndex() const = 0; + virtual PxU32 getLinkIndex() const = 0; /** \brief Retrieve all the child links. @@ -123,15 +120,15 @@ public: @see getNbChildren() */ - virtual PxU32 getChildren(PxArticulationLink** userBuffer, PxU32 bufferSize, PxU32 startIndex=0) const = 0; + virtual PxU32 getChildren(PxArticulationLink** userBuffer, PxU32 bufferSize, PxU32 startIndex=0) const = 0; - virtual const char* getConcreteTypeName() const { return "PxArticulationLink"; } + virtual const char* getConcreteTypeName() const { return "PxArticulationLink"; } protected: - PX_INLINE PxArticulationLink(PxType concreteType, PxBaseFlags baseFlags) : PxRigidBody(concreteType, baseFlags) {} - PX_INLINE PxArticulationLink(PxBaseFlags baseFlags) : PxRigidBody(baseFlags) {} - virtual ~PxArticulationLink() {} - virtual bool isKindOf(const char* name) const { return !::strcmp("PxArticulationLink", name) || PxRigidBody::isKindOf(name); } + PX_INLINE PxArticulationLink(PxType concreteType, PxBaseFlags baseFlags) : PxRigidBody(concreteType, baseFlags) {} + PX_INLINE PxArticulationLink(PxBaseFlags baseFlags) : PxRigidBody(baseFlags) {} + virtual ~PxArticulationLink() {} + virtual bool isKindOf(const char* name) const { return !::strcmp("PxArticulationLink", name) || PxRigidBody::isKindOf(name); } }; #if !PX_DOXYGEN diff --git a/src/PhysX/physx/include/PxArticulationReducedCoordinate.h b/src/PhysX/physx/include/PxArticulationReducedCoordinate.h index 6314c0953..15f9f23bf 100644 --- a/src/PhysX/physx/include/PxArticulationReducedCoordinate.h +++ b/src/PhysX/physx/include/PxArticulationReducedCoordinate.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -53,11 +53,10 @@ namespace physx { enum Enum { - eFIX_BASE = (1 << 1) + eFIX_BASE = (1 << 0) }; }; - class PxJoint; typedef PxFlags PxArticulationFlags; @@ -75,7 +74,6 @@ namespace physx struct PxArticulationRootLinkData { - PxTransform transform; PxVec3 linVel; PxVec3 angVel; @@ -117,14 +115,11 @@ namespace physx void* scratchMemory; //this is used for internal calculation void* scratchAllocator; PxU32 version; //cache version. If the articulation configulation change, the cache is invalid - - }; typedef PxFlags PxArticulationCacheFlags; PX_FLAGS_OPERATORS(PxArticulationCache::Enum, PxU8) - /** \brief a tree structure of bodies connected by joints that is treated as a unit by the dynamics solver @@ -145,8 +140,7 @@ namespace physx { public: - virtual void release() = 0; - + virtual void release() = 0; /** \brief Sets flags on the articulation @@ -154,7 +148,7 @@ namespace physx \param[in] flags Articulation flags */ - virtual void setArticulationFlags(PxArticulationFlags flags) = 0; + virtual void setArticulationFlags(PxArticulationFlags flags) = 0; /** \brief Raises or clears a flag on the articulation @@ -163,40 +157,39 @@ namespace physx \param[in] value true/false indicating whether to raise or clear the flag */ - virtual void setArticulationFlag(PxArticulationFlag::Enum flag, bool value) = 0; + virtual void setArticulationFlag(PxArticulationFlag::Enum flag, bool value) = 0; /** \brief return PxArticulationFlags */ - virtual PxArticulationFlags getArticulationFlags() const = 0; + virtual PxArticulationFlags getArticulationFlags() const = 0; /** \brief returns the total Dofs of the articulation */ - virtual PxU32 getDofs() const = 0; + virtual PxU32 getDofs() const = 0; /** \brief create an articulation cache \note this call may only be made on articulations that are in a scene, and may not be made during simulation */ - virtual PxArticulationCache* createCache() const = 0; + virtual PxArticulationCache* createCache() const = 0; /** \brief Get the size of the articulation cache \note this call may only be made on articulations that are in a scene, and may not be made during simulation */ - virtual PxU32 getCacheDataSize() const = 0; + virtual PxU32 getCacheDataSize() const = 0; /** \brief zero all data in the articulation cache beside the cache version \note this call may only be made on articulations that are in a scene, and may not be made during simulation */ - virtual void zeroCache(PxArticulationCache& cache) = 0; + virtual void zeroCache(PxArticulationCache& cache) = 0; - /** \brief apply the user defined data in the cache to the articulation system @@ -206,7 +199,7 @@ namespace physx @see createCache copyInternalStateToCache */ - virtual void applyCache(PxArticulationCache& cache, const PxArticulationCacheFlags flag, bool autowake = true) = 0; + virtual void applyCache(PxArticulationCache& cache, const PxArticulationCacheFlags flag, bool autowake = true) = 0; /** \brief copy the internal data of the articulation to the cache @@ -216,8 +209,7 @@ namespace physx @see createCache applyCache */ - virtual void copyInternalStateToCache(PxArticulationCache& cache, const PxArticulationCacheFlags flag) const = 0; - + virtual void copyInternalStateToCache(PxArticulationCache& cache, const PxArticulationCacheFlags flag) const = 0; /** \brief release an articulation cache @@ -226,28 +218,26 @@ namespace physx @see createCache applyCache copyInternalStateToCache */ - virtual void releaseCache(PxArticulationCache& cache) const = 0; - + virtual void releaseCache(PxArticulationCache& cache) const = 0; /** \brief reduce the maximum data format to the reduced internal data \param[in] maximum joint data format \param[out] reduced joint data format */ - virtual void packJointData(const PxReal* maximum, PxReal* reduced) const = 0; + virtual void packJointData(const PxReal* maximum, PxReal* reduced) const = 0; /** \brief turn the reduced internal data to maximum joint data format \param[in] reduced joint data format \param[out] maximum joint data format */ - virtual void unpackJointData(const PxReal* reduced, PxReal* maximum) const = 0; + virtual void unpackJointData(const PxReal* reduced, PxReal* maximum) const = 0; /** \brief initialize all the common data for inverse dynamic */ - virtual void commonInit() const = 0; - + virtual void commonInit() const = 0; /** \brief determine the statically balance of the joint force of gravity for entire articulation. External force, joint velocity and joint acceleration @@ -257,7 +247,7 @@ namespace physx @see commonInit */ - virtual void computeGeneralizedGravityForce(PxArticulationCache& cache) const = 0; + virtual void computeGeneralizedGravityForce(PxArticulationCache& cache) const = 0; /** \brief determine coriolise and centrifugal force. External force, gravity and joint acceleration @@ -267,7 +257,7 @@ namespace physx @see commonInit */ - virtual void computeCoriolisAndCentrifugalForce(PxArticulationCache& cache) const = 0; + virtual void computeCoriolisAndCentrifugalForce(PxArticulationCache& cache) const = 0; /** \brief determine joint force change caused by external force. Gravity, joint acceleration and joint velocity @@ -277,7 +267,8 @@ namespace physx @see commonInit */ - virtual void computeGeneralizedExternalForce(PxArticulationCache& cache) const = 0; + virtual void computeGeneralizedExternalForce(PxArticulationCache& cache) const = 0; + /** \brief determine the joint acceleration for each joint This is purely calculates the change in joint acceleration due to change in the joint force @@ -286,8 +277,7 @@ namespace physx @see commonInit */ - virtual void computeJointAcceleration(PxArticulationCache& cache) const = 0; - + virtual void computeJointAcceleration(PxArticulationCache& cache) const = 0; /** \brief determine the joint force @@ -298,7 +288,7 @@ namespace physx @see commonInit */ - virtual void computeJointForce(PxArticulationCache& cache) const = 0; + virtual void computeJointForce(PxArticulationCache& cache) const = 0; /** \brief compute the kinematic jacobian for each joint from end effector to the root in world space @@ -307,16 +297,14 @@ namespace physx @see commonInit */ - virtual void computeKinematicJacobian(const PxU32 linkID, PxArticulationCache& cache) const = 0; - + virtual void computeKinematicJacobian(const PxU32 linkID, PxArticulationCache& cache) const = 0; /** \brief compute the coefficent matrix for contact force. PxContactJoint is the contact point \param[out] cache returs the coefficent matrix. Each column is the joint force effected by a contact based on impulse strength 1 @see commonInit */ - virtual void computeCoefficentMatrix(PxArticulationCache& cache) const = 0; - + virtual void computeCoefficentMatrix(PxArticulationCache& cache) const = 0; /** \brief compute the lambda value when the test impulse is 1 @@ -326,7 +314,7 @@ namespace physx \param[out] cache returns the coefficent matrix. Each column is the joint force effected by a contact based on impulse strength 1 @see commonInit */ - virtual bool computeLambda(PxArticulationCache& cache, PxArticulationCache& initialState, const PxReal* const jointTorque, const PxU32 maxIter) const = 0; + virtual bool computeLambda(PxArticulationCache& cache, PxArticulationCache& initialState, const PxReal* const jointTorque, const PxU32 maxIter) const = 0; /** \brief compute the joint-space inertia matrix @@ -334,7 +322,7 @@ namespace physx @see commonInit */ - virtual void computeGeneralizedMassMatrix(PxArticulationCache& cache) const = 0; + virtual void computeGeneralizedMassMatrix(PxArticulationCache& cache) const = 0; /** \brief add loop joint to the articulation system for inverse dynamic @@ -342,7 +330,7 @@ namespace physx @see commonInit */ - virtual void addLoopJoint(PxJoint* joint) = 0; + virtual void addLoopJoint(PxJoint* joint) = 0; /** \brief remove loop joint from the articulation system @@ -350,14 +338,13 @@ namespace physx @see commonInit */ - virtual void removeLoopJoint(PxJoint* joint) = 0; + virtual void removeLoopJoint(PxJoint* joint) = 0; /** \brief returns the number of loop joints in the articulation \return number of loop joints */ - - virtual PxU32 getNbLoopJoints() const = 0; + virtual PxU32 getNbLoopJoints() const = 0; /** \brief returns the set of loop constraints in the articulation @@ -371,15 +358,13 @@ namespace physx @see ArticulationLink */ - - virtual PxU32 getLoopJoints(PxJoint** userBuffer, PxU32 bufferSize, PxU32 startIndex = 0) const = 0; + virtual PxU32 getLoopJoints(PxJoint** userBuffer, PxU32 bufferSize, PxU32 startIndex = 0) const = 0; /** \brief returns the required size of coeffient matrix in the articulation. The coefficient matrix is number of constraint(loop joints) by total dofs. Constraint Torque = transpose(K) * lambda(). Lambda is a vector of number of constraints \return bite size of the coefficient matrix(nc * n) */ - - virtual PxU32 getCoefficentMatrixSize() const = 0; + virtual PxU32 getCoefficentMatrixSize() const = 0; /** \brief teleport root link to a new location @@ -388,12 +373,12 @@ namespace physx @see commonInit */ - virtual void teleportRootLink(const PxTransform& pose, bool autowake) = 0; + virtual void teleportRootLink(const PxTransform& pose, bool autowake) = 0; protected: - PX_INLINE PxArticulationReducedCoordinate(PxType concreteType, PxBaseFlags baseFlags) : PxArticulationBase(concreteType, baseFlags) {} - PX_INLINE PxArticulationReducedCoordinate(PxBaseFlags baseFlags) : PxArticulationBase(baseFlags) {} - virtual ~PxArticulationReducedCoordinate() {} + PX_INLINE PxArticulationReducedCoordinate(PxType concreteType, PxBaseFlags baseFlags) : PxArticulationBase(concreteType, baseFlags) {} + PX_INLINE PxArticulationReducedCoordinate(PxBaseFlags baseFlags) : PxArticulationBase(baseFlags) {} + virtual ~PxArticulationReducedCoordinate() {} }; #if PX_VC @@ -404,6 +389,5 @@ namespace physx } // namespace physx #endif - /** @} */ #endif diff --git a/src/PhysX/physx/include/PxBatchQuery.h b/src/PhysX/physx/include/PxBatchQuery.h index 63f1e7209..0feb6f678 100644 --- a/src/PhysX/physx/include/PxBatchQuery.h +++ b/src/PhysX/physx/include/PxBatchQuery.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxBatchQueryDesc.h b/src/PhysX/physx/include/PxBatchQueryDesc.h index 185ca89a7..faefa08ef 100644 --- a/src/PhysX/physx/include/PxBatchQueryDesc.h +++ b/src/PhysX/physx/include/PxBatchQueryDesc.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxBroadPhase.h b/src/PhysX/physx/include/PxBroadPhase.h index 39d3c4305..d3b231221 100644 --- a/src/PhysX/physx/include/PxBroadPhase.h +++ b/src/PhysX/physx/include/PxBroadPhase.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxClient.h b/src/PhysX/physx/include/PxClient.h index 4124add51..85a8ae21b 100644 --- a/src/PhysX/physx/include/PxClient.h +++ b/src/PhysX/physx/include/PxClient.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxConstraint.h b/src/PhysX/physx/include/PxConstraint.h index f0fb733c0..58ddcbc8d 100644 --- a/src/PhysX/physx/include/PxConstraint.h +++ b/src/PhysX/physx/include/PxConstraint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxConstraintDesc.h b/src/PhysX/physx/include/PxConstraintDesc.h index b469b55b5..138829313 100644 --- a/src/PhysX/physx/include/PxConstraintDesc.h +++ b/src/PhysX/physx/include/PxConstraintDesc.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxContact.h b/src/PhysX/physx/include/PxContact.h index 0fab1333d..586baa42d 100644 --- a/src/PhysX/physx/include/PxContact.h +++ b/src/PhysX/physx/include/PxContact.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxContactModifyCallback.h b/src/PhysX/physx/include/PxContactModifyCallback.h index adca7a60a..d248ad86c 100644 --- a/src/PhysX/physx/include/PxContactModifyCallback.h +++ b/src/PhysX/physx/include/PxContactModifyCallback.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxDeletionListener.h b/src/PhysX/physx/include/PxDeletionListener.h index 0ca180360..b982ab3b3 100644 --- a/src/PhysX/physx/include/PxDeletionListener.h +++ b/src/PhysX/physx/include/PxDeletionListener.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxFiltering.h b/src/PhysX/physx/include/PxFiltering.h index b3a7f5289..6902c09a9 100644 --- a/src/PhysX/physx/include/PxFiltering.h +++ b/src/PhysX/physx/include/PxFiltering.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxForceMode.h b/src/PhysX/physx/include/PxForceMode.h index bac6253ec..f5915156d 100644 --- a/src/PhysX/physx/include/PxForceMode.h +++ b/src/PhysX/physx/include/PxForceMode.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxFoundation.h b/src/PhysX/physx/include/PxFoundation.h index 8a1104c5b..cc80a83c3 100644 --- a/src/PhysX/physx/include/PxFoundation.h +++ b/src/PhysX/physx/include/PxFoundation.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -36,6 +36,7 @@ #include "foundation/Px.h" #include "foundation/PxErrors.h" +#include "foundation/PxFoundationConfig.h" #if !PX_DOXYGEN namespace physx diff --git a/src/PhysX/physx/include/PxImmediateMode.h b/src/PhysX/physx/include/PxImmediateMode.h index 827d2a3ec..7e19fb51a 100644 --- a/src/PhysX/physx/include/PxImmediateMode.h +++ b/src/PhysX/physx/include/PxImmediateMode.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -192,7 +192,7 @@ namespace immediate PX_C_EXPORT PX_PHYSX_CORE_API void PxIntegrateSolverBodies(PxSolverBodyData* solverBodyData, PxSolverBody* solverBody, const PxVec3* linearMotionVelocity, const PxVec3* angularMotionState, const PxU32 nbBodiesToIntegrate, PxReal dt); /** - abrief Performs contact generation for a given pair of geometries at the specified poses. Produced contacts are stored in the provided Gu::ContactBuffer. Information is cached in PxCache structure + \brief Performs contact generation for a given pair of geometries at the specified poses. Produced contacts are stored in the provided Gu::ContactBuffer. Information is cached in PxCache structure to accelerate future contact generation between pairs. This cache data is valid only as long as the memory provided by PxCacheAllocator has not been released/re-used. Recommendation is to retain that data for a single simulation frame, discarding cached data after 2 frames. If the cached memory has been released/re-used prior to the corresponding pair having contact generation performed again, it is the application's responsibility to reset the PxCache. diff --git a/src/PhysX/physx/include/PxLockedData.h b/src/PhysX/physx/include/PxLockedData.h index 11b0b829e..bde841487 100644 --- a/src/PhysX/physx/include/PxLockedData.h +++ b/src/PhysX/physx/include/PxLockedData.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxMaterial.h b/src/PhysX/physx/include/PxMaterial.h index 24dc74a3d..0d7b18b71 100644 --- a/src/PhysX/physx/include/PxMaterial.h +++ b/src/PhysX/physx/include/PxMaterial.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -77,7 +77,20 @@ struct PxMaterialFlag Note: This flag only has an effect if the PxMaterialFlag::eDISABLE_FRICTION bit is 0. */ - eDISABLE_STRONG_FRICTION = 1 << 1 + eDISABLE_STRONG_FRICTION = 1 << 1, + + /** + This flag only has an effect if PxFrictionType::ePATCH friction model is used. + + When using the patch friction model, up to 2 friction anchors are generated per patch. As the number of friction anchors + can be smaller than the number of contacts, the normal force is accumulated over all contacts and used to compute friction + for all anchors. Where there are more than 2 anchors, this can produce frictional behavior that is too strong (approximately 2x as strong + as analytical models suggest). + + This flag causes the normal force to be distributed between the friction anchors such that the total amount of friction applied does not + exceed the analyical results. + */ + eIMPROVED_PATCH_FRICTION = 1 << 2 }; }; diff --git a/src/PhysX/physx/include/PxPhysXConfig.h b/src/PhysX/physx/include/PxPhysXConfig.h index 9f532199b..93ec00318 100644 --- a/src/PhysX/physx/include/PxPhysXConfig.h +++ b/src/PhysX/physx/include/PxPhysXConfig.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxPhysics.h b/src/PhysX/physx/include/PxPhysics.h index e05dbc0c6..2ffc2cbe2 100644 --- a/src/PhysX/physx/include/PxPhysics.h +++ b/src/PhysX/physx/include/PxPhysics.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxPhysicsAPI.h b/src/PhysX/physx/include/PxPhysicsAPI.h index 727774540..ffe979ed3 100644 --- a/src/PhysX/physx/include/PxPhysicsAPI.h +++ b/src/PhysX/physx/include/PxPhysicsAPI.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -155,7 +155,6 @@ Alternatively, one can instead directly #include a subset of the below files. //Character Controller #include "characterkinematic/PxBoxController.h" #include "characterkinematic/PxCapsuleController.h" -#include "characterkinematic/PxCharacter.h" #include "characterkinematic/PxController.h" #include "characterkinematic/PxControllerBehavior.h" #include "characterkinematic/PxControllerManager.h" diff --git a/src/PhysX/physx/include/PxPhysicsSerialization.h b/src/PhysX/physx/include/PxPhysicsSerialization.h index c4cad9d29..4f0446683 100644 --- a/src/PhysX/physx/include/PxPhysicsSerialization.h +++ b/src/PhysX/physx/include/PxPhysicsSerialization.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxPhysicsVersion.h b/src/PhysX/physx/include/PxPhysicsVersion.h index 9dd9de053..6a9e11606 100644 --- a/src/PhysX/physx/include/PxPhysicsVersion.h +++ b/src/PhysX/physx/include/PxPhysicsVersion.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxPruningStructure.h b/src/PhysX/physx/include/PxPruningStructure.h index beeb1d7ac..964c0b8bf 100644 --- a/src/PhysX/physx/include/PxPruningStructure.h +++ b/src/PhysX/physx/include/PxPruningStructure.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxQueryFiltering.h b/src/PhysX/physx/include/PxQueryFiltering.h index 7991246f6..98680bf95 100644 --- a/src/PhysX/physx/include/PxQueryFiltering.h +++ b/src/PhysX/physx/include/PxQueryFiltering.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxQueryReport.h b/src/PhysX/physx/include/PxQueryReport.h index f50322906..17b3ebbb6 100644 --- a/src/PhysX/physx/include/PxQueryReport.h +++ b/src/PhysX/physx/include/PxQueryReport.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxRigidActor.h b/src/PhysX/physx/include/PxRigidActor.h index 950f35e59..beec2a752 100644 --- a/src/PhysX/physx/include/PxRigidActor.h +++ b/src/PhysX/physx/include/PxRigidActor.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxRigidBody.h b/src/PhysX/physx/include/PxRigidBody.h index f25628f3c..6cbd33559 100644 --- a/src/PhysX/physx/include/PxRigidBody.h +++ b/src/PhysX/physx/include/PxRigidBody.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxRigidDynamic.h b/src/PhysX/physx/include/PxRigidDynamic.h index 071e9a9d3..a0ae0bcfc 100644 --- a/src/PhysX/physx/include/PxRigidDynamic.h +++ b/src/PhysX/physx/include/PxRigidDynamic.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxRigidStatic.h b/src/PhysX/physx/include/PxRigidStatic.h index 9d9281455..f98fa58ad 100644 --- a/src/PhysX/physx/include/PxRigidStatic.h +++ b/src/PhysX/physx/include/PxRigidStatic.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxScene.h b/src/PhysX/physx/include/PxScene.h index 49ea87f34..737832b8f 100644 --- a/src/PhysX/physx/include/PxScene.h +++ b/src/PhysX/physx/include/PxScene.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxSceneDesc.h b/src/PhysX/physx/include/PxSceneDesc.h index 67c107690..87f06629a 100644 --- a/src/PhysX/physx/include/PxSceneDesc.h +++ b/src/PhysX/physx/include/PxSceneDesc.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -632,7 +632,7 @@ public: /** \brief Selects the solver algorithm to use. - Default: PxSolverType::eDEFAULT + Default: PxSolverType::ePGS @see PxSolverType */ @@ -848,6 +848,22 @@ public: */ PxU32 ccdMaxPasses; + /** + \brief CCD threshold + + CCD performs sweeps against shapes if and only if the relative motion of the shapes is fast-enough that a collision would be missed + by the discrete contact generation. However, in some circumstances, e.g. when the environment is constructed from large convex shapes, this + approach may produce undesired simulation artefacts. This parameter defines the minimum relative motion that would be required to force CCD between shapes. + The smaller of this value and the sum of the thresholds calculated for the shapes involved will be used. + + \note It is not advisable to set this to a very small value as this may lead to CCD "jamming" and detrimentally effect performance. This value should be at least larger than the translation caused by a single frame's gravitational effect + + Default: PX_MAX_F32 + Range: [Eps, PX_MAX_F32]
+ */ + + PxReal ccdThreshold; + /** \brief The wake counter reset value @@ -980,6 +996,7 @@ PX_INLINE PxSceneDesc::PxSceneDesc(const PxTolerancesScale& scale): maxBiasCoefficient (PX_MAX_F32), contactReportStreamBufferSize (8192), ccdMaxPasses (1), + ccdThreshold (PX_MAX_F32), wakeCounterResetValue (20.0f*0.02f), sanityBounds (PxBounds3(PxVec3(-PX_MAX_BOUNDS_EXTENTS), PxVec3(PX_MAX_BOUNDS_EXTENTS))), gpuMaxNumPartitions (8), @@ -1020,6 +1037,9 @@ PX_INLINE bool PxSceneDesc::isValid() const if (solverOffsetSlop < 0.f) return false; + if(ccdThreshold <= 0.f) + return false; + if(!cpuDispatcher) return false; diff --git a/src/PhysX/physx/include/PxSceneLock.h b/src/PhysX/physx/include/PxSceneLock.h index 97ffad0c8..136d49568 100644 --- a/src/PhysX/physx/include/PxSceneLock.h +++ b/src/PhysX/physx/include/PxSceneLock.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxShape.h b/src/PhysX/physx/include/PxShape.h index 392006428..4ca85e639 100644 --- a/src/PhysX/physx/include/PxShape.h +++ b/src/PhysX/physx/include/PxShape.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxSimulationEventCallback.h b/src/PhysX/physx/include/PxSimulationEventCallback.h index 52186d374..8d89d965a 100644 --- a/src/PhysX/physx/include/PxSimulationEventCallback.h +++ b/src/PhysX/physx/include/PxSimulationEventCallback.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxSimulationStatistics.h b/src/PhysX/physx/include/PxSimulationStatistics.h index 6aa3e74a7..c08a86b49 100644 --- a/src/PhysX/physx/include/PxSimulationStatistics.h +++ b/src/PhysX/physx/include/PxSimulationStatistics.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/PxVisualizationParameter.h b/src/PhysX/physx/include/PxVisualizationParameter.h index eac8a3f00..372f0073e 100644 --- a/src/PhysX/physx/include/PxVisualizationParameter.h +++ b/src/PhysX/physx/include/PxVisualizationParameter.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/characterkinematic/PxBoxController.h b/src/PhysX/physx/include/characterkinematic/PxBoxController.h index ecb7d3baa..6523a85a5 100644 --- a/src/PhysX/physx/include/characterkinematic/PxBoxController.h +++ b/src/PhysX/physx/include/characterkinematic/PxBoxController.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -34,7 +34,6 @@ @{ */ -#include "characterkinematic/PxCharacter.h" #include "characterkinematic/PxController.h" #if !PX_DOXYGEN diff --git a/src/PhysX/physx/include/characterkinematic/PxCapsuleController.h b/src/PhysX/physx/include/characterkinematic/PxCapsuleController.h index c8cf8a67f..869d8a19a 100644 --- a/src/PhysX/physx/include/characterkinematic/PxCapsuleController.h +++ b/src/PhysX/physx/include/characterkinematic/PxCapsuleController.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -34,7 +34,6 @@ @{ */ -#include "characterkinematic/PxCharacter.h" #include "characterkinematic/PxController.h" #if !PX_DOXYGEN diff --git a/src/PhysX/physx/include/characterkinematic/PxController.h b/src/PhysX/physx/include/characterkinematic/PxController.h index a0be05740..f5cac0d87 100644 --- a/src/PhysX/physx/include/characterkinematic/PxController.h +++ b/src/PhysX/physx/include/characterkinematic/PxController.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -35,7 +35,6 @@ @{ */ -#include "characterkinematic/PxCharacter.h" #include "characterkinematic/PxExtended.h" #include "characterkinematic/PxControllerObstacles.h" #include "PxQueryFiltering.h" diff --git a/src/PhysX/physx/include/characterkinematic/PxControllerBehavior.h b/src/PhysX/physx/include/characterkinematic/PxControllerBehavior.h index e3b3f74c9..7c4e295ea 100644 --- a/src/PhysX/physx/include/characterkinematic/PxControllerBehavior.h +++ b/src/PhysX/physx/include/characterkinematic/PxControllerBehavior.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -34,7 +34,6 @@ */ #include "PxFiltering.h" -#include "characterkinematic/PxCharacter.h" #if !PX_DOXYGEN namespace physx diff --git a/src/PhysX/physx/include/characterkinematic/PxControllerManager.h b/src/PhysX/physx/include/characterkinematic/PxControllerManager.h index 924133ca3..1bc3aa979 100644 --- a/src/PhysX/physx/include/characterkinematic/PxControllerManager.h +++ b/src/PhysX/physx/include/characterkinematic/PxControllerManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -34,8 +34,6 @@ @{ */ -#include "characterkinematic/PxCharacter.h" - #include "PxPhysXConfig.h" #include "foundation/PxFlags.h" #include "foundation/PxErrorCallback.h" @@ -83,7 +81,7 @@ PX_FLAGS_OPERATORS(PxControllerDebugRenderFlag::Enum, PxU32) @see PxController PxBoxController PxCapsuleController */ -class PX_PHYSX_CHARACTER_API PxControllerManager +class PxControllerManager { public: /** @@ -295,7 +293,7 @@ protected: By default, locking is disabled. */ -PX_C_EXPORT PX_PHYSX_CHARACTER_API physx::PxControllerManager* PX_CALL_CONV PxCreateControllerManager(physx::PxScene& scene, bool lockingEnabled = false); +PX_C_EXPORT physx::PxControllerManager* PX_CALL_CONV PxCreateControllerManager(physx::PxScene& scene, bool lockingEnabled = false); /** @} */ #endif //PX_PHYSICS_CCT_MANAGER diff --git a/src/PhysX/physx/include/characterkinematic/PxControllerObstacles.h b/src/PhysX/physx/include/characterkinematic/PxControllerObstacles.h index ae1ef5231..243dc0060 100644 --- a/src/PhysX/physx/include/characterkinematic/PxControllerObstacles.h +++ b/src/PhysX/physx/include/characterkinematic/PxControllerObstacles.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -33,7 +33,6 @@ @{ */ -#include "characterkinematic/PxCharacter.h" #include "characterkinematic/PxExtended.h" #include "geometry/PxGeometry.h" diff --git a/src/PhysX/physx/include/characterkinematic/PxExtended.h b/src/PhysX/physx/include/characterkinematic/PxExtended.h index 1adb4b9f4..7dc962269 100644 --- a/src/PhysX/physx/include/characterkinematic/PxExtended.h +++ b/src/PhysX/physx/include/characterkinematic/PxExtended.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/collision/PxCollisionDefs.h b/src/PhysX/physx/include/collision/PxCollisionDefs.h index 276954912..de7245f80 100644 --- a/src/PhysX/physx/include/collision/PxCollisionDefs.h +++ b/src/PhysX/physx/include/collision/PxCollisionDefs.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/common/PxBase.h b/src/PhysX/physx/include/common/PxBase.h index 848fe91cb..5d997d63a 100644 --- a/src/PhysX/physx/include/common/PxBase.h +++ b/src/PhysX/physx/include/common/PxBase.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/common/PxCollection.h b/src/PhysX/physx/include/common/PxCollection.h index 904055445..c5fbf5717 100644 --- a/src/PhysX/physx/include/common/PxCollection.h +++ b/src/PhysX/physx/include/common/PxCollection.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/common/PxCoreUtilityTypes.h b/src/PhysX/physx/include/common/PxCoreUtilityTypes.h index 57a475aa9..5302a5b13 100644 --- a/src/PhysX/physx/include/common/PxCoreUtilityTypes.h +++ b/src/PhysX/physx/include/common/PxCoreUtilityTypes.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/common/PxMetaData.h b/src/PhysX/physx/include/common/PxMetaData.h index c1a050fc4..a8a7cd51f 100644 --- a/src/PhysX/physx/include/common/PxMetaData.h +++ b/src/PhysX/physx/include/common/PxMetaData.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/common/PxMetaDataFlags.h b/src/PhysX/physx/include/common/PxMetaDataFlags.h index 7c890f9e0..6f3a60448 100644 --- a/src/PhysX/physx/include/common/PxMetaDataFlags.h +++ b/src/PhysX/physx/include/common/PxMetaDataFlags.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/common/PxPhysXCommonConfig.h b/src/PhysX/physx/include/common/PxPhysXCommonConfig.h index 61e2d8754..e81e5ca42 100644 --- a/src/PhysX/physx/include/common/PxPhysXCommonConfig.h +++ b/src/PhysX/physx/include/common/PxPhysXCommonConfig.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -44,7 +44,7 @@ https://developercommunity.visualstudio.com/content/problem/66047/possible-compi #endif // define API function declaration (public API only needed because of extensions) -#if defined PX_PHYSX_STATIC_LIB || defined PX_PHYSX_CORE_STATIC_LIB +#if defined PX_PHYSX_STATIC_LIB #define PX_PHYSX_CORE_API #else #if PX_WINDOWS @@ -82,7 +82,7 @@ https://developercommunity.visualstudio.com/content/problem/66047/possible-compi #define PX_PHYSX_GPU_API #endif // PX_SUPPORT_GPU_PHYSX -#if defined PX_PHYSX_STATIC_LIB || defined PX_PHYSX_CORE_STATIC_LIB +#if defined PX_PHYSX_STATIC_LIB #define PX_PHYSX_COMMON_API #else #if PX_WINDOWS && !defined(__CUDACC__) diff --git a/src/PhysX/physx/include/common/PxPhysicsInsertionCallback.h b/src/PhysX/physx/include/common/PxPhysicsInsertionCallback.h index 414695259..f28fc444f 100644 --- a/src/PhysX/physx/include/common/PxPhysicsInsertionCallback.h +++ b/src/PhysX/physx/include/common/PxPhysicsInsertionCallback.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/common/PxProfileZone.h b/src/PhysX/physx/include/common/PxProfileZone.h index 0fda159f1..5a7af2676 100644 --- a/src/PhysX/physx/include/common/PxProfileZone.h +++ b/src/PhysX/physx/include/common/PxProfileZone.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXFOUNDATION_PXPROFILEZONE_H #define PXFOUNDATION_PXPROFILEZONE_H diff --git a/src/PhysX/physx/include/common/PxRenderBuffer.h b/src/PhysX/physx/include/common/PxRenderBuffer.h index 8fe0b0fa1..ab3cc5684 100644 --- a/src/PhysX/physx/include/common/PxRenderBuffer.h +++ b/src/PhysX/physx/include/common/PxRenderBuffer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/common/PxSerialFramework.h b/src/PhysX/physx/include/common/PxSerialFramework.h index ac2565a7b..9ff8e473e 100644 --- a/src/PhysX/physx/include/common/PxSerialFramework.h +++ b/src/PhysX/physx/include/common/PxSerialFramework.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/common/PxSerializer.h b/src/PhysX/physx/include/common/PxSerializer.h index d3c1327fc..80c6456cc 100644 --- a/src/PhysX/physx/include/common/PxSerializer.h +++ b/src/PhysX/physx/include/common/PxSerializer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/common/PxStringTable.h b/src/PhysX/physx/include/common/PxStringTable.h index 5564045eb..2e3508554 100644 --- a/src/PhysX/physx/include/common/PxStringTable.h +++ b/src/PhysX/physx/include/common/PxStringTable.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/common/PxTolerancesScale.h b/src/PhysX/physx/include/common/PxTolerancesScale.h index f966de3a4..e4165cbd7 100644 --- a/src/PhysX/physx/include/common/PxTolerancesScale.h +++ b/src/PhysX/physx/include/common/PxTolerancesScale.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/common/PxTypeInfo.h b/src/PhysX/physx/include/common/PxTypeInfo.h index 5e74ea331..1c84bed9e 100644 --- a/src/PhysX/physx/include/common/PxTypeInfo.h +++ b/src/PhysX/physx/include/common/PxTypeInfo.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/common/windows/PxWindowsDelayLoadHook.h b/src/PhysX/physx/include/common/windows/PxWindowsDelayLoadHook.h index 7f3e45bae..82fc2e528 100644 --- a/src/PhysX/physx/include/common/windows/PxWindowsDelayLoadHook.h +++ b/src/PhysX/physx/include/common/windows/PxWindowsDelayLoadHook.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/cooking/PxBVH33MidphaseDesc.h b/src/PhysX/physx/include/cooking/PxBVH33MidphaseDesc.h index dd0168922..1d5505177 100644 --- a/src/PhysX/physx/include/cooking/PxBVH33MidphaseDesc.h +++ b/src/PhysX/physx/include/cooking/PxBVH33MidphaseDesc.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/cooking/PxBVH34MidphaseDesc.h b/src/PhysX/physx/include/cooking/PxBVH34MidphaseDesc.h index aec2fe218..6c708a414 100644 --- a/src/PhysX/physx/include/cooking/PxBVH34MidphaseDesc.h +++ b/src/PhysX/physx/include/cooking/PxBVH34MidphaseDesc.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/cooking/PxBVHStructureDesc.h b/src/PhysX/physx/include/cooking/PxBVHStructureDesc.h index 6c9a8544a..3474a8678 100644 --- a/src/PhysX/physx/include/cooking/PxBVHStructureDesc.h +++ b/src/PhysX/physx/include/cooking/PxBVHStructureDesc.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/cooking/PxConvexMeshDesc.h b/src/PhysX/physx/include/cooking/PxConvexMeshDesc.h index 20d0ee1e6..5a8085101 100644 --- a/src/PhysX/physx/include/cooking/PxConvexMeshDesc.h +++ b/src/PhysX/physx/include/cooking/PxConvexMeshDesc.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/cooking/PxCooking.h b/src/PhysX/physx/include/cooking/PxCooking.h index f1a8a257e..ae5e5dab8 100644 --- a/src/PhysX/physx/include/cooking/PxCooking.h +++ b/src/PhysX/physx/include/cooking/PxCooking.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/cooking/PxMidphaseDesc.h b/src/PhysX/physx/include/cooking/PxMidphaseDesc.h index 731926451..6daf4077d 100644 --- a/src/PhysX/physx/include/cooking/PxMidphaseDesc.h +++ b/src/PhysX/physx/include/cooking/PxMidphaseDesc.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/cooking/PxTriangleMeshDesc.h b/src/PhysX/physx/include/cooking/PxTriangleMeshDesc.h index 9aa422fc3..17a612f22 100644 --- a/src/PhysX/physx/include/cooking/PxTriangleMeshDesc.h +++ b/src/PhysX/physx/include/cooking/PxTriangleMeshDesc.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/cooking/Pxc.h b/src/PhysX/physx/include/cooking/Pxc.h index a279db6cd..55f43f93e 100644 --- a/src/PhysX/physx/include/cooking/Pxc.h +++ b/src/PhysX/physx/include/cooking/Pxc.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/cudamanager/PxCudaContextManager.h b/src/PhysX/physx/include/cudamanager/PxCudaContextManager.h index 1bcaf2409..6ed643f0c 100644 --- a/src/PhysX/physx/include/cudamanager/PxCudaContextManager.h +++ b/src/PhysX/physx/include/cudamanager/PxCudaContextManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXCUDACONTEXTMANAGER_PXCUDACONTEXTMANAGER_H diff --git a/src/PhysX/physx/include/cudamanager/PxCudaMemoryManager.h b/src/PhysX/physx/include/cudamanager/PxCudaMemoryManager.h index 9d20feb61..ce44d9b06 100644 --- a/src/PhysX/physx/include/cudamanager/PxCudaMemoryManager.h +++ b/src/PhysX/physx/include/cudamanager/PxCudaMemoryManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXCUDACONTEXTMANAGER_PXCUDAMEMORYMANAGER_H #define PXCUDACONTEXTMANAGER_PXCUDAMEMORYMANAGER_H diff --git a/src/PhysX/physx/include/cudamanager/PxGpuCopyDesc.h b/src/PhysX/physx/include/cudamanager/PxGpuCopyDesc.h index 6429a7b1b..d37404270 100644 --- a/src/PhysX/physx/include/cudamanager/PxGpuCopyDesc.h +++ b/src/PhysX/physx/include/cudamanager/PxGpuCopyDesc.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXCUDACONTEXTMANAGER_PXGPUCOPYDESC_H #define PXCUDACONTEXTMANAGER_PXGPUCOPYDESC_H diff --git a/src/PhysX/physx/include/cudamanager/PxGpuCopyDescQueue.h b/src/PhysX/physx/include/cudamanager/PxGpuCopyDescQueue.h index 64d190b03..e2bf0067b 100644 --- a/src/PhysX/physx/include/cudamanager/PxGpuCopyDescQueue.h +++ b/src/PhysX/physx/include/cudamanager/PxGpuCopyDescQueue.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXCUDACONTEXTMANAGER_PXGPUCOPYDESCQUEUE_H #define PXCUDACONTEXTMANAGER_PXGPUCOPYDESCQUEUE_H diff --git a/src/PhysX/physx/include/extensions/PxBinaryConverter.h b/src/PhysX/physx/include/extensions/PxBinaryConverter.h index 1a985fda7..542adce25 100644 --- a/src/PhysX/physx/include/extensions/PxBinaryConverter.h +++ b/src/PhysX/physx/include/extensions/PxBinaryConverter.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxBroadPhaseExt.h b/src/PhysX/physx/include/extensions/PxBroadPhaseExt.h index 8347bcc10..50f86763a 100644 --- a/src/PhysX/physx/include/extensions/PxBroadPhaseExt.h +++ b/src/PhysX/physx/include/extensions/PxBroadPhaseExt.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxCollectionExt.h b/src/PhysX/physx/include/extensions/PxCollectionExt.h index 157c28108..beba4b19a 100644 --- a/src/PhysX/physx/include/extensions/PxCollectionExt.h +++ b/src/PhysX/physx/include/extensions/PxCollectionExt.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxConstraintExt.h b/src/PhysX/physx/include/extensions/PxConstraintExt.h index 62ca07814..87eb4b3e7 100644 --- a/src/PhysX/physx/include/extensions/PxConstraintExt.h +++ b/src/PhysX/physx/include/extensions/PxConstraintExt.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxContactJoint.h b/src/PhysX/physx/include/extensions/PxContactJoint.h index 00f84a5e3..a834b4552 100644 --- a/src/PhysX/physx/include/extensions/PxContactJoint.h +++ b/src/PhysX/physx/include/extensions/PxContactJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxConvexMeshExt.h b/src/PhysX/physx/include/extensions/PxConvexMeshExt.h index 39b150f42..60bc2f790 100644 --- a/src/PhysX/physx/include/extensions/PxConvexMeshExt.h +++ b/src/PhysX/physx/include/extensions/PxConvexMeshExt.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxD6Joint.h b/src/PhysX/physx/include/extensions/PxD6Joint.h index 7fe722d8d..6ce359f36 100644 --- a/src/PhysX/physx/include/extensions/PxD6Joint.h +++ b/src/PhysX/physx/include/extensions/PxD6Joint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxD6JointCreate.h b/src/PhysX/physx/include/extensions/PxD6JointCreate.h index 0e2d1964a..513bde4a7 100644 --- a/src/PhysX/physx/include/extensions/PxD6JointCreate.h +++ b/src/PhysX/physx/include/extensions/PxD6JointCreate.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxDefaultAllocator.h b/src/PhysX/physx/include/extensions/PxDefaultAllocator.h index 86405a44b..3814f40f3 100644 --- a/src/PhysX/physx/include/extensions/PxDefaultAllocator.h +++ b/src/PhysX/physx/include/extensions/PxDefaultAllocator.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxDefaultCpuDispatcher.h b/src/PhysX/physx/include/extensions/PxDefaultCpuDispatcher.h index 458676b32..595f89838 100644 --- a/src/PhysX/physx/include/extensions/PxDefaultCpuDispatcher.h +++ b/src/PhysX/physx/include/extensions/PxDefaultCpuDispatcher.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxDefaultErrorCallback.h b/src/PhysX/physx/include/extensions/PxDefaultErrorCallback.h index 7880c12ed..d0a5c6914 100644 --- a/src/PhysX/physx/include/extensions/PxDefaultErrorCallback.h +++ b/src/PhysX/physx/include/extensions/PxDefaultErrorCallback.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxDefaultSimulationFilterShader.h b/src/PhysX/physx/include/extensions/PxDefaultSimulationFilterShader.h index c4edb5e11..40fd3903c 100644 --- a/src/PhysX/physx/include/extensions/PxDefaultSimulationFilterShader.h +++ b/src/PhysX/physx/include/extensions/PxDefaultSimulationFilterShader.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxDefaultStreams.h b/src/PhysX/physx/include/extensions/PxDefaultStreams.h index 9eddeda5e..3f5e7ad46 100644 --- a/src/PhysX/physx/include/extensions/PxDefaultStreams.h +++ b/src/PhysX/physx/include/extensions/PxDefaultStreams.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxDistanceJoint.h b/src/PhysX/physx/include/extensions/PxDistanceJoint.h index bd752d25d..29ad6926c 100644 --- a/src/PhysX/physx/include/extensions/PxDistanceJoint.h +++ b/src/PhysX/physx/include/extensions/PxDistanceJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxExtensionsAPI.h b/src/PhysX/physx/include/extensions/PxExtensionsAPI.h index 6647b3cc2..3fde4b99c 100644 --- a/src/PhysX/physx/include/extensions/PxExtensionsAPI.h +++ b/src/PhysX/physx/include/extensions/PxExtensionsAPI.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxFixedJoint.h b/src/PhysX/physx/include/extensions/PxFixedJoint.h index fff4b84e9..789cf2e48 100644 --- a/src/PhysX/physx/include/extensions/PxFixedJoint.h +++ b/src/PhysX/physx/include/extensions/PxFixedJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxJoint.h b/src/PhysX/physx/include/extensions/PxJoint.h index 14898d6be..f6f31f26d 100644 --- a/src/PhysX/physx/include/extensions/PxJoint.h +++ b/src/PhysX/physx/include/extensions/PxJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxJointLimit.h b/src/PhysX/physx/include/extensions/PxJointLimit.h index 85a4ec82f..5859f92da 100644 --- a/src/PhysX/physx/include/extensions/PxJointLimit.h +++ b/src/PhysX/physx/include/extensions/PxJointLimit.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxMassProperties.h b/src/PhysX/physx/include/extensions/PxMassProperties.h index a5bc057a5..17b431966 100644 --- a/src/PhysX/physx/include/extensions/PxMassProperties.h +++ b/src/PhysX/physx/include/extensions/PxMassProperties.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxPrismaticJoint.h b/src/PhysX/physx/include/extensions/PxPrismaticJoint.h index b82ac2c8a..aba1341aa 100644 --- a/src/PhysX/physx/include/extensions/PxPrismaticJoint.h +++ b/src/PhysX/physx/include/extensions/PxPrismaticJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxRaycastCCD.h b/src/PhysX/physx/include/extensions/PxRaycastCCD.h index ed8f84ba0..190251b4d 100644 --- a/src/PhysX/physx/include/extensions/PxRaycastCCD.h +++ b/src/PhysX/physx/include/extensions/PxRaycastCCD.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxRepXSerializer.h b/src/PhysX/physx/include/extensions/PxRepXSerializer.h index dae0ef604..ae60b89e3 100644 --- a/src/PhysX/physx/include/extensions/PxRepXSerializer.h +++ b/src/PhysX/physx/include/extensions/PxRepXSerializer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_REPX_SERIALIZER_H diff --git a/src/PhysX/physx/include/extensions/PxRepXSimpleType.h b/src/PhysX/physx/include/extensions/PxRepXSimpleType.h index bd6023e92..43c5a11e1 100644 --- a/src/PhysX/physx/include/extensions/PxRepXSimpleType.h +++ b/src/PhysX/physx/include/extensions/PxRepXSimpleType.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxRevoluteJoint.h b/src/PhysX/physx/include/extensions/PxRevoluteJoint.h index d7d1c685c..3aabbebf8 100644 --- a/src/PhysX/physx/include/extensions/PxRevoluteJoint.h +++ b/src/PhysX/physx/include/extensions/PxRevoluteJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxRigidActorExt.h b/src/PhysX/physx/include/extensions/PxRigidActorExt.h index 2a437be7f..d14793e0b 100644 --- a/src/PhysX/physx/include/extensions/PxRigidActorExt.h +++ b/src/PhysX/physx/include/extensions/PxRigidActorExt.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxRigidBodyExt.h b/src/PhysX/physx/include/extensions/PxRigidBodyExt.h index f7c8f53ed..2d1ef552e 100644 --- a/src/PhysX/physx/include/extensions/PxRigidBodyExt.h +++ b/src/PhysX/physx/include/extensions/PxRigidBodyExt.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxSceneQueryExt.h b/src/PhysX/physx/include/extensions/PxSceneQueryExt.h index 1d4b86c01..3e755e0c4 100644 --- a/src/PhysX/physx/include/extensions/PxSceneQueryExt.h +++ b/src/PhysX/physx/include/extensions/PxSceneQueryExt.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxSerialization.h b/src/PhysX/physx/include/extensions/PxSerialization.h index 2d111ca78..44980aef8 100644 --- a/src/PhysX/physx/include/extensions/PxSerialization.h +++ b/src/PhysX/physx/include/extensions/PxSerialization.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxShapeExt.h b/src/PhysX/physx/include/extensions/PxShapeExt.h index 02228d5e4..d11998722 100644 --- a/src/PhysX/physx/include/extensions/PxShapeExt.h +++ b/src/PhysX/physx/include/extensions/PxShapeExt.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxSimpleFactory.h b/src/PhysX/physx/include/extensions/PxSimpleFactory.h index 354fe2080..e4f1e4ccf 100644 --- a/src/PhysX/physx/include/extensions/PxSimpleFactory.h +++ b/src/PhysX/physx/include/extensions/PxSimpleFactory.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxSmoothNormals.h b/src/PhysX/physx/include/extensions/PxSmoothNormals.h index 0aa373b44..a14817d0c 100644 --- a/src/PhysX/physx/include/extensions/PxSmoothNormals.h +++ b/src/PhysX/physx/include/extensions/PxSmoothNormals.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxSphericalJoint.h b/src/PhysX/physx/include/extensions/PxSphericalJoint.h index 80e513193..f3cb509a1 100644 --- a/src/PhysX/physx/include/extensions/PxSphericalJoint.h +++ b/src/PhysX/physx/include/extensions/PxSphericalJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxStringTableExt.h b/src/PhysX/physx/include/extensions/PxStringTableExt.h index 3585983ea..c1ef6882a 100644 --- a/src/PhysX/physx/include/extensions/PxStringTableExt.h +++ b/src/PhysX/physx/include/extensions/PxStringTableExt.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/extensions/PxTriangleMeshExt.h b/src/PhysX/physx/include/extensions/PxTriangleMeshExt.h index 43dc29e2d..9be39a471 100644 --- a/src/PhysX/physx/include/extensions/PxTriangleMeshExt.h +++ b/src/PhysX/physx/include/extensions/PxTriangleMeshExt.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/filebuf/PxFileBuf.h b/src/PhysX/physx/include/filebuf/PxFileBuf.h index b54f09b2a..3ef07eeac 100644 --- a/src/PhysX/physx/include/filebuf/PxFileBuf.h +++ b/src/PhysX/physx/include/filebuf/PxFileBuf.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/foundation/PxAssert.h b/src/PhysX/physx/include/foundation/PxAssert.h new file mode 100644 index 000000000..88309d53f --- /dev/null +++ b/src/PhysX/physx/include/foundation/PxAssert.h @@ -0,0 +1,98 @@ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// * Neither the name of NVIDIA CORPORATION nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. +// Copyright (c) 2001-2004 NovodeX AG. All rights reserved. + +#ifndef PX_FOUNDATION_PX_ASSERT_H +#define PX_FOUNDATION_PX_ASSERT_H + +#include "foundation/PxFoundationConfig.h" +#include "foundation/Px.h" + +/** \addtogroup foundation + @{ +*/ + +#if !PX_DOXYGEN +namespace physx +{ +#endif + +/* Base class to handle assert failures */ +class PX_DEPRECATED PxAssertHandler +{ + public: + virtual ~PxAssertHandler() + { + } + virtual void operator()(const char* exp, const char* file, int line, bool& ignore) = 0; +}; + +PX_FOUNDATION_API PX_DEPRECATED PxAssertHandler& PxGetAssertHandler(); +PX_FOUNDATION_API PX_DEPRECATED void PxSetAssertHandler(PxAssertHandler& handler); + +#if !PX_ENABLE_ASSERTS + #define PX_ASSERT(exp) ((void)0) + #define PX_ALWAYS_ASSERT_MESSAGE(exp) ((void)0) + #define PX_ASSERT_WITH_MESSAGE(condition, message) ((void)0) +#else +#if PX_VC + #define PX_CODE_ANALYSIS_ASSUME(exp) \ + __analysis_assume(!!(exp)) // This macro will be used to get rid of analysis warning messages if a PX_ASSERT is used + // to "guard" illegal mem access, for example. +#else + #define PX_CODE_ANALYSIS_ASSUME(exp) +#endif + #define PX_ASSERT(exp) \ + { \ + static bool _ignore = false; \ + ((void)((!!(exp)) || (!_ignore && (physx::PxGetAssertHandler()(#exp, __FILE__, __LINE__, _ignore), false)))); \ + PX_CODE_ANALYSIS_ASSUME(exp); \ + } + #define PX_ALWAYS_ASSERT_MESSAGE(exp) \ + { \ + static bool _ignore = false; \ + if(!_ignore) \ + physx::PxGetAssertHandler()(exp, __FILE__, __LINE__, _ignore); \ + } + #define PX_ASSERT_WITH_MESSAGE(exp, message) \ + { \ + static bool _ignore = false; \ + ((void)((!!(exp)) || (!_ignore && (physx::PxGetAssertHandler()(message, __FILE__, __LINE__, _ignore), false)))); \ + PX_CODE_ANALYSIS_ASSUME(exp); \ + } +#endif // !PX_ENABLE_ASSERTS + +#define PX_ALWAYS_ASSERT() PX_ASSERT(0) + +#if !PX_DOXYGEN +} // namespace physx +#endif + + +/** @} */ +#endif // PX_FOUNDATION_PX_ASSERT_H diff --git a/src/PhysX/physx/include/foundation/PxFoundationConfig.h b/src/PhysX/physx/include/foundation/PxFoundationConfig.h new file mode 100644 index 000000000..0ff58be35 --- /dev/null +++ b/src/PhysX/physx/include/foundation/PxFoundationConfig.h @@ -0,0 +1,57 @@ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// * Neither the name of NVIDIA CORPORATION nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. +// Copyright (c) 2001-2004 NovodeX AG. All rights reserved. + +#ifndef PX_FOUNDATION_PX_FOUNDATION_CONFIG_H +#define PX_FOUNDATION_PX_FOUNDATION_CONFIG_H + +#include "foundation/PxPreprocessor.h" + +/** \addtogroup foundation + @{ +*/ + +#if defined PX_PHYSX_STATIC_LIB + #define PX_FOUNDATION_API +#else + #if PX_WINDOWS && !defined(__CUDACC__) + #if defined PX_PHYSX_FOUNDATION_EXPORTS + #define PX_FOUNDATION_API __declspec(dllexport) + #else + #define PX_FOUNDATION_API __declspec(dllimport) + #endif + #elif PX_UNIX_FAMILY + #define PX_FOUNDATION_API PX_UNIX_EXPORT + #else + #define PX_FOUNDATION_API + #endif +#endif + + +/** @} */ +#endif // PX_FOUNDATION_PX_ASSERT_H diff --git a/src/PhysX/physx/include/foundation/PxMathUtils.h b/src/PhysX/physx/include/foundation/PxMathUtils.h new file mode 100644 index 000000000..445439c0c --- /dev/null +++ b/src/PhysX/physx/include/foundation/PxMathUtils.h @@ -0,0 +1,74 @@ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// * Neither the name of NVIDIA CORPORATION nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. +// Copyright (c) 2001-2004 NovodeX AG. All rights reserved. + +#ifndef PXFOUNDATION_PXMATHUTILS_H +#define PXFOUNDATION_PXMATHUTILS_H + +/** \addtogroup common + @{ +*/ + +#include "foundation/Px.h" +#include "foundation/PxFoundationConfig.h" + +#if !PX_DOXYGEN +namespace physx +{ +#endif + +/** +\brief finds the shortest rotation between two vectors. + +\param[in] from the vector to start from +\param[in] target the vector to rotate to +\return a rotation about an axis normal to the two vectors which takes one to the other via the shortest path +*/ + +PX_FOUNDATION_API PxQuat PxShortestRotation(const PxVec3& from, const PxVec3& target); + +/* \brief diagonalizes a 3x3 symmetric matrix y + +The returned matrix satisfies M = R * D * R', where R is the rotation matrix for the output quaternion, R' its +transpose, and D the diagonal matrix + +If the matrix is not symmetric, the result is undefined. + +\param[in] m the matrix to diagonalize +\param[out] axes a quaternion rotation which diagonalizes the matrix +\return the vector diagonal of the diagonalized matrix. +*/ + +PX_FOUNDATION_API PxVec3 PxDiagonalize(const PxMat33& m, PxQuat& axes); + +#if !PX_DOXYGEN +} // namespace physx +#endif + +/** @} */ +#endif diff --git a/src/PhysX/physx/include/geometry/PxBVHStructure.h b/src/PhysX/physx/include/geometry/PxBVHStructure.h index 86050b13e..515a542b1 100644 --- a/src/PhysX/physx/include/geometry/PxBVHStructure.h +++ b/src/PhysX/physx/include/geometry/PxBVHStructure.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxBoxGeometry.h b/src/PhysX/physx/include/geometry/PxBoxGeometry.h index a0fa7d0c6..d1bfde7de 100644 --- a/src/PhysX/physx/include/geometry/PxBoxGeometry.h +++ b/src/PhysX/physx/include/geometry/PxBoxGeometry.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxCapsuleGeometry.h b/src/PhysX/physx/include/geometry/PxCapsuleGeometry.h index 4600f4da4..8acb931b2 100644 --- a/src/PhysX/physx/include/geometry/PxCapsuleGeometry.h +++ b/src/PhysX/physx/include/geometry/PxCapsuleGeometry.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -34,6 +34,7 @@ @{ */ #include "geometry/PxGeometry.h" +#include "foundation/PxFoundationConfig.h" #if !PX_DOXYGEN namespace physx diff --git a/src/PhysX/physx/include/geometry/PxConvexMesh.h b/src/PhysX/physx/include/geometry/PxConvexMesh.h index b331a4223..921d1f837 100644 --- a/src/PhysX/physx/include/geometry/PxConvexMesh.h +++ b/src/PhysX/physx/include/geometry/PxConvexMesh.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxConvexMeshGeometry.h b/src/PhysX/physx/include/geometry/PxConvexMeshGeometry.h index dad042c8c..d8bc9d1d8 100644 --- a/src/PhysX/physx/include/geometry/PxConvexMeshGeometry.h +++ b/src/PhysX/physx/include/geometry/PxConvexMeshGeometry.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxGeometry.h b/src/PhysX/physx/include/geometry/PxGeometry.h index 5c8133918..b0b5e9d6f 100644 --- a/src/PhysX/physx/include/geometry/PxGeometry.h +++ b/src/PhysX/physx/include/geometry/PxGeometry.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxGeometryHelpers.h b/src/PhysX/physx/include/geometry/PxGeometryHelpers.h index e4637df70..6573907b0 100644 --- a/src/PhysX/physx/include/geometry/PxGeometryHelpers.h +++ b/src/PhysX/physx/include/geometry/PxGeometryHelpers.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxGeometryQuery.h b/src/PhysX/physx/include/geometry/PxGeometryQuery.h index 95274b34f..2be498133 100644 --- a/src/PhysX/physx/include/geometry/PxGeometryQuery.h +++ b/src/PhysX/physx/include/geometry/PxGeometryQuery.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxHeightField.h b/src/PhysX/physx/include/geometry/PxHeightField.h index 5cc07ae71..5f45226fb 100644 --- a/src/PhysX/physx/include/geometry/PxHeightField.h +++ b/src/PhysX/physx/include/geometry/PxHeightField.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxHeightFieldDesc.h b/src/PhysX/physx/include/geometry/PxHeightFieldDesc.h index eac748ccc..23fc6f1a9 100644 --- a/src/PhysX/physx/include/geometry/PxHeightFieldDesc.h +++ b/src/PhysX/physx/include/geometry/PxHeightFieldDesc.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxHeightFieldFlag.h b/src/PhysX/physx/include/geometry/PxHeightFieldFlag.h index 0f0e407df..03cfe4ac9 100644 --- a/src/PhysX/physx/include/geometry/PxHeightFieldFlag.h +++ b/src/PhysX/physx/include/geometry/PxHeightFieldFlag.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxHeightFieldGeometry.h b/src/PhysX/physx/include/geometry/PxHeightFieldGeometry.h index b0dc61102..a68c5dd9f 100644 --- a/src/PhysX/physx/include/geometry/PxHeightFieldGeometry.h +++ b/src/PhysX/physx/include/geometry/PxHeightFieldGeometry.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxHeightFieldSample.h b/src/PhysX/physx/include/geometry/PxHeightFieldSample.h index 4f2170556..634c4ea97 100644 --- a/src/PhysX/physx/include/geometry/PxHeightFieldSample.h +++ b/src/PhysX/physx/include/geometry/PxHeightFieldSample.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxMeshQuery.h b/src/PhysX/physx/include/geometry/PxMeshQuery.h index 0c381ea7e..284439d6e 100644 --- a/src/PhysX/physx/include/geometry/PxMeshQuery.h +++ b/src/PhysX/physx/include/geometry/PxMeshQuery.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxMeshScale.h b/src/PhysX/physx/include/geometry/PxMeshScale.h index 7771a7e0e..85206ba98 100644 --- a/src/PhysX/physx/include/geometry/PxMeshScale.h +++ b/src/PhysX/physx/include/geometry/PxMeshScale.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxPlaneGeometry.h b/src/PhysX/physx/include/geometry/PxPlaneGeometry.h index 002c72715..f25a3df9f 100644 --- a/src/PhysX/physx/include/geometry/PxPlaneGeometry.h +++ b/src/PhysX/physx/include/geometry/PxPlaneGeometry.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -36,6 +36,7 @@ #include "foundation/PxPlane.h" #include "foundation/PxTransform.h" #include "geometry/PxGeometry.h" +#include "foundation/PxFoundationConfig.h" #if !PX_DOXYGEN namespace physx diff --git a/src/PhysX/physx/include/geometry/PxSimpleTriangleMesh.h b/src/PhysX/physx/include/geometry/PxSimpleTriangleMesh.h index eeaea9858..921699eda 100644 --- a/src/PhysX/physx/include/geometry/PxSimpleTriangleMesh.h +++ b/src/PhysX/physx/include/geometry/PxSimpleTriangleMesh.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxSphereGeometry.h b/src/PhysX/physx/include/geometry/PxSphereGeometry.h index 05ea69c76..d822314ed 100644 --- a/src/PhysX/physx/include/geometry/PxSphereGeometry.h +++ b/src/PhysX/physx/include/geometry/PxSphereGeometry.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxTriangle.h b/src/PhysX/physx/include/geometry/PxTriangle.h index 68d227464..3cfffcce1 100644 --- a/src/PhysX/physx/include/geometry/PxTriangle.h +++ b/src/PhysX/physx/include/geometry/PxTriangle.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxTriangleMesh.h b/src/PhysX/physx/include/geometry/PxTriangleMesh.h index e6fc1582e..94d6a314f 100644 --- a/src/PhysX/physx/include/geometry/PxTriangleMesh.h +++ b/src/PhysX/physx/include/geometry/PxTriangleMesh.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geometry/PxTriangleMeshGeometry.h b/src/PhysX/physx/include/geometry/PxTriangleMeshGeometry.h index f2a8bdbd8..d93278517 100644 --- a/src/PhysX/physx/include/geometry/PxTriangleMeshGeometry.h +++ b/src/PhysX/physx/include/geometry/PxTriangleMeshGeometry.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geomutils/GuContactBuffer.h b/src/PhysX/physx/include/geomutils/GuContactBuffer.h index 06568fe62..9b6bb6d72 100644 --- a/src/PhysX/physx/include/geomutils/GuContactBuffer.h +++ b/src/PhysX/physx/include/geomutils/GuContactBuffer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/geomutils/GuContactPoint.h b/src/PhysX/physx/include/geomutils/GuContactPoint.h index 5f2bcb623..71c244c02 100644 --- a/src/PhysX/physx/include/geomutils/GuContactPoint.h +++ b/src/PhysX/physx/include/geomutils/GuContactPoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/gpu/PxGpu.h b/src/PhysX/physx/include/gpu/PxGpu.h index 5f495bcaa..75fcc7405 100644 --- a/src/PhysX/physx/include/gpu/PxGpu.h +++ b/src/PhysX/physx/include/gpu/PxGpu.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PX_GPU_H #define PX_GPU_H diff --git a/src/PhysX/physx/include/pvd/PxPvd.h b/src/PhysX/physx/include/pvd/PxPvd.h index df4cbc63d..dab681b9e 100644 --- a/src/PhysX/physx/include/pvd/PxPvd.h +++ b/src/PhysX/physx/include/pvd/PxPvd.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/pvd/PxPvdSceneClient.h b/src/PhysX/physx/include/pvd/PxPvdSceneClient.h index 86c5eb040..43592c3b7 100644 --- a/src/PhysX/physx/include/pvd/PxPvdSceneClient.h +++ b/src/PhysX/physx/include/pvd/PxPvdSceneClient.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/pvd/PxPvdTransport.h b/src/PhysX/physx/include/pvd/PxPvdTransport.h index 098fbb5c1..fc4da49a2 100644 --- a/src/PhysX/physx/include/pvd/PxPvdTransport.h +++ b/src/PhysX/physx/include/pvd/PxPvdTransport.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/solver/PxSolverDefs.h b/src/PhysX/physx/include/solver/PxSolverDefs.h index 6fad51007..5a29686c0 100644 --- a/src/PhysX/physx/include/solver/PxSolverDefs.h +++ b/src/PhysX/physx/include/solver/PxSolverDefs.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/task/PxCpuDispatcher.h b/src/PhysX/physx/include/task/PxCpuDispatcher.h index 523c69af4..ff466e669 100644 --- a/src/PhysX/physx/include/task/PxCpuDispatcher.h +++ b/src/PhysX/physx/include/task/PxCpuDispatcher.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXTASK_PXCPUDISPATCHER_H #define PXTASK_PXCPUDISPATCHER_H diff --git a/src/PhysX/physx/include/task/PxGpuDispatcher.h b/src/PhysX/physx/include/task/PxGpuDispatcher.h index ae53ab1a1..7e04bccd9 100644 --- a/src/PhysX/physx/include/task/PxGpuDispatcher.h +++ b/src/PhysX/physx/include/task/PxGpuDispatcher.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXTASK_PXGPUDISPATCHER_H #define PXTASK_PXGPUDISPATCHER_H diff --git a/src/PhysX/physx/include/task/PxGpuTask.h b/src/PhysX/physx/include/task/PxGpuTask.h index e9d88ac52..60e359bc1 100644 --- a/src/PhysX/physx/include/task/PxGpuTask.h +++ b/src/PhysX/physx/include/task/PxGpuTask.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXTASK_PXGPUTASK_H diff --git a/src/PhysX/physx/include/task/PxTask.h b/src/PhysX/physx/include/task/PxTask.h index b51e6bc58..c75ae9006 100644 --- a/src/PhysX/physx/include/task/PxTask.h +++ b/src/PhysX/physx/include/task/PxTask.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXTASK_PXTASK_H #define PXTASK_PXTASK_H diff --git a/src/PhysX/physx/include/task/PxTaskDefine.h b/src/PhysX/physx/include/task/PxTaskDefine.h index 935089046..4c439c08d 100644 --- a/src/PhysX/physx/include/task/PxTaskDefine.h +++ b/src/PhysX/physx/include/task/PxTaskDefine.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXTASK_PXTASKDEFINE_H #define PXTASK_PXTASKDEFINE_H diff --git a/src/PhysX/physx/include/task/PxTaskManager.h b/src/PhysX/physx/include/task/PxTaskManager.h index d1738ef0b..278c24fb0 100644 --- a/src/PhysX/physx/include/task/PxTaskManager.h +++ b/src/PhysX/physx/include/task/PxTaskManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXTASK_PXTASKMANAGER_H #define PXTASK_PXTASKMANAGER_H diff --git a/src/PhysX/physx/include/vehicle/PxVehicleComponents.h b/src/PhysX/physx/include/vehicle/PxVehicleComponents.h index 3a85fcbd5..4bf599f48 100644 --- a/src/PhysX/physx/include/vehicle/PxVehicleComponents.h +++ b/src/PhysX/physx/include/vehicle/PxVehicleComponents.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/vehicle/PxVehicleDrive.h b/src/PhysX/physx/include/vehicle/PxVehicleDrive.h index 6358c7f84..bacd8a3ea 100644 --- a/src/PhysX/physx/include/vehicle/PxVehicleDrive.h +++ b/src/PhysX/physx/include/vehicle/PxVehicleDrive.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -44,7 +44,6 @@ namespace physx struct PxFilterData; class PxGeometry; class PxPhysics; -class PxBatchQuery; class PxVehicleDrivableSurfaceToTireFrictionPairs; class PxShape; class PxMaterial; diff --git a/src/PhysX/physx/include/vehicle/PxVehicleDrive4W.h b/src/PhysX/physx/include/vehicle/PxVehicleDrive4W.h index ec91e7b49..65880a3d3 100644 --- a/src/PhysX/physx/include/vehicle/PxVehicleDrive4W.h +++ b/src/PhysX/physx/include/vehicle/PxVehicleDrive4W.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -46,7 +46,6 @@ namespace physx struct PxFilterData; class PxGeometry; class PxPhysics; -class PxBatchQuery; class PxVehicleDrivableSurfaceToTireFrictionPairs; class PxShape; class PxMaterial; diff --git a/src/PhysX/physx/include/vehicle/PxVehicleDriveNW.h b/src/PhysX/physx/include/vehicle/PxVehicleDriveNW.h index f4a0f84ea..5a358f28d 100644 --- a/src/PhysX/physx/include/vehicle/PxVehicleDriveNW.h +++ b/src/PhysX/physx/include/vehicle/PxVehicleDriveNW.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -45,7 +45,6 @@ namespace physx struct PxFilterData; class PxGeometry; class PxPhysics; -class PxBatchQuery; class PxVehicleDrivableSurfaceToTireFrictionPairs; class PxShape; class PxMaterial; diff --git a/src/PhysX/physx/include/vehicle/PxVehicleDriveTank.h b/src/PhysX/physx/include/vehicle/PxVehicleDriveTank.h index 3e176f124..dae2f2009 100644 --- a/src/PhysX/physx/include/vehicle/PxVehicleDriveTank.h +++ b/src/PhysX/physx/include/vehicle/PxVehicleDriveTank.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -46,7 +46,6 @@ namespace physx struct PxFilterData; class PxGeometry; class PxPhysics; -class PxBatchQuery; class PxVehicleDrivableSurfaceToTireFrictionPairs; class PxShape; class PxMaterial; diff --git a/src/PhysX/physx/include/vehicle/PxVehicleNoDrive.h b/src/PhysX/physx/include/vehicle/PxVehicleNoDrive.h index a92a082e4..6c092c05d 100644 --- a/src/PhysX/physx/include/vehicle/PxVehicleNoDrive.h +++ b/src/PhysX/physx/include/vehicle/PxVehicleNoDrive.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -45,7 +45,6 @@ namespace physx struct PxFilterData; class PxGeometry; class PxPhysics; -class PxBatchQuery; class PxVehicleDrivableSurfaceToTireFrictionPairs; class PxShape; class PxMaterial; diff --git a/src/PhysX/physx/include/vehicle/PxVehicleSDK.h b/src/PhysX/physx/include/vehicle/PxVehicleSDK.h index 01924b203..9568519d9 100644 --- a/src/PhysX/physx/include/vehicle/PxVehicleSDK.h +++ b/src/PhysX/physx/include/vehicle/PxVehicleSDK.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/vehicle/PxVehicleShaders.h b/src/PhysX/physx/include/vehicle/PxVehicleShaders.h index 915ab0af5..740a0d692 100644 --- a/src/PhysX/physx/include/vehicle/PxVehicleShaders.h +++ b/src/PhysX/physx/include/vehicle/PxVehicleShaders.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/vehicle/PxVehicleTireFriction.h b/src/PhysX/physx/include/vehicle/PxVehicleTireFriction.h index dd4f05c30..855e4de5e 100644 --- a/src/PhysX/physx/include/vehicle/PxVehicleTireFriction.h +++ b/src/PhysX/physx/include/vehicle/PxVehicleTireFriction.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/vehicle/PxVehicleUpdate.h b/src/PhysX/physx/include/vehicle/PxVehicleUpdate.h index 381a01ead..cd8fd5864 100644 --- a/src/PhysX/physx/include/vehicle/PxVehicleUpdate.h +++ b/src/PhysX/physx/include/vehicle/PxVehicleUpdate.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/vehicle/PxVehicleUtil.h b/src/PhysX/physx/include/vehicle/PxVehicleUtil.h index 8c67751bc..fc6d374c0 100644 --- a/src/PhysX/physx/include/vehicle/PxVehicleUtil.h +++ b/src/PhysX/physx/include/vehicle/PxVehicleUtil.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/vehicle/PxVehicleUtilControl.h b/src/PhysX/physx/include/vehicle/PxVehicleUtilControl.h index 3daf06453..d69edacf9 100644 --- a/src/PhysX/physx/include/vehicle/PxVehicleUtilControl.h +++ b/src/PhysX/physx/include/vehicle/PxVehicleUtilControl.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/vehicle/PxVehicleUtilSetup.h b/src/PhysX/physx/include/vehicle/PxVehicleUtilSetup.h index e4a1a4c9c..155ddbff5 100644 --- a/src/PhysX/physx/include/vehicle/PxVehicleUtilSetup.h +++ b/src/PhysX/physx/include/vehicle/PxVehicleUtilSetup.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/vehicle/PxVehicleUtilTelemetry.h b/src/PhysX/physx/include/vehicle/PxVehicleUtilTelemetry.h index e6b4109d8..08fa26ca3 100644 --- a/src/PhysX/physx/include/vehicle/PxVehicleUtilTelemetry.h +++ b/src/PhysX/physx/include/vehicle/PxVehicleUtilTelemetry.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/include/vehicle/PxVehicleWheels.h b/src/PhysX/physx/include/vehicle/PxVehicleWheels.h index cd36131b4..3af39112c 100644 --- a/src/PhysX/physx/include/vehicle/PxVehicleWheels.h +++ b/src/PhysX/physx/include/vehicle/PxVehicleWheels.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/platform_readme.html b/src/PhysX/physx/platform_readme.html index 8d9c05553..550b29991 100644 --- a/src/PhysX/physx/platform_readme.html +++ b/src/PhysX/physx/platform_readme.html @@ -7,10 +7,10 @@ - +


-Copyright (C) 2008-2018 NVIDIA Corporation, 2701 San Thomas Expressway, Santa Clara, CA 95050 U.S.A. All rights reserved. www.nvidia.com +Copyright (C) 2008-2019 NVIDIA Corporation, 2701 San Thomas Expressway, Santa Clara, CA 95050 U.S.A. All rights reserved. www.nvidia.com

diff --git a/src/PhysX/physx/release_notes.html b/src/PhysX/physx/release_notes.html index ea4e7b40f..238aab6a9 100644 --- a/src/PhysX/physx/release_notes.html +++ b/src/PhysX/physx/release_notes.html @@ -28,6 +28,39 @@ +

Release Notes - NVIDIA® PhysX® SDK 4.0.0.25635910

+

January 2019

+ +

General

+ + + +

Release Notes - NVIDIA® PhysX® SDK 4.0

December 2018

@@ -135,6 +168,7 @@
  • A flag to enable friction constraints to be processed every frame has been added
  • PxContactJoint added to represent contacts in inverse dynamics. Not intended for use in simulation.
  • A missing PxShape::getReferenceCount() function has been added.
    • +
  • A new flag has been added to PxMaterial to improve friction accuracy. The flag is disabled by default to maintain legacy behavior.
  • Removed:
    • - +

    Release Notes - NVIDIA® PhysX® SDK 3.4.2.24990349

    @@ -362,7 +396,7 @@
  • Fixed an incorrect mesh index reported in contact buffer when stabilization flag was used.
    • - +

    Release Notes - NVIDIA® PhysX® SDK 3.4.2.24698370

    @@ -3674,7 +3708,7 @@


    - Copyright (C) 2008-2018 NVIDIA Corporation, 2701 San Thomas Expressway, Santa Clara, CA 95050 U.S.A. All rights reserved. www.nvidia.com + Copyright (C) 2008-2019 NVIDIA Corporation, 2701 San Thomas Expressway, Santa Clara, CA 95050 U.S.A. All rights reserved. www.nvidia.com

    diff --git a/src/PhysX/physx/source/common/include/windows/CmWindowsLoadLibrary.h b/src/PhysX/physx/source/common/include/windows/CmWindowsLoadLibrary.h index 6a99075be..2ced199eb 100644 --- a/src/PhysX/physx/source/common/include/windows/CmWindowsLoadLibrary.h +++ b/src/PhysX/physx/source/common/include/windows/CmWindowsLoadLibrary.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/include/windows/CmWindowsModuleUpdateLoader.h b/src/PhysX/physx/source/common/include/windows/CmWindowsModuleUpdateLoader.h index 3afd86db2..a97cf34bb 100644 --- a/src/PhysX/physx/source/common/include/windows/CmWindowsModuleUpdateLoader.h +++ b/src/PhysX/physx/source/common/include/windows/CmWindowsModuleUpdateLoader.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmBitMap.h b/src/PhysX/physx/source/common/src/CmBitMap.h index 31c62853b..bbe3f124f 100644 --- a/src/PhysX/physx/source/common/src/CmBitMap.h +++ b/src/PhysX/physx/source/common/src/CmBitMap.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmBlockArray.h b/src/PhysX/physx/source/common/src/CmBlockArray.h index 2e80a9b47..585475bc6 100644 --- a/src/PhysX/physx/source/common/src/CmBlockArray.h +++ b/src/PhysX/physx/source/common/src/CmBlockArray.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmCollection.cpp b/src/PhysX/physx/source/common/src/CmCollection.cpp index 87e9e1ccb..16a06d1bd 100644 --- a/src/PhysX/physx/source/common/src/CmCollection.cpp +++ b/src/PhysX/physx/source/common/src/CmCollection.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmCollection.h b/src/PhysX/physx/source/common/src/CmCollection.h index b80ec256b..6b73366b9 100644 --- a/src/PhysX/physx/source/common/src/CmCollection.h +++ b/src/PhysX/physx/source/common/src/CmCollection.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmConeLimitHelper.h b/src/PhysX/physx/source/common/src/CmConeLimitHelper.h index edd921b79..0423b10e9 100644 --- a/src/PhysX/physx/source/common/src/CmConeLimitHelper.h +++ b/src/PhysX/physx/source/common/src/CmConeLimitHelper.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmFlushPool.h b/src/PhysX/physx/source/common/src/CmFlushPool.h index e9e9ebe47..bc0932c6f 100644 --- a/src/PhysX/physx/source/common/src/CmFlushPool.h +++ b/src/PhysX/physx/source/common/src/CmFlushPool.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmIDPool.h b/src/PhysX/physx/source/common/src/CmIDPool.h index ea848face..20868058f 100644 --- a/src/PhysX/physx/source/common/src/CmIDPool.h +++ b/src/PhysX/physx/source/common/src/CmIDPool.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmIO.h b/src/PhysX/physx/source/common/src/CmIO.h index 5d290a0fb..c81618557 100644 --- a/src/PhysX/physx/source/common/src/CmIO.h +++ b/src/PhysX/physx/source/common/src/CmIO.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmMathUtils.cpp b/src/PhysX/physx/source/common/src/CmMathUtils.cpp index 70c71326e..03806a589 100644 --- a/src/PhysX/physx/source/common/src/CmMathUtils.cpp +++ b/src/PhysX/physx/source/common/src/CmMathUtils.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmMatrix34.h b/src/PhysX/physx/source/common/src/CmMatrix34.h index 01d8f34ea..bb85a1263 100644 --- a/src/PhysX/physx/source/common/src/CmMatrix34.h +++ b/src/PhysX/physx/source/common/src/CmMatrix34.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmPhysXCommon.h b/src/PhysX/physx/source/common/src/CmPhysXCommon.h index 6ff0387c6..946a79e39 100644 --- a/src/PhysX/physx/source/common/src/CmPhysXCommon.h +++ b/src/PhysX/physx/source/common/src/CmPhysXCommon.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmPool.h b/src/PhysX/physx/source/common/src/CmPool.h index a28ea0307..56276d52f 100644 --- a/src/PhysX/physx/source/common/src/CmPool.h +++ b/src/PhysX/physx/source/common/src/CmPool.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -54,26 +54,21 @@ class PoolList : public Ps::AllocatorTraits::Type typedef typename Ps::AllocatorTraits::Type Alloc; PX_NOCOPY(PoolList) public: - PX_INLINE PoolList(const Alloc& alloc, ArgumentType* argument, PxU32 eltsPerSlab, PxU32 maxSlabs) + PX_INLINE PoolList(const Alloc& alloc, ArgumentType* argument, PxU32 eltsPerSlab) : Alloc(alloc), mEltsPerSlab(eltsPerSlab), - mMaxSlabs(maxSlabs), mSlabCount(0), mFreeList(0), mFreeCount(0), - mSlabs(reinterpret_cast(Alloc::allocate(maxSlabs * sizeof(T*), __FILE__, __LINE__))), + mSlabs(NULL), mArgument(argument) { PX_ASSERT(mEltsPerSlab>0); - // either maxSlabs = 1 (non-resizable pool), or elts per slab must be a power of two - PX_ASSERT((maxSlabs==1) || ((maxSlabs < 8192) && (mEltsPerSlab & (mEltsPerSlab-1))) == 0); + PX_ASSERT((mEltsPerSlab & (mEltsPerSlab-1)) == 0); mLog2EltsPerSlab = 0; - if(mMaxSlabs>1) - { - for(mLog2EltsPerSlab=0; mEltsPerSlab!=PxU32(1<= mMaxSlabs) - return nbElements; //Return only nbFromFree because we're not going to allocate any slabs. Seriously, we need to nuke this "maxSlabs" stuff ASAP! - //allocate our slabs... PxU32 freeCount = mFreeCount; @@ -145,17 +136,29 @@ public: if (!mAddr) return nbElements; //Allocation failed so only return the set of elements we could allocate from the free list - mSlabs[mSlabCount++] = mAddr; + PxU32 newSlabCount = mSlabCount+1; // Make sure the usage bitmap is up-to-size - if (mUseBitmap.size() < mSlabCount*mEltsPerSlab) + if (mUseBitmap.size() < newSlabCount*mEltsPerSlab) { - mUseBitmap.resize(2 * mSlabCount*mEltsPerSlab); //set last element as not used + mUseBitmap.resize(2 * newSlabCount*mEltsPerSlab); //set last element as not used if (mFreeList) - PX_FREE(mFreeList); - mFreeList = reinterpret_cast(Alloc::allocate(2 * mSlabCount * mEltsPerSlab * sizeof(T*), __FILE__, __LINE__)); + Alloc::deallocate(mFreeList); + mFreeList = reinterpret_cast(Alloc::allocate(2 * newSlabCount * mEltsPerSlab * sizeof(T*), __FILE__, __LINE__)); + + T** slabs = reinterpret_cast(Alloc::allocate(2* newSlabCount *sizeof(T*), __FILE__, __LINE__)); + if (mSlabs) + { + PxMemCopy(slabs, mSlabs, sizeof(T*)*newSlabCount); + + Alloc::deallocate(mSlabs); + } + + mSlabs = slabs; } + mSlabs[mSlabCount++] = mAddr; + PxU32 baseIndex = (mSlabCount-1) * mEltsPerSlab; //Now add all these to the mFreeList and elements... @@ -217,7 +220,7 @@ public: { if(index>=mSlabCount*mEltsPerSlab || !(mUseBitmap.boundedTest(index))) return 0; - return mMaxSlabs==1 ? mSlabs[0]+index : mSlabs[index>>mLog2EltsPerSlab] + (index&(mEltsPerSlab-1)); + return mSlabs[index>>mLog2EltsPerSlab] + (index&(mEltsPerSlab-1)); } /* @@ -225,29 +228,37 @@ public: */ PX_FORCE_INLINE T* findByIndexFast(PxU32 index) const { - PX_ASSERT(mMaxSlabs != 1); return mSlabs[index>>mLog2EltsPerSlab] + (index&(mEltsPerSlab-1)); } bool extend() { - if(mSlabCount == mMaxSlabs) - return false; T * mAddr = reinterpret_cast(Alloc::allocate(mEltsPerSlab * sizeof(T), __FILE__, __LINE__)); if(!mAddr) return false; - mSlabs[mSlabCount++] = mAddr; - + PxU32 newSlabCount = mSlabCount+1; // Make sure the usage bitmap is up-to-size - if(mUseBitmap.size() < mSlabCount*mEltsPerSlab) + if(mUseBitmap.size() < newSlabCount*mEltsPerSlab) { - mUseBitmap.resize(2*mSlabCount*mEltsPerSlab); //set last element as not used + mUseBitmap.resize(2* newSlabCount*mEltsPerSlab); //set last element as not used if(mFreeList) - PX_FREE(mFreeList); - mFreeList = reinterpret_cast(Alloc::allocate(2*mSlabCount * mEltsPerSlab * sizeof(T*), __FILE__, __LINE__)); + Alloc::deallocate(mFreeList); + mFreeList = reinterpret_cast(Alloc::allocate(2* newSlabCount * mEltsPerSlab * sizeof(T*), __FILE__, __LINE__)); + + T** slabs = reinterpret_cast(Alloc::allocate(2 * newSlabCount * sizeof(T*), __FILE__, __LINE__)); + if (mSlabs) + { + PxMemCopy(slabs, mSlabs, sizeof(T*)*newSlabCount); + + Alloc::deallocate(mSlabs); + } + + mSlabs = slabs; } + + mSlabs[mSlabCount++] = mAddr; // Add to free list in descending order so that lowest indices get allocated first - // the FW context code currently *relies* on this behavior to grab the zero-index volume @@ -275,7 +286,6 @@ public: private: const PxU32 mEltsPerSlab; - const PxU32 mMaxSlabs; PxU32 mSlabCount; PxU32 mLog2EltsPerSlab; T** mFreeList; diff --git a/src/PhysX/physx/source/common/src/CmPreallocatingPool.h b/src/PhysX/physx/source/common/src/CmPreallocatingPool.h index e3b9ece83..704944b55 100644 --- a/src/PhysX/physx/source/common/src/CmPreallocatingPool.h +++ b/src/PhysX/physx/source/common/src/CmPreallocatingPool.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmPriorityQueue.h b/src/PhysX/physx/source/common/src/CmPriorityQueue.h index a1eeef523..ccec56a13 100644 --- a/src/PhysX/physx/source/common/src/CmPriorityQueue.h +++ b/src/PhysX/physx/source/common/src/CmPriorityQueue.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmPtrTable.cpp b/src/PhysX/physx/source/common/src/CmPtrTable.cpp index 2341f0a3b..888fb0bc3 100644 --- a/src/PhysX/physx/source/common/src/CmPtrTable.cpp +++ b/src/PhysX/physx/source/common/src/CmPtrTable.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmPtrTable.h b/src/PhysX/physx/source/common/src/CmPtrTable.h index cc5041d4d..933615656 100644 --- a/src/PhysX/physx/source/common/src/CmPtrTable.h +++ b/src/PhysX/physx/source/common/src/CmPtrTable.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmQueue.h b/src/PhysX/physx/source/common/src/CmQueue.h index 334a530b5..9bba870c9 100644 --- a/src/PhysX/physx/source/common/src/CmQueue.h +++ b/src/PhysX/physx/source/common/src/CmQueue.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmRadixSort.cpp b/src/PhysX/physx/source/common/src/CmRadixSort.cpp index bb0adf40e..baea6e22f 100644 --- a/src/PhysX/physx/source/common/src/CmRadixSort.cpp +++ b/src/PhysX/physx/source/common/src/CmRadixSort.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmRadixSort.h b/src/PhysX/physx/source/common/src/CmRadixSort.h index d8faf4e62..8c7419136 100644 --- a/src/PhysX/physx/source/common/src/CmRadixSort.h +++ b/src/PhysX/physx/source/common/src/CmRadixSort.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmRadixSortBuffered.cpp b/src/PhysX/physx/source/common/src/CmRadixSortBuffered.cpp index 81096309a..d1d701ea3 100644 --- a/src/PhysX/physx/source/common/src/CmRadixSortBuffered.cpp +++ b/src/PhysX/physx/source/common/src/CmRadixSortBuffered.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmRadixSortBuffered.h b/src/PhysX/physx/source/common/src/CmRadixSortBuffered.h index 9e6bcc034..96893592d 100644 --- a/src/PhysX/physx/source/common/src/CmRadixSortBuffered.h +++ b/src/PhysX/physx/source/common/src/CmRadixSortBuffered.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmRefCountable.h b/src/PhysX/physx/source/common/src/CmRefCountable.h index 361437628..06adcaf3d 100644 --- a/src/PhysX/physx/source/common/src/CmRefCountable.h +++ b/src/PhysX/physx/source/common/src/CmRefCountable.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmRenderBuffer.h b/src/PhysX/physx/source/common/src/CmRenderBuffer.h index 062bd0e34..aaffc2a57 100644 --- a/src/PhysX/physx/source/common/src/CmRenderBuffer.h +++ b/src/PhysX/physx/source/common/src/CmRenderBuffer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmRenderOutput.cpp b/src/PhysX/physx/source/common/src/CmRenderOutput.cpp index bc5b78241..9d89b96f9 100644 --- a/src/PhysX/physx/source/common/src/CmRenderOutput.cpp +++ b/src/PhysX/physx/source/common/src/CmRenderOutput.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmRenderOutput.h b/src/PhysX/physx/source/common/src/CmRenderOutput.h index 4662ed1ab..782b5628f 100644 --- a/src/PhysX/physx/source/common/src/CmRenderOutput.h +++ b/src/PhysX/physx/source/common/src/CmRenderOutput.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmScaling.h b/src/PhysX/physx/source/common/src/CmScaling.h index 53ba22345..f76f8053d 100644 --- a/src/PhysX/physx/source/common/src/CmScaling.h +++ b/src/PhysX/physx/source/common/src/CmScaling.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmSpatialVector.h b/src/PhysX/physx/source/common/src/CmSpatialVector.h index 05e7ef57c..9d51d3bd4 100644 --- a/src/PhysX/physx/source/common/src/CmSpatialVector.h +++ b/src/PhysX/physx/source/common/src/CmSpatialVector.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmTask.h b/src/PhysX/physx/source/common/src/CmTask.h index cf28c7da5..681c6eff9 100644 --- a/src/PhysX/physx/source/common/src/CmTask.h +++ b/src/PhysX/physx/source/common/src/CmTask.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmTaskPool.h b/src/PhysX/physx/source/common/src/CmTaskPool.h index 8bb36a71b..3c3e00ea0 100644 --- a/src/PhysX/physx/source/common/src/CmTaskPool.h +++ b/src/PhysX/physx/source/common/src/CmTaskPool.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmTmpMem.h b/src/PhysX/physx/source/common/src/CmTmpMem.h index 9f30304d8..a68c87dbe 100644 --- a/src/PhysX/physx/source/common/src/CmTmpMem.h +++ b/src/PhysX/physx/source/common/src/CmTmpMem.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmTransformUtils.h b/src/PhysX/physx/source/common/src/CmTransformUtils.h index fe70469b6..d3a84887a 100644 --- a/src/PhysX/physx/source/common/src/CmTransformUtils.h +++ b/src/PhysX/physx/source/common/src/CmTransformUtils.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmUtils.h b/src/PhysX/physx/source/common/src/CmUtils.h index c9480bef7..bb7c1d995 100644 --- a/src/PhysX/physx/source/common/src/CmUtils.h +++ b/src/PhysX/physx/source/common/src/CmUtils.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmVisualization.cpp b/src/PhysX/physx/source/common/src/CmVisualization.cpp index 70a54e905..3f263f3b0 100644 --- a/src/PhysX/physx/source/common/src/CmVisualization.cpp +++ b/src/PhysX/physx/source/common/src/CmVisualization.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/CmVisualization.h b/src/PhysX/physx/source/common/src/CmVisualization.h index 982cd8018..67aeb895c 100644 --- a/src/PhysX/physx/source/common/src/CmVisualization.h +++ b/src/PhysX/physx/source/common/src/CmVisualization.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/windows/CmWindowsDelayLoadHook.cpp b/src/PhysX/physx/source/common/src/windows/CmWindowsDelayLoadHook.cpp index a0424983f..5ac2b0e68 100644 --- a/src/PhysX/physx/source/common/src/windows/CmWindowsDelayLoadHook.cpp +++ b/src/PhysX/physx/source/common/src/windows/CmWindowsDelayLoadHook.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/common/src/windows/CmWindowsModuleUpdateLoader.cpp b/src/PhysX/physx/source/common/src/windows/CmWindowsModuleUpdateLoader.cpp index b10cba8d8..c94717c00 100644 --- a/src/PhysX/physx/source/common/src/windows/CmWindowsModuleUpdateLoader.cpp +++ b/src/PhysX/physx/source/common/src/windows/CmWindowsModuleUpdateLoader.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/compiler/cmake/CMakeLists.txt b/src/PhysX/physx/source/compiler/cmake/CMakeLists.txt index f8747b862..35872d525 100644 --- a/src/PhysX/physx/source/compiler/cmake/CMakeLists.txt +++ b/src/PhysX/physx/source/compiler/cmake/CMakeLists.txt @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. cmake_minimum_required(VERSION 3.7) @@ -132,9 +132,15 @@ SET(CMAKE_POSITION_INDEPENDENT_CODE ON) SET(SOURCE_DISTRO_FILE_LIST "") +SET(HEADER_GUARD_NAME "CONFIG") +SET(HEADER_CONTENT "") + # Include the platform specific CMakeLists INCLUDE(${PHYSX_ROOT_DIR}/${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/CMakeLists.txt) +# generate PxPhysXConfig.h header that will contain PhysX configuration defines like PX_PHYSX_STATIC_LIB +CONFIGURE_FILE(${CMAKE_MODULE_PATH}/template/PxIncludeTemplate.h ${PHYSX_ROOT_DIR}/include/PxConfig.h) + IF(PX_GENERATE_SOURCE_DISTRO) FOREACH(FILE_NAME ${SOURCE_DISTRO_FILE_LIST}) FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/source_distro_list.txt" "${FILE_NAME}\n") diff --git a/src/PhysX/physx/source/compiler/cmake/FastXml.cmake b/src/PhysX/physx/source/compiler/cmake/FastXml.cmake index 4ac700275..257ddccf5 100644 --- a/src/PhysX/physx/source/compiler/cmake/FastXml.cmake +++ b/src/PhysX/physx/source/compiler/cmake/FastXml.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build FastXml common diff --git a/src/PhysX/physx/source/compiler/cmake/IfTemplate.txt b/src/PhysX/physx/source/compiler/cmake/IfTemplate.txt index 5561e9ae7..4c48e99c1 100644 --- a/src/PhysX/physx/source/compiler/cmake/IfTemplate.txt +++ b/src/PhysX/physx/source/compiler/cmake/IfTemplate.txt @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. IF(TARGET_BUILD_PLATFORM STREQUAL "Windows") ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "PS4") diff --git a/src/PhysX/physx/source/compiler/cmake/LowLevel.cmake b/src/PhysX/physx/source/compiler/cmake/LowLevel.cmake index 8b97e6b98..aa51b9faf 100644 --- a/src/PhysX/physx/source/compiler/cmake/LowLevel.cmake +++ b/src/PhysX/physx/source/compiler/cmake/LowLevel.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevel common @@ -60,7 +60,6 @@ SET(LL_COMMON_COLLISION_HEADERS ) SOURCE_GROUP("Common Includes\\collision" FILES ${LL_COMMON_COLLISION_HEADERS}) SET(LL_COMMON_PIPELINE_HEADERS - ${LL_COMMON_DIR}/include/pipeline/PxcCCDStateStreamPair.h ${LL_COMMON_DIR}/include/pipeline/PxcConstraintBlockStream.h ${LL_COMMON_DIR}/include/pipeline/PxcContactCache.h ${LL_COMMON_DIR}/include/pipeline/PxcMaterialMethodImpl.h diff --git a/src/PhysX/physx/source/compiler/cmake/LowLevelAABB.cmake b/src/PhysX/physx/source/compiler/cmake/LowLevelAABB.cmake index 1a655d664..b81e3e31e 100644 --- a/src/PhysX/physx/source/compiler/cmake/LowLevelAABB.cmake +++ b/src/PhysX/physx/source/compiler/cmake/LowLevelAABB.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevelAABB common diff --git a/src/PhysX/physx/source/compiler/cmake/LowLevelDynamics.cmake b/src/PhysX/physx/source/compiler/cmake/LowLevelDynamics.cmake index 0069c413f..b55688cec 100644 --- a/src/PhysX/physx/source/compiler/cmake/LowLevelDynamics.cmake +++ b/src/PhysX/physx/source/compiler/cmake/LowLevelDynamics.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevelDynamics common diff --git a/src/PhysX/physx/source/compiler/cmake/PhysX.cmake b/src/PhysX/physx/source/compiler/cmake/PhysX.cmake index a4628160e..ddba5ac63 100644 --- a/src/PhysX/physx/source/compiler/cmake/PhysX.cmake +++ b/src/PhysX/physx/source/compiler/cmake/PhysX.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysX (PROJECT not SOLUTION) common diff --git a/src/PhysX/physx/source/compiler/cmake/PhysXCharacterKinematic.cmake b/src/PhysX/physx/source/compiler/cmake/PhysXCharacterKinematic.cmake index cd9ee9dd6..fc976e31d 100644 --- a/src/PhysX/physx/source/compiler/cmake/PhysXCharacterKinematic.cmake +++ b/src/PhysX/physx/source/compiler/cmake/PhysXCharacterKinematic.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCharacterKinematic common @@ -39,7 +39,6 @@ include(${PHYSX_ROOT_DIR}/${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/Ph SET(PHYSXCCT_HEADERS ${PHYSX_ROOT_DIR}/include/characterkinematic/PxBoxController.h ${PHYSX_ROOT_DIR}/include/characterkinematic/PxCapsuleController.h - ${PHYSX_ROOT_DIR}/include/characterkinematic/PxCharacter.h ${PHYSX_ROOT_DIR}/include/characterkinematic/PxController.h ${PHYSX_ROOT_DIR}/include/characterkinematic/PxControllerBehavior.h ${PHYSX_ROOT_DIR}/include/characterkinematic/PxControllerManager.h diff --git a/src/PhysX/physx/source/compiler/cmake/PhysXCommon.cmake b/src/PhysX/physx/source/compiler/cmake/PhysXCommon.cmake index 5bcbf8222..aac4599f9 100644 --- a/src/PhysX/physx/source/compiler/cmake/PhysXCommon.cmake +++ b/src/PhysX/physx/source/compiler/cmake/PhysXCommon.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCommon common @@ -43,7 +43,6 @@ include(${PHYSX_ROOT_DIR}/${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/Ph SET(PHYSX_COMMON_SOURCE - ${COMMON_SRC_DIR}/CmBoxPruning.cpp ${COMMON_SRC_DIR}/CmCollection.cpp ${COMMON_SRC_DIR}/CmMathUtils.cpp ${COMMON_SRC_DIR}/CmPtrTable.cpp @@ -53,7 +52,6 @@ SET(PHYSX_COMMON_SOURCE ${COMMON_SRC_DIR}/CmVisualization.cpp ${COMMON_SRC_DIR}/CmBitMap.h ${COMMON_SRC_DIR}/CmBlockArray.h - ${COMMON_SRC_DIR}/CmBoxPruning.h ${COMMON_SRC_DIR}/CmCollection.h ${COMMON_SRC_DIR}/CmConeLimitHelper.h ${COMMON_SRC_DIR}/CmFlushPool.h @@ -137,7 +135,6 @@ SET(PHYSXCOMMON_COLLISION_HEADERS SOURCE_GROUP(include\\collision FILES ${PHYSXCOMMON_COLLISION_HEADERS}) SET(PHYSXCOMMON_GU_HEADERS - ${GU_SOURCE_DIR}/include/GuAxes.h ${GU_SOURCE_DIR}/include/GuBox.h ${GU_SOURCE_DIR}/include/GuDistanceSegmentBox.h ${GU_SOURCE_DIR}/include/GuDistanceSegmentSegment.h diff --git a/src/PhysX/physx/source/compiler/cmake/PhysXCooking.cmake b/src/PhysX/physx/source/compiler/cmake/PhysXCooking.cmake index 4a7719cc9..b452a4904 100644 --- a/src/PhysX/physx/source/compiler/cmake/PhysXCooking.cmake +++ b/src/PhysX/physx/source/compiler/cmake/PhysXCooking.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCooking common diff --git a/src/PhysX/physx/source/compiler/cmake/PhysXExtensions.cmake b/src/PhysX/physx/source/compiler/cmake/PhysXExtensions.cmake index aeb868943..50454d3d8 100644 --- a/src/PhysX/physx/source/compiler/cmake/PhysXExtensions.cmake +++ b/src/PhysX/physx/source/compiler/cmake/PhysXExtensions.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXExtensions common diff --git a/src/PhysX/physx/source/compiler/cmake/PhysXFoundation.cmake b/src/PhysX/physx/source/compiler/cmake/PhysXFoundation.cmake index fb93058f3..8b164baca 100644 --- a/src/PhysX/physx/source/compiler/cmake/PhysXFoundation.cmake +++ b/src/PhysX/physx/source/compiler/cmake/PhysXFoundation.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXFoundation common @@ -40,11 +40,19 @@ SET(PHYSXFOUNDATION_HEADERS ) SOURCE_GROUP(include FILES ${PHYSXFOUNDATION_HEADERS}) +SET(PHYSXFOUNDATION_HEADERS_2 + ${PHYSX_ROOT_DIR}/include/foundation/PxAssert.h + ${PHYSX_ROOT_DIR}/include/foundation/PxFoundationConfig.h + ${PHYSX_ROOT_DIR}/include/foundation/PxMathUtils.h +) +SOURCE_GROUP(include\\foundation FILES ${PHYSXFOUNDATION_HEADERS_2}) + + SET(PXSHARED_HEADERS ${PXSHARED_PATH}/include/foundation/Px.h ${PXSHARED_PATH}/include/foundation/PxAllocatorCallback.h ${PXSHARED_PATH}/include/foundation/PxProfiler.h - ${PXSHARED_PATH}/include/foundation/PxAssert.h + ${PXSHARED_PATH}/include/foundation/PxSharedAssert.h ${PXSHARED_PATH}/include/foundation/PxBitAndData.h ${PXSHARED_PATH}/include/foundation/PxBounds3.h ${PXSHARED_PATH}/include/foundation/PxErrorCallback.h @@ -54,8 +62,7 @@ SET(PXSHARED_HEADERS ${PXSHARED_PATH}/include/foundation/PxIO.h ${PXSHARED_PATH}/include/foundation/PxMat33.h ${PXSHARED_PATH}/include/foundation/PxMat44.h - ${PXSHARED_PATH}/include/foundation/PxMath.h - ${PXSHARED_PATH}/include/foundation/PxMathUtils.h + ${PXSHARED_PATH}/include/foundation/PxMath.h ${PXSHARED_PATH}/include/foundation/PxMemory.h ${PXSHARED_PATH}/include/foundation/PxPlane.h ${PXSHARED_PATH}/include/foundation/PxPreprocessor.h @@ -131,6 +138,7 @@ ADD_LIBRARY(PhysXFoundation ${PHYSXFOUNDATION_LIBTYPE} ${PHYSXFOUNDATION_SOURCE} ${PHYSXFOUNDATION_SOURCE_HEADERS} ${PHYSXFOUNDATION_HEADERS} + ${PHYSXFOUNDATION_HEADERS_2} ${PHYSXFOUNDATION_PLATFORM_FILES} ${PXSHARED_HEADERS} ${PXSHARED_PLATFORM_HEADERS} @@ -138,6 +146,7 @@ ADD_LIBRARY(PhysXFoundation ${PHYSXFOUNDATION_LIBTYPE} # Add the headers to the install INSTALL(FILES ${PHYSXFOUNDATION_HEADERS} DESTINATION include) +INSTALL(FILES ${PHYSXFOUNDATION_HEADERS_2} DESTINATION include/foundation) INSTALL(FILES ${PHYSXFOUNDATION_SOURCE_HEADERS} DESTINATION source/foundation/include) INSTALL(FILES ${PXSHARED_HEADERS} DESTINATION ${PXSHARED_INSTALL_PREFIX}/include/foundation) @@ -189,6 +198,7 @@ IF(PX_GENERATE_SOURCE_DISTRO) LIST(APPEND SOURCE_DISTRO_FILE_LIST ${PHYSXFOUNDATION_SOURCE}) LIST(APPEND SOURCE_DISTRO_FILE_LIST ${PHYSXFOUNDATION_SOURCE_HEADERS}) LIST(APPEND SOURCE_DISTRO_FILE_LIST ${PHYSXFOUNDATION_HEADERS}) + LIST(APPEND SOURCE_DISTRO_FILE_LIST ${PHYSXFOUNDATION_HEADERS_2}) LIST(APPEND SOURCE_DISTRO_FILE_LIST ${PHYSXFOUNDATION_PLATFORM_FILES}) LIST(APPEND SOURCE_DISTRO_FILE_LIST ${PXSHARED_HEADERS}) LIST(APPEND SOURCE_DISTRO_FILE_LIST ${PXSHARED_PLATFORM_HEADERS}) diff --git a/src/PhysX/physx/source/compiler/cmake/PhysXPvdSDK.cmake b/src/PhysX/physx/source/compiler/cmake/PhysXPvdSDK.cmake index aad0e7143..470393df6 100644 --- a/src/PhysX/physx/source/compiler/cmake/PhysXPvdSDK.cmake +++ b/src/PhysX/physx/source/compiler/cmake/PhysXPvdSDK.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXPvdSDK common diff --git a/src/PhysX/physx/source/compiler/cmake/PhysXTask.cmake b/src/PhysX/physx/source/compiler/cmake/PhysXTask.cmake index 61596f3d9..b9c032e04 100644 --- a/src/PhysX/physx/source/compiler/cmake/PhysXTask.cmake +++ b/src/PhysX/physx/source/compiler/cmake/PhysXTask.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXTask common diff --git a/src/PhysX/physx/source/compiler/cmake/PhysXVehicle.cmake b/src/PhysX/physx/source/compiler/cmake/PhysXVehicle.cmake index 64ac6ff85..0e2fb4b3a 100644 --- a/src/PhysX/physx/source/compiler/cmake/PhysXVehicle.cmake +++ b/src/PhysX/physx/source/compiler/cmake/PhysXVehicle.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXVehicle common diff --git a/src/PhysX/physx/source/compiler/cmake/SceneQuery.cmake b/src/PhysX/physx/source/compiler/cmake/SceneQuery.cmake index c73b20b24..feca1ba78 100644 --- a/src/PhysX/physx/source/compiler/cmake/SceneQuery.cmake +++ b/src/PhysX/physx/source/compiler/cmake/SceneQuery.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build SceneQuery common diff --git a/src/PhysX/physx/source/compiler/cmake/SimulationController.cmake b/src/PhysX/physx/source/compiler/cmake/SimulationController.cmake index 577a75d38..219f6ab2e 100644 --- a/src/PhysX/physx/source/compiler/cmake/SimulationController.cmake +++ b/src/PhysX/physx/source/compiler/cmake/SimulationController.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build SimulationController common diff --git a/src/PhysX/physx/source/compiler/cmake/android/CMakeLists.txt b/src/PhysX/physx/source/compiler/cmake/android/CMakeLists.txt index b53ca716b..b4b2e55b4 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/CMakeLists.txt +++ b/src/PhysX/physx/source/compiler/cmake/android/CMakeLists.txt @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # We define the CXX flags for this CMakeLists and all others that are included afterwards. This is a GLOBAL setting. # If/when the solutions go standalone (say, samples and visual tests) - those CMakeLists will need to be fixed. @@ -92,3 +92,19 @@ INCLUDE(SceneQuery.cmake) INCLUDE(SimulationController.cmake) INCLUDE(FastXml.cmake) +# Set folder PhysX SDK to all common SDK source projects +SET_PROPERTY(TARGET PhysX PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXCharacterKinematic PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXCommon PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXCooking PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXExtensions PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXVehicle PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET LowLevel PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET LowLevelAABB PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET LowLevelDynamics PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET SceneQuery PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET SimulationController PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET FastXml PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXPvdSDK PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXTask PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXFoundation PROPERTY FOLDER "PhysX SDK") \ No newline at end of file diff --git a/src/PhysX/physx/source/compiler/cmake/android/FastXml.cmake b/src/PhysX/physx/source/compiler/cmake/android/FastXml.cmake index 7ba5b42da..b2788efb9 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/FastXml.cmake +++ b/src/PhysX/physx/source/compiler/cmake/android/FastXml.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build FastXml @@ -31,7 +31,7 @@ SET(FASTXML_COMPILE_DEFS # Common to all configurations - ${PHYSX_ANDROID_COMPILE_DEFS};PX_FOUNDATION_DLL=0; + ${PHYSX_ANDROID_COMPILE_DEFS}; $<$:${PHYSX_ANDROID_DEBUG_COMPILE_DEFS};> $<$:${PHYSX_ANDROID_CHECKED_COMPILE_DEFS};> diff --git a/src/PhysX/physx/source/compiler/cmake/android/LowLevel.cmake b/src/PhysX/physx/source/compiler/cmake/android/LowLevel.cmake index 8190dcae3..beb3c6ed0 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/LowLevel.cmake +++ b/src/PhysX/physx/source/compiler/cmake/android/LowLevel.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevel diff --git a/src/PhysX/physx/source/compiler/cmake/android/LowLevelAABB.cmake b/src/PhysX/physx/source/compiler/cmake/android/LowLevelAABB.cmake index 8438d7a2a..304444b80 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/LowLevelAABB.cmake +++ b/src/PhysX/physx/source/compiler/cmake/android/LowLevelAABB.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevelAABB diff --git a/src/PhysX/physx/source/compiler/cmake/android/LowLevelDynamics.cmake b/src/PhysX/physx/source/compiler/cmake/android/LowLevelDynamics.cmake index 3c0478908..3bd069f9a 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/LowLevelDynamics.cmake +++ b/src/PhysX/physx/source/compiler/cmake/android/LowLevelDynamics.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevelDynamics diff --git a/src/PhysX/physx/source/compiler/cmake/android/PhysX.cmake b/src/PhysX/physx/source/compiler/cmake/android/PhysX.cmake index be1c03fa1..fc6e1142e 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/PhysX.cmake +++ b/src/PhysX/physx/source/compiler/cmake/android/PhysX.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysX (PROJECT not SOLUTION) diff --git a/src/PhysX/physx/source/compiler/cmake/android/PhysXCharacterKinematic.cmake b/src/PhysX/physx/source/compiler/cmake/android/PhysXCharacterKinematic.cmake index 083c4a81c..6c91a11b1 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/PhysXCharacterKinematic.cmake +++ b/src/PhysX/physx/source/compiler/cmake/android/PhysXCharacterKinematic.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCharacterKinematic diff --git a/src/PhysX/physx/source/compiler/cmake/android/PhysXCommon.cmake b/src/PhysX/physx/source/compiler/cmake/android/PhysXCommon.cmake index 33846420f..cb30e4edd 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/PhysXCommon.cmake +++ b/src/PhysX/physx/source/compiler/cmake/android/PhysXCommon.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCommon diff --git a/src/PhysX/physx/source/compiler/cmake/android/PhysXCooking.cmake b/src/PhysX/physx/source/compiler/cmake/android/PhysXCooking.cmake index ea13629c4..9dd497f85 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/PhysXCooking.cmake +++ b/src/PhysX/physx/source/compiler/cmake/android/PhysXCooking.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCooking diff --git a/src/PhysX/physx/source/compiler/cmake/android/PhysXExtensions.cmake b/src/PhysX/physx/source/compiler/cmake/android/PhysXExtensions.cmake index a75161f1b..4b263095c 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/PhysXExtensions.cmake +++ b/src/PhysX/physx/source/compiler/cmake/android/PhysXExtensions.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXExtensions diff --git a/src/PhysX/physx/source/compiler/cmake/android/PhysXFoundation.cmake b/src/PhysX/physx/source/compiler/cmake/android/PhysXFoundation.cmake index 3a403b252..74015cb5a 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/PhysXFoundation.cmake +++ b/src/PhysX/physx/source/compiler/cmake/android/PhysXFoundation.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXFoundation diff --git a/src/PhysX/physx/source/compiler/cmake/android/PhysXPvdSDK.cmake b/src/PhysX/physx/source/compiler/cmake/android/PhysXPvdSDK.cmake index a38d1580c..9c89d43bd 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/PhysXPvdSDK.cmake +++ b/src/PhysX/physx/source/compiler/cmake/android/PhysXPvdSDK.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXPvdSDK diff --git a/src/PhysX/physx/source/compiler/cmake/android/PhysXTask.cmake b/src/PhysX/physx/source/compiler/cmake/android/PhysXTask.cmake index 350cf7961..e9974430f 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/PhysXTask.cmake +++ b/src/PhysX/physx/source/compiler/cmake/android/PhysXTask.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXTask diff --git a/src/PhysX/physx/source/compiler/cmake/android/PhysXVehicle.cmake b/src/PhysX/physx/source/compiler/cmake/android/PhysXVehicle.cmake index c3e9bee77..f268b5d3a 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/PhysXVehicle.cmake +++ b/src/PhysX/physx/source/compiler/cmake/android/PhysXVehicle.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXVehicle diff --git a/src/PhysX/physx/source/compiler/cmake/android/SceneQuery.cmake b/src/PhysX/physx/source/compiler/cmake/android/SceneQuery.cmake index 03e10a690..23cb7648a 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/SceneQuery.cmake +++ b/src/PhysX/physx/source/compiler/cmake/android/SceneQuery.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build SceneQuery diff --git a/src/PhysX/physx/source/compiler/cmake/android/SimulationController.cmake b/src/PhysX/physx/source/compiler/cmake/android/SimulationController.cmake index 36d435d58..bdd42a3a6 100644 --- a/src/PhysX/physx/source/compiler/cmake/android/SimulationController.cmake +++ b/src/PhysX/physx/source/compiler/cmake/android/SimulationController.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build SimulationController diff --git a/src/PhysX/physx/source/compiler/cmake/ios/CMakeLists.txt b/src/PhysX/physx/source/compiler/cmake/ios/CMakeLists.txt index bcbaf2284..4a9e55d0c 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/CMakeLists.txt +++ b/src/PhysX/physx/source/compiler/cmake/ios/CMakeLists.txt @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -ferror-limit=0 -Wall -Wextra -Werror -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-unknown-warning-option -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -gdwarf-2" CACHE INTERAL "PhysX CXX") @@ -74,3 +74,19 @@ INCLUDE(SceneQuery.cmake) INCLUDE(SimulationController.cmake) INCLUDE(FastXml.cmake) +# Set folder PhysX SDK to all common SDK source projects +SET_PROPERTY(TARGET PhysX PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXCharacterKinematic PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXCommon PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXCooking PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXExtensions PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXVehicle PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET LowLevel PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET LowLevelAABB PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET LowLevelDynamics PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET SceneQuery PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET SimulationController PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET FastXml PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXPvdSDK PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXTask PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXFoundation PROPERTY FOLDER "PhysX SDK") \ No newline at end of file diff --git a/src/PhysX/physx/source/compiler/cmake/ios/FastXml.cmake b/src/PhysX/physx/source/compiler/cmake/ios/FastXml.cmake index 299dec64b..47fec399b 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/FastXml.cmake +++ b/src/PhysX/physx/source/compiler/cmake/ios/FastXml.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build FastXml @@ -33,7 +33,7 @@ SET(FASTXML_COMPILE_DEFS # Common to all configurations - ${PHYSX_IOS_COMPILE_DEFS};PX_FOUNDATION_DLL=0; + ${PHYSX_IOS_COMPILE_DEFS}; $<$:${PHYSX_IOS_DEBUG_COMPILE_DEFS};> $<$:${PHYSX_IOS_CHECKED_COMPILE_DEFS};> diff --git a/src/PhysX/physx/source/compiler/cmake/ios/LowLevel.cmake b/src/PhysX/physx/source/compiler/cmake/ios/LowLevel.cmake index 9c0d07f0a..4a569f1f4 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/LowLevel.cmake +++ b/src/PhysX/physx/source/compiler/cmake/ios/LowLevel.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevel diff --git a/src/PhysX/physx/source/compiler/cmake/ios/LowLevelAABB.cmake b/src/PhysX/physx/source/compiler/cmake/ios/LowLevelAABB.cmake index 5ba12ba7a..75977873a 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/LowLevelAABB.cmake +++ b/src/PhysX/physx/source/compiler/cmake/ios/LowLevelAABB.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevelAABB diff --git a/src/PhysX/physx/source/compiler/cmake/ios/LowLevelDynamics.cmake b/src/PhysX/physx/source/compiler/cmake/ios/LowLevelDynamics.cmake index f2747d0e0..96158a006 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/LowLevelDynamics.cmake +++ b/src/PhysX/physx/source/compiler/cmake/ios/LowLevelDynamics.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevelDynamics diff --git a/src/PhysX/physx/source/compiler/cmake/ios/PhysX.cmake b/src/PhysX/physx/source/compiler/cmake/ios/PhysX.cmake index fe635d5ec..057cbd871 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/PhysX.cmake +++ b/src/PhysX/physx/source/compiler/cmake/ios/PhysX.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysX (PROJECT not SOLUTION) diff --git a/src/PhysX/physx/source/compiler/cmake/ios/PhysXCharacterKinematic.cmake b/src/PhysX/physx/source/compiler/cmake/ios/PhysXCharacterKinematic.cmake index af2d60b58..3dd134e03 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/PhysXCharacterKinematic.cmake +++ b/src/PhysX/physx/source/compiler/cmake/ios/PhysXCharacterKinematic.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCharacterKinematic @@ -34,7 +34,7 @@ SET(PHYSXCHARACTERKINEMATICS_COMPILE_DEFS # Common to all configurations - ${PHYSX_IOS_COMPILE_DEFS};PX_PHYSX_CHARACTER_EXPORTS;PX_PHYSX_CORE_EXPORTS;PX_FOUNDATION_DLL=1; + ${PHYSX_IOS_COMPILE_DEFS}; $<$:${PHYSX_IOS_DEBUG_COMPILE_DEFS};> $<$:${PHYSX_IOS_CHECKED_COMPILE_DEFS};> diff --git a/src/PhysX/physx/source/compiler/cmake/ios/PhysXCommon.cmake b/src/PhysX/physx/source/compiler/cmake/ios/PhysXCommon.cmake index b19f22570..a88a3bcbb 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/PhysXCommon.cmake +++ b/src/PhysX/physx/source/compiler/cmake/ios/PhysXCommon.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCommon @@ -40,7 +40,7 @@ SET(PXCOMMON_PLATFORM_INCLUDES SET(PXCOMMON_COMPILE_DEFS # Common to all configurations - ${PHYSX_IOS_COMPILE_DEFS};PX_FOUNDATION_DLL=1;PX_PHYSX_COMMON_EXPORTS; + ${PHYSX_IOS_COMPILE_DEFS}; # Switch platforms here? $<$:${PHYSX_IOS_DEBUG_COMPILE_DEFS}> diff --git a/src/PhysX/physx/source/compiler/cmake/ios/PhysXCooking.cmake b/src/PhysX/physx/source/compiler/cmake/ios/PhysXCooking.cmake index 73e6d26b2..1a76dc1e3 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/PhysXCooking.cmake +++ b/src/PhysX/physx/source/compiler/cmake/ios/PhysXCooking.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCooking diff --git a/src/PhysX/physx/source/compiler/cmake/ios/PhysXExtensions.cmake b/src/PhysX/physx/source/compiler/cmake/ios/PhysXExtensions.cmake index 773941eea..84f729f8e 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/PhysXExtensions.cmake +++ b/src/PhysX/physx/source/compiler/cmake/ios/PhysXExtensions.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXExtensions diff --git a/src/PhysX/physx/source/compiler/cmake/ios/PhysXFoundation.cmake b/src/PhysX/physx/source/compiler/cmake/ios/PhysXFoundation.cmake index d047086fa..d44cc573c 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/PhysXFoundation.cmake +++ b/src/PhysX/physx/source/compiler/cmake/ios/PhysXFoundation.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXFoundation diff --git a/src/PhysX/physx/source/compiler/cmake/ios/PhysXPvdSDK.cmake b/src/PhysX/physx/source/compiler/cmake/ios/PhysXPvdSDK.cmake index ba98d234e..a19143ff6 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/PhysXPvdSDK.cmake +++ b/src/PhysX/physx/source/compiler/cmake/ios/PhysXPvdSDK.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXPvdSDK diff --git a/src/PhysX/physx/source/compiler/cmake/ios/PhysXTask.cmake b/src/PhysX/physx/source/compiler/cmake/ios/PhysXTask.cmake index 687e798ac..343de5606 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/PhysXTask.cmake +++ b/src/PhysX/physx/source/compiler/cmake/ios/PhysXTask.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXTask @@ -31,7 +31,7 @@ SET(PHYSXTASK_COMPILE_DEFS - ${PHYSX_IOS_COMPILE_DEFS};PX_FOUNDATION_DLL=0; + ${PHYSX_IOS_COMPILE_DEFS}; $<$:${PHYSX_IOS_DEBUG_COMPILE_DEFS};> $<$:${PHYSX_IOS_CHECKED_COMPILE_DEFS};> $<$:${PHYSX_IOS_PROFILE_COMPILE_DEFS};> diff --git a/src/PhysX/physx/source/compiler/cmake/ios/PhysXVehicle.cmake b/src/PhysX/physx/source/compiler/cmake/ios/PhysXVehicle.cmake index e5e5a477e..26de80fb6 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/PhysXVehicle.cmake +++ b/src/PhysX/physx/source/compiler/cmake/ios/PhysXVehicle.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXVehicle diff --git a/src/PhysX/physx/source/compiler/cmake/ios/SceneQuery.cmake b/src/PhysX/physx/source/compiler/cmake/ios/SceneQuery.cmake index f00560aa4..7df44d20e 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/SceneQuery.cmake +++ b/src/PhysX/physx/source/compiler/cmake/ios/SceneQuery.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build SceneQuery diff --git a/src/PhysX/physx/source/compiler/cmake/ios/SimulationController.cmake b/src/PhysX/physx/source/compiler/cmake/ios/SimulationController.cmake index bf3309e65..68045f96f 100644 --- a/src/PhysX/physx/source/compiler/cmake/ios/SimulationController.cmake +++ b/src/PhysX/physx/source/compiler/cmake/ios/SimulationController.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build SimulationController diff --git a/src/PhysX/physx/source/compiler/cmake/linux/CMakeLists.txt b/src/PhysX/physx/source/compiler/cmake/linux/CMakeLists.txt index 65ba87305..85465dc32 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/CMakeLists.txt +++ b/src/PhysX/physx/source/compiler/cmake/linux/CMakeLists.txt @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. STRING(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWERCASE) @@ -81,6 +81,16 @@ IF(PX_GENERATE_GPU_PROJECTS_ONLY) INCLUDE(PhysXCudaContextManager.cmake) INCLUDE(PhysXArticulationGpu.cmake) INCLUDE(PhysXGpu.cmake) # must be last + + SET_PROPERTY(TARGET PhysXBroadphaseGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXCommonGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXNarrowphaseGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXSimulationControllerGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXArticulationGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXSolverGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET CloudGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXCudaContextManager PROPERTY FOLDER "PhysX SDK/GPU") ELSE() INCLUDE(PhysXFoundation.cmake) INCLUDE(LowLevel.cmake) @@ -97,6 +107,23 @@ ELSE() INCLUDE(FastXml.cmake) INCLUDE(PhysXPvdSDK.cmake) INCLUDE(PhysXTask.cmake) + + # Set folder PhysX SDK to all common SDK source projects + SET_PROPERTY(TARGET PhysX PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXCharacterKinematic PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXCommon PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXCooking PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXExtensions PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXVehicle PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET LowLevel PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET LowLevelAABB PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET LowLevelDynamics PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET SceneQuery PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET SimulationController PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET FastXml PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXPvdSDK PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXTask PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXFoundation PROPERTY FOLDER "PhysX SDK") SET(PHYSXDISTRO_LIBS PhysXFoundation PhysX PhysXCharacterKinematic PhysXPvdSDK PhysXCommon PhysXCooking PhysXExtensions PhysXVehicle) @@ -110,6 +137,16 @@ ELSE() INCLUDE(PhysXCudaContextManager.cmake) INCLUDE(PhysXArticulationGpu.cmake) INCLUDE(PhysXGpu.cmake) # must be last + + SET_PROPERTY(TARGET PhysXBroadphaseGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXCommonGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXNarrowphaseGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXSimulationControllerGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXArticulationGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXSolverGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET CloudGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXCudaContextManager PROPERTY FOLDER "PhysX SDK/GPU") LIST(APPEND PHYSXDISTRO_LIBS PhysXGpu) ENDIF() diff --git a/src/PhysX/physx/source/compiler/cmake/linux/FastXml.cmake b/src/PhysX/physx/source/compiler/cmake/linux/FastXml.cmake index e2377741e..f78d11aaf 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/FastXml.cmake +++ b/src/PhysX/physx/source/compiler/cmake/linux/FastXml.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build FastXml diff --git a/src/PhysX/physx/source/compiler/cmake/linux/LowLevel.cmake b/src/PhysX/physx/source/compiler/cmake/linux/LowLevel.cmake index 20b7eddf9..83f977b06 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/LowLevel.cmake +++ b/src/PhysX/physx/source/compiler/cmake/linux/LowLevel.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevel diff --git a/src/PhysX/physx/source/compiler/cmake/linux/LowLevelAABB.cmake b/src/PhysX/physx/source/compiler/cmake/linux/LowLevelAABB.cmake index 5ff3a9592..3ae9488a2 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/LowLevelAABB.cmake +++ b/src/PhysX/physx/source/compiler/cmake/linux/LowLevelAABB.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevelAABB diff --git a/src/PhysX/physx/source/compiler/cmake/linux/LowLevelDynamics.cmake b/src/PhysX/physx/source/compiler/cmake/linux/LowLevelDynamics.cmake index e7cdc1d63..4472e1085 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/LowLevelDynamics.cmake +++ b/src/PhysX/physx/source/compiler/cmake/linux/LowLevelDynamics.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevelDynamics diff --git a/src/PhysX/physx/source/compiler/cmake/linux/PhysX.cmake b/src/PhysX/physx/source/compiler/cmake/linux/PhysX.cmake index 5ab23e0d2..0e324d99c 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/PhysX.cmake +++ b/src/PhysX/physx/source/compiler/cmake/linux/PhysX.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysX (PROJECT not SOLUTION) @@ -34,6 +34,13 @@ SET(PHYSX_GPU_HEADERS ) SOURCE_GROUP(include\\gpu FILES ${PHYSX_GPU_HEADERS}) +SET(PHYSX_CUDACONTEXT_MANAGER_GPU_HEADERS + ${PHYSX_ROOT_DIR}/include/cudamanager/PxCudaContextManager.h + ${PHYSX_ROOT_DIR}/include/cudamanager/PxCudaMemoryManager.h + ${PHYSX_ROOT_DIR}/include/cudamanager/PxGpuCopyDesc.h + ${PHYSX_ROOT_DIR}/include/cudamanager/PxGpuCopyDescQueue.h +) +SOURCE_GROUP(include\\cudamanager FILES ${PHYSX_CUDACONTEXT_MANAGER_GPU_HEADERS}) SET(PHYSX_PLATFORM_INCLUDES ${NVTOOLSEXT_INCLUDE_DIRS} @@ -57,6 +64,7 @@ SET(PHYSX_PLATFORM_SRC_FILES ) INSTALL(FILES ${PHYSX_GPU_HEADERS} DESTINATION include/gpu) +INSTALL(FILES ${PHYSX_CUDACONTEXT_MANAGER_GPU_HEADERS} DESTINATION include/cudamanager) IF(PX_GENERATE_STATIC_LIBRARIES) SET(PHYSX_LIBTYPE STATIC) diff --git a/src/PhysX/physx/source/compiler/cmake/linux/PhysXCharacterKinematic.cmake b/src/PhysX/physx/source/compiler/cmake/linux/PhysXCharacterKinematic.cmake index daa63e5cd..28d849663 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/PhysXCharacterKinematic.cmake +++ b/src/PhysX/physx/source/compiler/cmake/linux/PhysXCharacterKinematic.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCharacterKinematic @@ -33,7 +33,7 @@ SET(PHYSXCHARACTERKINEMATICS_COMPILE_DEFS # Common to all configurations - ${PHYSX_LINUX_COMPILE_DEFS};PX_PHYSX_CHARACTER_STATIC_LIB;PX_PHYSX_STATIC_LIB; + ${PHYSX_LINUX_COMPILE_DEFS}; $<$:${PHYSX_LINUX_DEBUG_COMPILE_DEFS};> $<$:${PHYSX_LINUX_CHECKED_COMPILE_DEFS};> diff --git a/src/PhysX/physx/source/compiler/cmake/linux/PhysXCommon.cmake b/src/PhysX/physx/source/compiler/cmake/linux/PhysXCommon.cmake index 6471c8b81..b00625579 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/PhysXCommon.cmake +++ b/src/PhysX/physx/source/compiler/cmake/linux/PhysXCommon.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCommon @@ -45,7 +45,7 @@ IF(PX_GENERATE_STATIC_LIBRARIES) SET(PHYSXCOMMON_LIBTYPE STATIC) ELSE() SET(PXCOMMON_LIBTYPE_DEFS - PX_FOUNDATION_DLL=1;PX_PHYSX_COMMON_EXPORTS; + PX_PHYSX_FOUNDATION_EXPORTS;PX_PHYSX_COMMON_EXPORTS; ) SET(PHYSXCOMMON_LIBTYPE SHARED) ENDIF() diff --git a/src/PhysX/physx/source/compiler/cmake/linux/PhysXCooking.cmake b/src/PhysX/physx/source/compiler/cmake/linux/PhysXCooking.cmake index 5f11a3f5d..e65bc3a39 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/PhysXCooking.cmake +++ b/src/PhysX/physx/source/compiler/cmake/linux/PhysXCooking.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCooking @@ -41,7 +41,7 @@ IF(PX_GENERATE_STATIC_LIBRARIES) ELSE() SET(PHYSXCOOKING_LIBTYPE SHARED) SET(PXCOOKING_LIBTYPE_DEFS - PX_FOUNDATION_DLL=1;PX_PHYSX_COMMON_EXPORTS;PX_PHYSX_COOKING_EXPORTS;PX_PHYSX_LOADER_EXPORTS;PX_PHYSX_CORE_EXPORTS + PX_PHYSX_FOUNDATION_EXPORTS;PX_PHYSX_COMMON_EXPORTS;PX_PHYSX_COOKING_EXPORTS;PX_PHYSX_LOADER_EXPORTS;PX_PHYSX_CORE_EXPORTS ) ENDIF() diff --git a/src/PhysX/physx/source/compiler/cmake/linux/PhysXExtensions.cmake b/src/PhysX/physx/source/compiler/cmake/linux/PhysXExtensions.cmake index 8e5831592..3a3456112 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/PhysXExtensions.cmake +++ b/src/PhysX/physx/source/compiler/cmake/linux/PhysXExtensions.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXExtensions diff --git a/src/PhysX/physx/source/compiler/cmake/linux/PhysXFoundation.cmake b/src/PhysX/physx/source/compiler/cmake/linux/PhysXFoundation.cmake index b4520e7fd..e3e6b08a8 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/PhysXFoundation.cmake +++ b/src/PhysX/physx/source/compiler/cmake/linux/PhysXFoundation.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXFoundation @@ -35,7 +35,7 @@ ELSE() SET(PHYSXFOUNDATION_LIBTYPE SHARED) SET(PHYSXFOUNDATION_PLATFORM_LINKED_LIBS rt) SET(PXFOUNDATION_LIBTYPE_DEFS - PX_FOUNDATION_DLL=1; + PX_PHYSX_FOUNDATION_EXPORTS; ) ENDIF() diff --git a/src/PhysX/physx/source/compiler/cmake/linux/PhysXPvdSDK.cmake b/src/PhysX/physx/source/compiler/cmake/linux/PhysXPvdSDK.cmake index 164ca1f83..74060fd66 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/PhysXPvdSDK.cmake +++ b/src/PhysX/physx/source/compiler/cmake/linux/PhysXPvdSDK.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXPvdSDK diff --git a/src/PhysX/physx/source/compiler/cmake/linux/PhysXTask.cmake b/src/PhysX/physx/source/compiler/cmake/linux/PhysXTask.cmake index a896acfb4..1e8ddfb1c 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/PhysXTask.cmake +++ b/src/PhysX/physx/source/compiler/cmake/linux/PhysXTask.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXTask diff --git a/src/PhysX/physx/source/compiler/cmake/linux/PhysXVehicle.cmake b/src/PhysX/physx/source/compiler/cmake/linux/PhysXVehicle.cmake index 048d2ea02..c1686f3d9 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/PhysXVehicle.cmake +++ b/src/PhysX/physx/source/compiler/cmake/linux/PhysXVehicle.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXVehicle diff --git a/src/PhysX/physx/source/compiler/cmake/linux/SceneQuery.cmake b/src/PhysX/physx/source/compiler/cmake/linux/SceneQuery.cmake index 6a9540b6a..a3b57aef1 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/SceneQuery.cmake +++ b/src/PhysX/physx/source/compiler/cmake/linux/SceneQuery.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build SceneQuery diff --git a/src/PhysX/physx/source/compiler/cmake/linux/SimulationController.cmake b/src/PhysX/physx/source/compiler/cmake/linux/SimulationController.cmake index a15ea443a..f543e50fe 100644 --- a/src/PhysX/physx/source/compiler/cmake/linux/SimulationController.cmake +++ b/src/PhysX/physx/source/compiler/cmake/linux/SimulationController.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build SimulationController diff --git a/src/PhysX/physx/source/compiler/cmake/mac/CMakeLists.txt b/src/PhysX/physx/source/compiler/cmake/mac/CMakeLists.txt index 9e9618c62..af43d8471 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/CMakeLists.txt +++ b/src/PhysX/physx/source/compiler/cmake/mac/CMakeLists.txt @@ -23,18 +23,10 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. - -OPTION(PX_32BIT "Specifies 32bit compilation flags." OFF) -OPTION(PX_64BIT "Specifies 64bit compilation flags." OFF) - -IF (PX_32BIT) - SET(OSX_BITNESS "-arch i386") -ELSE() - SET(OSX_BITNESS "-arch x86_64") - SET(CMAKE_OSX_ARCHITECTURES "x86_64") -ENDIF() +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. +SET(OSX_BITNESS "-arch x86_64") +SET(CMAKE_OSX_ARCHITECTURES "x86_64") SET(PHYSX_CXX_FLAGS "${OSX_BITNESS} -msse2 -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-unknown-warning-option -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -gdwarf-2" CACHE INTERAL "PhysX CXX") @@ -89,4 +81,19 @@ INCLUDE(SceneQuery.cmake) INCLUDE(SimulationController.cmake) INCLUDE(FastXml.cmake) - +# Set folder PhysX SDK to all common SDK source projects +SET_PROPERTY(TARGET PhysX PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXCharacterKinematic PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXCommon PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXCooking PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXExtensions PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXVehicle PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET LowLevel PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET LowLevelAABB PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET LowLevelDynamics PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET SceneQuery PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET SimulationController PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET FastXml PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXPvdSDK PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXTask PROPERTY FOLDER "PhysX SDK") +SET_PROPERTY(TARGET PhysXFoundation PROPERTY FOLDER "PhysX SDK") diff --git a/src/PhysX/physx/source/compiler/cmake/mac/FastXml.cmake b/src/PhysX/physx/source/compiler/cmake/mac/FastXml.cmake index ac4c4d53e..15d7fa312 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/FastXml.cmake +++ b/src/PhysX/physx/source/compiler/cmake/mac/FastXml.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build FastXml @@ -34,7 +34,7 @@ SET(FASTXML_COMPILE_DEFS # Common to all configurations - ${PHYSX_MAC_COMPILE_DEFS};PX_FOUNDATION_DLL=0; + ${PHYSX_MAC_COMPILE_DEFS}; $<$:${PHYSX_MAC_DEBUG_COMPILE_DEFS};> $<$:${PHYSX_MAC_CHECKED_COMPILE_DEFS};> diff --git a/src/PhysX/physx/source/compiler/cmake/mac/LowLevel.cmake b/src/PhysX/physx/source/compiler/cmake/mac/LowLevel.cmake index b314a2f0c..1a6e92595 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/LowLevel.cmake +++ b/src/PhysX/physx/source/compiler/cmake/mac/LowLevel.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevel diff --git a/src/PhysX/physx/source/compiler/cmake/mac/LowLevelAABB.cmake b/src/PhysX/physx/source/compiler/cmake/mac/LowLevelAABB.cmake index fbec014b1..af413cf4a 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/LowLevelAABB.cmake +++ b/src/PhysX/physx/source/compiler/cmake/mac/LowLevelAABB.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevelAABB diff --git a/src/PhysX/physx/source/compiler/cmake/mac/LowLevelDynamics.cmake b/src/PhysX/physx/source/compiler/cmake/mac/LowLevelDynamics.cmake index 9069816b2..060d6573b 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/LowLevelDynamics.cmake +++ b/src/PhysX/physx/source/compiler/cmake/mac/LowLevelDynamics.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevelDynamics diff --git a/src/PhysX/physx/source/compiler/cmake/mac/PhysX.cmake b/src/PhysX/physx/source/compiler/cmake/mac/PhysX.cmake index 731c18224..954580850 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/PhysX.cmake +++ b/src/PhysX/physx/source/compiler/cmake/mac/PhysX.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysX (PROJECT not SOLUTION) diff --git a/src/PhysX/physx/source/compiler/cmake/mac/PhysXCharacterKinematic.cmake b/src/PhysX/physx/source/compiler/cmake/mac/PhysXCharacterKinematic.cmake index 055eb7911..bca24f5d0 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/PhysXCharacterKinematic.cmake +++ b/src/PhysX/physx/source/compiler/cmake/mac/PhysXCharacterKinematic.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCharacterKinematic diff --git a/src/PhysX/physx/source/compiler/cmake/mac/PhysXCommon.cmake b/src/PhysX/physx/source/compiler/cmake/mac/PhysXCommon.cmake index 739565130..2f5c96653 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/PhysXCommon.cmake +++ b/src/PhysX/physx/source/compiler/cmake/mac/PhysXCommon.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCommon diff --git a/src/PhysX/physx/source/compiler/cmake/mac/PhysXCooking.cmake b/src/PhysX/physx/source/compiler/cmake/mac/PhysXCooking.cmake index 9e882ef83..142a12119 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/PhysXCooking.cmake +++ b/src/PhysX/physx/source/compiler/cmake/mac/PhysXCooking.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCooking diff --git a/src/PhysX/physx/source/compiler/cmake/mac/PhysXExtensions.cmake b/src/PhysX/physx/source/compiler/cmake/mac/PhysXExtensions.cmake index b4c15ac27..46b465b92 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/PhysXExtensions.cmake +++ b/src/PhysX/physx/source/compiler/cmake/mac/PhysXExtensions.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXExtensions diff --git a/src/PhysX/physx/source/compiler/cmake/mac/PhysXFoundation.cmake b/src/PhysX/physx/source/compiler/cmake/mac/PhysXFoundation.cmake index 256293a02..1a3e836b7 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/PhysXFoundation.cmake +++ b/src/PhysX/physx/source/compiler/cmake/mac/PhysXFoundation.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXFoundation @@ -33,7 +33,7 @@ IF(PX_GENERATE_STATIC_LIBRARIES) SET(PHYSXFOUNDATION_LIBTYPE STATIC) ELSE() SET(PHYSXFOUNDATION_LIBTYPE SHARED) - SET(PHYSXFOUNDATION_SHARED_LIBRARY_DEFS PX_FOUNDATION_DLL=1;) + SET(PXFOUNDATION_LIBTYPE_DEFS PX_PHYSX_FOUNDATION_EXPORTS) ENDIF() SET(PXSHARED_PLATFORM_HEADERS @@ -93,7 +93,7 @@ SET(PHYSXFOUNDATION_PLATFORM_FILES SET(PHYSXFOUNDATION_COMPILE_DEFS # Common to all configurations - ${PHYSX_MAC_COMPILE_DEFS} + ${PHYSX_MAC_COMPILE_DEFS};${PXFOUNDATION_LIBTYPE_DEFS}; $<$:${PHYSX_MAC_DEBUG_COMPILE_DEFS}> $<$:${PHYSX_MAC_CHECKED_COMPILE_DEFS}> diff --git a/src/PhysX/physx/source/compiler/cmake/mac/PhysXPvdSDK.cmake b/src/PhysX/physx/source/compiler/cmake/mac/PhysXPvdSDK.cmake index 1f0506c85..d1e9e0d62 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/PhysXPvdSDK.cmake +++ b/src/PhysX/physx/source/compiler/cmake/mac/PhysXPvdSDK.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXPvdSDK diff --git a/src/PhysX/physx/source/compiler/cmake/mac/PhysXTask.cmake b/src/PhysX/physx/source/compiler/cmake/mac/PhysXTask.cmake index ec71f0c54..66cfc9f00 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/PhysXTask.cmake +++ b/src/PhysX/physx/source/compiler/cmake/mac/PhysXTask.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXTask @@ -31,7 +31,7 @@ SET(PHYSXTASK_COMPILE_DEFS - ${PHYSX_MAC_COMPILE_DEFS};PX_FOUNDATION_DLL=0; + ${PHYSX_MAC_COMPILE_DEFS}; $<$:${PHYSX_MAC_DEBUG_COMPILE_DEFS};> $<$:${PHYSX_MAC_CHECKED_COMPILE_DEFS};> $<$:${PHYSX_MAC_PROFILE_COMPILE_DEFS};> diff --git a/src/PhysX/physx/source/compiler/cmake/mac/PhysXVehicle.cmake b/src/PhysX/physx/source/compiler/cmake/mac/PhysXVehicle.cmake index c81d171e3..554c7ad54 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/PhysXVehicle.cmake +++ b/src/PhysX/physx/source/compiler/cmake/mac/PhysXVehicle.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXVehicle diff --git a/src/PhysX/physx/source/compiler/cmake/mac/SceneQuery.cmake b/src/PhysX/physx/source/compiler/cmake/mac/SceneQuery.cmake index 6222fe3a0..10fb1a6fd 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/SceneQuery.cmake +++ b/src/PhysX/physx/source/compiler/cmake/mac/SceneQuery.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build SceneQuery diff --git a/src/PhysX/physx/source/compiler/cmake/mac/SimulationController.cmake b/src/PhysX/physx/source/compiler/cmake/mac/SimulationController.cmake index 6c811d569..164ae475d 100644 --- a/src/PhysX/physx/source/compiler/cmake/mac/SimulationController.cmake +++ b/src/PhysX/physx/source/compiler/cmake/mac/SimulationController.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build SimulationController diff --git a/src/PhysX/physx/source/compiler/cmake/windows/CMakeLists.txt b/src/PhysX/physx/source/compiler/cmake/windows/CMakeLists.txt index db4d0457d..0416c42e7 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/CMakeLists.txt +++ b/src/PhysX/physx/source/compiler/cmake/windows/CMakeLists.txt @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. OPTION(PX_COPY_EXTERNAL_DLL "Copy external dlls into SDK bin directory" OFF) OPTION(PX_FLOAT_POINT_PRECISE_MATH "Float point precise math" OFF) @@ -41,9 +41,9 @@ ELSE() SET(PHYSX_FP_MODE "/fp:fast") ENDIF() IF(CMAKE_CL_64) - SET(PHYSX_CXX_FLAGS "/Wall /d2Zi+ /MP /WX /W4 /GF /GS- /GR- /Gd ${PHYSX_FP_MODE} /Oy ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") + SET(PHYSX_CXX_FLAGS "/d2Zi+ /MP /WX /W4 /GF /GS- /GR- /Gd ${PHYSX_FP_MODE} /Oy ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") ELSE() - SET(PHYSX_CXX_FLAGS "/Wall /arch:SSE2 /d2Zi+ /MP /WX /W4 /GF /GS- /GR- /Gd ${PHYSX_FP_MODE} /Oy ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") + SET(PHYSX_CXX_FLAGS "/arch:SSE2 /d2Zi+ /MP /WX /W4 /GF /GS- /GR- /Gd ${PHYSX_FP_MODE} /Oy ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") ENDIF() SET(PHYSX_CXX_FLAGS_DEBUG "/Od ${WINCRT_DEBUG} /RTCu /Zi" CACHE INTERNAL "PhysX Debug CXX Flags") @@ -53,7 +53,7 @@ SET(PHYSX_CXX_FLAGS_RELEASE "/Ox ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Rel # cache lib type defs IF(PX_GENERATE_STATIC_LIBRARIES) - SET(PHYSX_LIBTYPE_DEFS "PX_PHYSX_STATIC_LIB;PX_FOUNDATION_DLL=0;" CACHE INTERNAL "PhysX lib type defs") + SET(PHYSX_LIBTYPE_DEFS "PX_PHYSX_STATIC_LIB;" CACHE INTERNAL "PhysX lib type defs") ENDIF() IF(PX_GENERATE_GPU_STATIC_LIBRARIES) SET(PHYSXGPU_LIBTYPE_DEFS "PX_PHYSX_GPU_STATIC;" CACHE INTERNAL "PhysX GPU lib type defs") @@ -163,6 +163,18 @@ IF(PX_GENERATE_GPU_PROJECTS_ONLY) INCLUDE(PhysXCudaContextManager.cmake) INCLUDE(PhysXArticulationGpu.cmake) INCLUDE(PhysXGpu.cmake) # must be the last PhysXGPU + + SET_PROPERTY(TARGET PhysXFoundation PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXCommon PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXBroadphaseGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXCommonGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXNarrowphaseGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXSimulationControllerGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXArticulationGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXSolverGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET CloudGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXCudaContextManager PROPERTY FOLDER "PhysX SDK/GPU") SET(PHYSXDISTRO_LIBS PhysXGpu) INSTALL( @@ -186,6 +198,23 @@ ELSE() INCLUDE(FastXml.cmake) INCLUDE(PhysXPvdSDK.cmake) INCLUDE(PhysXTask.cmake) + + # Set folder PhysX SDK to all common SDK source projects + SET_PROPERTY(TARGET PhysX PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXCharacterKinematic PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXCommon PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXCooking PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXExtensions PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXVehicle PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET LowLevel PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET LowLevelAABB PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET LowLevelDynamics PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET SceneQuery PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET SimulationController PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET FastXml PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXPvdSDK PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXTask PROPERTY FOLDER "PhysX SDK") + SET_PROPERTY(TARGET PhysXFoundation PROPERTY FOLDER "PhysX SDK") IF(PX_GENERATE_STATIC_LIBRARIES) SET(PHYSXDISTRO_LIBS PhysXFoundation PhysX PhysXCharacterKinematic PhysXPvdSDK PhysXCommon PhysXCooking PhysXExtensions PhysXVehicle) @@ -204,6 +233,16 @@ ELSE() INCLUDE(PhysXArticulationGpu.cmake) INCLUDE(PhysXGpu.cmake) # must be the last PhysXGPU + SET_PROPERTY(TARGET PhysXBroadphaseGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXCommonGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXNarrowphaseGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXSimulationControllerGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXArticulationGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXSolverGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET CloudGpu PROPERTY FOLDER "PhysX SDK/GPU") + SET_PROPERTY(TARGET PhysXCudaContextManager PROPERTY FOLDER "PhysX SDK/GPU") + LIST(APPEND PHYSXDISTRO_LIBS PhysXGpu) ENDIF() @@ -214,3 +253,7 @@ ELSE() ) ENDIF() + +IF(PX_GENERATE_STATIC_LIBRARIES) + STRING(APPEND HEADER_CONTENT "#define PX_PHYSX_STATIC_LIB\n") +ENDIF() \ No newline at end of file diff --git a/src/PhysX/physx/source/compiler/cmake/windows/FastXml.cmake b/src/PhysX/physx/source/compiler/cmake/windows/FastXml.cmake index da1153c3c..1b86595ef 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/FastXml.cmake +++ b/src/PhysX/physx/source/compiler/cmake/windows/FastXml.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build FastXml @@ -32,7 +32,7 @@ # Use generator expressions to set config specific preprocessor definitions SET(FASTXML_COMPILE_DEFS # Common to all configurations - ${PHYSX_WINDOWS_COMPILE_DEFS};PX_FOUNDATION_DLL=0; + ${PHYSX_WINDOWS_COMPILE_DEFS}; $<$:${PHYSX_WINDOWS_DEBUG_COMPILE_DEFS};> $<$:${PHYSX_WINDOWS_CHECKED_COMPILE_DEFS};> diff --git a/src/PhysX/physx/source/compiler/cmake/windows/LowLevel.cmake b/src/PhysX/physx/source/compiler/cmake/windows/LowLevel.cmake index 7b037d3a6..3c0b1b3cb 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/LowLevel.cmake +++ b/src/PhysX/physx/source/compiler/cmake/windows/LowLevel.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevel diff --git a/src/PhysX/physx/source/compiler/cmake/windows/LowLevelAABB.cmake b/src/PhysX/physx/source/compiler/cmake/windows/LowLevelAABB.cmake index 2efd43b8b..cea99a4eb 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/LowLevelAABB.cmake +++ b/src/PhysX/physx/source/compiler/cmake/windows/LowLevelAABB.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevelAABB diff --git a/src/PhysX/physx/source/compiler/cmake/windows/LowLevelDynamics.cmake b/src/PhysX/physx/source/compiler/cmake/windows/LowLevelDynamics.cmake index facc9890d..daa3afcbb 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/LowLevelDynamics.cmake +++ b/src/PhysX/physx/source/compiler/cmake/windows/LowLevelDynamics.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build LowLevelDynamics diff --git a/src/PhysX/physx/source/compiler/cmake/windows/PhysX.cmake b/src/PhysX/physx/source/compiler/cmake/windows/PhysX.cmake index aada387ab..3f8572df9 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/PhysX.cmake +++ b/src/PhysX/physx/source/compiler/cmake/windows/PhysX.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysX (PROJECT not SOLUTION) @@ -44,10 +44,18 @@ SET(PHYSX_GPU_HEADERS ) SOURCE_GROUP(include\\gpu FILES ${PHYSX_GPU_HEADERS}) +SET(PHYSX_CUDACONTEXT_MANAGER_GPU_HEADERS + ${PHYSX_ROOT_DIR}/include/cudamanager/PxCudaContextManager.h + ${PHYSX_ROOT_DIR}/include/cudamanager/PxCudaMemoryManager.h + ${PHYSX_ROOT_DIR}/include/cudamanager/PxGpuCopyDesc.h + ${PHYSX_ROOT_DIR}/include/cudamanager/PxGpuCopyDescQueue.h +) +SOURCE_GROUP(include\\cudamanager FILES ${PHYSX_CUDACONTEXT_MANAGER_GPU_HEADERS}) + SET(PHYSX_COMMON_WINDOWS_HEADERS ${PHYSX_ROOT_DIR}/include/common/windows/PxWindowsDelayLoadHook.h ) -SOURCE_GROUP(include\\gpu FILES ${PHYSX_GPU_HEADERS}) +SOURCE_GROUP(include\\common\\windows FILES ${PHYSX_COMMON_WINDOWS_HEADERS}) SET(PHYSX_RESOURCE ${PHYSX_SOURCE_DIR}/compiler/resource_${RESOURCE_LIBPATH_SUFFIX}/PhysX.rc @@ -86,6 +94,7 @@ ENDIF() SET(PHYSX_PLATFORM_SRC_FILES ${PHYSX_GPU_HEADERS} + ${PHYSX_CUDACONTEXT_MANAGER_GPU_HEADERS} ${PHYSX_RESOURCE} ${PHYSX_COMMON_WINDOWS_HEADERS} @@ -98,6 +107,7 @@ SET(PHYSX_PLATFORM_SRC_FILES ) INSTALL(FILES ${PHYSX_GPU_HEADERS} DESTINATION include/gpu) +INSTALL(FILES ${PHYSX_CUDACONTEXT_MANAGER_GPU_HEADERS} DESTINATION include/cudamanager) INSTALL(FILES ${PHYSX_COMMON_WINDOWS_HEADERS} DESTINATION include/common/windows) IF(NV_USE_GAMEWORKS_OUTPUT_DIRS) @@ -111,7 +121,7 @@ ENDIF() IF(NOT PX_GENERATE_STATIC_LIBRARIES) SET(PXPHYSX_LIBTYPE_DEFS - PX_FOUNDATION_DLL=1;PX_PHYSX_CORE_EXPORTS; + PX_PHYSX_FOUNDATION_EXPORTS;PX_PHYSX_CORE_EXPORTS; ) ENDIF() diff --git a/src/PhysX/physx/source/compiler/cmake/windows/PhysXCharacterKinematic.cmake b/src/PhysX/physx/source/compiler/cmake/windows/PhysXCharacterKinematic.cmake index 0519de2d7..5eaf4b40c 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/PhysXCharacterKinematic.cmake +++ b/src/PhysX/physx/source/compiler/cmake/windows/PhysXCharacterKinematic.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCharacterKinematic @@ -35,7 +35,7 @@ SET(PHYSXCHARACTERKINEMATIC_LIBTYPE STATIC) SET(PHYSXCHARACTERKINEMATICS_COMPILE_DEFS # Common to all configurations - ${PHYSX_WINDOWS_COMPILE_DEFS};PX_PHYSX_CHARACTER_STATIC_LIB;${PHYSX_LIBTYPE_DEFS};${PHYSXGPU_LIBTYPE_DEFS} + ${PHYSX_WINDOWS_COMPILE_DEFS};${PHYSX_LIBTYPE_DEFS};${PHYSXGPU_LIBTYPE_DEFS} $<$:${PHYSX_WINDOWS_DEBUG_COMPILE_DEFS};> $<$:${PHYSX_WINDOWS_CHECKED_COMPILE_DEFS};> diff --git a/src/PhysX/physx/source/compiler/cmake/windows/PhysXCommon.cmake b/src/PhysX/physx/source/compiler/cmake/windows/PhysXCommon.cmake index 572f0db76..76575853b 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/PhysXCommon.cmake +++ b/src/PhysX/physx/source/compiler/cmake/windows/PhysXCommon.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCommon @@ -58,7 +58,7 @@ SET(PXCOMMON_PLATFORM_INCLUDES IF(NOT PX_GENERATE_STATIC_LIBRARIES) SET(PXCOMMON_LIBTYPE_DEFS - PX_FOUNDATION_DLL=1;PX_PHYSX_COMMON_EXPORTS; + PX_PHYSX_COMMON_EXPORTS; ) ENDIF() diff --git a/src/PhysX/physx/source/compiler/cmake/windows/PhysXCooking.cmake b/src/PhysX/physx/source/compiler/cmake/windows/PhysXCooking.cmake index 13c254ac4..85254ec0e 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/PhysXCooking.cmake +++ b/src/PhysX/physx/source/compiler/cmake/windows/PhysXCooking.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXCooking @@ -31,7 +31,7 @@ IF(NOT PX_GENERATE_STATIC_LIBRARIES) SET(PXCOOKING_LIBTYPE_DEFS - PX_FOUNDATION_DLL=1;PX_PHYSX_COMMON_EXPORTS;PX_PHYSX_COOKING_EXPORTS;PX_PHYSX_LOADER_EXPORTS;PX_PHYSX_CORE_EXPORTS + PX_PHYSX_FOUNDATION_EXPORTS;PX_PHYSX_COMMON_EXPORTS;PX_PHYSX_COOKING_EXPORTS;PX_PHYSX_LOADER_EXPORTS;PX_PHYSX_CORE_EXPORTS ) ENDIF() diff --git a/src/PhysX/physx/source/compiler/cmake/windows/PhysXExtensions.cmake b/src/PhysX/physx/source/compiler/cmake/windows/PhysXExtensions.cmake index 6fec964d7..213193206 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/PhysXExtensions.cmake +++ b/src/PhysX/physx/source/compiler/cmake/windows/PhysXExtensions.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXExtensions diff --git a/src/PhysX/physx/source/compiler/cmake/windows/PhysXFoundation.cmake b/src/PhysX/physx/source/compiler/cmake/windows/PhysXFoundation.cmake index a4ca7b522..4f4990ca3 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/PhysXFoundation.cmake +++ b/src/PhysX/physx/source/compiler/cmake/windows/PhysXFoundation.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXFoundation @@ -33,7 +33,7 @@ IF(PX_GENERATE_STATIC_LIBRARIES) SET(PHYSXFOUNDATION_LIBTYPE STATIC) ELSE() SET(PHYSXFOUNDATION_LIBTYPE SHARED) - SET(PHYSXFOUNDATION_SHARED_LIBRARY_DEFS PX_FOUNDATION_DLL=1;) + SET(PXFOUNDATION_LIBTYPE_DEFS PX_PHYSX_FOUNDATION_EXPORTS) ENDIF() SET(PXSHARED_PLATFORM_HEADERS @@ -89,12 +89,6 @@ SET(PHYSXFOUNDATION_PLATFORM_INCLUDES ${LL_SOURCE_DIR}/include/windows ) -IF(NOT PX_GENERATE_STATIC_LIBRARIES) - SET(PXFOUNDATION_LIBTYPE_DEFS - PX_FOUNDATION_DLL=1; - ) -ENDIF() - SET(PHYSXFOUNDATION_COMPILE_DEFS # Common to all configurations ${PHYSX_WINDOWS_COMPILE_DEFS};_WINSOCK_DEPRECATED_NO_WARNINGS;${PXFOUNDATION_LIBTYPE_DEFS};${PHYSX_LIBTYPE_DEFS}; diff --git a/src/PhysX/physx/source/compiler/cmake/windows/PhysXPvdSDK.cmake b/src/PhysX/physx/source/compiler/cmake/windows/PhysXPvdSDK.cmake index 06cb95478..90c6efc6d 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/PhysXPvdSDK.cmake +++ b/src/PhysX/physx/source/compiler/cmake/windows/PhysXPvdSDK.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXPvdSDK diff --git a/src/PhysX/physx/source/compiler/cmake/windows/PhysXTask.cmake b/src/PhysX/physx/source/compiler/cmake/windows/PhysXTask.cmake index dcd1013e5..cfffc737e 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/PhysXTask.cmake +++ b/src/PhysX/physx/source/compiler/cmake/windows/PhysXTask.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXTask diff --git a/src/PhysX/physx/source/compiler/cmake/windows/PhysXVehicle.cmake b/src/PhysX/physx/source/compiler/cmake/windows/PhysXVehicle.cmake index 3c8eec283..cee25b335 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/PhysXVehicle.cmake +++ b/src/PhysX/physx/source/compiler/cmake/windows/PhysXVehicle.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build PhysXVehicle diff --git a/src/PhysX/physx/source/compiler/cmake/windows/SceneQuery.cmake b/src/PhysX/physx/source/compiler/cmake/windows/SceneQuery.cmake index 76604a4dc..351495ed3 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/SceneQuery.cmake +++ b/src/PhysX/physx/source/compiler/cmake/windows/SceneQuery.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build SceneQuery diff --git a/src/PhysX/physx/source/compiler/cmake/windows/SimulationController.cmake b/src/PhysX/physx/source/compiler/cmake/windows/SimulationController.cmake index 856d9a23a..d6179ac5f 100644 --- a/src/PhysX/physx/source/compiler/cmake/windows/SimulationController.cmake +++ b/src/PhysX/physx/source/compiler/cmake/windows/SimulationController.cmake @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. # # Build SimulationController diff --git a/src/PhysX/physx/source/compiler/resource_x64/PhysX.rc b/src/PhysX/physx/source/compiler/resource_x64/PhysX.rc index e93c4a969..fb4252f22 100644 --- a/src/PhysX/physx/source/compiler/resource_x64/PhysX.rc +++ b/src/PhysX/physx/source/compiler/resource_x64/PhysX.rc @@ -70,7 +70,7 @@ BEGIN VALUE "FileDescription", "PhysX 64bit Dynamic Link Library" VALUE "FileVersion", "4.0.0.0" VALUE "InternalName", "PhysX_64" - VALUE "LegalCopyright", "Copyright (C) 2018 NVIDIA Corporation" + VALUE "LegalCopyright", "Copyright (C) 2019 NVIDIA Corporation" VALUE "OriginalFilename", "PhysX_64.dll" VALUE "ProductName", "PhysX" VALUE "ProductVersion", "4.0.0.0" diff --git a/src/PhysX/physx/source/compiler/resource_x64/PhysXCommon.rc b/src/PhysX/physx/source/compiler/resource_x64/PhysXCommon.rc index 5d8a51c48..7782d962e 100644 --- a/src/PhysX/physx/source/compiler/resource_x64/PhysXCommon.rc +++ b/src/PhysX/physx/source/compiler/resource_x64/PhysXCommon.rc @@ -70,7 +70,7 @@ BEGIN VALUE "FileDescription", "PhysXCommon 64bit Dynamic Link Library" VALUE "FileVersion", "4.0.0.0" VALUE "InternalName", "PhysXCommon_64" - VALUE "LegalCopyright", "Copyright (C) 2018 NVIDIA Corporation" + VALUE "LegalCopyright", "Copyright (C) 2019 NVIDIA Corporation" VALUE "OriginalFilename", "PhysXCommon_64.dll" VALUE "ProductName", "PhysX" VALUE "ProductVersion", "4.0.0.0" diff --git a/src/PhysX/physx/source/compiler/resource_x64/PhysXCooking.rc b/src/PhysX/physx/source/compiler/resource_x64/PhysXCooking.rc index 577b8060d..235effbb2 100644 --- a/src/PhysX/physx/source/compiler/resource_x64/PhysXCooking.rc +++ b/src/PhysX/physx/source/compiler/resource_x64/PhysXCooking.rc @@ -73,7 +73,7 @@ BEGIN VALUE "FileDescription", "PhysXCooking 64bit Dynamic Link Library" VALUE "FileVersion", "4.0.0.0" VALUE "InternalName", "PhysXCooking_64" - VALUE "LegalCopyright", "Copyright (C) 2018 NVIDIA Corporation" + VALUE "LegalCopyright", "Copyright (C) 2019 NVIDIA Corporation" VALUE "OriginalFilename", "PhysXCooking_64.dll" VALUE "ProductName", "PhysX" VALUE "ProductVersion", "4.0.0.0" diff --git a/src/PhysX/physx/source/compiler/resource_x64/PhysXFoundation.rc b/src/PhysX/physx/source/compiler/resource_x64/PhysXFoundation.rc index f2e1701b6..16a0ff05f 100644 Binary files a/src/PhysX/physx/source/compiler/resource_x64/PhysXFoundation.rc and b/src/PhysX/physx/source/compiler/resource_x64/PhysXFoundation.rc differ diff --git a/src/PhysX/physx/source/compiler/resource_x64/resource.h b/src/PhysX/physx/source/compiler/resource_x64/resource.h index f7e903232..974fe21ed 100644 --- a/src/PhysX/physx/source/compiler/resource_x64/resource.h +++ b/src/PhysX/physx/source/compiler/resource_x64/resource.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/compiler/resource_x86/PhysX.rc b/src/PhysX/physx/source/compiler/resource_x86/PhysX.rc index 68221cbe9..d3223ec7d 100644 --- a/src/PhysX/physx/source/compiler/resource_x86/PhysX.rc +++ b/src/PhysX/physx/source/compiler/resource_x86/PhysX.rc @@ -70,7 +70,7 @@ BEGIN VALUE "FileDescription", "PhysX 32bit Dynamic Link Library" VALUE "FileVersion", "4.0.0.0" VALUE "InternalName", "PhysX_32" - VALUE "LegalCopyright", "Copyright (C) 2018 NVIDIA Corporation" + VALUE "LegalCopyright", "Copyright (C) 2019 NVIDIA Corporation" VALUE "OriginalFilename", "PhysX_32.dll" VALUE "ProductName", "PhysX" VALUE "ProductVersion", "4.0.0.0" diff --git a/src/PhysX/physx/source/compiler/resource_x86/PhysXCommon.rc b/src/PhysX/physx/source/compiler/resource_x86/PhysXCommon.rc index 85691030c..d0c59e5ab 100644 --- a/src/PhysX/physx/source/compiler/resource_x86/PhysXCommon.rc +++ b/src/PhysX/physx/source/compiler/resource_x86/PhysXCommon.rc @@ -74,7 +74,7 @@ BEGIN VALUE "FileDescription", "PhysXCommon 32bit Dynamic Link Library" VALUE "FileVersion", "4.0.0.0" VALUE "InternalName", "PhysXCommon_32" - VALUE "LegalCopyright", "Copyright (C) 2018 NVIDIA Corporation" + VALUE "LegalCopyright", "Copyright (C) 2019 NVIDIA Corporation" VALUE "OriginalFilename", "PhysXCommon_32.dll" VALUE "ProductName", "PhysX" VALUE "ProductVersion", "4.0.0.0" diff --git a/src/PhysX/physx/source/compiler/resource_x86/PhysXCooking.rc b/src/PhysX/physx/source/compiler/resource_x86/PhysXCooking.rc index 7a3544042..2fcf20442 100644 --- a/src/PhysX/physx/source/compiler/resource_x86/PhysXCooking.rc +++ b/src/PhysX/physx/source/compiler/resource_x86/PhysXCooking.rc @@ -73,7 +73,7 @@ BEGIN VALUE "FileDescription", "PhysXCooking 32bit Dynamic Link Library" VALUE "FileVersion", "4.0.0.0" VALUE "InternalName", "PhysXCooking_32" - VALUE "LegalCopyright", "Copyright (C) 2018 NVIDIA Corporation" + VALUE "LegalCopyright", "Copyright (C) 2019 NVIDIA Corporation" VALUE "OriginalFilename", "PhysXCooking_32.dll" VALUE "ProductName", "PhysX" VALUE "ProductVersion", "4.0.0.0" diff --git a/src/PhysX/physx/source/compiler/resource_x86/PhysXFoundation.rc b/src/PhysX/physx/source/compiler/resource_x86/PhysXFoundation.rc index 0f7ccc372..39bc201f0 100644 Binary files a/src/PhysX/physx/source/compiler/resource_x86/PhysXFoundation.rc and b/src/PhysX/physx/source/compiler/resource_x86/PhysXFoundation.rc differ diff --git a/src/PhysX/physx/source/compiler/resource_x86/resource.h b/src/PhysX/physx/source/compiler/resource_x86/resource.h index db7f1710c..467c4db33 100644 --- a/src/PhysX/physx/source/compiler/resource_x86/resource.h +++ b/src/PhysX/physx/source/compiler/resource_x86/resource.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/fastxml/include/PsFastXml.h b/src/PhysX/physx/source/fastxml/include/PsFastXml.h index 9ab55bbac..eee2430ec 100644 --- a/src/PhysX/physx/source/fastxml/include/PsFastXml.h +++ b/src/PhysX/physx/source/fastxml/include/PsFastXml.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/fastxml/src/PsFastXml.cpp b/src/PhysX/physx/source/fastxml/src/PsFastXml.cpp index 7aeba4b0e..7a19ced00 100644 --- a/src/PhysX/physx/source/fastxml/src/PsFastXml.cpp +++ b/src/PhysX/physx/source/fastxml/src/PsFastXml.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/filebuf/include/PsAsciiConversion.h b/src/PhysX/physx/source/filebuf/include/PsAsciiConversion.h index 5f74c07f8..ebeebb183 100644 --- a/src/PhysX/physx/source/filebuf/include/PsAsciiConversion.h +++ b/src/PhysX/physx/source/filebuf/include/PsAsciiConversion.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PSFILEBUFFER_PSASCIICONVERSION_H #define PSFILEBUFFER_PSASCIICONVERSION_H diff --git a/src/PhysX/physx/source/filebuf/include/PsAsciiConversion.inl b/src/PhysX/physx/source/filebuf/include/PsAsciiConversion.inl index aa84e84a7..f034ce491 100644 --- a/src/PhysX/physx/source/filebuf/include/PsAsciiConversion.inl +++ b/src/PhysX/physx/source/filebuf/include/PsAsciiConversion.inl @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. /*! \file diff --git a/src/PhysX/physx/source/filebuf/include/PsFileBuffer.h b/src/PhysX/physx/source/filebuf/include/PsFileBuffer.h index 965df8fad..3ddcf2a53 100644 --- a/src/PhysX/physx/source/filebuf/include/PsFileBuffer.h +++ b/src/PhysX/physx/source/filebuf/include/PsFileBuffer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PSFILEBUFFER_PSFILEBUFFER_H #define PSFILEBUFFER_PSFILEBUFFER_H diff --git a/src/PhysX/physx/source/filebuf/include/PsIOStream.h b/src/PhysX/physx/source/filebuf/include/PsIOStream.h index e32330c91..e4a444e48 100644 --- a/src/PhysX/physx/source/filebuf/include/PsIOStream.h +++ b/src/PhysX/physx/source/filebuf/include/PsIOStream.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PSFILEBUFFER_PSIOSTREAM_H #define PSFILEBUFFER_PSIOSTREAM_H diff --git a/src/PhysX/physx/source/filebuf/include/PsIOStream.inl b/src/PhysX/physx/source/filebuf/include/PsIOStream.inl index 74f7e2066..ebbac63ed 100644 --- a/src/PhysX/physx/source/filebuf/include/PsIOStream.inl +++ b/src/PhysX/physx/source/filebuf/include/PsIOStream.inl @@ -23,43 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. - - -/* - * Copyright 2009-2018 NVIDIA Corporation. All rights reserved. - * - * NOTICE TO USER: - * - * This source code is subject to NVIDIA ownership rights under U.S. and - * international Copyright laws. Users and possessors of this source code - * are hereby granted a nonexclusive, royalty-free license to use this code - * in individual and commercial software. - * - * NVIDIA MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE - * CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR - * IMPLIED WARRANTY OF ANY KIND. NVIDIA DISCLAIMS ALL WARRANTIES WITH - * REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE. - * IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL, - * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE - * OR PERFORMANCE OF THIS SOURCE CODE. - * - * U.S. Government End Users. This source code is a "commercial item" as - * that term is defined at 48 C.F.R. 2.101 (OCT 1995), consisting of - * "commercial computer software" and "commercial computer software - * documentation" as such terms are used in 48 C.F.R. 12.212 (SEPT 1995) - * and is provided to the U.S. Government only as a commercial end item. - * Consistent with 48 C.F.R.12.212 and 48 C.F.R. 227.7202-1 through - * 227.7202-4 (JUNE 1995), all U.S. Government End Users acquire the - * source code with only those rights set forth herein. - * - * Any use of this source code in individual and commercial software must - * include, in the user documentation and internal comments to the code, - * the above Disclaimer and U.S. Government End Users Notice. - */ +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. /*! \file diff --git a/src/PhysX/physx/source/filebuf/include/PsMemoryBuffer.h b/src/PhysX/physx/source/filebuf/include/PsMemoryBuffer.h index ae0bc8da5..9b6fd2830 100644 --- a/src/PhysX/physx/source/filebuf/include/PsMemoryBuffer.h +++ b/src/PhysX/physx/source/filebuf/include/PsMemoryBuffer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PSFILEBUFFER_PSMEMORYBUFFER_H #define PSFILEBUFFER_PSMEMORYBUFFER_H diff --git a/src/PhysX/physx/source/foundation/include/Ps.h b/src/PhysX/physx/source/foundation/include/Ps.h index 7827ca13d..2283f3441 100644 --- a/src/PhysX/physx/source/foundation/include/Ps.h +++ b/src/PhysX/physx/source/foundation/include/Ps.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsAlignedMalloc.h b/src/PhysX/physx/source/foundation/include/PsAlignedMalloc.h index 50fdbe954..e6870ec8e 100644 --- a/src/PhysX/physx/source/foundation/include/PsAlignedMalloc.h +++ b/src/PhysX/physx/source/foundation/include/PsAlignedMalloc.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsAlloca.h b/src/PhysX/physx/source/foundation/include/PsAlloca.h index a264eb72a..20201ac49 100644 --- a/src/PhysX/physx/source/foundation/include/PsAlloca.h +++ b/src/PhysX/physx/source/foundation/include/PsAlloca.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsAllocator.h b/src/PhysX/physx/source/foundation/include/PsAllocator.h index 9de5d81c0..679dac912 100644 --- a/src/PhysX/physx/source/foundation/include/PsAllocator.h +++ b/src/PhysX/physx/source/foundation/include/PsAllocator.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsAoS.h b/src/PhysX/physx/source/foundation/include/PsAoS.h index 128e99fb6..d99cad040 100644 --- a/src/PhysX/physx/source/foundation/include/PsAoS.h +++ b/src/PhysX/physx/source/foundation/include/PsAoS.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsArray.h b/src/PhysX/physx/source/foundation/include/PsArray.h index 0282899a1..68b833090 100644 --- a/src/PhysX/physx/source/foundation/include/PsArray.h +++ b/src/PhysX/physx/source/foundation/include/PsArray.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsAtomic.h b/src/PhysX/physx/source/foundation/include/PsAtomic.h index 58ca22bd1..05b2be1f3 100644 --- a/src/PhysX/physx/source/foundation/include/PsAtomic.h +++ b/src/PhysX/physx/source/foundation/include/PsAtomic.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -31,6 +31,7 @@ #define PSFOUNDATION_PSATOMIC_H #include "Ps.h" +#include "foundation/PxFoundationConfig.h" namespace physx { diff --git a/src/PhysX/physx/source/foundation/include/PsBasicTemplates.h b/src/PhysX/physx/source/foundation/include/PsBasicTemplates.h index bd4f82da9..be4ac025d 100644 --- a/src/PhysX/physx/source/foundation/include/PsBasicTemplates.h +++ b/src/PhysX/physx/source/foundation/include/PsBasicTemplates.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsBitUtils.h b/src/PhysX/physx/source/foundation/include/PsBitUtils.h index b01fb532b..1f5533e8d 100644 --- a/src/PhysX/physx/source/foundation/include/PsBitUtils.h +++ b/src/PhysX/physx/source/foundation/include/PsBitUtils.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsBroadcast.h b/src/PhysX/physx/source/foundation/include/PsBroadcast.h index 242bf81f6..b05f5f856 100644 --- a/src/PhysX/physx/source/foundation/include/PsBroadcast.h +++ b/src/PhysX/physx/source/foundation/include/PsBroadcast.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsCpu.h b/src/PhysX/physx/source/foundation/include/PsCpu.h index 11df8cf7e..abac9c738 100644 --- a/src/PhysX/physx/source/foundation/include/PsCpu.h +++ b/src/PhysX/physx/source/foundation/include/PsCpu.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsFPU.h b/src/PhysX/physx/source/foundation/include/PsFPU.h index f599d21fc..5891d47b1 100644 --- a/src/PhysX/physx/source/foundation/include/PsFPU.h +++ b/src/PhysX/physx/source/foundation/include/PsFPU.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -33,21 +33,13 @@ #include "Ps.h" #include "PsIntrinsics.h" -#define PX_IR(x) ((uint32_t&)(x)) -#define PX_SIR(x) ((int32_t&)(x)) -#define PX_FR(x) ((float&)(x)) - -// signed integer representation of a floating-point value. - -// Floating-point representation of a integer value. - -#define PX_SIGN_BITMASK 0x80000000 +#define PX_IR(x) ((uint32_t&)(x)) // integer representation of a floating-point value. +#define PX_SIR(x) ((int32_t&)(x)) // signed integer representation of a floating-point value. +#define PX_FR(x) ((float&)(x)) // floating-point representation of a integer value. #define PX_FPU_GUARD shdfnd::FPUGuard scopedFpGuard; #define PX_SIMD_GUARD shdfnd::SIMDGuard scopedFpGuard; -#define PX_SUPPORT_GUARDS (PX_WINDOWS_FAMILY || PX_XBOXONE || (PX_LINUX && (PX_X86 || PX_X64)) || PX_PS4 || PX_OSX) - namespace physx { namespace shdfnd @@ -69,9 +61,7 @@ class SIMDGuard PX_INLINE SIMDGuard(); // set simd control word for PhysX PX_INLINE ~SIMDGuard(); // restore simd control word private: -#if PX_SUPPORT_GUARDS uint32_t mControlWord; -#endif }; /** diff --git a/src/PhysX/physx/source/foundation/include/PsFoundation.h b/src/PhysX/physx/source/foundation/include/PsFoundation.h index e95753fbd..2de371259 100644 --- a/src/PhysX/physx/source/foundation/include/PsFoundation.h +++ b/src/PhysX/physx/source/foundation/include/PsFoundation.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsHash.h b/src/PhysX/physx/source/foundation/include/PsHash.h index 786907033..9cb6e5391 100644 --- a/src/PhysX/physx/source/foundation/include/PsHash.h +++ b/src/PhysX/physx/source/foundation/include/PsHash.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsHashInternals.h b/src/PhysX/physx/source/foundation/include/PsHashInternals.h index 89d0265e6..06cc5d837 100644 --- a/src/PhysX/physx/source/foundation/include/PsHashInternals.h +++ b/src/PhysX/physx/source/foundation/include/PsHashInternals.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsHashMap.h b/src/PhysX/physx/source/foundation/include/PsHashMap.h index f5913fb96..ce292b99a 100644 --- a/src/PhysX/physx/source/foundation/include/PsHashMap.h +++ b/src/PhysX/physx/source/foundation/include/PsHashMap.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsHashSet.h b/src/PhysX/physx/source/foundation/include/PsHashSet.h index 95eae09a6..f0314c7b7 100644 --- a/src/PhysX/physx/source/foundation/include/PsHashSet.h +++ b/src/PhysX/physx/source/foundation/include/PsHashSet.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsInlineAllocator.h b/src/PhysX/physx/source/foundation/include/PsInlineAllocator.h index 9acdc9120..5e687ddcf 100644 --- a/src/PhysX/physx/source/foundation/include/PsInlineAllocator.h +++ b/src/PhysX/physx/source/foundation/include/PsInlineAllocator.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsInlineAoS.h b/src/PhysX/physx/source/foundation/include/PsInlineAoS.h index f08405758..e1e7631a3 100644 --- a/src/PhysX/physx/source/foundation/include/PsInlineAoS.h +++ b/src/PhysX/physx/source/foundation/include/PsInlineAoS.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsInlineArray.h b/src/PhysX/physx/source/foundation/include/PsInlineArray.h index c7fed5eb2..5faad26fc 100644 --- a/src/PhysX/physx/source/foundation/include/PsInlineArray.h +++ b/src/PhysX/physx/source/foundation/include/PsInlineArray.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsIntrinsics.h b/src/PhysX/physx/source/foundation/include/PsIntrinsics.h index d6b6408c4..270e32fb1 100644 --- a/src/PhysX/physx/source/foundation/include/PsIntrinsics.h +++ b/src/PhysX/physx/source/foundation/include/PsIntrinsics.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsMathUtils.h b/src/PhysX/physx/source/foundation/include/PsMathUtils.h index 33200a38f..f72830618 100644 --- a/src/PhysX/physx/source/foundation/include/PsMathUtils.h +++ b/src/PhysX/physx/source/foundation/include/PsMathUtils.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsMutex.h b/src/PhysX/physx/source/foundation/include/PsMutex.h index 675f6bf04..0e9cd3e01 100644 --- a/src/PhysX/physx/source/foundation/include/PsMutex.h +++ b/src/PhysX/physx/source/foundation/include/PsMutex.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsPool.h b/src/PhysX/physx/source/foundation/include/PsPool.h index a6f3a10fb..f2af5f076 100644 --- a/src/PhysX/physx/source/foundation/include/PsPool.h +++ b/src/PhysX/physx/source/foundation/include/PsPool.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsSList.h b/src/PhysX/physx/source/foundation/include/PsSList.h index b03bc9b96..4a6f0c0d4 100644 --- a/src/PhysX/physx/source/foundation/include/PsSList.h +++ b/src/PhysX/physx/source/foundation/include/PsSList.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsSocket.h b/src/PhysX/physx/source/foundation/include/PsSocket.h index 3b3d68f6b..7240c271d 100644 --- a/src/PhysX/physx/source/foundation/include/PsSocket.h +++ b/src/PhysX/physx/source/foundation/include/PsSocket.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsSort.h b/src/PhysX/physx/source/foundation/include/PsSort.h index 8beec55ec..0cb2ca513 100644 --- a/src/PhysX/physx/source/foundation/include/PsSort.h +++ b/src/PhysX/physx/source/foundation/include/PsSort.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsSortInternals.h b/src/PhysX/physx/source/foundation/include/PsSortInternals.h index 54d9b4480..284060c00 100644 --- a/src/PhysX/physx/source/foundation/include/PsSortInternals.h +++ b/src/PhysX/physx/source/foundation/include/PsSortInternals.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsString.h b/src/PhysX/physx/source/foundation/include/PsString.h index eeb1b2444..6944de369 100644 --- a/src/PhysX/physx/source/foundation/include/PsString.h +++ b/src/PhysX/physx/source/foundation/include/PsString.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -32,6 +32,7 @@ #include "foundation/PxPreprocessor.h" #include "foundation/PxSimpleTypes.h" +#include "foundation/PxFoundationConfig.h" #include namespace physx diff --git a/src/PhysX/physx/source/foundation/include/PsSync.h b/src/PhysX/physx/source/foundation/include/PsSync.h index f8d73b36f..8f03850f6 100644 --- a/src/PhysX/physx/source/foundation/include/PsSync.h +++ b/src/PhysX/physx/source/foundation/include/PsSync.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsTempAllocator.h b/src/PhysX/physx/source/foundation/include/PsTempAllocator.h index 6594bafad..02540bb8f 100644 --- a/src/PhysX/physx/source/foundation/include/PsTempAllocator.h +++ b/src/PhysX/physx/source/foundation/include/PsTempAllocator.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsThread.h b/src/PhysX/physx/source/foundation/include/PsThread.h index c9304ca7a..615a2a416 100644 --- a/src/PhysX/physx/source/foundation/include/PsThread.h +++ b/src/PhysX/physx/source/foundation/include/PsThread.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsTime.h b/src/PhysX/physx/source/foundation/include/PsTime.h index 078e45365..8602362d5 100644 --- a/src/PhysX/physx/source/foundation/include/PsTime.h +++ b/src/PhysX/physx/source/foundation/include/PsTime.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -31,6 +31,7 @@ #define PSFOUNDATION_PSTIME_H #include "Ps.h" +#include "foundation/PxFoundationConfig.h" #if PX_LINUX || PX_ANDROID #include diff --git a/src/PhysX/physx/source/foundation/include/PsUserAllocated.h b/src/PhysX/physx/source/foundation/include/PsUserAllocated.h index 1ca80f193..d4aaf54e8 100644 --- a/src/PhysX/physx/source/foundation/include/PsUserAllocated.h +++ b/src/PhysX/physx/source/foundation/include/PsUserAllocated.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsUtilities.h b/src/PhysX/physx/source/foundation/include/PsUtilities.h index d991be1fd..11c5aef58 100644 --- a/src/PhysX/physx/source/foundation/include/PsUtilities.h +++ b/src/PhysX/physx/source/foundation/include/PsUtilities.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsVecMath.h b/src/PhysX/physx/source/foundation/include/PsVecMath.h index 680c350c6..322baa862 100644 --- a/src/PhysX/physx/source/foundation/include/PsVecMath.h +++ b/src/PhysX/physx/source/foundation/include/PsVecMath.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsVecMathAoSScalar.h b/src/PhysX/physx/source/foundation/include/PsVecMathAoSScalar.h index 8607565c8..4af1798fc 100644 --- a/src/PhysX/physx/source/foundation/include/PsVecMathAoSScalar.h +++ b/src/PhysX/physx/source/foundation/include/PsVecMathAoSScalar.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsVecMathAoSScalarInline.h b/src/PhysX/physx/source/foundation/include/PsVecMathAoSScalarInline.h index e88f79c9b..28e86ffb7 100644 --- a/src/PhysX/physx/source/foundation/include/PsVecMathAoSScalarInline.h +++ b/src/PhysX/physx/source/foundation/include/PsVecMathAoSScalarInline.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsVecMathSSE.h b/src/PhysX/physx/source/foundation/include/PsVecMathSSE.h index cc292caf8..a062b07da 100644 --- a/src/PhysX/physx/source/foundation/include/PsVecMathSSE.h +++ b/src/PhysX/physx/source/foundation/include/PsVecMathSSE.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsVecMathUtilities.h b/src/PhysX/physx/source/foundation/include/PsVecMathUtilities.h index a00a944d6..b19d65479 100644 --- a/src/PhysX/physx/source/foundation/include/PsVecMathUtilities.h +++ b/src/PhysX/physx/source/foundation/include/PsVecMathUtilities.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsVecQuat.h b/src/PhysX/physx/source/foundation/include/PsVecQuat.h index 8eb3ea487..ac665efd3 100644 --- a/src/PhysX/physx/source/foundation/include/PsVecQuat.h +++ b/src/PhysX/physx/source/foundation/include/PsVecQuat.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/PsVecTransform.h b/src/PhysX/physx/source/foundation/include/PsVecTransform.h index d9da8d0e4..1bb5ed6f0 100644 --- a/src/PhysX/physx/source/foundation/include/PsVecTransform.h +++ b/src/PhysX/physx/source/foundation/include/PsVecTransform.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/unix/PsUnixAoS.h b/src/PhysX/physx/source/foundation/include/unix/PsUnixAoS.h index 02fa34a25..06ac5f2bc 100644 --- a/src/PhysX/physx/source/foundation/include/unix/PsUnixAoS.h +++ b/src/PhysX/physx/source/foundation/include/unix/PsUnixAoS.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/unix/PsUnixFPU.h b/src/PhysX/physx/source/foundation/include/unix/PsUnixFPU.h index 3a2138fea..86ae3c8e8 100644 --- a/src/PhysX/physx/source/foundation/include/unix/PsUnixFPU.h +++ b/src/PhysX/physx/source/foundation/include/unix/PsUnixFPU.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -43,7 +43,6 @@ #include #endif - PX_INLINE physx::shdfnd::SIMDGuard::SIMDGuard() { #if !PX_EMSCRIPTEN && (PX_X86 || PX_X64) @@ -63,7 +62,7 @@ PX_INLINE physx::shdfnd::SIMDGuard::~SIMDGuard() } #else -#error No SIMD implementation for this unix platform. + #error No SIMD implementation for this unix platform. #endif // PX_LINUX || PX_PS4 || PX_OSX #endif // #ifndef PSFOUNDATION_PSUNIXFPU_H diff --git a/src/PhysX/physx/source/foundation/include/unix/PsUnixInlineAoS.h b/src/PhysX/physx/source/foundation/include/unix/PsUnixInlineAoS.h index 9c14ea9f8..29ddac91d 100644 --- a/src/PhysX/physx/source/foundation/include/unix/PsUnixInlineAoS.h +++ b/src/PhysX/physx/source/foundation/include/unix/PsUnixInlineAoS.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/unix/PsUnixIntrinsics.h b/src/PhysX/physx/source/foundation/include/unix/PsUnixIntrinsics.h index b69b57c54..c5e819b10 100644 --- a/src/PhysX/physx/source/foundation/include/unix/PsUnixIntrinsics.h +++ b/src/PhysX/physx/source/foundation/include/unix/PsUnixIntrinsics.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/unix/PsUnixTrigConstants.h b/src/PhysX/physx/source/foundation/include/unix/PsUnixTrigConstants.h index 8753a24b8..058143eb1 100644 --- a/src/PhysX/physx/source/foundation/include/unix/PsUnixTrigConstants.h +++ b/src/PhysX/physx/source/foundation/include/unix/PsUnixTrigConstants.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/unix/neon/PsUnixNeonAoS.h b/src/PhysX/physx/source/foundation/include/unix/neon/PsUnixNeonAoS.h index fc90c5235..5ca956003 100644 --- a/src/PhysX/physx/source/foundation/include/unix/neon/PsUnixNeonAoS.h +++ b/src/PhysX/physx/source/foundation/include/unix/neon/PsUnixNeonAoS.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/unix/neon/PsUnixNeonInlineAoS.h b/src/PhysX/physx/source/foundation/include/unix/neon/PsUnixNeonInlineAoS.h index 2db302e93..d73195075 100644 --- a/src/PhysX/physx/source/foundation/include/unix/neon/PsUnixNeonInlineAoS.h +++ b/src/PhysX/physx/source/foundation/include/unix/neon/PsUnixNeonInlineAoS.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/unix/sse2/PsUnixSse2AoS.h b/src/PhysX/physx/source/foundation/include/unix/sse2/PsUnixSse2AoS.h index 102746281..9259432d5 100644 --- a/src/PhysX/physx/source/foundation/include/unix/sse2/PsUnixSse2AoS.h +++ b/src/PhysX/physx/source/foundation/include/unix/sse2/PsUnixSse2AoS.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/unix/sse2/PsUnixSse2InlineAoS.h b/src/PhysX/physx/source/foundation/include/unix/sse2/PsUnixSse2InlineAoS.h index 9899af581..c22946bbb 100644 --- a/src/PhysX/physx/source/foundation/include/unix/sse2/PsUnixSse2InlineAoS.h +++ b/src/PhysX/physx/source/foundation/include/unix/sse2/PsUnixSse2InlineAoS.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/windows/PsWindowsAoS.h b/src/PhysX/physx/source/foundation/include/windows/PsWindowsAoS.h index 2a2d71063..253720093 100644 --- a/src/PhysX/physx/source/foundation/include/windows/PsWindowsAoS.h +++ b/src/PhysX/physx/source/foundation/include/windows/PsWindowsAoS.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/windows/PsWindowsFPU.h b/src/PhysX/physx/source/foundation/include/windows/PsWindowsFPU.h index 019bfc9a0..1235b400a 100644 --- a/src/PhysX/physx/source/foundation/include/windows/PsWindowsFPU.h +++ b/src/PhysX/physx/source/foundation/include/windows/PsWindowsFPU.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/windows/PsWindowsInclude.h b/src/PhysX/physx/source/foundation/include/windows/PsWindowsInclude.h index 4dab60145..c002ab5f9 100644 --- a/src/PhysX/physx/source/foundation/include/windows/PsWindowsInclude.h +++ b/src/PhysX/physx/source/foundation/include/windows/PsWindowsInclude.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/windows/PsWindowsInlineAoS.h b/src/PhysX/physx/source/foundation/include/windows/PsWindowsInlineAoS.h index 887535d4a..b53673e57 100644 --- a/src/PhysX/physx/source/foundation/include/windows/PsWindowsInlineAoS.h +++ b/src/PhysX/physx/source/foundation/include/windows/PsWindowsInlineAoS.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/windows/PsWindowsIntrinsics.h b/src/PhysX/physx/source/foundation/include/windows/PsWindowsIntrinsics.h index b8c837d9c..980601c9a 100644 --- a/src/PhysX/physx/source/foundation/include/windows/PsWindowsIntrinsics.h +++ b/src/PhysX/physx/source/foundation/include/windows/PsWindowsIntrinsics.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/include/windows/PsWindowsTrigConstants.h b/src/PhysX/physx/source/foundation/include/windows/PsWindowsTrigConstants.h index f622cfe41..83de7ade6 100644 --- a/src/PhysX/physx/source/foundation/include/windows/PsWindowsTrigConstants.h +++ b/src/PhysX/physx/source/foundation/include/windows/PsWindowsTrigConstants.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/PsAllocator.cpp b/src/PhysX/physx/source/foundation/src/PsAllocator.cpp index 8ffff92ba..a084c98ea 100644 --- a/src/PhysX/physx/source/foundation/src/PsAllocator.cpp +++ b/src/PhysX/physx/source/foundation/src/PsAllocator.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/PsAssert.cpp b/src/PhysX/physx/source/foundation/src/PsAssert.cpp index a6e5a6143..fdcc50a2f 100644 --- a/src/PhysX/physx/source/foundation/src/PsAssert.cpp +++ b/src/PhysX/physx/source/foundation/src/PsAssert.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/PsFoundation.cpp b/src/PhysX/physx/source/foundation/src/PsFoundation.cpp index f2edf3f87..ad11facee 100644 --- a/src/PhysX/physx/source/foundation/src/PsFoundation.cpp +++ b/src/PhysX/physx/source/foundation/src/PsFoundation.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -83,7 +83,6 @@ Foundation& Foundation::getInstance() void Foundation::setInstance(Foundation& foundation) { - PX_ASSERT(mInstance == NULL || &foundation == mInstance); mInstance = &foundation; } diff --git a/src/PhysX/physx/source/foundation/src/PsMathUtils.cpp b/src/PhysX/physx/source/foundation/src/PsMathUtils.cpp index 9aa30690b..58584a211 100644 --- a/src/PhysX/physx/source/foundation/src/PsMathUtils.cpp +++ b/src/PhysX/physx/source/foundation/src/PsMathUtils.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/PsString.cpp b/src/PhysX/physx/source/foundation/src/PsString.cpp index 1916fb0df..ad244687b 100644 --- a/src/PhysX/physx/source/foundation/src/PsString.cpp +++ b/src/PhysX/physx/source/foundation/src/PsString.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/PsTempAllocator.cpp b/src/PhysX/physx/source/foundation/src/PsTempAllocator.cpp index f174168ed..a8f3bb3ff 100644 --- a/src/PhysX/physx/source/foundation/src/PsTempAllocator.cpp +++ b/src/PhysX/physx/source/foundation/src/PsTempAllocator.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/PsUtilities.cpp b/src/PhysX/physx/source/foundation/src/PsUtilities.cpp index 1d1e174ba..06ea3a5f0 100644 --- a/src/PhysX/physx/source/foundation/src/PsUtilities.cpp +++ b/src/PhysX/physx/source/foundation/src/PsUtilities.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/unix/PsUnixAtomic.cpp b/src/PhysX/physx/source/foundation/src/unix/PsUnixAtomic.cpp index 9ca9249cf..8880d279e 100644 --- a/src/PhysX/physx/source/foundation/src/unix/PsUnixAtomic.cpp +++ b/src/PhysX/physx/source/foundation/src/unix/PsUnixAtomic.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #include "Ps.h" diff --git a/src/PhysX/physx/source/foundation/src/unix/PsUnixCpu.cpp b/src/PhysX/physx/source/foundation/src/unix/PsUnixCpu.cpp index dda248c39..062f86551 100644 --- a/src/PhysX/physx/source/foundation/src/unix/PsUnixCpu.cpp +++ b/src/PhysX/physx/source/foundation/src/unix/PsUnixCpu.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/unix/PsUnixFPU.cpp b/src/PhysX/physx/source/foundation/src/unix/PsUnixFPU.cpp index b6fc57c40..0a3a4b2b5 100644 --- a/src/PhysX/physx/source/foundation/src/unix/PsUnixFPU.cpp +++ b/src/PhysX/physx/source/foundation/src/unix/PsUnixFPU.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #include "PsFPU.h" diff --git a/src/PhysX/physx/source/foundation/src/unix/PsUnixMutex.cpp b/src/PhysX/physx/source/foundation/src/unix/PsUnixMutex.cpp index 194e23ff3..b523d619d 100644 --- a/src/PhysX/physx/source/foundation/src/unix/PsUnixMutex.cpp +++ b/src/PhysX/physx/source/foundation/src/unix/PsUnixMutex.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/unix/PsUnixPrintString.cpp b/src/PhysX/physx/source/foundation/src/unix/PsUnixPrintString.cpp index a19eff11e..31db6bdee 100644 --- a/src/PhysX/physx/source/foundation/src/unix/PsUnixPrintString.cpp +++ b/src/PhysX/physx/source/foundation/src/unix/PsUnixPrintString.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/unix/PsUnixSList.cpp b/src/PhysX/physx/source/foundation/src/unix/PsUnixSList.cpp index a3b1e2e68..612dd5dc2 100644 --- a/src/PhysX/physx/source/foundation/src/unix/PsUnixSList.cpp +++ b/src/PhysX/physx/source/foundation/src/unix/PsUnixSList.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/unix/PsUnixSocket.cpp b/src/PhysX/physx/source/foundation/src/unix/PsUnixSocket.cpp index 0d273cc9d..41c07cacc 100644 --- a/src/PhysX/physx/source/foundation/src/unix/PsUnixSocket.cpp +++ b/src/PhysX/physx/source/foundation/src/unix/PsUnixSocket.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/unix/PsUnixSync.cpp b/src/PhysX/physx/source/foundation/src/unix/PsUnixSync.cpp index 9336fd3e7..d6a5c47c1 100644 --- a/src/PhysX/physx/source/foundation/src/unix/PsUnixSync.cpp +++ b/src/PhysX/physx/source/foundation/src/unix/PsUnixSync.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/unix/PsUnixThread.cpp b/src/PhysX/physx/source/foundation/src/unix/PsUnixThread.cpp index a868512ad..1c292c10d 100644 --- a/src/PhysX/physx/source/foundation/src/unix/PsUnixThread.cpp +++ b/src/PhysX/physx/source/foundation/src/unix/PsUnixThread.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/unix/PsUnixTime.cpp b/src/PhysX/physx/source/foundation/src/unix/PsUnixTime.cpp index e1fc32c1d..22479f304 100644 --- a/src/PhysX/physx/source/foundation/src/unix/PsUnixTime.cpp +++ b/src/PhysX/physx/source/foundation/src/unix/PsUnixTime.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/windows/PsWindowsAtomic.cpp b/src/PhysX/physx/source/foundation/src/windows/PsWindowsAtomic.cpp index d8ebca2da..f7b672bc2 100644 --- a/src/PhysX/physx/source/foundation/src/windows/PsWindowsAtomic.cpp +++ b/src/PhysX/physx/source/foundation/src/windows/PsWindowsAtomic.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/windows/PsWindowsCpu.cpp b/src/PhysX/physx/source/foundation/src/windows/PsWindowsCpu.cpp index 75c308333..234352b2e 100644 --- a/src/PhysX/physx/source/foundation/src/windows/PsWindowsCpu.cpp +++ b/src/PhysX/physx/source/foundation/src/windows/PsWindowsCpu.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/windows/PsWindowsFPU.cpp b/src/PhysX/physx/source/foundation/src/windows/PsWindowsFPU.cpp index a8575a062..3d1ed8751 100644 --- a/src/PhysX/physx/source/foundation/src/windows/PsWindowsFPU.cpp +++ b/src/PhysX/physx/source/foundation/src/windows/PsWindowsFPU.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #include "PsFPU.h" diff --git a/src/PhysX/physx/source/foundation/src/windows/PsWindowsMutex.cpp b/src/PhysX/physx/source/foundation/src/windows/PsWindowsMutex.cpp index 45cbeafea..f3c6a38ee 100644 --- a/src/PhysX/physx/source/foundation/src/windows/PsWindowsMutex.cpp +++ b/src/PhysX/physx/source/foundation/src/windows/PsWindowsMutex.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/windows/PsWindowsPrintString.cpp b/src/PhysX/physx/source/foundation/src/windows/PsWindowsPrintString.cpp index 50a83eb46..adf5b8314 100644 --- a/src/PhysX/physx/source/foundation/src/windows/PsWindowsPrintString.cpp +++ b/src/PhysX/physx/source/foundation/src/windows/PsWindowsPrintString.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/windows/PsWindowsSList.cpp b/src/PhysX/physx/source/foundation/src/windows/PsWindowsSList.cpp index 76647cc9c..7f7fdd7d6 100644 --- a/src/PhysX/physx/source/foundation/src/windows/PsWindowsSList.cpp +++ b/src/PhysX/physx/source/foundation/src/windows/PsWindowsSList.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/windows/PsWindowsSocket.cpp b/src/PhysX/physx/source/foundation/src/windows/PsWindowsSocket.cpp index b50afa8e0..4a2b64bf0 100644 --- a/src/PhysX/physx/source/foundation/src/windows/PsWindowsSocket.cpp +++ b/src/PhysX/physx/source/foundation/src/windows/PsWindowsSocket.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/windows/PsWindowsSync.cpp b/src/PhysX/physx/source/foundation/src/windows/PsWindowsSync.cpp index b3675dc7a..9e96e174e 100644 --- a/src/PhysX/physx/source/foundation/src/windows/PsWindowsSync.cpp +++ b/src/PhysX/physx/source/foundation/src/windows/PsWindowsSync.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/windows/PsWindowsThread.cpp b/src/PhysX/physx/source/foundation/src/windows/PsWindowsThread.cpp index 243c501dc..e4b5060a3 100644 --- a/src/PhysX/physx/source/foundation/src/windows/PsWindowsThread.cpp +++ b/src/PhysX/physx/source/foundation/src/windows/PsWindowsThread.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/foundation/src/windows/PsWindowsTime.cpp b/src/PhysX/physx/source/foundation/src/windows/PsWindowsTime.cpp index 71d5e41c6..772aa39c2 100644 --- a/src/PhysX/physx/source/foundation/src/windows/PsWindowsTime.cpp +++ b/src/PhysX/physx/source/foundation/src/windows/PsWindowsTime.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/include/GuBox.h b/src/PhysX/physx/source/geomutils/include/GuBox.h index bdd96e3ea..539ae738d 100644 --- a/src/PhysX/physx/source/geomutils/include/GuBox.h +++ b/src/PhysX/physx/source/geomutils/include/GuBox.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/include/GuDistanceSegmentBox.h b/src/PhysX/physx/source/geomutils/include/GuDistanceSegmentBox.h index ab28b9268..039914378 100644 --- a/src/PhysX/physx/source/geomutils/include/GuDistanceSegmentBox.h +++ b/src/PhysX/physx/source/geomutils/include/GuDistanceSegmentBox.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/include/GuDistanceSegmentSegment.h b/src/PhysX/physx/source/geomutils/include/GuDistanceSegmentSegment.h index 65202aaee..8c0622be8 100644 --- a/src/PhysX/physx/source/geomutils/include/GuDistanceSegmentSegment.h +++ b/src/PhysX/physx/source/geomutils/include/GuDistanceSegmentSegment.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/include/GuIntersectionBoxBox.h b/src/PhysX/physx/source/geomutils/include/GuIntersectionBoxBox.h index 1b1b8eee2..a53ed2bb4 100644 --- a/src/PhysX/physx/source/geomutils/include/GuIntersectionBoxBox.h +++ b/src/PhysX/physx/source/geomutils/include/GuIntersectionBoxBox.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/include/GuIntersectionTriangleBox.h b/src/PhysX/physx/source/geomutils/include/GuIntersectionTriangleBox.h index 160ccd66f..d643751b5 100644 --- a/src/PhysX/physx/source/geomutils/include/GuIntersectionTriangleBox.h +++ b/src/PhysX/physx/source/geomutils/include/GuIntersectionTriangleBox.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/include/GuIntersectionTriangleBoxRef.h b/src/PhysX/physx/source/geomutils/include/GuIntersectionTriangleBoxRef.h index e136c8ed7..714700228 100644 --- a/src/PhysX/physx/source/geomutils/include/GuIntersectionTriangleBoxRef.h +++ b/src/PhysX/physx/source/geomutils/include/GuIntersectionTriangleBoxRef.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/include/GuRaycastTests.h b/src/PhysX/physx/source/geomutils/include/GuRaycastTests.h index e54e65b71..bb862657c 100644 --- a/src/PhysX/physx/source/geomutils/include/GuRaycastTests.h +++ b/src/PhysX/physx/source/geomutils/include/GuRaycastTests.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/include/GuSIMDHelpers.h b/src/PhysX/physx/source/geomutils/include/GuSIMDHelpers.h index a28f39f82..c15dd1802 100644 --- a/src/PhysX/physx/source/geomutils/include/GuSIMDHelpers.h +++ b/src/PhysX/physx/source/geomutils/include/GuSIMDHelpers.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/include/GuSegment.h b/src/PhysX/physx/source/geomutils/include/GuSegment.h index bcee652c5..433eab6aa 100644 --- a/src/PhysX/physx/source/geomutils/include/GuSegment.h +++ b/src/PhysX/physx/source/geomutils/include/GuSegment.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuAABBTreeBuild.cpp b/src/PhysX/physx/source/geomutils/src/GuAABBTreeBuild.cpp index 1d9ae9dcc..39ad61345 100644 --- a/src/PhysX/physx/source/geomutils/src/GuAABBTreeBuild.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuAABBTreeBuild.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuAABBTreeBuild.h b/src/PhysX/physx/source/geomutils/src/GuAABBTreeBuild.h index 93dfb7f1a..05034140a 100644 --- a/src/PhysX/physx/source/geomutils/src/GuAABBTreeBuild.h +++ b/src/PhysX/physx/source/geomutils/src/GuAABBTreeBuild.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuAABBTreeQuery.h b/src/PhysX/physx/source/geomutils/src/GuAABBTreeQuery.h index 2fbc91c95..4938f9690 100644 --- a/src/PhysX/physx/source/geomutils/src/GuAABBTreeQuery.h +++ b/src/PhysX/physx/source/geomutils/src/GuAABBTreeQuery.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuBVHStructure.cpp b/src/PhysX/physx/source/geomutils/src/GuBVHStructure.cpp index b565da2b6..449e89898 100644 --- a/src/PhysX/physx/source/geomutils/src/GuBVHStructure.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuBVHStructure.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuBVHStructure.h b/src/PhysX/physx/source/geomutils/src/GuBVHStructure.h index cf8b94706..d5f816b22 100644 --- a/src/PhysX/physx/source/geomutils/src/GuBVHStructure.h +++ b/src/PhysX/physx/source/geomutils/src/GuBVHStructure.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuBVHTestsSIMD.h b/src/PhysX/physx/source/geomutils/src/GuBVHTestsSIMD.h index 903b4416a..2ad12f9af 100644 --- a/src/PhysX/physx/source/geomutils/src/GuBVHTestsSIMD.h +++ b/src/PhysX/physx/source/geomutils/src/GuBVHTestsSIMD.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuBounds.cpp b/src/PhysX/physx/source/geomutils/src/GuBounds.cpp index 38ee4c779..aec9eb4d2 100644 --- a/src/PhysX/physx/source/geomutils/src/GuBounds.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuBounds.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuBounds.h b/src/PhysX/physx/source/geomutils/src/GuBounds.h index 6e8293f05..643d9eb58 100644 --- a/src/PhysX/physx/source/geomutils/src/GuBounds.h +++ b/src/PhysX/physx/source/geomutils/src/GuBounds.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuBox.cpp b/src/PhysX/physx/source/geomutils/src/GuBox.cpp index 53c173708..51d8882c6 100644 --- a/src/PhysX/physx/source/geomutils/src/GuBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuCCTSweepTests.cpp b/src/PhysX/physx/source/geomutils/src/GuCCTSweepTests.cpp index 08751a946..c5040ac69 100644 --- a/src/PhysX/physx/source/geomutils/src/GuCCTSweepTests.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuCCTSweepTests.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuCapsule.cpp b/src/PhysX/physx/source/geomutils/src/GuCapsule.cpp index f0572a9ea..b61f4d99d 100644 --- a/src/PhysX/physx/source/geomutils/src/GuCapsule.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuCapsule.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuCapsule.h b/src/PhysX/physx/source/geomutils/src/GuCapsule.h index 157bb9984..23890ec7d 100644 --- a/src/PhysX/physx/source/geomutils/src/GuCapsule.h +++ b/src/PhysX/physx/source/geomutils/src/GuCapsule.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuCenterExtents.h b/src/PhysX/physx/source/geomutils/src/GuCenterExtents.h index f81e0a278..56fde2f6b 100644 --- a/src/PhysX/physx/source/geomutils/src/GuCenterExtents.h +++ b/src/PhysX/physx/source/geomutils/src/GuCenterExtents.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuGeometryQuery.cpp b/src/PhysX/physx/source/geomutils/src/GuGeometryQuery.cpp index f0b10899c..23287953e 100644 --- a/src/PhysX/physx/source/geomutils/src/GuGeometryQuery.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuGeometryQuery.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuGeometryUnion.cpp b/src/PhysX/physx/source/geomutils/src/GuGeometryUnion.cpp index 69b74f74f..117440652 100644 --- a/src/PhysX/physx/source/geomutils/src/GuGeometryUnion.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuGeometryUnion.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuGeometryUnion.h b/src/PhysX/physx/source/geomutils/src/GuGeometryUnion.h index 621a2f8d1..d43fe688f 100644 --- a/src/PhysX/physx/source/geomutils/src/GuGeometryUnion.h +++ b/src/PhysX/physx/source/geomutils/src/GuGeometryUnion.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuInternal.cpp b/src/PhysX/physx/source/geomutils/src/GuInternal.cpp index 8cfca77c1..21dd5bcac 100644 --- a/src/PhysX/physx/source/geomutils/src/GuInternal.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuInternal.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuInternal.h b/src/PhysX/physx/source/geomutils/src/GuInternal.h index cdab8a730..97f2cda6e 100644 --- a/src/PhysX/physx/source/geomutils/src/GuInternal.h +++ b/src/PhysX/physx/source/geomutils/src/GuInternal.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuMTD.cpp b/src/PhysX/physx/source/geomutils/src/GuMTD.cpp index 599254609..c5f0bbc7a 100644 --- a/src/PhysX/physx/source/geomutils/src/GuMTD.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuMTD.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuMTD.h b/src/PhysX/physx/source/geomutils/src/GuMTD.h index 572ca9437..aed1cd557 100644 --- a/src/PhysX/physx/source/geomutils/src/GuMTD.h +++ b/src/PhysX/physx/source/geomutils/src/GuMTD.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuMeshFactory.cpp b/src/PhysX/physx/source/geomutils/src/GuMeshFactory.cpp index bd422fc6c..657c131d9 100644 --- a/src/PhysX/physx/source/geomutils/src/GuMeshFactory.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuMeshFactory.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuMeshFactory.h b/src/PhysX/physx/source/geomutils/src/GuMeshFactory.h index e17ca335f..75e449de7 100644 --- a/src/PhysX/physx/source/geomutils/src/GuMeshFactory.h +++ b/src/PhysX/physx/source/geomutils/src/GuMeshFactory.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuMetaData.cpp b/src/PhysX/physx/source/geomutils/src/GuMetaData.cpp index 2b312630e..54bb6f39e 100644 --- a/src/PhysX/physx/source/geomutils/src/GuMetaData.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuMetaData.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuOverlapTests.cpp b/src/PhysX/physx/source/geomutils/src/GuOverlapTests.cpp index 80fab6271..e0ed10b3f 100644 --- a/src/PhysX/physx/source/geomutils/src/GuOverlapTests.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuOverlapTests.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuOverlapTests.h b/src/PhysX/physx/source/geomutils/src/GuOverlapTests.h index dd59a44c2..02db81314 100644 --- a/src/PhysX/physx/source/geomutils/src/GuOverlapTests.h +++ b/src/PhysX/physx/source/geomutils/src/GuOverlapTests.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuRaycastTests.cpp b/src/PhysX/physx/source/geomutils/src/GuRaycastTests.cpp index aba0a6b91..7587490bf 100644 --- a/src/PhysX/physx/source/geomutils/src/GuRaycastTests.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuRaycastTests.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuSerialize.cpp b/src/PhysX/physx/source/geomutils/src/GuSerialize.cpp index 83205d8a2..4508b0c2f 100644 --- a/src/PhysX/physx/source/geomutils/src/GuSerialize.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuSerialize.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuSerialize.h b/src/PhysX/physx/source/geomutils/src/GuSerialize.h index 7bc92bdab..88ae4f42e 100644 --- a/src/PhysX/physx/source/geomutils/src/GuSerialize.h +++ b/src/PhysX/physx/source/geomutils/src/GuSerialize.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuSphere.h b/src/PhysX/physx/source/geomutils/src/GuSphere.h index c249f4e21..cb1f06660 100644 --- a/src/PhysX/physx/source/geomutils/src/GuSphere.h +++ b/src/PhysX/physx/source/geomutils/src/GuSphere.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuSweepMTD.cpp b/src/PhysX/physx/source/geomutils/src/GuSweepMTD.cpp index d2e8cb917..bcc684e58 100644 --- a/src/PhysX/physx/source/geomutils/src/GuSweepMTD.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuSweepMTD.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuSweepMTD.h b/src/PhysX/physx/source/geomutils/src/GuSweepMTD.h index 9c63c9c2f..40f05dd77 100644 --- a/src/PhysX/physx/source/geomutils/src/GuSweepMTD.h +++ b/src/PhysX/physx/source/geomutils/src/GuSweepMTD.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuSweepSharedTests.cpp b/src/PhysX/physx/source/geomutils/src/GuSweepSharedTests.cpp index f5b3ab00c..66b93c56b 100644 --- a/src/PhysX/physx/source/geomutils/src/GuSweepSharedTests.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuSweepSharedTests.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuSweepSharedTests.h b/src/PhysX/physx/source/geomutils/src/GuSweepSharedTests.h index 81c1ad2bd..563c018ca 100644 --- a/src/PhysX/physx/source/geomutils/src/GuSweepSharedTests.h +++ b/src/PhysX/physx/source/geomutils/src/GuSweepSharedTests.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuSweepTests.cpp b/src/PhysX/physx/source/geomutils/src/GuSweepTests.cpp index 8f213b38b..fe4a46ee1 100644 --- a/src/PhysX/physx/source/geomutils/src/GuSweepTests.cpp +++ b/src/PhysX/physx/source/geomutils/src/GuSweepTests.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/GuSweepTests.h b/src/PhysX/physx/source/geomutils/src/GuSweepTests.h index a77fcd3d1..3abf54869 100644 --- a/src/PhysX/physx/source/geomutils/src/GuSweepTests.h +++ b/src/PhysX/physx/source/geomutils/src/GuSweepTests.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/ccd/GuCCDSweepConvexMesh.cpp b/src/PhysX/physx/source/geomutils/src/ccd/GuCCDSweepConvexMesh.cpp index d4ee6d785..5c053fbac 100644 --- a/src/PhysX/physx/source/geomutils/src/ccd/GuCCDSweepConvexMesh.cpp +++ b/src/PhysX/physx/source/geomutils/src/ccd/GuCCDSweepConvexMesh.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/ccd/GuCCDSweepConvexMesh.h b/src/PhysX/physx/source/geomutils/src/ccd/GuCCDSweepConvexMesh.h index 70eecc954..ba2d6cc22 100644 --- a/src/PhysX/physx/source/geomutils/src/ccd/GuCCDSweepConvexMesh.h +++ b/src/PhysX/physx/source/geomutils/src/ccd/GuCCDSweepConvexMesh.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/ccd/GuCCDSweepPrimitives.cpp b/src/PhysX/physx/source/geomutils/src/ccd/GuCCDSweepPrimitives.cpp index 8f6b1401b..ded00a31b 100644 --- a/src/PhysX/physx/source/geomutils/src/ccd/GuCCDSweepPrimitives.cpp +++ b/src/PhysX/physx/source/geomutils/src/ccd/GuCCDSweepPrimitives.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/common/GuBarycentricCoordinates.cpp b/src/PhysX/physx/source/geomutils/src/common/GuBarycentricCoordinates.cpp index a072a3918..2dfb05d6c 100644 --- a/src/PhysX/physx/source/geomutils/src/common/GuBarycentricCoordinates.cpp +++ b/src/PhysX/physx/source/geomutils/src/common/GuBarycentricCoordinates.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/common/GuBarycentricCoordinates.h b/src/PhysX/physx/source/geomutils/src/common/GuBarycentricCoordinates.h index 4dea0543a..171d26d59 100644 --- a/src/PhysX/physx/source/geomutils/src/common/GuBarycentricCoordinates.h +++ b/src/PhysX/physx/source/geomutils/src/common/GuBarycentricCoordinates.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/common/GuBoxConversion.h b/src/PhysX/physx/source/geomutils/src/common/GuBoxConversion.h index 5d2c01c9e..bacf001c7 100644 --- a/src/PhysX/physx/source/geomutils/src/common/GuBoxConversion.h +++ b/src/PhysX/physx/source/geomutils/src/common/GuBoxConversion.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/common/GuEdgeCache.h b/src/PhysX/physx/source/geomutils/src/common/GuEdgeCache.h index 3729fc600..feb981b9c 100644 --- a/src/PhysX/physx/source/geomutils/src/common/GuEdgeCache.h +++ b/src/PhysX/physx/source/geomutils/src/common/GuEdgeCache.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/common/GuEdgeListData.h b/src/PhysX/physx/source/geomutils/src/common/GuEdgeListData.h index c32b58c94..b791ebdc5 100644 --- a/src/PhysX/physx/source/geomutils/src/common/GuEdgeListData.h +++ b/src/PhysX/physx/source/geomutils/src/common/GuEdgeListData.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/common/GuSeparatingAxes.cpp b/src/PhysX/physx/source/geomutils/src/common/GuSeparatingAxes.cpp index 8f20642b2..fe168fddf 100644 --- a/src/PhysX/physx/source/geomutils/src/common/GuSeparatingAxes.cpp +++ b/src/PhysX/physx/source/geomutils/src/common/GuSeparatingAxes.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/common/GuSeparatingAxes.h b/src/PhysX/physx/source/geomutils/src/common/GuSeparatingAxes.h index df2048cc3..4063ad78f 100644 --- a/src/PhysX/physx/source/geomutils/src/common/GuSeparatingAxes.h +++ b/src/PhysX/physx/source/geomutils/src/common/GuSeparatingAxes.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactBoxBox.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactBoxBox.cpp index 1af188211..f02badde0 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactBoxBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactBoxBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleBox.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleBox.cpp index c2502147f..654c248ee 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleCapsule.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleCapsule.cpp index 13ce6e029..16d63878a 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleCapsule.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleCapsule.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleConvex.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleConvex.cpp index 772f04f7b..67f996a57 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleConvex.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleConvex.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleMesh.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleMesh.cpp index cc56351c1..8aa2b896a 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleMesh.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactCapsuleMesh.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactConvexConvex.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactConvexConvex.cpp index e5ed03c3e..4c2f58d1f 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactConvexConvex.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactConvexConvex.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactConvexMesh.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactConvexMesh.cpp index 2f70453f8..f5ff88ab3 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactConvexMesh.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactConvexMesh.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactMethodImpl.h b/src/PhysX/physx/source/geomutils/src/contact/GuContactMethodImpl.h index 1a73901c6..a0b5d9875 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactMethodImpl.h +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactMethodImpl.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactPlaneBox.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactPlaneBox.cpp index 533ddb65b..d9380589f 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactPlaneBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactPlaneBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactPlaneCapsule.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactPlaneCapsule.cpp index bfde6cf2f..aa13c7567 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactPlaneCapsule.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactPlaneCapsule.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactPlaneConvex.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactPlaneConvex.cpp index 28a84855d..712ee2545 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactPlaneConvex.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactPlaneConvex.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactPolygonPolygon.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactPolygonPolygon.cpp index 740c77cf4..2d0567d35 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactPolygonPolygon.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactPolygonPolygon.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactPolygonPolygon.h b/src/PhysX/physx/source/geomutils/src/contact/GuContactPolygonPolygon.h index 7789b5af1..f25f64e47 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactPolygonPolygon.h +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactPolygonPolygon.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereBox.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereBox.cpp index 722364c44..20e394219 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereCapsule.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereCapsule.cpp index 54d7c4d93..d098dbb86 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereCapsule.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereCapsule.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereMesh.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereMesh.cpp index 2c1eeea81..23837e2d3 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereMesh.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereMesh.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactSpherePlane.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactSpherePlane.cpp index 470b2d586..f6a5c3685 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactSpherePlane.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactSpherePlane.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereSphere.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereSphere.cpp index d8ffdb4b9..bcf11a0cc 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereSphere.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuContactSphereSphere.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuFeatureCode.cpp b/src/PhysX/physx/source/geomutils/src/contact/GuFeatureCode.cpp index d0bc0ecf1..be56074fd 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuFeatureCode.cpp +++ b/src/PhysX/physx/source/geomutils/src/contact/GuFeatureCode.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/contact/GuFeatureCode.h b/src/PhysX/physx/source/geomutils/src/contact/GuFeatureCode.h index ab1e0cb8e..5ead64493 100644 --- a/src/PhysX/physx/source/geomutils/src/contact/GuFeatureCode.h +++ b/src/PhysX/physx/source/geomutils/src/contact/GuFeatureCode.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuBigConvexData.cpp b/src/PhysX/physx/source/geomutils/src/convex/GuBigConvexData.cpp index 52e94931d..5f676cff3 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuBigConvexData.cpp +++ b/src/PhysX/physx/source/geomutils/src/convex/GuBigConvexData.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuBigConvexData.h b/src/PhysX/physx/source/geomutils/src/convex/GuBigConvexData.h index 90af247ec..673bebbfb 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuBigConvexData.h +++ b/src/PhysX/physx/source/geomutils/src/convex/GuBigConvexData.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuBigConvexData2.h b/src/PhysX/physx/source/geomutils/src/convex/GuBigConvexData2.h index 9fc5d717f..5de9651b4 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuBigConvexData2.h +++ b/src/PhysX/physx/source/geomutils/src/convex/GuBigConvexData2.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuConvexEdgeFlags.h b/src/PhysX/physx/source/geomutils/src/convex/GuConvexEdgeFlags.h index 9756e3de6..8d021a419 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuConvexEdgeFlags.h +++ b/src/PhysX/physx/source/geomutils/src/convex/GuConvexEdgeFlags.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuConvexHelper.cpp b/src/PhysX/physx/source/geomutils/src/convex/GuConvexHelper.cpp index 53fee1171..33f4d94a2 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuConvexHelper.cpp +++ b/src/PhysX/physx/source/geomutils/src/convex/GuConvexHelper.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuConvexHelper.h b/src/PhysX/physx/source/geomutils/src/convex/GuConvexHelper.h index d264bac91..d90354294 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuConvexHelper.h +++ b/src/PhysX/physx/source/geomutils/src/convex/GuConvexHelper.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuConvexMesh.cpp b/src/PhysX/physx/source/geomutils/src/convex/GuConvexMesh.cpp index feb66f8da..c4630db8e 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuConvexMesh.cpp +++ b/src/PhysX/physx/source/geomutils/src/convex/GuConvexMesh.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuConvexMesh.h b/src/PhysX/physx/source/geomutils/src/convex/GuConvexMesh.h index 9a7d08ed6..d271c5b1e 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuConvexMesh.h +++ b/src/PhysX/physx/source/geomutils/src/convex/GuConvexMesh.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuConvexMeshData.h b/src/PhysX/physx/source/geomutils/src/convex/GuConvexMeshData.h index 12e311914..f212558e1 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuConvexMeshData.h +++ b/src/PhysX/physx/source/geomutils/src/convex/GuConvexMeshData.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuConvexSupportTable.cpp b/src/PhysX/physx/source/geomutils/src/convex/GuConvexSupportTable.cpp index 564f68cbb..82fbf3fa3 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuConvexSupportTable.cpp +++ b/src/PhysX/physx/source/geomutils/src/convex/GuConvexSupportTable.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuConvexSupportTable.h b/src/PhysX/physx/source/geomutils/src/convex/GuConvexSupportTable.h index 1147ec982..8f802debd 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuConvexSupportTable.h +++ b/src/PhysX/physx/source/geomutils/src/convex/GuConvexSupportTable.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuConvexUtilsInternal.cpp b/src/PhysX/physx/source/geomutils/src/convex/GuConvexUtilsInternal.cpp index 851110773..5fa63ba94 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuConvexUtilsInternal.cpp +++ b/src/PhysX/physx/source/geomutils/src/convex/GuConvexUtilsInternal.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuConvexUtilsInternal.h b/src/PhysX/physx/source/geomutils/src/convex/GuConvexUtilsInternal.h index d7b2226a8..7791051c2 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuConvexUtilsInternal.h +++ b/src/PhysX/physx/source/geomutils/src/convex/GuConvexUtilsInternal.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuCubeIndex.h b/src/PhysX/physx/source/geomutils/src/convex/GuCubeIndex.h index 2001ad736..8e52ef920 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuCubeIndex.h +++ b/src/PhysX/physx/source/geomutils/src/convex/GuCubeIndex.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuHillClimbing.cpp b/src/PhysX/physx/source/geomutils/src/convex/GuHillClimbing.cpp index cb03c9953..c14e503e8 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuHillClimbing.cpp +++ b/src/PhysX/physx/source/geomutils/src/convex/GuHillClimbing.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuHillClimbing.h b/src/PhysX/physx/source/geomutils/src/convex/GuHillClimbing.h index 0db865e86..bfe041de6 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuHillClimbing.h +++ b/src/PhysX/physx/source/geomutils/src/convex/GuHillClimbing.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuShapeConvex.cpp b/src/PhysX/physx/source/geomutils/src/convex/GuShapeConvex.cpp index 4b089626d..4f838cecc 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuShapeConvex.cpp +++ b/src/PhysX/physx/source/geomutils/src/convex/GuShapeConvex.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/convex/GuShapeConvex.h b/src/PhysX/physx/source/geomutils/src/convex/GuShapeConvex.h index 8d6f81d0b..5374b0597 100644 --- a/src/PhysX/physx/source/geomutils/src/convex/GuShapeConvex.h +++ b/src/PhysX/physx/source/geomutils/src/convex/GuShapeConvex.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointBox.cpp b/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointBox.cpp index e564e083e..bdaf6d39b 100644 --- a/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointBox.h b/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointBox.h index 8ebcc3e51..fe7504d5b 100644 --- a/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointBox.h +++ b/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointBox.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointSegment.h b/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointSegment.h index a441cde18..902212b02 100644 --- a/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointSegment.h +++ b/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointSegment.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointTriangle.cpp b/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointTriangle.cpp index b86a49bf8..3b8b1085f 100644 --- a/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointTriangle.cpp +++ b/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointTriangle.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointTriangle.h b/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointTriangle.h index 279991f54..51e5cb4c8 100644 --- a/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointTriangle.h +++ b/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointTriangle.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointTriangleSIMD.h b/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointTriangleSIMD.h index 587952c87..d2babe517 100644 --- a/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointTriangleSIMD.h +++ b/src/PhysX/physx/source/geomutils/src/distance/GuDistancePointTriangleSIMD.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentBox.cpp b/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentBox.cpp index f97b039cf..94e78592d 100644 --- a/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentSegment.cpp b/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentSegment.cpp index 3e97cc884..ff3385d5a 100644 --- a/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentSegment.cpp +++ b/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentSegment.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentSegmentSIMD.h b/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentSegmentSIMD.h index f5d6394ac..d3be35e34 100644 --- a/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentSegmentSIMD.h +++ b/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentSegmentSIMD.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentTriangle.cpp b/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentTriangle.cpp index c2ab4e964..bfbd4cef8 100644 --- a/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentTriangle.cpp +++ b/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentTriangle.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentTriangle.h b/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentTriangle.h index f91778702..268cbefb9 100644 --- a/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentTriangle.h +++ b/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentTriangle.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentTriangleSIMD.h b/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentTriangleSIMD.h index 1c9938943..40cb1c76b 100644 --- a/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentTriangleSIMD.h +++ b/src/PhysX/physx/source/geomutils/src/distance/GuDistanceSegmentTriangleSIMD.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuEPA.cpp b/src/PhysX/physx/source/geomutils/src/gjk/GuEPA.cpp index f45df41c9..480535bdf 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuEPA.cpp +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuEPA.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuEPA.h b/src/PhysX/physx/source/geomutils/src/gjk/GuEPA.h index 4ae929579..851ea6f7d 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuEPA.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuEPA.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuEPAFacet.h b/src/PhysX/physx/source/geomutils/src/gjk/GuEPAFacet.h index 44de1afb6..583f0d7e7 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuEPAFacet.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuEPAFacet.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuGJK.h b/src/PhysX/physx/source/geomutils/src/gjk/GuGJK.h index 015005e76..03c1ae149 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuGJK.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuGJK.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuGJKPenetration.h b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKPenetration.h index 23fb003d0..63dfd4b04 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuGJKPenetration.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKPenetration.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuGJKRaycast.h b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKRaycast.h index 79c04931c..5394ba1a8 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuGJKRaycast.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKRaycast.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuGJKSimplex.cpp b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKSimplex.cpp index 9dc648cf5..e5005f86f 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuGJKSimplex.cpp +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKSimplex.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuGJKSimplex.h b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKSimplex.h index 415d94070..b5d6c652b 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuGJKSimplex.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKSimplex.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuGJKTest.cpp b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKTest.cpp index 3e252d511..215a69077 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuGJKTest.cpp +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKTest.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuGJKTest.h b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKTest.h index 412b9a438..3d75b6658 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuGJKTest.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKTest.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuGJKType.h b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKType.h index 6856a2611..646b1cdba 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuGJKType.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKType.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuGJKUtil.h b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKUtil.h index b83364d0c..de3d81e47 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuGJKUtil.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuGJKUtil.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuVecBox.h b/src/PhysX/physx/source/geomutils/src/gjk/GuVecBox.h index d8e3d167e..ff97dee89 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuVecBox.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuVecBox.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuVecCapsule.h b/src/PhysX/physx/source/geomutils/src/gjk/GuVecCapsule.h index fdc17131f..cf16c5a3a 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuVecCapsule.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuVecCapsule.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuVecConvex.h b/src/PhysX/physx/source/geomutils/src/gjk/GuVecConvex.h index 4133bc1e9..fe38a6b8b 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuVecConvex.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuVecConvex.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuVecConvexHull.h b/src/PhysX/physx/source/geomutils/src/gjk/GuVecConvexHull.h index ff675fdb7..1c7d9d7c0 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuVecConvexHull.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuVecConvexHull.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuVecConvexHullNoScale.h b/src/PhysX/physx/source/geomutils/src/gjk/GuVecConvexHullNoScale.h index 7273e52dc..4b6ede5a0 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuVecConvexHullNoScale.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuVecConvexHullNoScale.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuVecPlane.h b/src/PhysX/physx/source/geomutils/src/gjk/GuVecPlane.h index ca95a2d87..04e3667e6 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuVecPlane.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuVecPlane.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuVecSphere.h b/src/PhysX/physx/source/geomutils/src/gjk/GuVecSphere.h index 95845b192..304209dd3 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuVecSphere.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuVecSphere.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/gjk/GuVecTriangle.h b/src/PhysX/physx/source/geomutils/src/gjk/GuVecTriangle.h index 6dd676ab5..30225d26c 100644 --- a/src/PhysX/physx/source/geomutils/src/gjk/GuVecTriangle.h +++ b/src/PhysX/physx/source/geomutils/src/gjk/GuVecTriangle.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/hf/GuEntityReport.h b/src/PhysX/physx/source/geomutils/src/hf/GuEntityReport.h index 94c072a7a..d34a4a4f4 100644 --- a/src/PhysX/physx/source/geomutils/src/hf/GuEntityReport.h +++ b/src/PhysX/physx/source/geomutils/src/hf/GuEntityReport.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/hf/GuHeightField.cpp b/src/PhysX/physx/source/geomutils/src/hf/GuHeightField.cpp index d7e795d61..779b39a3e 100644 --- a/src/PhysX/physx/source/geomutils/src/hf/GuHeightField.cpp +++ b/src/PhysX/physx/source/geomutils/src/hf/GuHeightField.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/hf/GuHeightField.h b/src/PhysX/physx/source/geomutils/src/hf/GuHeightField.h index 7a1d36330..93b5465af 100644 --- a/src/PhysX/physx/source/geomutils/src/hf/GuHeightField.h +++ b/src/PhysX/physx/source/geomutils/src/hf/GuHeightField.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/hf/GuHeightFieldData.h b/src/PhysX/physx/source/geomutils/src/hf/GuHeightFieldData.h index 2e165936d..4b589759e 100644 --- a/src/PhysX/physx/source/geomutils/src/hf/GuHeightFieldData.h +++ b/src/PhysX/physx/source/geomutils/src/hf/GuHeightFieldData.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/hf/GuHeightFieldUtil.cpp b/src/PhysX/physx/source/geomutils/src/hf/GuHeightFieldUtil.cpp index d4e9b9bb8..88f9491d2 100644 --- a/src/PhysX/physx/source/geomutils/src/hf/GuHeightFieldUtil.cpp +++ b/src/PhysX/physx/source/geomutils/src/hf/GuHeightFieldUtil.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/hf/GuHeightFieldUtil.h b/src/PhysX/physx/source/geomutils/src/hf/GuHeightFieldUtil.h index 18e52420a..391a18b12 100644 --- a/src/PhysX/physx/source/geomutils/src/hf/GuHeightFieldUtil.h +++ b/src/PhysX/physx/source/geomutils/src/hf/GuHeightFieldUtil.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/hf/GuOverlapTestsHF.cpp b/src/PhysX/physx/source/geomutils/src/hf/GuOverlapTestsHF.cpp index 4b14b885e..1a2ea3092 100644 --- a/src/PhysX/physx/source/geomutils/src/hf/GuOverlapTestsHF.cpp +++ b/src/PhysX/physx/source/geomutils/src/hf/GuOverlapTestsHF.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/hf/GuSweepsHF.cpp b/src/PhysX/physx/source/geomutils/src/hf/GuSweepsHF.cpp index 32e400b0a..4b58317c6 100644 --- a/src/PhysX/physx/source/geomutils/src/hf/GuSweepsHF.cpp +++ b/src/PhysX/physx/source/geomutils/src/hf/GuSweepsHF.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionBoxBox.cpp b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionBoxBox.cpp index 120a81c42..6e091676a 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionBoxBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionBoxBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionCapsuleTriangle.cpp b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionCapsuleTriangle.cpp index 2cbb0eb5c..929971d0a 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionCapsuleTriangle.cpp +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionCapsuleTriangle.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionCapsuleTriangle.h b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionCapsuleTriangle.h index 72c67d6ba..919bdf1fd 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionCapsuleTriangle.h +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionCapsuleTriangle.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionEdgeEdge.cpp b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionEdgeEdge.cpp index 4a5be9d0e..9c3a05d55 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionEdgeEdge.cpp +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionEdgeEdge.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionEdgeEdge.h b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionEdgeEdge.h index d9a4cd7c6..b0492256e 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionEdgeEdge.h +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionEdgeEdge.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRay.h b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRay.h index 2e120457e..ef9e005e0 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRay.h +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRay.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayBox.cpp b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayBox.cpp index 3b6c3fe95..5922a05c3 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayBox.h b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayBox.h index 965648436..29bbb41f3 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayBox.h +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayBox.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayBoxSIMD.h b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayBoxSIMD.h index 3d95493c1..6c82f4552 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayBoxSIMD.h +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayBoxSIMD.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayCapsule.cpp b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayCapsule.cpp index 3eaee1790..b5aaf884a 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayCapsule.cpp +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayCapsule.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayCapsule.h b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayCapsule.h index bac7c0b52..a25d4b045 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayCapsule.h +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayCapsule.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayPlane.h b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayPlane.h index 0418f1f49..7696d63b1 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayPlane.h +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayPlane.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRaySphere.cpp b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRaySphere.cpp index d6244b714..57a0c7b4f 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRaySphere.cpp +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRaySphere.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRaySphere.h b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRaySphere.h index f97d892a8..388cffc14 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRaySphere.h +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRaySphere.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayTriangle.h b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayTriangle.h index 25c081f5a..3455c4750 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayTriangle.h +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionRayTriangle.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionSphereBox.cpp b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionSphereBox.cpp index 26638001b..1abaecbe6 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionSphereBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionSphereBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionSphereBox.h b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionSphereBox.h index e787c39d0..605623d5d 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionSphereBox.h +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionSphereBox.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionTriangleBox.cpp b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionTriangleBox.cpp index 854fe53e0..bd0fe8a48 100644 --- a/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionTriangleBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/intersection/GuIntersectionTriangleBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV32.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuBV32.cpp index e049f883e..4b1fcb85c 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV32.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV32.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV32.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV32.h index 1ac5d53c2..d70011e05 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV32.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV32.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV32Build.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuBV32Build.cpp index 2f2e633f4..74f37975a 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV32Build.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV32Build.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV32Build.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV32Build.h index 7c03e8193..9488f460b 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV32Build.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV32Build.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4.cpp index 8d7896148..5e553e704 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4.h index 098205a5e..30972e192 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4Build.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4Build.cpp index 6cf6efabc..b7cf2c8f6 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4Build.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4Build.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4Build.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4Build.h index 2581388c9..586976f36 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4Build.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4Build.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4Settings.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4Settings.h index f0dca6e4a..41202caf3 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4Settings.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4Settings.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_AABBAABBSweepTest.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_AABBAABBSweepTest.h index a6cdd6978..c7be39f68 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_AABBAABBSweepTest.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_AABBAABBSweepTest.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_AABBSweep.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_AABBSweep.cpp index 17188acfa..d83644832 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_AABBSweep.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_AABBSweep.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxBoxOverlapTest.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxBoxOverlapTest.h index 29bd6a888..9e274d214 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxBoxOverlapTest.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxBoxOverlapTest.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxOverlap.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxOverlap.cpp index 64603e3ba..616cedd75 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxOverlap.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxOverlap.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxOverlap_Internal.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxOverlap_Internal.h index 5d89f5012..194ac8385 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxOverlap_Internal.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxOverlap_Internal.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxSweep_Internal.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxSweep_Internal.h index a5ba47544..1540ce38d 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxSweep_Internal.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxSweep_Internal.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxSweep_Params.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxSweep_Params.h index a80e18e8c..aa8c5f8c9 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxSweep_Params.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_BoxSweep_Params.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_CapsuleSweep.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_CapsuleSweep.cpp index f0ee08a08..2d7d6de21 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_CapsuleSweep.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_CapsuleSweep.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_CapsuleSweepAA.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_CapsuleSweepAA.cpp index ea1d77bf9..1bb8c74fb 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_CapsuleSweepAA.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_CapsuleSweepAA.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_CapsuleSweep_Internal.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_CapsuleSweep_Internal.h index 276fe4e8c..cb08a2725 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_CapsuleSweep_Internal.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_CapsuleSweep_Internal.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Common.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Common.h index 3ba60c972..b48a8e629 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Common.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Common.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Internal.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Internal.h index 5f24bdcbb..1222989b8 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Internal.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Internal.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_OBBSweep.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_OBBSweep.cpp index fb87e71ce..ffaf0fa2a 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_OBBSweep.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_OBBSweep.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_OBBOBB.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_OBBOBB.h index 47093e431..9e37a0d43 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_OBBOBB.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_OBBOBB.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_SegmentAABB.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_SegmentAABB.h index 327c4105e..42f15bc0a 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_SegmentAABB.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_SegmentAABB.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_SegmentAABB_Inflated.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_SegmentAABB_Inflated.h index a613ffdbd..0945e68f6 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_SegmentAABB_Inflated.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_SegmentAABB_Inflated.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_SphereAABB.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_SphereAABB.h index bce32cf01..87c8f0b22 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_SphereAABB.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamNoOrder_SphereAABB.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamOrdered_OBBOBB.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamOrdered_OBBOBB.h index ce1ec85ff..eebdb5e32 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamOrdered_OBBOBB.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamOrdered_OBBOBB.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamOrdered_SegmentAABB.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamOrdered_SegmentAABB.h index 44787078b..0abaa8d42 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamOrdered_SegmentAABB.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamOrdered_SegmentAABB.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamOrdered_SegmentAABB_Inflated.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamOrdered_SegmentAABB_Inflated.h index bd926d72f..13bbe8153 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamOrdered_SegmentAABB_Inflated.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_ProcessStreamOrdered_SegmentAABB_Inflated.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Raycast.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Raycast.cpp index fd8ce82a5..332b8b3ea 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Raycast.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Raycast.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs.h index 23ed4288e..cb91bd943 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_KajiyaNoOrder.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_KajiyaNoOrder.h index a36f76d97..1c17f50f2 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_KajiyaNoOrder.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_KajiyaNoOrder.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_KajiyaOrdered.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_KajiyaOrdered.h index e9d3ec241..b04731b65 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_KajiyaOrdered.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_KajiyaOrdered.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_SwizzledNoOrder.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_SwizzledNoOrder.h index decaebad4..2f408688c 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_SwizzledNoOrder.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_SwizzledNoOrder.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_SwizzledOrdered.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_SwizzledOrdered.h index c00d72037..1a7cd67b9 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_SwizzledOrdered.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_Slabs_SwizzledOrdered.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_SphereOverlap.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_SphereOverlap.cpp index 362ca6135..113a5fdc4 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_SphereOverlap.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_SphereOverlap.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_SphereSweep.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_SphereSweep.cpp index 8250997ed..829f9cb9d 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_SphereSweep.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBV4_SphereSweep.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuBVConstants.h b/src/PhysX/physx/source/geomutils/src/mesh/GuBVConstants.h index 7363fa62d..a72f4441d 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuBVConstants.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuBVConstants.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuMeshData.h b/src/PhysX/physx/source/geomutils/src/mesh/GuMeshData.h index bd4fc0dfc..dbdbddf4b 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuMeshData.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuMeshData.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuMeshQuery.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuMeshQuery.cpp index c4e2be499..58d9c2a33 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuMeshQuery.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuMeshQuery.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuMidphaseBV4.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuMidphaseBV4.cpp index 0e141cbc1..9b279e6f4 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuMidphaseBV4.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuMidphaseBV4.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuMidphaseInterface.h b/src/PhysX/physx/source/geomutils/src/mesh/GuMidphaseInterface.h index d9574476b..eeecee872 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuMidphaseInterface.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuMidphaseInterface.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuMidphaseRTree.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuMidphaseRTree.cpp index f88f55381..e7838cbef 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuMidphaseRTree.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuMidphaseRTree.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuOverlapTestsMesh.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuOverlapTestsMesh.cpp index bc5ced894..d420f1529 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuOverlapTestsMesh.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuOverlapTestsMesh.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuRTree.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuRTree.cpp index 7034f90c3..b602cc01e 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuRTree.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuRTree.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuRTree.h b/src/PhysX/physx/source/geomutils/src/mesh/GuRTree.h index 4cd3ad9c5..11f7604f4 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuRTree.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuRTree.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuRTreeQueries.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuRTreeQueries.cpp index 4030ba0d7..eeaacc9c0 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuRTreeQueries.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuRTreeQueries.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuSweepConvexTri.h b/src/PhysX/physx/source/geomutils/src/mesh/GuSweepConvexTri.h index d6d803174..b5e58c388 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuSweepConvexTri.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuSweepConvexTri.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuSweepMesh.h b/src/PhysX/physx/source/geomutils/src/mesh/GuSweepMesh.h index 7d568acb9..6d7b113de 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuSweepMesh.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuSweepMesh.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuSweepsMesh.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuSweepsMesh.cpp index b4028ef8c..6b056c203 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuSweepsMesh.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuSweepsMesh.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuTriangle32.h b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangle32.h index 421198706..908dbcc25 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuTriangle32.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangle32.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleCache.h b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleCache.h index 5c46b8857..d176409de 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleCache.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleCache.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMesh.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMesh.cpp index dfe813423..1dc0d8ec5 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMesh.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMesh.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMesh.h b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMesh.h index 20bdb5c4b..9e1a01446 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMesh.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMesh.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshBV4.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshBV4.cpp index 71945ef5e..4fe609312 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshBV4.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshBV4.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshBV4.h b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshBV4.h index 558e2debd..a93a5c110 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshBV4.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshBV4.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshRTree.cpp b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshRTree.cpp index 3c2710c4c..9eb44a87e 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshRTree.cpp +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshRTree.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshRTree.h b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshRTree.h index 168281546..566643a8e 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshRTree.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleMeshRTree.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleVertexPointers.h b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleVertexPointers.h index e32534bff..096fb1921 100644 --- a/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleVertexPointers.h +++ b/src/PhysX/physx/source/geomutils/src/mesh/GuTriangleVertexPointers.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactBoxBox.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactBoxBox.cpp index 59a8faa08..671442bc1 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactBoxBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactBoxBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactBoxConvex.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactBoxConvex.cpp index 8e118556b..a913f5bee 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactBoxConvex.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactBoxConvex.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleBox.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleBox.cpp index cb77a96d8..40e4bbe0f 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleCapsule.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleCapsule.cpp index 708c2cfb8..0d5027aa1 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleCapsule.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleCapsule.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleConvex.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleConvex.cpp index d7a637c1f..6dc7bda87 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleConvex.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleConvex.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleHeightField.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleHeightField.cpp index b8b4d6a6b..148c551a7 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleHeightField.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleHeightField.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleMesh.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleMesh.cpp index 57bcf18df..93aec0493 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleMesh.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactCapsuleMesh.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexCommon.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexCommon.cpp index be2692f68..862804123 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexCommon.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexCommon.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexCommon.h b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexCommon.h index 2e46431b6..0185b4f53 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexCommon.h +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexCommon.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexConvex.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexConvex.cpp index 27deee46c..c2596a69d 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexConvex.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexConvex.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexHeightField.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexHeightField.cpp index afcceee2b..43dcceffa 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexHeightField.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexHeightField.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexMesh.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexMesh.cpp index 07ca96521..617d30ce6 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexMesh.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactConvexMesh.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGen.h b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGen.h index c072acd4c..8ddc95706 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGen.h +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGen.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGenBoxConvex.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGenBoxConvex.cpp index 6bb333116..fcda4833a 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGenBoxConvex.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGenBoxConvex.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGenSphereCapsule.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGenSphereCapsule.cpp index 25d92d74c..f8264b6b6 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGenSphereCapsule.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGenSphereCapsule.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGenUtil.h b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGenUtil.h index 9e1084a53..06ee918af 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGenUtil.h +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactGenUtil.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactMeshCallback.h b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactMeshCallback.h index c96349973..fc4f39ed6 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactMeshCallback.h +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactMeshCallback.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactPlaneBox.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactPlaneBox.cpp index fd184ab8f..862505ccb 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactPlaneBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactPlaneBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactPlaneCapsule.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactPlaneCapsule.cpp index 9e0023c9e..ed73e4038 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactPlaneCapsule.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactPlaneCapsule.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactPlaneConvex.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactPlaneConvex.cpp index 43b6dc00d..5e1474a3a 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactPlaneConvex.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactPlaneConvex.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereBox.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereBox.cpp index a9e057ea0..78f5b457e 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereCapsule.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereCapsule.cpp index a7851fe59..9cac7d9ed 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereCapsule.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereCapsule.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereConvex.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereConvex.cpp index 2bc568c42..f601db8a9 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereConvex.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereConvex.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereHeightField.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereHeightField.cpp index fb8288271..f1e9b250b 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereHeightField.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereHeightField.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereMesh.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereMesh.cpp index 549b78c79..e7642014e 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereMesh.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereMesh.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSpherePlane.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSpherePlane.cpp index 203ed52a1..61a41e3c7 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSpherePlane.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSpherePlane.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereSphere.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereSphere.cpp index 5ba3fee61..7f0225510 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereSphere.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMContactSphereSphere.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMShapeConvex.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMShapeConvex.cpp index 9f805a02c..c3ef1d5d4 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMShapeConvex.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMShapeConvex.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMShapeConvex.h b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMShapeConvex.h index a86b06b1d..1f292cef9 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMShapeConvex.h +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMShapeConvex.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMTriangleContactGen.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMTriangleContactGen.cpp index efd27ee93..9cae16eb9 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMTriangleContactGen.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMTriangleContactGen.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPCMTriangleContactGen.h b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMTriangleContactGen.h index ece7b1050..20bd78bf7 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPCMTriangleContactGen.h +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPCMTriangleContactGen.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPersistentContactManifold.cpp b/src/PhysX/physx/source/geomutils/src/pcm/GuPersistentContactManifold.cpp index 1360be1c7..6865dbdf1 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPersistentContactManifold.cpp +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPersistentContactManifold.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/pcm/GuPersistentContactManifold.h b/src/PhysX/physx/source/geomutils/src/pcm/GuPersistentContactManifold.h index 5dc8dd965..a20d74be4 100644 --- a/src/PhysX/physx/source/geomutils/src/pcm/GuPersistentContactManifold.h +++ b/src/PhysX/physx/source/geomutils/src/pcm/GuPersistentContactManifold.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxBox.cpp b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxBox.cpp index a7210a921..e187b2aba 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxBox.h b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxBox.h index efb643ca3..002fb7cca 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxBox.h +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxBox.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxSphere.cpp b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxSphere.cpp index 21a99edfd..45ceeb898 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxSphere.cpp +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxSphere.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxSphere.h b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxSphere.h index 0e561f2c4..10baf676c 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxSphere.h +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxSphere.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_FeatureBased.cpp b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_FeatureBased.cpp index 659e40023..bd32edc23 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_FeatureBased.cpp +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_FeatureBased.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_FeatureBased.h b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_FeatureBased.h index 81ebc2878..fef06fabc 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_FeatureBased.h +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_FeatureBased.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_SAT.cpp b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_SAT.cpp index 13219ea87..110fb4f3e 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_SAT.cpp +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_SAT.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_SAT.h b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_SAT.h index 3116f86e2..6a97a9d4a 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_SAT.h +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepBoxTriangle_SAT.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleBox.cpp b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleBox.cpp index 36dafac7c..ed0eae751 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleBox.cpp +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleBox.h b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleBox.h index 55b094c02..d117576d3 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleBox.h +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleBox.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleCapsule.cpp b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleCapsule.cpp index 5b05d0d75..da2af39bf 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleCapsule.cpp +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleCapsule.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleCapsule.h b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleCapsule.h index 6341ca275..7748db675 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleCapsule.h +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleCapsule.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleTriangle.cpp b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleTriangle.cpp index c3e4c5415..c9e268d0a 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleTriangle.cpp +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleTriangle.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleTriangle.h b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleTriangle.h index fa5dfdec0..725dda0a0 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleTriangle.h +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepCapsuleTriangle.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereCapsule.cpp b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereCapsule.cpp index 740c8d7b2..d39b82a08 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereCapsule.cpp +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereCapsule.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereCapsule.h b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereCapsule.h index 98e7e5691..e48121c49 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereCapsule.h +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereCapsule.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereSphere.cpp b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereSphere.cpp index a9378d64a..66141566f 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereSphere.cpp +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereSphere.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereSphere.h b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereSphere.h index 1c80b0273..51c61dd50 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereSphere.h +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereSphere.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereTriangle.cpp b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereTriangle.cpp index 30728ac5a..507f3349e 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereTriangle.cpp +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereTriangle.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereTriangle.h b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereTriangle.h index ecfe6ab00..f4863ba99 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereTriangle.h +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepSphereTriangle.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepTriangleUtils.cpp b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepTriangleUtils.cpp index 3960e0025..0c3f53821 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepTriangleUtils.cpp +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepTriangleUtils.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/geomutils/src/sweep/GuSweepTriangleUtils.h b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepTriangleUtils.h index 323529351..e31c82dbb 100644 --- a/src/PhysX/physx/source/geomutils/src/sweep/GuSweepTriangleUtils.h +++ b/src/PhysX/physx/source/geomutils/src/sweep/GuSweepTriangleUtils.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/immediatemode/src/NpImmediateMode.cpp b/src/PhysX/physx/source/immediatemode/src/NpImmediateMode.cpp index e0215b60b..6e9c640ba 100644 --- a/src/PhysX/physx/source/immediatemode/src/NpImmediateMode.cpp +++ b/src/PhysX/physx/source/immediatemode/src/NpImmediateMode.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -44,726 +44,701 @@ #include "GuPersistentContactManifold.h" #include "NpConstraint.h" -namespace physx +using namespace physx; + +namespace { - - namespace - { - #define MAX_NUM_PARTITIONS 32u - static PxU32 bitTable[32] = - { - 1u << 0, 1u << 1, 1u << 2, 1u << 3, 1u << 4, 1u << 5, 1u << 6, 1u << 7, 1u << 8, 1u << 9, 1u << 10, 1u << 11, 1u << 12, 1u << 13, 1u << 14, 1u << 15, 1u << 16, 1u << 17, - 1u << 18, 1u << 19, 1u << 20, 1u << 21, 1u << 22, 1u << 23, 1u << 24, 1u << 25, 1u << 26, 1u << 27, 1u << 28, 1u << 29, 1u << 30, 1u << 31 - }; + static PxU32 bitTable[32] = + { + 1u << 0, 1u << 1, 1u << 2, 1u << 3, 1u << 4, 1u << 5, 1u << 6, 1u << 7, 1u << 8, 1u << 9, 1u << 10, 1u << 11, 1u << 12, 1u << 13, 1u << 14, 1u << 15, 1u << 16, 1u << 17, + 1u << 18, 1u << 19, 1u << 20, 1u << 21, 1u << 22, 1u << 23, 1u << 24, 1u << 25, 1u << 26, 1u << 27, 1u << 28, 1u << 29, 1u << 30, 1u << 31 + }; - PxU32 getBit(const PxU32 index) + PxU32 getBit(const PxU32 index) + { + PX_ASSERT(index < 32); + return bitTable[index]; + } + + class RigidBodyClassification + { + PxSolverBody* PX_RESTRICT mBodies; + PxU32 mNumBodies; + + public: + RigidBodyClassification(PxSolverBody* PX_RESTRICT bodies, PxU32 numBodies) : mBodies(bodies), mNumBodies(numBodies) { - PX_ASSERT(index < 32); - return bitTable[index]; } - - class RigidBodyClassification + //Returns true if it is a dynamic-dynamic constriant; false if it is a dynamic-static or dynamic-kinematic constraint + PX_FORCE_INLINE bool classifyConstraint(const PxSolverConstraintDesc& desc, uintptr_t& indexA, uintptr_t& indexB, bool& activeA, bool& activeB) const { - PxSolverBody* PX_RESTRICT mBodies; - PxU32 mNumBodies; + indexA = uintptr_t(desc.bodyA - mBodies); + indexB = uintptr_t(desc.bodyB - mBodies); + activeA = indexA < mNumBodies; + activeB = indexB < mNumBodies; + return activeA && activeB; + } - public: - RigidBodyClassification(PxSolverBody* PX_RESTRICT bodies, PxU32 numBodies) : mBodies(bodies), mNumBodies(numBodies) + PX_FORCE_INLINE void reserveSpaceForStaticConstraints(PxU32* numConstraintsPerPartition) + { + for (PxU32 a = 0; a < mNumBodies; ++a) { - } + mBodies[a].solverProgress = 0; - //Returns true if it is a dynamic-dynamic constriant; false if it is a dynamic-static or dynamic-kinematic constraint - PX_FORCE_INLINE bool classifyConstraint(const PxSolverConstraintDesc& desc, uintptr_t& indexA, uintptr_t& indexB, bool& activeA, bool& activeB) const - { - indexA = uintptr_t(desc.bodyA - mBodies); - indexB = uintptr_t(desc.bodyB - mBodies); - activeA = indexA < mNumBodies; - activeB = indexB < mNumBodies; - return activeA && activeB; - } - - PX_FORCE_INLINE void reserveSpaceForStaticConstraints(PxU32* numConstraintsPerPartition) - { - for (PxU32 a = 0; a < mNumBodies; ++a) + for (PxU32 b = 0; b < mBodies[a].maxSolverFrictionProgress; ++b) { - mBodies[a].solverProgress = 0; - - for (PxU32 b = 0; b < mBodies[a].maxSolverFrictionProgress; ++b) - { - PxU32 partId = PxMin(PxU32(mBodies[a].maxSolverNormalProgress + b), MAX_NUM_PARTITIONS); - numConstraintsPerPartition[partId]++; - } + PxU32 partId = PxMin(PxU32(mBodies[a].maxSolverNormalProgress + b), MAX_NUM_PARTITIONS); + numConstraintsPerPartition[partId]++; } } - }; + } + }; - template - void classifyConstraintDesc(const PxSolverConstraintDesc* PX_RESTRICT descs, const PxU32 numConstraints, Classification& classification, - PxU32* numConstraintsPerPartition) + template + void classifyConstraintDesc(const PxSolverConstraintDesc* PX_RESTRICT descs, const PxU32 numConstraints, Classification& classification, + PxU32* numConstraintsPerPartition) + { + const PxSolverConstraintDesc* _desc = descs; + const PxU32 numConstraintsMin1 = numConstraints - 1; + + PxMemZero(numConstraintsPerPartition, sizeof(PxU32) * 33); + + for (PxU32 i = 0; i < numConstraints; ++i, _desc++) { - const PxSolverConstraintDesc* _desc = descs; - const PxU32 numConstraintsMin1 = numConstraints - 1; + const PxU32 prefetchOffset = PxMin(numConstraintsMin1 - i, 4u); + Ps::prefetchLine(_desc[prefetchOffset].constraint); + Ps::prefetchLine(_desc[prefetchOffset].bodyA); + Ps::prefetchLine(_desc[prefetchOffset].bodyB); + Ps::prefetchLine(_desc + 8); - PxMemZero(numConstraintsPerPartition, sizeof(PxU32) * 33); + uintptr_t indexA, indexB; + bool activeA, activeB; - for (PxU32 i = 0; i < numConstraints; ++i, _desc++) + const bool notContainsStatic = classification.classifyConstraint(*_desc, indexA, indexB, activeA, activeB); + + if (notContainsStatic) { - const PxU32 prefetchOffset = PxMin(numConstraintsMin1 - i, 4u); - Ps::prefetchLine(_desc[prefetchOffset].constraint); - Ps::prefetchLine(_desc[prefetchOffset].bodyA); - Ps::prefetchLine(_desc[prefetchOffset].bodyB); - Ps::prefetchLine(_desc + 8); + PxU32 partitionsA = _desc->bodyA->solverProgress; + PxU32 partitionsB = _desc->bodyB->solverProgress; - uintptr_t indexA, indexB; - bool activeA, activeB; - - const bool notContainsStatic = classification.classifyConstraint(*_desc, indexA, indexB, activeA, activeB); - - if (notContainsStatic) + PxU32 availablePartition; { - PxU32 partitionsA = _desc->bodyA->solverProgress; - PxU32 partitionsB = _desc->bodyB->solverProgress; - - PxU32 availablePartition; + const PxU32 combinedMask = (~partitionsA & ~partitionsB); + availablePartition = combinedMask == 0 ? MAX_NUM_PARTITIONS : Ps::lowestSetBit(combinedMask); + if (availablePartition == MAX_NUM_PARTITIONS) { - const PxU32 combinedMask = (~partitionsA & ~partitionsB); - availablePartition = combinedMask == 0 ? MAX_NUM_PARTITIONS : Ps::lowestSetBit(combinedMask); - if (availablePartition == MAX_NUM_PARTITIONS) - { - //Write to overflow partition... - numConstraintsPerPartition[availablePartition]++; - _desc->bodyA->maxSolverNormalProgress = MAX_NUM_PARTITIONS; - _desc->bodyB->maxSolverNormalProgress = MAX_NUM_PARTITIONS; - continue; - } - - const PxU32 partitionBit = getBit(availablePartition); - partitionsA |= partitionBit; - partitionsB |= partitionBit; + //Write to overflow partition... + numConstraintsPerPartition[availablePartition]++; + _desc->bodyA->maxSolverNormalProgress = MAX_NUM_PARTITIONS; + _desc->bodyB->maxSolverNormalProgress = MAX_NUM_PARTITIONS; + continue; } - _desc->bodyA->solverProgress = partitionsA; - _desc->bodyB->solverProgress = partitionsB; - numConstraintsPerPartition[availablePartition]++; - availablePartition++; - _desc->bodyA->maxSolverNormalProgress = PxMax(_desc->bodyA->maxSolverNormalProgress, PxU16(availablePartition)); - _desc->bodyB->maxSolverNormalProgress = PxMax(_desc->bodyB->maxSolverNormalProgress, PxU16(availablePartition)); - } - else - { - //Just count the number of static constraints and store in maxSolverFrictionProgress... - if (activeA) - _desc->bodyA->maxSolverFrictionProgress++; - else if (activeB) - _desc->bodyB->maxSolverFrictionProgress++; + const PxU32 partitionBit = getBit(availablePartition); + partitionsA |= partitionBit; + partitionsB |= partitionBit; } + + _desc->bodyA->solverProgress = partitionsA; + _desc->bodyB->solverProgress = partitionsB; + numConstraintsPerPartition[availablePartition]++; + availablePartition++; + _desc->bodyA->maxSolverNormalProgress = PxMax(_desc->bodyA->maxSolverNormalProgress, PxU16(availablePartition)); + _desc->bodyB->maxSolverNormalProgress = PxMax(_desc->bodyB->maxSolverNormalProgress, PxU16(availablePartition)); + } + else + { + //Just count the number of static constraints and store in maxSolverFrictionProgress... + if (activeA) + _desc->bodyA->maxSolverFrictionProgress++; + else if (activeB) + _desc->bodyB->maxSolverFrictionProgress++; } - - classification.reserveSpaceForStaticConstraints(numConstraintsPerPartition); - } - template - void writeConstraintDesc(const PxSolverConstraintDesc* PX_RESTRICT descs, const PxU32 numConstraints, Classification& classification, - PxU32* accumulatedConstraintsPerPartition, PxSolverConstraintDesc* PX_RESTRICT eaOrderedConstraintDesc) + classification.reserveSpaceForStaticConstraints(numConstraintsPerPartition); + } + + template + void writeConstraintDesc(const PxSolverConstraintDesc* PX_RESTRICT descs, const PxU32 numConstraints, Classification& classification, + PxU32* accumulatedConstraintsPerPartition, PxSolverConstraintDesc* PX_RESTRICT eaOrderedConstraintDesc) + { + const PxSolverConstraintDesc* _desc = descs; + const PxU32 numConstraintsMin1 = numConstraints - 1; + for (PxU32 i = 0; i < numConstraints; ++i, _desc++) { - const PxSolverConstraintDesc* _desc = descs; - const PxU32 numConstraintsMin1 = numConstraints - 1; - for (PxU32 i = 0; i < numConstraints; ++i, _desc++) + const PxU32 prefetchOffset = PxMin(numConstraintsMin1 - i, 4u); + Ps::prefetchLine(_desc[prefetchOffset].constraint); + Ps::prefetchLine(_desc[prefetchOffset].bodyA); + Ps::prefetchLine(_desc[prefetchOffset].bodyB); + Ps::prefetchLine(_desc + 8); + + uintptr_t indexA, indexB; + bool activeA, activeB; + const bool notContainsStatic = classification.classifyConstraint(*_desc, indexA, indexB, activeA, activeB); + + if (notContainsStatic) { - const PxU32 prefetchOffset = PxMin(numConstraintsMin1 - i, 4u); - Ps::prefetchLine(_desc[prefetchOffset].constraint); - Ps::prefetchLine(_desc[prefetchOffset].bodyA); - Ps::prefetchLine(_desc[prefetchOffset].bodyB); - Ps::prefetchLine(_desc + 8); + PxU32 partitionsA = _desc->bodyA->solverProgress; + PxU32 partitionsB = _desc->bodyB->solverProgress; - uintptr_t indexA, indexB; - bool activeA, activeB; - const bool notContainsStatic = classification.classifyConstraint(*_desc, indexA, indexB, activeA, activeB); - - if (notContainsStatic) + PxU32 availablePartition; { - PxU32 partitionsA = _desc->bodyA->solverProgress; - PxU32 partitionsB = _desc->bodyB->solverProgress; - - PxU32 availablePartition; + const PxU32 combinedMask = (~partitionsA & ~partitionsB); + availablePartition = combinedMask == 0 ? MAX_NUM_PARTITIONS : Ps::lowestSetBit(combinedMask); + if (availablePartition == MAX_NUM_PARTITIONS) { - const PxU32 combinedMask = (~partitionsA & ~partitionsB); - availablePartition = combinedMask == 0 ? MAX_NUM_PARTITIONS : Ps::lowestSetBit(combinedMask); - if (availablePartition == MAX_NUM_PARTITIONS) - { - eaOrderedConstraintDesc[accumulatedConstraintsPerPartition[availablePartition]++] = *_desc; - continue; - } - - const PxU32 partitionBit = getBit(availablePartition); - - partitionsA |= partitionBit; - partitionsB |= partitionBit; + eaOrderedConstraintDesc[accumulatedConstraintsPerPartition[availablePartition]++] = *_desc; + continue; } - _desc->bodyA->solverProgress = partitionsA; - _desc->bodyB->solverProgress = partitionsB; + const PxU32 partitionBit = getBit(availablePartition); - eaOrderedConstraintDesc[accumulatedConstraintsPerPartition[availablePartition]++] = *_desc; + partitionsA |= partitionBit; + partitionsB |= partitionBit; } - else - { - //Just count the number of static constraints and store in maxSolverFrictionProgress... - PxU32 index = 0; - if (activeA) - index = PxMin(PxU32(_desc->bodyA->maxSolverNormalProgress + _desc->bodyA->maxSolverFrictionProgress++), MAX_NUM_PARTITIONS); - else if (activeB) - index = PxMin(PxU32(_desc->bodyB->maxSolverNormalProgress + _desc->bodyB->maxSolverFrictionProgress++), MAX_NUM_PARTITIONS); - eaOrderedConstraintDesc[accumulatedConstraintsPerPartition[index]++] = *_desc; - } + _desc->bodyA->solverProgress = partitionsA; + _desc->bodyB->solverProgress = partitionsB; + + eaOrderedConstraintDesc[accumulatedConstraintsPerPartition[availablePartition]++] = *_desc; + } + else + { + //Just count the number of static constraints and store in maxSolverFrictionProgress... + PxU32 index = 0; + if (activeA) + index = PxMin(PxU32(_desc->bodyA->maxSolverNormalProgress + _desc->bodyA->maxSolverFrictionProgress++), MAX_NUM_PARTITIONS); + else if (activeB) + index = PxMin(PxU32(_desc->bodyB->maxSolverNormalProgress + _desc->bodyB->maxSolverFrictionProgress++), MAX_NUM_PARTITIONS); + + eaOrderedConstraintDesc[accumulatedConstraintsPerPartition[index]++] = *_desc; } } + } +} +void immediate::PxConstructSolverBodies(const PxRigidBodyData* inRigidData, PxSolverBodyData* outSolverBodyData, const PxU32 nbBodies, const PxVec3& gravity, const PxReal dt) +{ + for (PxU32 a = 0; a < nbBodies; ++a) + { + const PxRigidBodyData& rigidData = inRigidData[a]; + PxVec3 lv = rigidData.linearVelocity, av = rigidData.angularVelocity; + Dy::bodyCoreComputeUnconstrainedVelocity(gravity, dt, rigidData.linearDamping, rigidData.angularDamping, 1.f, rigidData.maxLinearVelocitySq, rigidData.maxAngularVelocitySq, lv, av, false); + Dy::copyToSolverBodyData(lv, av, rigidData.invMass, rigidData.invInertia, rigidData.body2World, -rigidData.maxDepenetrationVelocity, rigidData.maxContactImpulse, IG_INVALID_NODE, PX_MAX_F32, outSolverBodyData[a], 0); + } +} + +void immediate::PxConstructStaticSolverBody(const PxTransform& globalPose, PxSolverBodyData& solverBodyData) +{ + PxVec3 zero(0.f); + Dy::copyToSolverBodyData(zero, zero, 0.f, zero, globalPose, -PX_MAX_F32, PX_MAX_F32, IG_INVALID_NODE, PX_MAX_F32, solverBodyData, 0); +} + +void immediate::PxIntegrateSolverBodies(PxSolverBodyData* solverBodyData, PxSolverBody* solverBody, const PxVec3* linearMotionVelocity, const PxVec3* angularMotionState, const PxU32 nbBodiesToIntegrate, PxReal dt) +{ + for (PxU32 i = 0; i < nbBodiesToIntegrate; ++i) + { + PxVec3 lmv = linearMotionVelocity[i]; + PxVec3 amv = angularMotionState[i]; + Dy::integrateCore(lmv, amv, solverBody[i], solverBodyData[i], dt); + } +} + +PxU32 immediate::PxBatchConstraints(PxSolverConstraintDesc* solverConstraintDescs, const PxU32 nbConstraints, PxSolverBody* solverBodies, PxU32 numBodies, PxConstraintBatchHeader* outBatchHeaders, + PxSolverConstraintDesc* outOrderedConstraintDescs) +{ + PxU32 constraintsPerPartition[MAX_NUM_PARTITIONS + 1]; + + for (PxU32 a = 0; a < numBodies; ++a) + { + PxSolverBody& body = solverBodies[a]; + body.solverProgress = 0; + //We re-use maxSolverFrictionProgress and maxSolverNormalProgress to record the + //maximum partition used by dynamic constraints and the number of static constraints affecting + //a body. We use this to make partitioning much cheaper and be able to support + body.maxSolverFrictionProgress = 0; + body.maxSolverNormalProgress = 0; } - - void immediate::PxConstructSolverBodies(const PxRigidBodyData* inRigidData, PxSolverBodyData* outSolverBodyData, const PxU32 nbBodies, const PxVec3& gravity, const PxReal dt) { - for (PxU32 a = 0; a < nbBodies; ++a) + RigidBodyClassification classification(solverBodies, numBodies); + classifyConstraintDesc(solverConstraintDescs, nbConstraints, classification, constraintsPerPartition); + + PxU32 accumulation = 0; + for (PxU32 a = 0; a < MAX_NUM_PARTITIONS+1; ++a) { - const PxRigidBodyData& rigidData = inRigidData[a]; - PxVec3 lv = rigidData.linearVelocity, av = rigidData.angularVelocity; - Dy::bodyCoreComputeUnconstrainedVelocity(gravity, dt, rigidData.linearDamping, rigidData.angularDamping, 1.f, rigidData.maxLinearVelocitySq, rigidData.maxAngularVelocitySq, lv, av, false); - Dy::copyToSolverBodyData(lv, av, rigidData.invMass, rigidData.invInertia, rigidData.body2World, -rigidData.maxDepenetrationVelocity, rigidData.maxContactImpulse, IG_INVALID_NODE, PX_MAX_F32, outSolverBodyData[a], 0); + PxU32 count = constraintsPerPartition[a]; + constraintsPerPartition[a] = accumulation; + accumulation += count; } - } - - void immediate::PxConstructStaticSolverBody(const PxTransform& globalPose, PxSolverBodyData& solverBodyData) - { - PxVec3 zero(0.f); - Dy::copyToSolverBodyData(zero, zero, 0.f, zero, globalPose, -PX_MAX_F32, PX_MAX_F32, IG_INVALID_NODE, PX_MAX_F32, solverBodyData, 0); - } - - - void immediate::PxIntegrateSolverBodies(PxSolverBodyData* solverBodyData, PxSolverBody* solverBody, const PxVec3* linearMotionVelocity, const PxVec3* angularMotionState, const PxU32 nbBodiesToIntegrate, PxReal dt) - { - for (PxU32 i = 0; i < nbBodiesToIntegrate; ++i) - { - PxVec3 lmv = linearMotionVelocity[i]; - PxVec3 amv = angularMotionState[i]; - Dy::integrateCore(lmv, amv, solverBody[i], solverBodyData[i], dt); - } - } - - - PxU32 immediate::PxBatchConstraints(PxSolverConstraintDesc* solverConstraintDescs, const PxU32 nbConstraints, PxSolverBody* solverBodies, PxU32 numBodies, PxConstraintBatchHeader* outBatchHeaders, - PxSolverConstraintDesc* outOrderedConstraintDescs) - { - PxU32 constraintsPerPartition[MAX_NUM_PARTITIONS + 1]; for (PxU32 a = 0; a < numBodies; ++a) { PxSolverBody& body = solverBodies[a]; body.solverProgress = 0; - //We re-use maxSolverFrictionProgress and maxSolverNormalProgress to record the - //maximum partition used by dynamic constraints and the number of static constraints affecting - //a body. We use this to make partitioning much cheaper and be able to support + //Keep the dynamic constraint count but bump the static constraint count back to 0. + //This allows us to place the static constraints in the appropriate place when we see them + //because we know the maximum index for the dynamic constraints... body.maxSolverFrictionProgress = 0; - body.maxSolverNormalProgress = 0; } + writeConstraintDesc(solverConstraintDescs, nbConstraints, classification, constraintsPerPartition, outOrderedConstraintDescs); + + PxU32 numHeaders = 0; + PxU32 currentPartition = 0; + PxU32 maxJ = nbConstraints == 0 ? 0 : constraintsPerPartition[0]; + + const PxU32 maxBatchPartition = MAX_NUM_PARTITIONS; + for (PxU32 a = 0; a < nbConstraints;) { - RigidBodyClassification classification(solverBodies, numBodies); - classifyConstraintDesc(solverConstraintDescs, nbConstraints, classification, constraintsPerPartition); + PxConstraintBatchHeader& header = outBatchHeaders[numHeaders++]; + header.mStartIndex = a; - PxU32 accumulation = 0; - for (PxU32 a = 0; a < MAX_NUM_PARTITIONS+1; ++a) + PxU32 loopMax = PxMin(maxJ - a, 4u); + PxU16 j = 0; + if (loopMax > 0) { - PxU32 count = constraintsPerPartition[a]; - constraintsPerPartition[a] = accumulation; - accumulation += count; - } - - for (PxU32 a = 0; a < numBodies; ++a) - { - PxSolverBody& body = solverBodies[a]; - body.solverProgress = 0; - //Keep the dynamic constraint count but bump the static constraint count back to 0. - //This allows us to place the static constraints in the appropriate place when we see them - //because we know the maximum index for the dynamic constraints... - body.maxSolverFrictionProgress = 0; - } - - writeConstraintDesc(solverConstraintDescs, nbConstraints, classification, constraintsPerPartition, outOrderedConstraintDescs); - - PxU32 numHeaders = 0; - PxU32 currentPartition = 0; - PxU32 maxJ = nbConstraints == 0 ? 0 : constraintsPerPartition[0]; - - const PxU32 maxBatchPartition = MAX_NUM_PARTITIONS; - for (PxU32 a = 0; a < nbConstraints;) - { - PxConstraintBatchHeader& header = outBatchHeaders[numHeaders++]; - header.mStartIndex = a; - - PxU32 loopMax = PxMin(maxJ - a, 4u); - PxU16 j = 0; - if (loopMax > 0) + j = 1; + PxSolverConstraintDesc& desc = outOrderedConstraintDescs[a]; + if (currentPartition < maxBatchPartition) { - j = 1; - PxSolverConstraintDesc& desc = outOrderedConstraintDescs[a]; - if (currentPartition < maxBatchPartition) - { - for (; j < loopMax && desc.constraintLengthOver16 == outOrderedConstraintDescs[a + j].constraintLengthOver16; ++j); - } - header.mStride = j; - header.mConstraintType = desc.constraintLengthOver16; + for (; j < loopMax && desc.constraintLengthOver16 == outOrderedConstraintDescs[a + j].constraintLengthOver16; ++j); } - if (maxJ == (a + j) && maxJ != nbConstraints) - { - currentPartition++; - maxJ = constraintsPerPartition[currentPartition]; - } - a += j; + header.mStride = j; + header.mConstraintType = desc.constraintLengthOver16; } - return numHeaders; + if (maxJ == (a + j) && maxJ != nbConstraints) + { + currentPartition++; + maxJ = constraintsPerPartition[currentPartition]; + } + a += j; } + return numHeaders; } +} +bool immediate::PxCreateContactConstraints(PxConstraintBatchHeader* batchHeaders, const PxU32 nbHeaders, PxSolverContactDesc* contactDescs, + PxConstraintAllocator& allocator, PxReal invDt, PxReal bounceThreshold, PxReal frictionOffsetThreshold, PxReal correlationDistance) +{ + PX_ASSERT(invDt > 0.f && PxIsFinite(invDt)); + PX_ASSERT(bounceThreshold < 0.f); + PX_ASSERT(frictionOffsetThreshold > 0.f); + PX_ASSERT(correlationDistance > 0.f); - bool immediate::PxCreateContactConstraints(PxConstraintBatchHeader* batchHeaders, const PxU32 nbHeaders, PxSolverContactDesc* contactDescs, - PxConstraintAllocator& allocator, PxReal invDt, PxReal bounceThreshold, PxReal frictionOffsetThreshold, PxReal correlationDistance) + Dy::SolverConstraintPrepState::Enum state = Dy::SolverConstraintPrepState::eUNBATCHABLE; + + Dy::CorrelationBuffer cb; + + PxU32 currentContactDescIdx = 0; + + for (PxU32 i = 0; i < nbHeaders; ++i) { - PX_ASSERT(invDt > 0.f && PxIsFinite(invDt)); - PX_ASSERT(bounceThreshold < 0.f); - PX_ASSERT(frictionOffsetThreshold > 0.f); - PX_ASSERT(correlationDistance > 0.f); - - Dy::SolverConstraintPrepState::Enum state = Dy::SolverConstraintPrepState::eUNBATCHABLE; - - Dy::CorrelationBuffer cb; - - PxU32 currentContactDescIdx = 0; - - for (PxU32 i = 0; i < nbHeaders; ++i) + PxConstraintBatchHeader& batchHeader = batchHeaders[i]; + if (batchHeader.mStride == 4) { - PxConstraintBatchHeader& batchHeader = batchHeaders[i]; - if (batchHeader.mStride == 4) + PxU32 totalContacts = contactDescs[currentContactDescIdx].numContacts + contactDescs[currentContactDescIdx + 1].numContacts + + contactDescs[currentContactDescIdx + 2].numContacts + contactDescs[currentContactDescIdx + 3].numContacts; + + if (totalContacts <= 64) { - PxU32 totalContacts = contactDescs[currentContactDescIdx].numContacts + contactDescs[currentContactDescIdx + 1].numContacts + - contactDescs[currentContactDescIdx + 2].numContacts + contactDescs[currentContactDescIdx + 3].numContacts; - - if (totalContacts <= 64) - { - state = Dy::createFinalizeSolverContacts4(cb, - contactDescs + currentContactDescIdx, - invDt, - bounceThreshold, - frictionOffsetThreshold, - correlationDistance, - 0.f, - allocator); - } + state = Dy::createFinalizeSolverContacts4(cb, + contactDescs + currentContactDescIdx, + invDt, + bounceThreshold, + frictionOffsetThreshold, + correlationDistance, + 0.f, + allocator); } - - if (state == Dy::SolverConstraintPrepState::eUNBATCHABLE) - { - for (PxU32 a = 0; a < batchHeader.mStride; ++a) - { - Dy::createFinalizeSolverContacts(contactDescs[currentContactDescIdx + a], cb, invDt, bounceThreshold, - frictionOffsetThreshold, correlationDistance, 0.f, allocator, NULL); - } - } - PxU8 type = *contactDescs[currentContactDescIdx].desc->constraint; - - if (type == DY_SC_TYPE_STATIC_CONTACT) - { - //Check if any block of constraints is classified as type static (single) contact constraint. - //If they are, iterate over all constraints grouped with it and switch to "dynamic" contact constraint - //type if there's a dynamic contact constraint in the group. - for (PxU32 c = 1; c < batchHeader.mStride; ++c) - { - if (*contactDescs[currentContactDescIdx + c].desc->constraint == DY_SC_TYPE_RB_CONTACT) - { - type = DY_SC_TYPE_RB_CONTACT; - break; - } - } - } - - batchHeader.mConstraintType = type; - - currentContactDescIdx += batchHeader.mStride; } - - - - - return true; - } - - - bool immediate::PxCreateJointConstraints(PxConstraintBatchHeader* batchHeaders, const PxU32 nbHeaders, PxSolverConstraintPrepDesc* jointDescs, PxConstraintAllocator& allocator, PxReal dt, PxReal invDt) - { - PX_ASSERT(dt > 0.f); - PX_ASSERT(invDt > 0.f && PxIsFinite(invDt)); - - Dy::SolverConstraintPrepState::Enum state = Dy::SolverConstraintPrepState::eUNBATCHABLE; - - PxU32 currentDescIdx = 0; - for (PxU32 i = 0; i < nbHeaders; ++i) + if (state == Dy::SolverConstraintPrepState::eUNBATCHABLE) { - PxConstraintBatchHeader& batchHeader = batchHeaders[i]; - - PxU8 type = DY_SC_TYPE_BLOCK_1D; - if (batchHeader.mStride == 4) - { - PxU32 totalRows = 0; - PxU32 maxRows = 0; - bool batchable = true; - for (PxU32 a = 0; a < batchHeader.mStride; ++a) - { - if (jointDescs[currentDescIdx + a].numRows == 0) - { - batchable = false; - break; - } - totalRows += jointDescs[currentDescIdx + a].numRows; - maxRows = PxMax(maxRows, jointDescs[currentDescIdx + a].numRows); - } - - if (batchable) - { - state = Dy::setupSolverConstraint4 - (jointDescs + currentDescIdx, - dt, invDt, totalRows, - allocator, maxRows); - } - } - - if (state == Dy::SolverConstraintPrepState::eUNBATCHABLE) - { - type = DY_SC_TYPE_RB_1D; - for (PxU32 a = 0; a < batchHeader.mStride; ++a) - { - Dy::ConstraintHelper::setupSolverConstraint(jointDescs[currentDescIdx + a], - allocator, dt, invDt, NULL); - } - } - - batchHeader.mConstraintType = type; - currentDescIdx += batchHeader.mStride; - } - - return true; - } - - bool immediate::PxCreateJointConstraintsWithShaders(PxConstraintBatchHeader* batchHeaders, const PxU32 nbHeaders, PxConstraint** constraints, PxSolverConstraintPrepDesc* jointDescs, PxConstraintAllocator& allocator, - PxReal dt, PxReal invDt) - { - Px1DConstraint allRows[Dy::MAX_CONSTRAINT_ROWS * 4]; - - //Runs shaders to fill in rows... - - PxU32 currentDescIdx = 0; - - for (PxU32 i = 0; i < nbHeaders; ++i) - { - - PxU32 numRows = 0; - PxU32 preppedIndex = 0; - PxU32 maxRows = 0; - - PxConstraintBatchHeader& batchHeader = batchHeaders[i]; - for (PxU32 a = 0; a < batchHeader.mStride; ++a) { - Px1DConstraint* rows = allRows + numRows; - PxSolverConstraintPrepDesc& desc = jointDescs[currentDescIdx + a]; - - NpConstraint* npConstraint = static_cast(constraints[currentDescIdx + a]); - - npConstraint->updateConstants(); - - Sc::ConstraintCore& core = npConstraint->getScbConstraint().getScConstraint(); - - PxConstraintSolverPrep prep = core.getPxConnector()->getPrep(); - const void* constantBlock = core.getPxConnector()->getConstantBlock(); - PX_ASSERT(prep); - - PxMemZero(rows + preppedIndex, sizeof(Px1DConstraint)*(Dy::MAX_CONSTRAINT_ROWS)); - for (PxU32 b = preppedIndex; b < Dy::MAX_CONSTRAINT_ROWS; ++b) - { - Px1DConstraint& c = rows[b]; - //Px1DConstraintInit(c); - c.minImpulse = -PX_MAX_REAL; - c.maxImpulse = PX_MAX_REAL; - } - - desc.mInvMassScales.linear0 = desc.mInvMassScales.linear1 = desc.mInvMassScales.angular0 = desc.mInvMassScales.angular1 = 1.f; - - desc.body0WorldOffset = PxVec3(0.f); - - PxVec3 cA2w, cB2w; - PxU32 constraintCount = prep(rows, - desc.body0WorldOffset, - Dy::MAX_CONSTRAINT_ROWS, - desc.mInvMassScales, - constantBlock, - desc.bodyFrame0, desc.bodyFrame1, - !!(core.getFlags() & PxConstraintFlag::eENABLE_EXTENDED_LIMITS), - cA2w, cB2w); - - preppedIndex = Dy::MAX_CONSTRAINT_ROWS - constraintCount; - - maxRows = PxMax(constraintCount, maxRows); - - desc.rows = rows; - desc.numRows = constraintCount; - numRows += constraintCount; + Dy::createFinalizeSolverContacts(contactDescs[currentContactDescIdx + a], cb, invDt, bounceThreshold, + frictionOffsetThreshold, correlationDistance, 0.f, allocator, NULL); } - - PxCreateJointConstraints(&batchHeader, 1, jointDescs + currentDescIdx, allocator, dt, invDt); - - currentDescIdx += batchHeader.mStride; } + PxU8 type = *contactDescs[currentContactDescIdx].desc->constraint; - return true; //KS - TODO - do some error reporting/management... - } - - PX_FORCE_INLINE bool PxIsZero(PxSolverBody* bodies, PxU32 nbBodies) - { - for (PxU32 i = 0; i < nbBodies; ++i) + if (type == DY_SC_TYPE_STATIC_CONTACT) { - if (!bodies[i].linearVelocity.isZero() || - !bodies[i].angularState.isZero()) - return false; - } - return true; - } - - - void immediate::PxSolveConstraints(PxConstraintBatchHeader* batchHeaders, const PxU32 nbBatchHeaders, PxSolverConstraintDesc* solverConstraintDescs, PxSolverBody* solverBodies, - PxVec3* linearMotionVelocity, PxVec3* angularMotionVelocity, const PxU32 nbSolverBodies, const PxU32 nbPositionIterations, const PxU32 nbVelocityIterations) - { - PX_ASSERT(nbPositionIterations > 0); - PX_ASSERT(nbVelocityIterations > 0); - PX_ASSERT(PxIsZero(solverBodies, nbSolverBodies)); //Ensure that solver body velocities have been zeroed before solving - - //Stage 1: solve the position iterations... - Dy::SolveBlockMethod* solveTable = Dy::getSolveBlockTable(); - - Dy::SolveBlockMethod* solveConcludeTable = Dy::getSolverConcludeBlockTable(); - - Dy::SolveWriteBackBlockMethod* solveWritebackTable = Dy::getSolveWritebackBlockTable(); - - Dy::SolverContext cache; - cache.mThresholdStreamIndex = 0; - cache.mThresholdStreamLength = 0xFFFFFFF; - - PX_ASSERT(nbPositionIterations > 0); - PX_ASSERT(nbVelocityIterations > 0); - - for (PxU32 i = nbPositionIterations; i > 1; --i) - { - cache.doFriction = i <= 3; - for (PxU32 a = 0; a < nbBatchHeaders; ++a) + //Check if any block of constraints is classified as type static (single) contact constraint. + //If they are, iterate over all constraints grouped with it and switch to "dynamic" contact constraint + //type if there's a dynamic contact constraint in the group. + for (PxU32 c = 1; c < batchHeader.mStride; ++c) { - PxConstraintBatchHeader& batch = batchHeaders[a]; - solveTable[batch.mConstraintType](solverConstraintDescs + batch.mStartIndex, batch.mStride, cache); + if (*contactDescs[currentContactDescIdx + c].desc->constraint == DY_SC_TYPE_RB_CONTACT) + { + type = DY_SC_TYPE_RB_CONTACT; + break; + } } } - cache.doFriction = true; + batchHeader.mConstraintType = type; + + currentContactDescIdx += batchHeader.mStride; + } + return true; +} + +bool immediate::PxCreateJointConstraints(PxConstraintBatchHeader* batchHeaders, const PxU32 nbHeaders, PxSolverConstraintPrepDesc* jointDescs, PxConstraintAllocator& allocator, PxReal dt, PxReal invDt) +{ + PX_ASSERT(dt > 0.f); + PX_ASSERT(invDt > 0.f && PxIsFinite(invDt)); + + Dy::SolverConstraintPrepState::Enum state = Dy::SolverConstraintPrepState::eUNBATCHABLE; + + PxU32 currentDescIdx = 0; + for (PxU32 i = 0; i < nbHeaders; ++i) + { + PxConstraintBatchHeader& batchHeader = batchHeaders[i]; + + PxU8 type = DY_SC_TYPE_BLOCK_1D; + if (batchHeader.mStride == 4) + { + PxU32 totalRows = 0; + PxU32 maxRows = 0; + bool batchable = true; + for (PxU32 a = 0; a < batchHeader.mStride; ++a) + { + if (jointDescs[currentDescIdx + a].numRows == 0) + { + batchable = false; + break; + } + totalRows += jointDescs[currentDescIdx + a].numRows; + maxRows = PxMax(maxRows, jointDescs[currentDescIdx + a].numRows); + } + + if (batchable) + { + state = Dy::setupSolverConstraint4 + (jointDescs + currentDescIdx, + dt, invDt, totalRows, + allocator, maxRows); + } + } + + if (state == Dy::SolverConstraintPrepState::eUNBATCHABLE) + { + type = DY_SC_TYPE_RB_1D; + for (PxU32 a = 0; a < batchHeader.mStride; ++a) + { + Dy::ConstraintHelper::setupSolverConstraint(jointDescs[currentDescIdx + a], + allocator, dt, invDt, NULL); + } + } + + batchHeader.mConstraintType = type; + currentDescIdx += batchHeader.mStride; + } + + return true; +} + +bool immediate::PxCreateJointConstraintsWithShaders(PxConstraintBatchHeader* batchHeaders, const PxU32 nbHeaders, PxConstraint** constraints, PxSolverConstraintPrepDesc* jointDescs, PxConstraintAllocator& allocator, + PxReal dt, PxReal invDt) +{ + Px1DConstraint allRows[Dy::MAX_CONSTRAINT_ROWS * 4]; + + //Runs shaders to fill in rows... + + PxU32 currentDescIdx = 0; + + for (PxU32 i = 0; i < nbHeaders; ++i) + { + + PxU32 numRows = 0; + PxU32 preppedIndex = 0; + PxU32 maxRows = 0; + + PxConstraintBatchHeader& batchHeader = batchHeaders[i]; + + for (PxU32 a = 0; a < batchHeader.mStride; ++a) + { + Px1DConstraint* rows = allRows + numRows; + PxSolverConstraintPrepDesc& desc = jointDescs[currentDescIdx + a]; + + NpConstraint* npConstraint = static_cast(constraints[currentDescIdx + a]); + + npConstraint->updateConstants(); + + Sc::ConstraintCore& core = npConstraint->getScbConstraint().getScConstraint(); + + PxConstraintSolverPrep prep = core.getPxConnector()->getPrep(); + const void* constantBlock = core.getPxConnector()->getConstantBlock(); + PX_ASSERT(prep); + + PxMemZero(rows + preppedIndex, sizeof(Px1DConstraint)*(Dy::MAX_CONSTRAINT_ROWS)); + for (PxU32 b = preppedIndex; b < Dy::MAX_CONSTRAINT_ROWS; ++b) + { + Px1DConstraint& c = rows[b]; + //Px1DConstraintInit(c); + c.minImpulse = -PX_MAX_REAL; + c.maxImpulse = PX_MAX_REAL; + } + + desc.mInvMassScales.linear0 = desc.mInvMassScales.linear1 = desc.mInvMassScales.angular0 = desc.mInvMassScales.angular1 = 1.f; + + desc.body0WorldOffset = PxVec3(0.f); + + PxVec3 cA2w, cB2w; + PxU32 constraintCount = prep(rows, + desc.body0WorldOffset, + Dy::MAX_CONSTRAINT_ROWS, + desc.mInvMassScales, + constantBlock, + desc.bodyFrame0, desc.bodyFrame1, + !!(core.getFlags() & PxConstraintFlag::eENABLE_EXTENDED_LIMITS), + cA2w, cB2w); + + preppedIndex = Dy::MAX_CONSTRAINT_ROWS - constraintCount; + + maxRows = PxMax(constraintCount, maxRows); + + desc.rows = rows; + desc.numRows = constraintCount; + numRows += constraintCount; + } + + PxCreateJointConstraints(&batchHeader, 1, jointDescs + currentDescIdx, allocator, dt, invDt); + + currentDescIdx += batchHeader.mStride; + } + + return true; //KS - TODO - do some error reporting/management... +} + +PX_FORCE_INLINE bool PxIsZero(PxSolverBody* bodies, PxU32 nbBodies) +{ + for (PxU32 i = 0; i < nbBodies; ++i) + { + if (!bodies[i].linearVelocity.isZero() || + !bodies[i].angularState.isZero()) + return false; + } + return true; +} + +void immediate::PxSolveConstraints(PxConstraintBatchHeader* batchHeaders, const PxU32 nbBatchHeaders, PxSolverConstraintDesc* solverConstraintDescs, PxSolverBody* solverBodies, + PxVec3* linearMotionVelocity, PxVec3* angularMotionVelocity, const PxU32 nbSolverBodies, const PxU32 nbPositionIterations, const PxU32 nbVelocityIterations) +{ + PX_ASSERT(nbPositionIterations > 0); + PX_ASSERT(nbVelocityIterations > 0); + PX_ASSERT(PxIsZero(solverBodies, nbSolverBodies)); //Ensure that solver body velocities have been zeroed before solving + + //Stage 1: solve the position iterations... + Dy::SolveBlockMethod* solveTable = Dy::getSolveBlockTable(); + + Dy::SolveBlockMethod* solveConcludeTable = Dy::getSolverConcludeBlockTable(); + + Dy::SolveWriteBackBlockMethod* solveWritebackTable = Dy::getSolveWritebackBlockTable(); + + Dy::SolverContext cache; + cache.mThresholdStreamIndex = 0; + cache.mThresholdStreamLength = 0xFFFFFFF; + + PX_ASSERT(nbPositionIterations > 0); + PX_ASSERT(nbVelocityIterations > 0); + + for (PxU32 i = nbPositionIterations; i > 1; --i) + { + cache.doFriction = i <= 3; for (PxU32 a = 0; a < nbBatchHeaders; ++a) { PxConstraintBatchHeader& batch = batchHeaders[a]; - solveConcludeTable[batch.mConstraintType](solverConstraintDescs + batch.mStartIndex, batch.mStride, cache); + solveTable[batch.mConstraintType](solverConstraintDescs + batch.mStartIndex, batch.mStride, cache); } + } - //Save motion velocities... + cache.doFriction = true; + for (PxU32 a = 0; a < nbBatchHeaders; ++a) + { + PxConstraintBatchHeader& batch = batchHeaders[a]; + solveConcludeTable[batch.mConstraintType](solverConstraintDescs + batch.mStartIndex, batch.mStride, cache); + } - for (PxU32 a = 0; a < nbSolverBodies; ++a) - { - linearMotionVelocity[a] = solverBodies[a].linearVelocity; - angularMotionVelocity[a] = solverBodies[a].angularState; - } + //Save motion velocities... - for (PxU32 i = nbVelocityIterations; i > 1; --i) - { - for (PxU32 a = 0; a < nbBatchHeaders; ++a) - { - PxConstraintBatchHeader& batch = batchHeaders[a]; - solveTable[batch.mConstraintType](solverConstraintDescs + batch.mStartIndex, batch.mStride, cache); - } - } + for (PxU32 a = 0; a < nbSolverBodies; ++a) + { + linearMotionVelocity[a] = solverBodies[a].linearVelocity; + angularMotionVelocity[a] = solverBodies[a].angularState; + } + for (PxU32 i = nbVelocityIterations; i > 1; --i) + { for (PxU32 a = 0; a < nbBatchHeaders; ++a) { PxConstraintBatchHeader& batch = batchHeaders[a]; - solveWritebackTable[batch.mConstraintType](solverConstraintDescs + batch.mStartIndex, batch.mStride, cache); + solveTable[batch.mConstraintType](solverConstraintDescs + batch.mStartIndex, batch.mStride, cache); } - } - - void createCache(Gu::Cache& cache, PxGeometryType::Enum geomType0, PxGeometryType::Enum geomType1, PxCacheAllocator& allocator) + for (PxU32 a = 0; a < nbBatchHeaders; ++a) { - - if (gEnablePCMCaching[geomType0][geomType1]) - { - if (geomType0 <= PxGeometryType::eCONVEXMESH && - geomType1 <= PxGeometryType::eCONVEXMESH) - { - if (geomType0 == PxGeometryType::eSPHERE || geomType1 == PxGeometryType::eSPHERE) - { - Gu::PersistentContactManifold* manifold = PX_PLACEMENT_NEW(allocator.allocateCacheData(sizeof(Gu::SpherePersistentContactManifold)), Gu::SpherePersistentContactManifold)(); - cache.setManifold(manifold); - } - else - { - Gu::PersistentContactManifold* manifold = PX_PLACEMENT_NEW(allocator.allocateCacheData(sizeof(Gu::LargePersistentContactManifold)), Gu::LargePersistentContactManifold)(); - cache.setManifold(manifold); + PxConstraintBatchHeader& batch = batchHeaders[a]; + solveWritebackTable[batch.mConstraintType](solverConstraintDescs + batch.mStartIndex, batch.mStride, cache); + } +} - } - cache.getManifold().clearManifold(); +void createCache(Gu::Cache& cache, PxGeometryType::Enum geomType0, PxGeometryType::Enum geomType1, PxCacheAllocator& allocator) +{ + if (gEnablePCMCaching[geomType0][geomType1]) + { + if (geomType0 <= PxGeometryType::eCONVEXMESH && + geomType1 <= PxGeometryType::eCONVEXMESH) + { + if (geomType0 == PxGeometryType::eSPHERE || geomType1 == PxGeometryType::eSPHERE) + { + Gu::PersistentContactManifold* manifold = PX_PLACEMENT_NEW(allocator.allocateCacheData(sizeof(Gu::SpherePersistentContactManifold)), Gu::SpherePersistentContactManifold)(); + cache.setManifold(manifold); } else { - //ML: raised 1 to indicate the manifold is multiManifold which is for contact gen in mesh/height field - //cache.manifold = 1; - cache.setMultiManifold(NULL); + Gu::PersistentContactManifold* manifold = PX_PLACEMENT_NEW(allocator.allocateCacheData(sizeof(Gu::LargePersistentContactManifold)), Gu::LargePersistentContactManifold)(); + cache.setManifold(manifold); + } + cache.getManifold().clearManifold(); } else { - //cache.manifold = 0; - cache.mCachedData = NULL; - cache.mManifoldFlags = 0; + //ML: raised 1 to indicate the manifold is multiManifold which is for contact gen in mesh/height field + //cache.manifold = 1; + cache.setMultiManifold(NULL); } } - - - - bool immediate::PxGenerateContacts(const PxGeometry* const * geom0, const PxGeometry* const * geom1, const PxTransform* pose0, const PxTransform* pose1, PxCache* contactCache, const PxU32 nbPairs, PxContactRecorder& contactRecorder, - const PxReal contactDistance, const PxReal meshContactMargin, const PxReal toleranceLength, PxCacheAllocator& allocator) + else { - PX_ASSERT(meshContactMargin > 0.f); - PX_ASSERT(toleranceLength > 0.f); - PX_ASSERT(contactDistance > 0.f); - Gu::ContactBuffer contactBuffer; + //cache.manifold = 0; + cache.mCachedData = NULL; + cache.mManifoldFlags = 0; + } +} - for (PxU32 i = 0; i < nbPairs; ++i) +bool immediate::PxGenerateContacts(const PxGeometry* const * geom0, const PxGeometry* const * geom1, const PxTransform* pose0, const PxTransform* pose1, PxCache* contactCache, const PxU32 nbPairs, PxContactRecorder& contactRecorder, + const PxReal contactDistance, const PxReal meshContactMargin, const PxReal toleranceLength, PxCacheAllocator& allocator) +{ + PX_ASSERT(meshContactMargin > 0.f); + PX_ASSERT(toleranceLength > 0.f); + PX_ASSERT(contactDistance > 0.f); + Gu::ContactBuffer contactBuffer; + + for (PxU32 i = 0; i < nbPairs; ++i) + { + contactBuffer.count = 0; + PxGeometryType::Enum type0 = geom0[i]->getType(); + PxGeometryType::Enum type1 = geom1[i]->getType(); + + const PxGeometry* tempGeom0 = geom0[i]; + const PxGeometry* tempGeom1 = geom1[i]; + + PX_ALIGN(16, PxTransform) transform0 = pose0[i]; + PX_ALIGN(16, PxTransform) transform1 = pose1[i]; + + const bool bSwap = type0 > type1; + if (bSwap) { + const PxGeometry* temp = tempGeom0; + tempGeom0 = geom1[i]; + tempGeom1 = temp; + PxGeometryType::Enum tempType = type0; + type0 = type1; + type1 = tempType; + transform1 = pose0[i]; + transform0 = pose1[i]; + } - contactBuffer.count = 0; - PxGeometryType::Enum type0 = geom0[i]->getType(); - PxGeometryType::Enum type1 = geom1[i]->getType(); + const Gu::GeometryUnion geomUnion0(*tempGeom0); + const Gu::GeometryUnion geomUnion1(*tempGeom1); - const PxGeometry* tempGeom0 = geom0[i]; - const PxGeometry* tempGeom1 = geom1[i]; + //Now work out which type of PCM we need... - PX_ALIGN(16, PxTransform) transform0 = pose0[i]; - PX_ALIGN(16, PxTransform) transform1 = pose1[i]; + Gu::Cache& cache = static_cast(contactCache[i]); - const bool bSwap = type0 > type1; - if (bSwap) + bool needsMultiManifold = type1 > PxGeometryType::eCONVEXMESH; + + Gu::NarrowPhaseParams params(contactDistance, meshContactMargin, toleranceLength); + + if (needsMultiManifold) + { + Gu::MultiplePersistentContactManifold multiManifold; + + if (cache.isMultiManifold()) { - const PxGeometry* temp = tempGeom0; - tempGeom0 = geom1[i]; - tempGeom1 = temp; - PxGeometryType::Enum tempType = type0; - type0 = type1; - type1 = tempType; - transform1 = pose0[i]; - transform0 = pose1[i]; - } - - const Gu::GeometryUnion geomUnion0(*tempGeom0); - const Gu::GeometryUnion geomUnion1(*tempGeom1); - - //Now work out which type of PCM we need... - - Gu::Cache& cache = static_cast(contactCache[i]); - - bool needsMultiManifold = type1 > PxGeometryType::eCONVEXMESH; - - Gu::NarrowPhaseParams params(contactDistance, meshContactMargin, toleranceLength); - - if (needsMultiManifold) - { - Gu::MultiplePersistentContactManifold multiManifold; - - if (cache.isMultiManifold()) - { - multiManifold.fromBuffer(reinterpret_cast(&cache.getMultipleManifold())); - } - else - { - multiManifold.initialize(); - } - cache.setMultiManifold(&multiManifold); - - //Do collision detection, then write manifold out... - g_PCMContactMethodTable[type0][type1](geomUnion0, geomUnion1, transform0, transform1, params, cache, contactBuffer, NULL); - - const PxU32 size = (sizeof(Gu::MultiPersistentManifoldHeader) + - multiManifold.mNumManifolds * sizeof(Gu::SingleManifoldHeader) + - multiManifold.mNumTotalContacts * sizeof(Gu::CachedMeshPersistentContact)); - - PxU8* buffer = allocator.allocateCacheData(size); - - multiManifold.toBuffer(buffer); - - cache.setMultiManifold(buffer); - + multiManifold.fromBuffer(reinterpret_cast(&cache.getMultipleManifold())); } else { - //Allocate the type of manifold we need again... - Gu::PersistentContactManifold* oldManifold = NULL; + multiManifold.initialize(); + } + cache.setMultiManifold(&multiManifold); - if (cache.isManifold()) - oldManifold = &cache.getManifold(); + //Do collision detection, then write manifold out... + g_PCMContactMethodTable[type0][type1](geomUnion0, geomUnion1, transform0, transform1, params, cache, contactBuffer, NULL); - //Allocates and creates the PCM... - createCache(cache, type0, type1, allocator); + const PxU32 size = (sizeof(Gu::MultiPersistentManifoldHeader) + + multiManifold.mNumManifolds * sizeof(Gu::SingleManifoldHeader) + + multiManifold.mNumTotalContacts * sizeof(Gu::CachedMeshPersistentContact)); - //Copy PCM from old to new manifold... - if (oldManifold) - { - Gu::PersistentContactManifold& manifold = cache.getManifold(); - manifold.mRelativeTransform = oldManifold->mRelativeTransform; - manifold.mNumContacts = oldManifold->mNumContacts; - manifold.mNumWarmStartPoints = oldManifold->mNumWarmStartPoints; - manifold.mAIndice[0] = oldManifold->mAIndice[0]; manifold.mAIndice[1] = oldManifold->mAIndice[1]; - manifold.mAIndice[2] = oldManifold->mAIndice[2]; manifold.mAIndice[3] = oldManifold->mAIndice[3]; - manifold.mBIndice[0] = oldManifold->mBIndice[0]; manifold.mBIndice[1] = oldManifold->mBIndice[1]; - manifold.mBIndice[2] = oldManifold->mBIndice[2]; manifold.mBIndice[3] = oldManifold->mBIndice[3]; - PxMemCopy(manifold.mContactPoints, oldManifold->mContactPoints, sizeof(Gu::PersistentContact)*manifold.mNumContacts); - } + PxU8* buffer = allocator.allocateCacheData(size); - g_PCMContactMethodTable[type0][type1](geomUnion0, geomUnion1, transform0, transform1, params, cache, contactBuffer, NULL); + multiManifold.toBuffer(buffer); + + cache.setMultiManifold(buffer); + } + else + { + //Allocate the type of manifold we need again... + Gu::PersistentContactManifold* oldManifold = NULL; + + if (cache.isManifold()) + oldManifold = &cache.getManifold(); + + //Allocates and creates the PCM... + createCache(cache, type0, type1, allocator); + + //Copy PCM from old to new manifold... + if (oldManifold) + { + Gu::PersistentContactManifold& manifold = cache.getManifold(); + manifold.mRelativeTransform = oldManifold->mRelativeTransform; + manifold.mNumContacts = oldManifold->mNumContacts; + manifold.mNumWarmStartPoints = oldManifold->mNumWarmStartPoints; + manifold.mAIndice[0] = oldManifold->mAIndice[0]; manifold.mAIndice[1] = oldManifold->mAIndice[1]; + manifold.mAIndice[2] = oldManifold->mAIndice[2]; manifold.mAIndice[3] = oldManifold->mAIndice[3]; + manifold.mBIndice[0] = oldManifold->mBIndice[0]; manifold.mBIndice[1] = oldManifold->mBIndice[1]; + manifold.mBIndice[2] = oldManifold->mBIndice[2]; manifold.mBIndice[3] = oldManifold->mBIndice[3]; + PxMemCopy(manifold.mContactPoints, oldManifold->mContactPoints, sizeof(Gu::PersistentContact)*manifold.mNumContacts); } - if (bSwap) - { - for (PxU32 a = 0; a < contactBuffer.count; ++a) - { - contactBuffer.contacts[a].normal = -contactBuffer.contacts[a].normal; - } - } + g_PCMContactMethodTable[type0][type1](geomUnion0, geomUnion1, transform0, transform1, params, cache, contactBuffer, NULL); + } - - if (contactBuffer.count != 0) + if (bSwap) + { + for (PxU32 a = 0; a < contactBuffer.count; ++a) { - //Record this contact pair... - contactRecorder.recordContacts(contactBuffer.contacts, contactBuffer.count, i); + contactBuffer.contacts[a].normal = -contactBuffer.contacts[a].normal; } } - return true; - } + if (contactBuffer.count != 0) + { + //Record this contact pair... + contactRecorder.recordContacts(contactBuffer.contacts, contactBuffer.count, i); + } + } + return true; } + diff --git a/src/PhysX/physx/source/lowlevel/api/include/PxsMaterialCore.h b/src/PhysX/physx/source/lowlevel/api/include/PxsMaterialCore.h index 9178d0578..94c76fdd3 100644 --- a/src/PhysX/physx/source/lowlevel/api/include/PxsMaterialCore.h +++ b/src/PhysX/physx/source/lowlevel/api/include/PxsMaterialCore.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/api/include/PxsMaterialManager.h b/src/PhysX/physx/source/lowlevel/api/include/PxsMaterialManager.h index d81ca4eb6..d602eb75c 100644 --- a/src/PhysX/physx/source/lowlevel/api/include/PxsMaterialManager.h +++ b/src/PhysX/physx/source/lowlevel/api/include/PxsMaterialManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/api/include/PxvConfig.h b/src/PhysX/physx/source/lowlevel/api/include/PxvConfig.h index 524e26a8f..424686ab3 100644 --- a/src/PhysX/physx/source/lowlevel/api/include/PxvConfig.h +++ b/src/PhysX/physx/source/lowlevel/api/include/PxvConfig.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/api/include/PxvDynamics.h b/src/PhysX/physx/source/lowlevel/api/include/PxvDynamics.h index edaff42e3..3509b2a26 100644 --- a/src/PhysX/physx/source/lowlevel/api/include/PxvDynamics.h +++ b/src/PhysX/physx/source/lowlevel/api/include/PxvDynamics.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/api/include/PxvGeometry.h b/src/PhysX/physx/source/lowlevel/api/include/PxvGeometry.h index aef2d999b..9de406b63 100644 --- a/src/PhysX/physx/source/lowlevel/api/include/PxvGeometry.h +++ b/src/PhysX/physx/source/lowlevel/api/include/PxvGeometry.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/api/include/PxvGlobals.h b/src/PhysX/physx/source/lowlevel/api/include/PxvGlobals.h index de321befc..489ad9457 100644 --- a/src/PhysX/physx/source/lowlevel/api/include/PxvGlobals.h +++ b/src/PhysX/physx/source/lowlevel/api/include/PxvGlobals.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/api/include/PxvManager.h b/src/PhysX/physx/source/lowlevel/api/include/PxvManager.h index 685340ff9..919ba17d8 100644 --- a/src/PhysX/physx/source/lowlevel/api/include/PxvManager.h +++ b/src/PhysX/physx/source/lowlevel/api/include/PxvManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/api/include/PxvSimStats.h b/src/PhysX/physx/source/lowlevel/api/include/PxvSimStats.h index 530574b3a..9cce3f2eb 100644 --- a/src/PhysX/physx/source/lowlevel/api/include/PxvSimStats.h +++ b/src/PhysX/physx/source/lowlevel/api/include/PxvSimStats.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/api/src/px_globals.cpp b/src/PhysX/physx/source/lowlevel/api/src/px_globals.cpp index 69603db69..5394dd2d5 100644 --- a/src/PhysX/physx/source/lowlevel/api/src/px_globals.cpp +++ b/src/PhysX/physx/source/lowlevel/api/src/px_globals.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/include/collision/PxcContactMethodImpl.h b/src/PhysX/physx/source/lowlevel/common/include/collision/PxcContactMethodImpl.h index 1ca5dccbd..4783ea0a5 100644 --- a/src/PhysX/physx/source/lowlevel/common/include/collision/PxcContactMethodImpl.h +++ b/src/PhysX/physx/source/lowlevel/common/include/collision/PxcContactMethodImpl.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcConstraintBlockStream.h b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcConstraintBlockStream.h index 53f610bce..f1de8c56f 100644 --- a/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcConstraintBlockStream.h +++ b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcConstraintBlockStream.h @@ -23,12 +23,11 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. - #ifndef PXC_CONSTRAINTBLOCKPOOL_H #define PXC_CONSTRAINTBLOCKPOOL_H @@ -39,7 +38,6 @@ namespace physx { - class PxsConstraintBlockManager { public: @@ -48,15 +46,13 @@ public: { } - PX_FORCE_INLINE void reset() { mBlockPool.releaseConstraintBlocks(mTrackingArray); } - - PxcNpMemBlockArray mTrackingArray; - PxcNpMemBlockPool& mBlockPool; + PxcNpMemBlockArray mTrackingArray; + PxcNpMemBlockPool& mBlockPool; private: PxsConstraintBlockManager& operator=(const PxsConstraintBlockManager&); @@ -66,14 +62,14 @@ class PxcConstraintBlockStream { PX_NOCOPY(PxcConstraintBlockStream) public: - PxcConstraintBlockStream(PxcNpMemBlockPool & blockPool): - mBlockPool(blockPool), - mBlock(NULL), - mUsed(0) + PxcConstraintBlockStream(PxcNpMemBlockPool & blockPool) : + mBlockPool (blockPool), + mBlock (NULL), + mUsed (0) { } - PX_FORCE_INLINE PxU8* reserve(PxU32 size, PxsConstraintBlockManager& manager) + PX_FORCE_INLINE PxU8* reserve(PxU32 size, PxsConstraintBlockManager& manager) { size = (size+15)&~15; if(size>PxcNpMemBlock::SIZE) @@ -98,10 +94,7 @@ public: mUsed = 0; } - PX_FORCE_INLINE PxcNpMemBlockPool& getMemBlockPool() - { - return mBlockPool; - } + PX_FORCE_INLINE PxcNpMemBlockPool& getMemBlockPool() { return mBlockPool; } private: PxcNpMemBlockPool& mBlockPool; @@ -122,7 +115,7 @@ public: { } - PX_FORCE_INLINE PxU8* reserve(PxU32 size) + PX_FORCE_INLINE PxU8* reserve(PxU32 size) { size = (size+15)&~15; @@ -150,10 +143,7 @@ public: mUsed = 0; } - PX_FORCE_INLINE PxcNpMemBlockPool& getMemBlockPool() - { - return mBlockPool; - } + PX_FORCE_INLINE PxcNpMemBlockPool& getMemBlockPool() { return mBlockPool; } private: PxcNpMemBlockPool& mBlockPool; diff --git a/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcContactCache.h b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcContactCache.h index d8deb405d..b124586fd 100644 --- a/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcContactCache.h +++ b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcContactCache.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcMaterialMethodImpl.h b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcMaterialMethodImpl.h index 041ef0711..d4468a99c 100644 --- a/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcMaterialMethodImpl.h +++ b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcMaterialMethodImpl.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpBatch.h b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpBatch.h index 1ccb09358..ff5aa421d 100644 --- a/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpBatch.h +++ b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpBatch.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -36,30 +36,15 @@ namespace physx { struct PxcNpWorkUnit; class PxcNpThreadContext; + struct PxsContactManagerOutput; -struct PxcNpWorkUnit; -class PxsContactManager; -struct PxsContactManagerOutput; + namespace Gu + { + struct Cache; + } -namespace Gu -{ - struct Cache; -} - -namespace Cm -{ - class FlushPool; -} - -class PxLightCpuTask; - -namespace Gu -{ - class PxgGpuNarrowphaseCoreInterface; -} - -void PxcDiscreteNarrowPhase(PxcNpThreadContext& context, const PxcNpWorkUnit& cmInput, Gu::Cache& cache, PxsContactManagerOutput& output); -void PxcDiscreteNarrowPhasePCM(PxcNpThreadContext& context, const PxcNpWorkUnit& cmInput, Gu::Cache& cache, PxsContactManagerOutput& output); + void PxcDiscreteNarrowPhase(PxcNpThreadContext& context, const PxcNpWorkUnit& cmInput, Gu::Cache& cache, PxsContactManagerOutput& output); + void PxcDiscreteNarrowPhasePCM(PxcNpThreadContext& context, const PxcNpWorkUnit& cmInput, Gu::Cache& cache, PxsContactManagerOutput& output); } #endif diff --git a/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpCache.h b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpCache.h index ed8048b68..32cf102e6 100644 --- a/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpCache.h +++ b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpCache.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpCacheStreamPair.h b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpCacheStreamPair.h index ba7da39d2..f6eb1f882 100644 --- a/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpCacheStreamPair.h +++ b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpCacheStreamPair.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpContactPrepShared.h b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpContactPrepShared.h index 5683b0d1b..2cb3b25e8 100644 --- a/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpContactPrepShared.h +++ b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpContactPrepShared.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpMemBlockPool.h b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpMemBlockPool.h index bfe4debf4..b4050e7b2 100644 --- a/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpMemBlockPool.h +++ b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpMemBlockPool.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpThreadContext.h b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpThreadContext.h index 3a3bca94c..f051acef2 100644 --- a/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpThreadContext.h +++ b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpThreadContext.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpWorkUnit.h b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpWorkUnit.h index 0cb68d584..95dc69613 100644 --- a/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpWorkUnit.h +++ b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcNpWorkUnit.h @@ -23,12 +23,11 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. - #ifndef PXC_NPWORKUNIT_H #define PXC_NPWORKUNIT_H @@ -38,14 +37,9 @@ namespace physx { - -class PxvContact; - struct PxsRigidCore; struct PxsShapeCore; -class PxsMaterialManager; - struct PxcNpWorkUnitFlag { enum Enum @@ -83,53 +77,51 @@ struct PxcNpWorkUnitStatusFlag }; }; +// PT: TODO: fix the inconsistent namings (mXXX) in this class +struct PxcNpWorkUnit +{ + const PxsRigidCore* rigidCore0; // INPUT //4 //8 + const PxsRigidCore* rigidCore1; // INPUT //8 //16 + + const PxsShapeCore* shapeCore0; // INPUT //12 //24 + const PxsShapeCore* shapeCore1; // INPUT //16 //32 + + PxU8* ccdContacts; // OUTPUT //20 //40 + + PxU8* frictionDataPtr; // INOUT //24 //48 + + PxU16 flags; // INPUT //26 //50 + PxU8 frictionPatchCount; // INOUT //27 //51 + PxU8 statusFlags; // OUTPUT (see PxcNpWorkUnitStatusFlag) //28 //52 + + PxU8 dominance0; // INPUT //29 //53 + PxU8 dominance1; // INPUT //30 //54 + PxU8 geomType0; // INPUT //31 //55 + PxU8 geomType1; // INPUT //32 //56 + + PxU32 index; // INPUT //36 //60 + + PxReal restDistance; // INPUT //40 //64 + + PxU32 mTransformCache0; // //44 //68 + PxU32 mTransformCache1; // //48 //72 + + PxU32 mEdgeIndex; //inout the island gen edge index //52 //76 + PxU32 mNpIndex; //INPUT //56 //80 + + PxReal mTorsionalPatchRadius; //60 //84 + PxReal mMinTorsionalPatchRadius; //64 //88 +}; + /* * A struct to record the number of work units a particular constraint pointer references. * This is created at the beginning of the constriant data and is used to bypass constraint preparation when the * bodies are not moving a lot. In this case, we can recycle the constraints and save ourselves some cycles. */ -struct PxcNpWorkUnit; struct PxcNpWorkUnitBatch { - PxcNpWorkUnit* mUnits[4]; - PxU32 mSize; -}; - -struct PxcNpWorkUnit -{ - - const PxsRigidCore* rigidCore0; // INPUT //4 //8 - const PxsRigidCore* rigidCore1; // INPUT //8 //16 - - const PxsShapeCore* shapeCore0; // INPUT //12 //24 - const PxsShapeCore* shapeCore1; // INPUT //16 //32 - - PxU8* ccdContacts; // OUTPUT //20 //40 - - PxU8* frictionDataPtr; // INOUT //24 //48 - - PxU16 flags; // INPUT //26 //50 - PxU8 frictionPatchCount; // INOUT //27 //51 - PxU8 statusFlags; // OUTPUT (see PxcNpWorkUnitStatusFlag) //28 //52 - - PxU8 dominance0; // INPUT //29 //53 - PxU8 dominance1; // INPUT //30 //54 - PxU8 geomType0; // INPUT //31 //55 - PxU8 geomType1; // INPUT //32 //56 - - PxU32 index; // INPUT //36 //60 - - PxReal restDistance; // INPUT //40 //64 - - PxU32 mTransformCache0; // //44 //68 - PxU32 mTransformCache1; // //48 //72 - - PxU32 mEdgeIndex; //inout the island gen edge index //52 //76 - PxU32 mNpIndex; //INPUT //56 //80 - - PxReal mTorsionalPatchRadius; //60 //84 - PxReal mMinTorsionalPatchRadius; //64 //88 - + PxcNpWorkUnit* mUnits[4]; + PxU32 mSize; }; //#if !defined(PX_P64) @@ -141,7 +133,6 @@ PX_FORCE_INLINE void PxcNpWorkUnitClearContactState(PxcNpWorkUnit& n) n.ccdContacts = NULL; } - PX_FORCE_INLINE void PxcNpWorkUnitClearCachedState(PxcNpWorkUnit& n) { n.frictionDataPtr = 0; @@ -159,7 +150,6 @@ PX_FORCE_INLINE void PxcNpWorkUnitClearFrictionCachedState(PxcNpWorkUnit& n) #if !defined(PX_P64) //PX_COMPILE_TIME_ASSERT(sizeof(PxcNpWorkUnit)==128); #endif - } #endif diff --git a/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcRigidBody.h b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcRigidBody.h index 1f698d59e..645608d61 100644 --- a/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcRigidBody.h +++ b/src/PhysX/physx/source/lowlevel/common/include/pipeline/PxcRigidBody.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -38,9 +38,6 @@ namespace physx { - -class PxsContactManager; -struct PxsCCDPair; struct PxsCCDBody; #define PX_INTERNAL_LOCK_FLAG_START 8 @@ -52,63 +49,56 @@ public: enum PxcRigidBodyFlag { - eFROZEN = 1 << 0, //This flag indicates that the stabilization is enabled and the body is - //"frozen". By "frozen", we mean that the body's transform is unchanged - //from the previous frame. This permits various optimizations. - eFREEZE_THIS_FRAME = 1 << 1, - eUNFREEZE_THIS_FRAME = 1 << 2, - eACTIVATE_THIS_FRAME = 1 << 3, - eDEACTIVATE_THIS_FRAME = 1 << 4, - eDISABLE_GRAVITY = 1 << 5, - eSPECULATIVE_CCD = 1 << 6, + eFROZEN = 1 << 0, //This flag indicates that the stabilization is enabled and the body is + //"frozen". By "frozen", we mean that the body's transform is unchanged + //from the previous frame. This permits various optimizations. + eFREEZE_THIS_FRAME = 1 << 1, + eUNFREEZE_THIS_FRAME = 1 << 2, + eACTIVATE_THIS_FRAME = 1 << 3, + eDEACTIVATE_THIS_FRAME = 1 << 4, + eDISABLE_GRAVITY = 1 << 5, + eSPECULATIVE_CCD = 1 << 6, //KS - copied here for GPU simulation to avoid needing to pass another set of flags around. - eLOCK_LINEAR_X = 1 << (PX_INTERNAL_LOCK_FLAG_START), - eLOCK_LINEAR_Y = 1 << (PX_INTERNAL_LOCK_FLAG_START + 1), - eLOCK_LINEAR_Z = 1 << (PX_INTERNAL_LOCK_FLAG_START + 2), - eLOCK_ANGULAR_X = 1 << (PX_INTERNAL_LOCK_FLAG_START + 3), - eLOCK_ANGULAR_Y = 1 << (PX_INTERNAL_LOCK_FLAG_START + 4), - eLOCK_ANGULAR_Z = 1 << (PX_INTERNAL_LOCK_FLAG_START + 5) - - + eLOCK_LINEAR_X = 1 << (PX_INTERNAL_LOCK_FLAG_START), + eLOCK_LINEAR_Y = 1 << (PX_INTERNAL_LOCK_FLAG_START + 1), + eLOCK_LINEAR_Z = 1 << (PX_INTERNAL_LOCK_FLAG_START + 2), + eLOCK_ANGULAR_X = 1 << (PX_INTERNAL_LOCK_FLAG_START + 3), + eLOCK_ANGULAR_Y = 1 << (PX_INTERNAL_LOCK_FLAG_START + 4), + eLOCK_ANGULAR_Z = 1 << (PX_INTERNAL_LOCK_FLAG_START + 5) }; - PX_FORCE_INLINE PxcRigidBody(PxsBodyCore* core) - : mLastTransform(core->body2World), - mCCD(NULL), - mCore(core) - { - } + PX_FORCE_INLINE PxcRigidBody(PxsBodyCore* core) : + mLastTransform (core->body2World), + mCCD (NULL), + mCore (core) + {} - void adjustCCDLastTransform(); + void adjustCCDLastTransform(); protected: - ~PxcRigidBody() - { - } + ~PxcRigidBody() {} public: - PxTransform mLastTransform; //28 (28) + PxTransform mLastTransform; //28 (28) - PxU16 mInternalFlags; //30 (30) - PxU16 solverIterationCounts; //32 (32) + PxU16 mInternalFlags; //30 (30) + PxU16 solverIterationCounts; //32 (32) - PxsCCDBody* mCCD; //36 (40) // only valid during CCD + PxsCCDBody* mCCD; //36 (40) // only valid during CCD - PxsBodyCore* mCore; //40 (48) + PxsBodyCore* mCore; //40 (48) #if !PX_P64_FAMILY - PxU32 alignmentPad[2]; //48 (48) + PxU32 alignmentPad[2]; //48 (48) #endif - PxVec3 sleepLinVelAcc; //60 (60) - PxReal freezeCount; //64 (64) + PxVec3 sleepLinVelAcc; //60 (60) + PxReal freezeCount; //64 (64) - PxVec3 sleepAngVelAcc; //76 (76) - PxReal accelScale; //80 (80) - - + PxVec3 sleepAngVelAcc; //76 (76) + PxReal accelScale; //80 (80) } PX_ALIGN_SUFFIX(16); PX_COMPILE_TIME_ASSERT(0 == (sizeof(PxcRigidBody) & 0x0f)); diff --git a/src/PhysX/physx/source/lowlevel/common/include/utils/PxcScratchAllocator.h b/src/PhysX/physx/source/lowlevel/common/include/utils/PxcScratchAllocator.h index 70d918e88..4c143b8e8 100644 --- a/src/PhysX/physx/source/lowlevel/common/include/utils/PxcScratchAllocator.h +++ b/src/PhysX/physx/source/lowlevel/common/include/utils/PxcScratchAllocator.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/include/utils/PxcThreadCoherentCache.h b/src/PhysX/physx/source/lowlevel/common/include/utils/PxcThreadCoherentCache.h index d375eff46..8284abf21 100644 --- a/src/PhysX/physx/source/lowlevel/common/include/utils/PxcThreadCoherentCache.h +++ b/src/PhysX/physx/source/lowlevel/common/include/utils/PxcThreadCoherentCache.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/src/collision/PxcContact.cpp b/src/PhysX/physx/source/lowlevel/common/src/collision/PxcContact.cpp index 7840341ed..b2dd5102a 100644 --- a/src/PhysX/physx/source/lowlevel/common/src/collision/PxcContact.cpp +++ b/src/PhysX/physx/source/lowlevel/common/src/collision/PxcContact.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcContactCache.cpp b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcContactCache.cpp index 419163225..16349a096 100644 --- a/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcContactCache.cpp +++ b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcContactCache.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcContactMethodImpl.cpp b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcContactMethodImpl.cpp index fee241289..98ca30019 100644 --- a/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcContactMethodImpl.cpp +++ b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcContactMethodImpl.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialHeightField.cpp b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialHeightField.cpp index 26b27272c..aef589669 100644 --- a/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialHeightField.cpp +++ b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialHeightField.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialMesh.cpp b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialMesh.cpp index 281dc1da0..676f1ff63 100644 --- a/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialMesh.cpp +++ b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialMesh.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialMethodImpl.cpp b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialMethodImpl.cpp index 3a8dfcb6c..16bc439c2 100644 --- a/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialMethodImpl.cpp +++ b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialMethodImpl.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialShape.cpp b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialShape.cpp index 8b948eb5e..877b43e81 100644 --- a/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialShape.cpp +++ b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcMaterialShape.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpBatch.cpp b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpBatch.cpp index 0b3441ad9..6c116c274 100644 --- a/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpBatch.cpp +++ b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpBatch.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpCacheStreamPair.cpp b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpCacheStreamPair.cpp index a31890e22..b02764516 100644 --- a/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpCacheStreamPair.cpp +++ b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpCacheStreamPair.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpContactPrepShared.cpp b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpContactPrepShared.cpp index a824d6a93..c393359b8 100644 --- a/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpContactPrepShared.cpp +++ b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpContactPrepShared.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpMemBlockPool.cpp b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpMemBlockPool.cpp index 2c8b0160c..f7be99b82 100644 --- a/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpMemBlockPool.cpp +++ b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpMemBlockPool.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpThreadContext.cpp b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpThreadContext.cpp index 9a20f7ea7..8c5c6f4be 100644 --- a/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpThreadContext.cpp +++ b/src/PhysX/physx/source/lowlevel/common/src/pipeline/PxcNpThreadContext.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -51,7 +51,7 @@ PxcNpThreadContext::PxcNpThreadContext(PxcNpContext* params) : mContactStreamPool (params->mContactStreamPool), mPatchStreamPool (params->mPatchStreamPool), mForceAndIndiceStreamPool (params->mForceAndIndiceStreamPool), - mMaterialManager(params->mMaterialManager), + mMaterialManager (params->mMaterialManager), mLocalNewTouchCount (0), mLocalLostTouchCount (0), mLocalFoundPatchCount (0), diff --git a/src/PhysX/physx/source/lowlevel/software/include/PxsBodySim.h b/src/PhysX/physx/source/lowlevel/software/include/PxsBodySim.h index 12bc731da..aec3b5860 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsBodySim.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsBodySim.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsCCD.h b/src/PhysX/physx/source/lowlevel/software/include/PxsCCD.h index 883c49732..545ea6203 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsCCD.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsCCD.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -379,12 +379,12 @@ struct PxsCCDPair \param[in] pass The current CCD pass \return The normalized TOI. <=1.0 indicates a hit. Otherwise PX_MAX_REAL. */ - PxReal sweepFindToi(PxcNpThreadContext& threadContext, PxReal dt, PxU32 pass); + PxReal sweepFindToi(PxcNpThreadContext& threadContext, PxReal dt, PxU32 pass, PxReal ccdThreshold); /** \brief Performs a sweep estimation for this pair \return The normalized TOI. <= 1.0 indicates a potential hit, otherwise PX_MAX_REAL. */ - PxReal sweepEstimateToi(); + PxReal sweepEstimateToi(PxReal ccdThreshold); /** \brief Advances this pair to the TOI \param[in] dt The time-step @@ -432,7 +432,8 @@ public: /** \brief Creates this PxsCCDContext */ - static PxsCCDContext* create(PxsContext* context, Dy::ThresholdStream& dynamicsContext, PxvNphaseImplementationContext& nPhaseContext); + static PxsCCDContext* create(PxsContext* context, Dy::ThresholdStream& dynamicsContext, PxvNphaseImplementationContext& nPhaseContext, + PxReal ccdThreshold); /** \brief Destroys this PxsCCDContext @@ -485,6 +486,8 @@ public: */ PX_FORCE_INLINE void clearUpdatedBodies() { mUpdatedCCDBodies.forceSize_Unsafe(0); } + PX_FORCE_INLINE PxReal getCCDThreshold() const { return mCCDThreshold;} + /** \brief Runs the CCD contact modification. \param[in] contacts The list of modifiable contacts @@ -530,7 +533,8 @@ protected: \brief Constructor for PxsCCDContext \param[in] context The PxsContext that is associated with this PxsCCDContext. */ - PxsCCDContext(PxsContext* context, Dy::ThresholdStream& thresholdStream, PxvNphaseImplementationContext& nPhaseContext); + PxsCCDContext(PxsContext* context, Dy::ThresholdStream& thresholdStream, PxvNphaseImplementationContext& nPhaseContext, + PxReal ccdThreshold); /** \brief Destructor for PxsCCDContext */ @@ -608,6 +612,8 @@ private: Ps::Mutex mMutex; + PxReal mCCDThreshold; + private: PX_NOCOPY(PxsCCDContext) diff --git a/src/PhysX/physx/source/lowlevel/software/include/PxsContactManager.h b/src/PhysX/physx/source/lowlevel/software/include/PxsContactManager.h index 1293e2aeb..b6b91464b 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsContactManager.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsContactManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsContactManagerState.h b/src/PhysX/physx/source/lowlevel/software/include/PxsContactManagerState.h index 767eb08f3..d0419c9e7 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsContactManagerState.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsContactManagerState.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsContext.h b/src/PhysX/physx/source/lowlevel/software/include/PxsContext.h index 7f5fcc5d8..2257d8784 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsContext.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsContext.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsDefaultMemoryManager.h b/src/PhysX/physx/source/lowlevel/software/include/PxsDefaultMemoryManager.h index 950698b01..124fbe808 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsDefaultMemoryManager.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsDefaultMemoryManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsHeapMemoryAllocator.h b/src/PhysX/physx/source/lowlevel/software/include/PxsHeapMemoryAllocator.h index 0646fe2d7..baefa11a2 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsHeapMemoryAllocator.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsHeapMemoryAllocator.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsIncrementalConstraintPartitioning.h b/src/PhysX/physx/source/lowlevel/software/include/PxsIncrementalConstraintPartitioning.h index 0c75adab5..fd28fd434 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsIncrementalConstraintPartitioning.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsIncrementalConstraintPartitioning.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsIslandManagerTypes.h b/src/PhysX/physx/source/lowlevel/software/include/PxsIslandManagerTypes.h index 021cd95f0..cbf1cff23 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsIslandManagerTypes.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsIslandManagerTypes.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsIslandNodeIndex.h b/src/PhysX/physx/source/lowlevel/software/include/PxsIslandNodeIndex.h index 713ae169b..f208049dc 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsIslandNodeIndex.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsIslandNodeIndex.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsIslandSim.h b/src/PhysX/physx/source/lowlevel/software/include/PxsIslandSim.h index 2390636bf..0f5fc39fd 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsIslandSim.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsIslandSim.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsKernelWrangler.h b/src/PhysX/physx/source/lowlevel/software/include/PxsKernelWrangler.h index 9990dcb77..d0f82356a 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsKernelWrangler.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsKernelWrangler.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsMaterialCombiner.h b/src/PhysX/physx/source/lowlevel/software/include/PxsMaterialCombiner.h index 83a5e1337..19535c4e2 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsMaterialCombiner.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsMaterialCombiner.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsMemoryManager.h b/src/PhysX/physx/source/lowlevel/software/include/PxsMemoryManager.h index 9cf8d7b78..a8ec1c0a8 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsMemoryManager.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsMemoryManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsNphaseImplementationContext.h b/src/PhysX/physx/source/lowlevel/software/include/PxsNphaseImplementationContext.h index d06467212..524b02038 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsNphaseImplementationContext.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsNphaseImplementationContext.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsRigidBody.h b/src/PhysX/physx/source/lowlevel/software/include/PxsRigidBody.h index 571cba466..d3a04dc05 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsRigidBody.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsRigidBody.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsShapeSim.h b/src/PhysX/physx/source/lowlevel/software/include/PxsShapeSim.h index 7cadd5c01..1cb99b901 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsShapeSim.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsShapeSim.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsSimpleIslandManager.h b/src/PhysX/physx/source/lowlevel/software/include/PxsSimpleIslandManager.h index 6c78eaa01..69c5f2f6a 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsSimpleIslandManager.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsSimpleIslandManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsSimulationController.h b/src/PhysX/physx/source/lowlevel/software/include/PxsSimulationController.h index 625352642..953a1efe5 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsSimulationController.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsSimulationController.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxsTransformCache.h b/src/PhysX/physx/source/lowlevel/software/include/PxsTransformCache.h index 1970356f1..a14ec9897 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxsTransformCache.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxsTransformCache.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/include/PxvNphaseImplementationContext.h b/src/PhysX/physx/source/lowlevel/software/include/PxvNphaseImplementationContext.h index 6e8d84c9f..bc2435506 100644 --- a/src/PhysX/physx/source/lowlevel/software/include/PxvNphaseImplementationContext.h +++ b/src/PhysX/physx/source/lowlevel/software/include/PxvNphaseImplementationContext.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/src/PxsCCD.cpp b/src/PhysX/physx/source/lowlevel/software/src/PxsCCD.cpp index 6a962c6e3..ef68a4abe 100644 --- a/src/PhysX/physx/source/lowlevel/software/src/PxsCCD.cpp +++ b/src/PhysX/physx/source/lowlevel/software/src/PxsCCD.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -193,7 +193,8 @@ namespace namespace physx { - PxsCCDContext::PxsCCDContext(PxsContext* context, Dy::ThresholdStream& thresholdStream, PxvNphaseImplementationContext& nPhaseContext) : + PxsCCDContext::PxsCCDContext(PxsContext* context, Dy::ThresholdStream& thresholdStream, PxvNphaseImplementationContext& nPhaseContext, + PxReal ccdThreshold) : mPostCCDSweepTask (context->getContextId(), this, "PxsContext.postCCDSweep"), mPostCCDAdvanceTask (context->getContextId(), this, "PxsContext.postCCDAdvance"), mPostCCDDepenetrateTask (context->getContextId(), this, "PxsContext.postCCDDepenetrate"), @@ -205,7 +206,8 @@ namespace physx mCCDMaxPasses (1), mContext (context), mThresholdStream (thresholdStream), - mNphaseContext(nPhaseContext) + mNphaseContext (nPhaseContext), + mCCDThreshold (ccdThreshold) { } @@ -213,14 +215,15 @@ PxsCCDContext::~PxsCCDContext() { } -PxsCCDContext* PxsCCDContext::create(PxsContext* context, Dy::ThresholdStream& thresholdStream, PxvNphaseImplementationContext& nPhaseContext) +PxsCCDContext* PxsCCDContext::create(PxsContext* context, Dy::ThresholdStream& thresholdStream, PxvNphaseImplementationContext& nPhaseContext, + PxReal ccdThreshold) { PxsCCDContext* dc = reinterpret_cast( PX_ALLOC(sizeof(PxsCCDContext), "PxsCCDContext")); if(dc) { - new(dc) PxsCCDContext(context, thresholdStream, nPhaseContext); + new(dc) PxsCCDContext(context, thresholdStream, nPhaseContext, ccdThreshold); } return dc; } @@ -246,7 +249,8 @@ PxTransform PxsCCDShape::getLastCCDAbsPose(const PxsRigidBody* atom) const return atom->getLastCCDTransform() * atom->getCore().getBody2Actor().getInverse() * mShapeCore->transform; } -PxReal PxsCCDPair::sweepFindToi(PxcNpThreadContext& context, PxReal dt, PxU32 pass) +PxReal PxsCCDPair::sweepFindToi(PxcNpThreadContext& context, PxReal dt, PxU32 pass, + PxReal ccdThreshold) { printSeparator("findToi", pass, mBa0, mG0, NULL, PxGeometryType::eGEOMETRY_COUNT); //Update shape transforms if necessary @@ -298,7 +302,7 @@ PxReal PxsCCDPair::sweepFindToi(PxcNpThreadContext& context, PxReal dt, PxU32 pa const PxReal fastMovingThresh0 = ccdShape0->mFastMovingThreshold; const PxReal fastMovingThresh1 = ccdShape1->mFastMovingThreshold; - const PxReal sumFastMovingThresh = (fastMovingThresh0 + fastMovingThresh1); + const PxReal sumFastMovingThresh = PxMin(fastMovingThresh0 + fastMovingThresh1, ccdThreshold); PxReal toi = Gu::SweepShapeShape(*ccdShape0, *ccdShape1, tm0, tm1, lastTm0, lastTm1, restDistance, @@ -447,7 +451,7 @@ void PxsCCDPair::updateShapes() } } -PxReal PxsCCDPair::sweepEstimateToi() +PxReal PxsCCDPair::sweepEstimateToi(PxReal ccdThreshold) { //Update shape transforms if necessary updateShapes(); @@ -491,7 +495,7 @@ PxReal PxsCCDPair::sweepEstimateToi() //Work out the sum of the fast moving thresholds scaled by the step ratio const PxReal fastMovingThresh0 = ccdShape0->mFastMovingThreshold; const PxReal fastMovingThresh1 = ccdShape1->mFastMovingThreshold; - const PxReal sumFastMovingThresh = (fastMovingThresh0 + fastMovingThresh1); + const PxReal sumFastMovingThresh = PxMin(fastMovingThresh0 + fastMovingThresh1, ccdThreshold); mToiType = eEstimate; @@ -845,9 +849,11 @@ class PxsCCDSweepTask : public Cm::Task { PxsCCDPair** mPairs; PxU32 mNumPairs; + PxReal mCCDThreshold; public: - PxsCCDSweepTask(PxU64 contextID, PxsCCDPair** pairs, PxU32 nPairs) - : Cm::Task(contextID), mPairs(pairs), mNumPairs(nPairs) + PxsCCDSweepTask(PxU64 contextID, PxsCCDPair** pairs, PxU32 nPairs, + PxReal ccdThreshold) + : Cm::Task(contextID), mPairs(pairs), mNumPairs(nPairs), mCCDThreshold(ccdThreshold) { } @@ -856,7 +862,7 @@ public: for (PxU32 j = 0; j < mNumPairs; j++) { PxsCCDPair& pair = *mPairs[j]; - pair.sweepEstimateToi(); + pair.sweepEstimateToi(mCCDThreshold); pair.mEstimatePass = 0; } } @@ -920,6 +926,8 @@ public: PxcNpThreadContext* threadContext = mContext->getNpThreadContext(); + PxReal ccdThreshold = mCCDContext->getCCDThreshold(); + // -------------------------------------------------------------------------------------- // loop over island labels assigned to this thread PxU32 islandStart = mFirstIslandPair; @@ -973,7 +981,7 @@ public: //If the pair was an estimate, we must perform an accurate sweep now if(pair.mToiType == PxsCCDPair::eEstimate) { - pair.sweepFindToi(*threadContext, dt, mCCDPass); + pair.sweepFindToi(*threadContext, dt, mCCDPass, ccdThreshold); //Test to see if the pair is still the earliest pair. if((iFront + 1) < islandEnd && mCCDPairs[iFront+1]->mMinToi < pair.mMinToi) @@ -1136,7 +1144,7 @@ public: // resweep pair1 since either b0 or b1 trajectory has changed PxReal oldToi = pair1.mMinToi; verifyCCDPair(pair1); - PxReal toi1 = pair1.sweepEstimateToi(); + PxReal toi1 = pair1.sweepEstimateToi(ccdThreshold); PX_ASSERT(pair1.mBa0); // this is because mMinToiNormal is the impact point here if (toi1 < oldToi) { @@ -1544,7 +1552,7 @@ void PxsCCDContext::updateCCD(PxReal dt, PxBaseTask* continuation, IG::IslandSim //Calculate the sum of the thresholds and work out if we need to perform a sweep. - const PxReal thresh = threshold0 + threshold1; + const PxReal thresh = PxMin(threshold0 + threshold1, mCCDThreshold); //If no shape pairs in the entire scene are fast-moving, we can bypass the entire of the CCD. needsSweep = needsSweep || (trA - trB).magnitudeSquared() >= (thresh * thresh); } @@ -1723,7 +1731,8 @@ void PxsCCDContext::updateCCD(PxReal dt, PxBaseTask* continuation, IG::IslandSim PX_ASSERT_WITH_MESSAGE(ptr, "Failed to allocate PxsCCDSweepTask"); const PxU32 batchEnd = PxMin(nPairs, batchBegin + mCCDPairsPerBatch); PX_ASSERT(batchEnd >= batchBegin); - PxsCCDSweepTask* task = PX_PLACEMENT_NEW(ptr, PxsCCDSweepTask)(mContext->getContextId(), mCCDPtrPairs.begin() + batchBegin, batchEnd - batchBegin); + PxsCCDSweepTask* task = PX_PLACEMENT_NEW(ptr, PxsCCDSweepTask)(mContext->getContextId(), mCCDPtrPairs.begin() + batchBegin, batchEnd - batchBegin, + mCCDThreshold); task->setContinuation(*mContext->mTaskManager, &mPostCCDSweepTask); task->removeReference(); } diff --git a/src/PhysX/physx/source/lowlevel/software/src/PxsContactManager.cpp b/src/PhysX/physx/source/lowlevel/software/src/PxsContactManager.cpp index a9c84dd27..9b89e8794 100644 --- a/src/PhysX/physx/source/lowlevel/software/src/PxsContactManager.cpp +++ b/src/PhysX/physx/source/lowlevel/software/src/PxsContactManager.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/src/PxsContext.cpp b/src/PhysX/physx/source/lowlevel/software/src/PxsContext.cpp index 56412e13c..ba6d543a5 100644 --- a/src/PhysX/physx/source/lowlevel/software/src/PxsContext.cpp +++ b/src/PhysX/physx/source/lowlevel/software/src/PxsContext.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -65,7 +65,7 @@ using namespace physx::shdfnd; PxsContext::PxsContext(const PxSceneDesc& desc, PxTaskManager* taskManager, Cm::FlushPool& taskPool, PxU64 contextID) : mNpThreadContextPool (this), - mContactManagerPool ("mContactManagerPool", this, 256, 8192), + mContactManagerPool ("mContactManagerPool", this, 256), mManifoldPool ("mManifoldPool", 256), mSphereManifoldPool ("mSphereManifoldPool", 256), mContactModifyCallback (NULL), diff --git a/src/PhysX/physx/source/lowlevel/software/src/PxsDefaultMemoryManager.cpp b/src/PhysX/physx/source/lowlevel/software/src/PxsDefaultMemoryManager.cpp index 381830ed7..7772d47b5 100644 --- a/src/PhysX/physx/source/lowlevel/software/src/PxsDefaultMemoryManager.cpp +++ b/src/PhysX/physx/source/lowlevel/software/src/PxsDefaultMemoryManager.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/src/PxsIslandSim.cpp b/src/PhysX/physx/source/lowlevel/software/src/PxsIslandSim.cpp index 2dd427ee4..69644397a 100644 --- a/src/PhysX/physx/source/lowlevel/software/src/PxsIslandSim.cpp +++ b/src/PhysX/physx/source/lowlevel/software/src/PxsIslandSim.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/src/PxsMaterialCombiner.cpp b/src/PhysX/physx/source/lowlevel/software/src/PxsMaterialCombiner.cpp index 476d3bc71..ae6452f9a 100644 --- a/src/PhysX/physx/source/lowlevel/software/src/PxsMaterialCombiner.cpp +++ b/src/PhysX/physx/source/lowlevel/software/src/PxsMaterialCombiner.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/src/PxsNphaseImplementationContext.cpp b/src/PhysX/physx/source/lowlevel/software/src/PxsNphaseImplementationContext.cpp index 4dbd52df2..ce5995bdb 100644 --- a/src/PhysX/physx/source/lowlevel/software/src/PxsNphaseImplementationContext.cpp +++ b/src/PhysX/physx/source/lowlevel/software/src/PxsNphaseImplementationContext.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevel/software/src/PxsSimpleIslandManager.cpp b/src/PhysX/physx/source/lowlevel/software/src/PxsSimpleIslandManager.cpp index 728e6910b..cb5dbe1b2 100644 --- a/src/PhysX/physx/source/lowlevel/software/src/PxsSimpleIslandManager.cpp +++ b/src/PhysX/physx/source/lowlevel/software/src/PxsSimpleIslandManager.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/include/BpAABBManager.h b/src/PhysX/physx/source/lowlevelaabb/include/BpAABBManager.h index 3c54c0f3d..59967a751 100644 --- a/src/PhysX/physx/source/lowlevelaabb/include/BpAABBManager.h +++ b/src/PhysX/physx/source/lowlevelaabb/include/BpAABBManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/include/BpAABBManagerTasks.h b/src/PhysX/physx/source/lowlevelaabb/include/BpAABBManagerTasks.h index 7532d0da6..7836dacbe 100644 --- a/src/PhysX/physx/source/lowlevelaabb/include/BpAABBManagerTasks.h +++ b/src/PhysX/physx/source/lowlevelaabb/include/BpAABBManagerTasks.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/include/BpBroadPhase.h b/src/PhysX/physx/source/lowlevelaabb/include/BpBroadPhase.h index 11190cf82..476cdd725 100644 --- a/src/PhysX/physx/source/lowlevelaabb/include/BpBroadPhase.h +++ b/src/PhysX/physx/source/lowlevelaabb/include/BpBroadPhase.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/include/BpBroadPhaseUpdate.h b/src/PhysX/physx/source/lowlevelaabb/include/BpBroadPhaseUpdate.h index 6fe718204..ae483ef0b 100644 --- a/src/PhysX/physx/source/lowlevelaabb/include/BpBroadPhaseUpdate.h +++ b/src/PhysX/physx/source/lowlevelaabb/include/BpBroadPhaseUpdate.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpAABBManager.cpp b/src/PhysX/physx/source/lowlevelaabb/src/BpAABBManager.cpp index 85109e5f6..4e7fb66a6 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpAABBManager.cpp +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpAABBManager.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhase.cpp b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhase.cpp index 0df71d8b9..71dd51f6d 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhase.cpp +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhase.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseABP.cpp b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseABP.cpp index 53362dfaa..a3b336001 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseABP.cpp +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseABP.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseABP.h b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseABP.h index 0ab400bbb..65a998bdd 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseABP.h +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseABP.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.cpp b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.cpp index 92fe49d1d..40bf923fc 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.cpp +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.h b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.h index 3ef82b480..e1152a6fb 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.h +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseMBP.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseMBPCommon.h b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseMBPCommon.h index 1cc3f9dc8..ac609000f 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseMBPCommon.h +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseMBPCommon.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSap.cpp b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSap.cpp index c98eb371a..defeb354d 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSap.cpp +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSap.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSap.h b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSap.h index 3a08495dd..f46d02d30 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSap.h +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSap.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSapAux.cpp b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSapAux.cpp index 531f8065c..fe4f1eafc 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSapAux.cpp +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSapAux.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSapAux.h b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSapAux.h index 30c2366fd..b1a4f7001 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSapAux.h +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseSapAux.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -37,7 +37,6 @@ #include "BpBroadPhase.h" #include "BpBroadPhaseUpdate.h" #include "CmBitMap.h" -#include "GuAxes.h" #include "PxcScratchAllocator.h" namespace physx diff --git a/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseShared.cpp b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseShared.cpp index 0fef90132..32410b6b3 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseShared.cpp +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseShared.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseShared.h b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseShared.h index 013f7c544..dc3e7935c 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseShared.h +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpBroadPhaseShared.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpMBPTasks.cpp b/src/PhysX/physx/source/lowlevelaabb/src/BpMBPTasks.cpp index 5504ce468..62f61b1a2 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpMBPTasks.cpp +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpMBPTasks.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpMBPTasks.h b/src/PhysX/physx/source/lowlevelaabb/src/BpMBPTasks.h index 21f518516..128c189d1 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpMBPTasks.h +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpMBPTasks.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpSAPTasks.cpp b/src/PhysX/physx/source/lowlevelaabb/src/BpSAPTasks.cpp index 2735614b6..ce75f969e 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpSAPTasks.cpp +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpSAPTasks.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowlevelaabb/src/BpSAPTasks.h b/src/PhysX/physx/source/lowlevelaabb/src/BpSAPTasks.h index f9b0523b4..6f325eb16 100644 --- a/src/PhysX/physx/source/lowlevelaabb/src/BpSAPTasks.h +++ b/src/PhysX/physx/source/lowlevelaabb/src/BpSAPTasks.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/include/DyArticulation.h b/src/PhysX/physx/source/lowleveldynamics/include/DyArticulation.h index e653067f2..35282080e 100644 --- a/src/PhysX/physx/source/lowleveldynamics/include/DyArticulation.h +++ b/src/PhysX/physx/source/lowleveldynamics/include/DyArticulation.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -43,12 +43,16 @@ namespace physx { class PxConstraintAllocator; - + class PxcConstraintBlockStream; + struct PxSolverConstraintDesc; + class PxsConstraintBlockManager; #define DY_DEBUG_ARTICULATION 0 namespace Dy { + struct ArticulationJointTransforms; + struct PxTGSSolverConstraintDesc; struct FsInertia; struct FsData; @@ -79,10 +83,7 @@ public: //void setFsDataPtr(FsData* data) { mFsData = data; } // get data sizes for allocation at higher levels - virtual void getDataSizes(PxU32 linkCount, - PxU32 &solverDataSize, - PxU32& totalSize, - PxU32& scratchSize); + virtual void getDataSizes(PxU32 linkCount, PxU32& solverDataSize, PxU32& totalSize, PxU32& scratchSize); virtual void getImpulseResponse( PxU32 linkID, diff --git a/src/PhysX/physx/source/lowleveldynamics/include/DyArticulationCore.h b/src/PhysX/physx/source/lowleveldynamics/include/DyArticulationCore.h index 42e9dfdec..1c6cd38fe 100644 --- a/src/PhysX/physx/source/lowleveldynamics/include/DyArticulationCore.h +++ b/src/PhysX/physx/source/lowleveldynamics/include/DyArticulationCore.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/include/DyArticulationJointCore.h b/src/PhysX/physx/source/lowleveldynamics/include/DyArticulationJointCore.h index 724b5ff7d..79b617cc7 100644 --- a/src/PhysX/physx/source/lowleveldynamics/include/DyArticulationJointCore.h +++ b/src/PhysX/physx/source/lowleveldynamics/include/DyArticulationJointCore.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -38,7 +38,6 @@ namespace physx { namespace Dy { - struct ArticulationLimit { PxReal low, high; @@ -101,7 +100,6 @@ namespace physx relativeQuat = other.relativeQuat; jointType = other.jointType; jointOffset = other.jointOffset; //this is the dof offset for the joint in the cache - } // attachment points, don't change the order, otherwise it will break GPU code @@ -130,13 +128,10 @@ namespace physx PxU8 jointType; //1 291 PxU8 pad[13]; //13 304 - - ArticulationJointCoreBase() { maxJointVelocity = 100.f; } // PX_SERIALIZATION ArticulationJointCoreBase(const PxEMPTY&) {} //~PX_SERIALIZATION - }; } } diff --git a/src/PhysX/physx/source/lowleveldynamics/include/DyConstraint.h b/src/PhysX/physx/source/lowleveldynamics/include/DyConstraint.h index 67f05583b..1151a5673 100644 --- a/src/PhysX/physx/source/lowleveldynamics/include/DyConstraint.h +++ b/src/PhysX/physx/source/lowleveldynamics/include/DyConstraint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -46,7 +46,6 @@ class PxsRigidBody; namespace Dy { - #if PX_VC #pragma warning(push) #pragma warning( disable : 4324 ) // Padding was added at the end of a structure because of a __declspec(align) value. @@ -56,22 +55,22 @@ struct Constraint { public: - PxReal linBreakForce; //0 - PxReal angBreakForce; //4 - PxU16 constantBlockSize; //6 - PxU16 flags; //8 + PxReal linBreakForce; //0 + PxReal angBreakForce; //4 + PxU16 constantBlockSize; //6 + PxU16 flags; //8 - PxConstraintSolverPrep solverPrep; //12 - PxConstraintProject project; //16 - void* constantBlock; //20 + PxConstraintSolverPrep solverPrep; //12 + PxConstraintProject project; //16 + void* constantBlock; //20 - PxsRigidBody* body0; //24 - PxsRigidBody* body1; //28 + PxsRigidBody* body0; //24 + PxsRigidBody* body1; //28 - PxsBodyCore* bodyCore0; //32 - PxsBodyCore* bodyCore1; //36 - PxU32 index; //40 //this is also a constraint write back index - PxReal minResponseThreshold; //44 + PxsBodyCore* bodyCore0; //32 + PxsBodyCore* bodyCore1; //36 + PxU32 index; //40 //this is also a constraint write back index + PxReal minResponseThreshold; //44 } PX_ALIGN_SUFFIX(16); #if PX_VC diff --git a/src/PhysX/physx/source/lowleveldynamics/include/DyConstraintWriteBack.h b/src/PhysX/physx/source/lowleveldynamics/include/DyConstraintWriteBack.h index ca5d889a3..a98916211 100644 --- a/src/PhysX/physx/source/lowleveldynamics/include/DyConstraintWriteBack.h +++ b/src/PhysX/physx/source/lowleveldynamics/include/DyConstraintWriteBack.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/include/DyContext.h b/src/PhysX/physx/source/lowleveldynamics/include/DyContext.h index b16d0feda..c13055f5b 100644 --- a/src/PhysX/physx/source/lowleveldynamics/include/DyContext.h +++ b/src/PhysX/physx/source/lowleveldynamics/include/DyContext.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/include/DyFeatherstoneArticulation.h b/src/PhysX/physx/source/lowleveldynamics/include/DyFeatherstoneArticulation.h index 44026b435..baeabde1f 100644 --- a/src/PhysX/physx/source/lowleveldynamics/include/DyFeatherstoneArticulation.h +++ b/src/PhysX/physx/source/lowleveldynamics/include/DyFeatherstoneArticulation.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -47,7 +47,6 @@ namespace physx { - class PxContactJoint; struct PxSolverConstraintDesc; class PxcConstraintBlockStream; @@ -61,12 +60,12 @@ namespace physx namespace Dy { - //#if PX_VC //#pragma warning(push) //#pragma warning( disable : 4324 ) // Padding was added at the end of a structure because of a __declspec(align) value. //#endif + struct PxTGSSolverConstraintDesc; //class ArticulationJointCoreData; class ArticulationLinkData; struct SpatialSubspaceMatrix; @@ -78,7 +77,7 @@ namespace Dy struct SpatialTransform; struct Constraint; - struct DyScratchAllocator +/* struct DyScratchAllocator { char* base; size_t size; @@ -96,11 +95,10 @@ namespace Dy taken += sizeReq; return result; } - }; - + };*/ //This stuct is used in TGS - class ArticulationTempData +/* class ArticulationTempData { public: Cm::SpatialVectorF mBaseLinkMotionVelocite; @@ -108,56 +106,56 @@ namespace Dy Ps::Array mJointPosition; // joint position Ps::Array mJointVelocity; // joint velocity Ps::Array mLinkTransform; // this is the transform list for links - }; + };*/ struct ArticulationInternalConstraint { //Common/shared directional info between, frictions and drives - Cm::UnAlignedSpatialVector row0; //24 24 - Cm::UnAlignedSpatialVector row1; //24 48 - Cm::UnAlignedSpatialVector deltaVA; //24 72 - Cm::UnAlignedSpatialVector deltaVB; //24 96 + Cm::UnAlignedSpatialVector row0; //24 24 + Cm::UnAlignedSpatialVector row1; //24 48 + Cm::UnAlignedSpatialVector deltaVA; //24 72 + Cm::UnAlignedSpatialVector deltaVB; //24 96 //Response information - PxReal recipResponse; //4 100 - PxReal response; //4 104 + PxReal recipResponse; //4 100 + PxReal response; //4 104 //Joint limit values - PxReal lowLimit; //4 108 - PxReal highLimit; //4 112 - PxReal lowImpulse; //4 116 changed - PxReal highImpulse; //4 120 changed - PxReal erp; //4 124 + PxReal lowLimit; //4 108 + PxReal highLimit; //4 112 + PxReal lowImpulse; //4 116 changed + PxReal highImpulse; //4 120 changed + PxReal erp; //4 124 //Joint spring drive info - PxReal driveTargetVel; //4 128 - PxReal driveBiasCoefficient; //4 132 - PxReal driveTarget; //4 136 - PxReal driveVelMultiplier; //4 140 - PxReal driveImpulseMultiplier; //4 144 - PxReal maxDriveForce; //4 148 - PxReal driveForce; //4 152 + PxReal driveTargetVel; //4 128 + PxReal driveBiasCoefficient; //4 132 + PxReal driveTarget; //4 136 + PxReal driveVelMultiplier; //4 140 + PxReal driveImpulseMultiplier; //4 144 + PxReal maxDriveForce; //4 148 + PxReal driveForce; //4 152 - PxReal maxFrictionForce; //4 156 - PxReal frictionForce; //4 160 - PxReal frictionForceCoefficient; //4 164 + PxReal maxFrictionForce; //4 156 + PxReal frictionForce; //4 160 + PxReal frictionForceCoefficient; //4 164 - bool isLinearConstraint; //1 165 - PxU8 padding[11]; //15 176 + bool isLinearConstraint; //1 165 + PxU8 padding[11]; //11 176 }; struct ArticulationInternalLockedAxis { //How much an impulse will effect angular velocity - Cm::UnAlignedSpatialVector deltaVA; //24 24 - Cm::UnAlignedSpatialVector deltaVB; //24 48 + Cm::UnAlignedSpatialVector deltaVA; //24 24 + Cm::UnAlignedSpatialVector deltaVB; //24 48 //Jacobian axis that is locked - PxVec3 axis; //12 60 + PxVec3 axis; //12 60 //Response information - PxReal recipResponse; //4 64 + PxReal recipResponse; //4 64 //Initial error - PxReal error; //4 68 + PxReal error; //4 68 //Bias scale - PxReal biasScale; //4 72 + PxReal biasScale; //4 72 - PxU32 pad[2]; //4 80 + PxU32 pad[2]; //4 80 }; class ArticulationData @@ -168,151 +166,142 @@ namespace Dy mLinksData(NULL), mJointData(NULL), mDofs(0xffffffff), mLocks(0), mDataDirty(true) { - } ~ArticulationData(); - PX_FORCE_INLINE void init(); - PX_FORCE_INLINE void resizeLinkData(const PxU32 linkCount); - PX_FORCE_INLINE void resizeJointData(const PxU32 dofs); + PX_FORCE_INLINE void init(); + void resizeLinkData(const PxU32 linkCount); + void resizeJointData(const PxU32 dofs); - PX_FORCE_INLINE PxReal* getJointAccelerations() { return mJointAcceleration.begin(); } - PX_FORCE_INLINE PxReal* getJointVelocities() { return mJointVelocity.begin(); } - PX_FORCE_INLINE PxReal* getJointDeltaVelocities() { return mJointDeltaVelocity.begin(); } - PX_FORCE_INLINE PxReal* getJointPositions() { return mJointPosition.begin(); } - PX_FORCE_INLINE PxReal* getJointForces() { return mJointForce.begin(); } + PX_FORCE_INLINE PxReal* getJointAccelerations() { return mJointAcceleration.begin(); } + PX_FORCE_INLINE PxReal* getJointVelocities() { return mJointVelocity.begin(); } + PX_FORCE_INLINE PxReal* getJointDeltaVelocities() { return mJointDeltaVelocity.begin(); } + PX_FORCE_INLINE PxReal* getJointPositions() { return mJointPosition.begin(); } + PX_FORCE_INLINE PxReal* getJointForces() { return mJointForce.begin(); } //PX_FORCE_INLINE PxReal* getJointFrictionForces() { return mJointFrictionForce.begin(); } - PX_FORCE_INLINE ArticulationInternalConstraint& getInternalConstraint(const PxU32 dofId) { return mInternalConstraints[dofId]; } - PX_FORCE_INLINE const ArticulationInternalConstraint& getInternalConstraint(const PxU32 dofId) const { return mInternalConstraints[dofId]; } + PX_FORCE_INLINE ArticulationInternalConstraint& getInternalConstraint(const PxU32 dofId) { return mInternalConstraints[dofId]; } + PX_FORCE_INLINE const ArticulationInternalConstraint& getInternalConstraint(const PxU32 dofId) const { return mInternalConstraints[dofId]; } - PX_FORCE_INLINE ArticulationInternalLockedAxis& getInternalLocks(const PxU32 dofId) { return mInternalLockedAxes[dofId]; } - PX_FORCE_INLINE const ArticulationInternalLockedAxis& getInternalLocks(const PxU32 dofId) const { return mInternalLockedAxes[dofId]; } + PX_FORCE_INLINE ArticulationInternalLockedAxis& getInternalLocks(const PxU32 dofId) { return mInternalLockedAxes[dofId]; } + PX_FORCE_INLINE const ArticulationInternalLockedAxis& getInternalLocks(const PxU32 dofId) const { return mInternalLockedAxes[dofId]; } + PX_FORCE_INLINE Cm::SpatialVectorF* getMotionVelocities() { return mMotionVelocities.begin(); } + PX_FORCE_INLINE Cm::SpatialVectorF* getMotionAccelerations() { return mMotionAccelerations.begin(); } + PX_FORCE_INLINE Cm::SpatialVectorF* getCorioliseVectors() { return mCorioliseVectors.begin(); } + PX_FORCE_INLINE Cm::SpatialVectorF* getSpatialZAVectors() { return mZAForces.begin(); } + PX_FORCE_INLINE Cm::SpatialVectorF* getTransmittedForces() { return mJointTransmittedForce.begin(); } - PX_FORCE_INLINE Cm::SpatialVectorF* getMotionVelocities() { return mMotionVelocities.begin(); } - PX_FORCE_INLINE Cm::SpatialVectorF* getMotionAccelerations() { return mMotionAccelerations.begin(); } - PX_FORCE_INLINE Cm::SpatialVectorF* getCorioliseVectors() { return mCorioliseVectors.begin(); } - PX_FORCE_INLINE Cm::SpatialVectorF* getSpatialZAVectors() { return mZAForces.begin(); } - PX_FORCE_INLINE Cm::SpatialVectorF* getTransmittedForces() { return mJointTransmittedForce.begin(); } - - PX_FORCE_INLINE Cm::SpatialVectorF* getPosIterMotionVelocities() { return mPosIterMotionVelocities.begin(); } - PX_FORCE_INLINE PxReal* getPosIterJointDeltaVelocities() { return mPosIterJointDeltaVelocities.begin(); } + PX_FORCE_INLINE Cm::SpatialVectorF* getPosIterMotionVelocities() { return mPosIterMotionVelocities.begin(); } + PX_FORCE_INLINE PxReal* getPosIterJointDeltaVelocities() { return mPosIterJointDeltaVelocities.begin(); } + PX_FORCE_INLINE Cm::SpatialVectorF& getPosIterMotionVelocity(const PxU32 index) { return mPosIterMotionVelocities[index]; } + PX_FORCE_INLINE const Cm::SpatialVectorF& getMotionVelocity(const PxU32 index) const { return mMotionVelocities[index]; } + PX_FORCE_INLINE const Cm::SpatialVectorF& getMotionAcceleration(const PxU32 index) const { return mMotionAccelerations[index]; } + PX_FORCE_INLINE const Cm::SpatialVectorF& getCorioliseVector(const PxU32 index) const { return mCorioliseVectors[index]; } + PX_FORCE_INLINE const Cm::SpatialVectorF& getSpatialZAVector(const PxU32 index) const { return mZAForces[index]; } + PX_FORCE_INLINE const Cm::SpatialVectorF& getTransmittedForce(const PxU32 index) const { return mJointTransmittedForce[index]; } - PX_FORCE_INLINE Cm::SpatialVectorF& getPosIterMotionVelocity(const PxU32 index) { return mPosIterMotionVelocities[index]; } - PX_FORCE_INLINE const Cm::SpatialVectorF& getMotionVelocity(const PxU32 index) const { return mMotionVelocities[index]; } - PX_FORCE_INLINE const Cm::SpatialVectorF& getMotionAcceleration(const PxU32 index) const { return mMotionAccelerations[index]; } - PX_FORCE_INLINE const Cm::SpatialVectorF& getCorioliseVector(const PxU32 index) const { return mCorioliseVectors[index]; } - PX_FORCE_INLINE const Cm::SpatialVectorF& getSpatialZAVector(const PxU32 index) const { return mZAForces[index]; } - PX_FORCE_INLINE const Cm::SpatialVectorF& getTransmittedForce(const PxU32 index) const { return mJointTransmittedForce[index]; } - - - PX_FORCE_INLINE Cm::SpatialVectorF& getMotionVelocity(const PxU32 index) { return mMotionVelocities[index]; } - PX_FORCE_INLINE Cm::SpatialVectorF& getMotionAcceleration(const PxU32 index) { return mMotionAccelerations[index]; } - PX_FORCE_INLINE Cm::SpatialVectorF& getCorioliseVector(const PxU32 index) { return mCorioliseVectors[index]; } - PX_FORCE_INLINE Cm::SpatialVectorF& getSpatialZAVector(const PxU32 index) { return mZAForces[index]; } - PX_FORCE_INLINE Cm::SpatialVectorF& getTransmittedForce(const PxU32 index) { return mJointTransmittedForce[index]; } + PX_FORCE_INLINE Cm::SpatialVectorF& getMotionVelocity(const PxU32 index) { return mMotionVelocities[index]; } + PX_FORCE_INLINE Cm::SpatialVectorF& getMotionAcceleration(const PxU32 index) { return mMotionAccelerations[index]; } + PX_FORCE_INLINE Cm::SpatialVectorF& getCorioliseVector(const PxU32 index) { return mCorioliseVectors[index]; } + PX_FORCE_INLINE Cm::SpatialVectorF& getSpatialZAVector(const PxU32 index) { return mZAForces[index]; } + PX_FORCE_INLINE Cm::SpatialVectorF& getTransmittedForce(const PxU32 index) { return mJointTransmittedForce[index]; } //PX_FORCE_INLINE Dy::SpatialMatrix* getTempSpatialMatrix() { mTempSpatialMatrix.begin(); } + PX_FORCE_INLINE PxTransform& getPreTransform(const PxU32 index) { return mPreTransform[index]; } + PX_FORCE_INLINE const PxTransform& getPreTransform(const PxU32 index) const { return mPreTransform[index]; } + PX_FORCE_INLINE void setPreTransform(const PxU32 index, const PxTransform& t){ mPreTransform[index] = t; } + PX_FORCE_INLINE PxTransform* getPreTransform() { return mPreTransform.begin(); } - PX_FORCE_INLINE PxTransform& getPreTransform(const PxU32 index) { return mPreTransform[index]; } - PX_FORCE_INLINE const PxTransform& getPreTransform(const PxU32 index) const { return mPreTransform[index]; } - PX_FORCE_INLINE void setPreTransform(const PxU32 index, const PxTransform& tra) { mPreTransform[index] = tra; } - PX_FORCE_INLINE PxTransform* getPreTransform() { return mPreTransform.begin(); } - - PX_FORCE_INLINE const Cm::SpatialVectorF& getDeltaMotionVector(const PxU32 index) const { return mDeltaMotionVector[index]; } + PX_FORCE_INLINE const Cm::SpatialVectorF& getDeltaMotionVector(const PxU32 index) const { return mDeltaMotionVector[index]; } PX_FORCE_INLINE void setDeltaMotionVector(const PxU32 index, const Cm::SpatialVectorF& vec) { mDeltaMotionVector[index] = vec; } - PX_FORCE_INLINE Cm::SpatialVectorF* getDeltaMotionVector() { return mDeltaMotionVector.begin(); } + PX_FORCE_INLINE Cm::SpatialVectorF* getDeltaMotionVector() { return mDeltaMotionVector.begin(); } - PX_FORCE_INLINE ArticulationLink* getLinks() const { return mLinks; } - PX_FORCE_INLINE PxU32 getLinkCount() const { return mLinkCount; } + PX_FORCE_INLINE ArticulationLink* getLinks() const { return mLinks; } + PX_FORCE_INLINE PxU32 getLinkCount() const { return mLinkCount; } - PX_FORCE_INLINE ArticulationLink& getLink(PxU32 index) const { return mLinks[index]; } + PX_FORCE_INLINE ArticulationLink& getLink(PxU32 index) const { return mLinks[index]; } - PX_FORCE_INLINE ArticulationLinkData* getLinkData() const { return mLinksData; } - ArticulationLinkData& getLinkData(PxU32 index) const; + PX_FORCE_INLINE ArticulationLinkData* getLinkData() const { return mLinksData; } + ArticulationLinkData& getLinkData(PxU32 index) const; - PX_FORCE_INLINE ArticulationJointCoreData* getJointData() const { return mJointData; } - ArticulationJointCoreData& getJointData(PxU32 index) const { return mJointData[index]; } + PX_FORCE_INLINE ArticulationJointCoreData* getJointData() const { return mJointData; } + ArticulationJointCoreData& getJointData(PxU32 index) const { return mJointData[index]; } - PX_FORCE_INLINE const ArticulationCore* getCore() const { return mCore; } - PX_FORCE_INLINE Cm::SpatialVector* getExternalAccelerations() { return mExternalAcceleration; } + PX_FORCE_INLINE const ArticulationCore* getCore() const { return mCore; } + PX_FORCE_INLINE Cm::SpatialVector* getExternalAccelerations() { return mExternalAcceleration; } - PX_FORCE_INLINE PxU32 getSolverDataSize() { return mSolverDataSize; } - PX_FORCE_INLINE Cm::SpatialVector& getExternalAcceleration(const PxU32 linkID) { return mExternalAcceleration[linkID]; } + PX_FORCE_INLINE PxU32 getSolverDataSize() const { return mSolverDataSize; } + PX_FORCE_INLINE Cm::SpatialVector& getExternalAcceleration(const PxU32 linkID) { return mExternalAcceleration[linkID]; } - PX_FORCE_INLINE PxReal getDt() const { return mDt; } - PX_FORCE_INLINE void setDt(const PxReal dt) { mDt = dt; } + PX_FORCE_INLINE PxReal getDt() const { return mDt; } + PX_FORCE_INLINE void setDt(const PxReal dt) { mDt = dt; } - PX_FORCE_INLINE bool getDataDirty() { return mDataDirty; } - PX_FORCE_INLINE void setDataDirty(const bool dirty) { mDataDirty = dirty; } + PX_FORCE_INLINE bool getDataDirty() const { return mDataDirty; } + PX_FORCE_INLINE void setDataDirty(const bool dirty) { mDataDirty = dirty; } - PX_FORCE_INLINE PxU32 getDofs() const { return mDofs; } - PX_FORCE_INLINE void setDofs(const PxU32 dof) { mDofs = dof; } + PX_FORCE_INLINE PxU32 getDofs() const { return mDofs; } + PX_FORCE_INLINE void setDofs(const PxU32 dof) { mDofs = dof; } - PX_FORCE_INLINE PxU32 getLocks() const { return mLocks; } - PX_FORCE_INLINE void setLocks(const PxU32 locks) { mLocks = locks; } + PX_FORCE_INLINE PxU32 getLocks() const { return mLocks; } + PX_FORCE_INLINE void setLocks(const PxU32 locks) { mLocks = locks; } - PX_FORCE_INLINE FeatherstoneArticulation* getArticulation() { return mArticulation;} - PX_FORCE_INLINE void setArticulation(FeatherstoneArticulation* articulation) { mArticulation = articulation; } + PX_FORCE_INLINE FeatherstoneArticulation* getArticulation() { return mArticulation; } + PX_FORCE_INLINE void setArticulation(FeatherstoneArticulation* articulation) { mArticulation = articulation; } - PX_FORCE_INLINE const SpatialMatrix& getBaseInvSpatialArticulatedInertia() const { return mBaseInvSpatialArticulatedInertia; } + PX_FORCE_INLINE const SpatialMatrix& getBaseInvSpatialArticulatedInertia() const { return mBaseInvSpatialArticulatedInertia; } - PX_FORCE_INLINE PxTransform* getAccumulatedPoses() { return mAccumulatedPoses.begin(); } - - PX_FORCE_INLINE const PxTransform* getAccumulatedPoses() const { return mAccumulatedPoses.begin(); } + PX_FORCE_INLINE PxTransform* getAccumulatedPoses() { return mAccumulatedPoses.begin(); } + PX_FORCE_INLINE const PxTransform* getAccumulatedPoses() const { return mAccumulatedPoses.begin(); } private: - - Ps::Array mJointAcceleration; // joint acceleration - Ps::Array mJointVelocity; // joint velocity - Ps::Array mJointDeltaVelocity; // joint velocity change due to contacts - Ps::Array mJointPosition; // joint position - Ps::Array mJointForce; // joint force - //Ps::Array mJointFrictionForce; // joint friction force + Ps::Array mJointAcceleration; // joint acceleration + Ps::Array mJointVelocity; // joint velocity + Ps::Array mJointDeltaVelocity; // joint velocity change due to contacts + Ps::Array mJointPosition; // joint position + Ps::Array mJointForce; // joint force + //Ps::Array mJointFrictionForce; // joint friction force - Ps::Array mPosIterJointDeltaVelocities; //joint delta velocity after postion iternation before velocity iteration - Ps::Array mPosIterMotionVelocities; //link motion velocites after position iteration before velocity iteration - Ps::Array mMotionVelocities; //link motion velocites - Ps::Array mMotionAccelerations; //link motion accelerations - Ps::Array mCorioliseVectors; //link coriolise vector - Ps::Array mZAForces; //link spatial zero acceleration force/ spatial articulated force - Ps::Array mJointTransmittedForce; - Ps::Array mInternalConstraints; - Ps::Array mInternalLockedAxes; + Ps::Array mPosIterJointDeltaVelocities; //joint delta velocity after postion iternation before velocity iteration + Ps::Array mPosIterMotionVelocities; //link motion velocites after position iteration before velocity iteration + Ps::Array mMotionVelocities; //link motion velocites + Ps::Array mMotionAccelerations; //link motion accelerations + Ps::Array mCorioliseVectors; //link coriolise vector + Ps::Array mZAForces; //link spatial zero acceleration force/ spatial articulated force + Ps::Array mJointTransmittedForce; + Ps::Array mInternalConstraints; + Ps::Array mInternalLockedAxes; + Ps::Array mDeltaMotionVector; //this is for TGS solver + Ps::Array mPreTransform; //this is the previous transform list for links - Ps::Array mDeltaMotionVector; //this is for TGS solver - Ps::Array mPreTransform; //this is the previous transform list for links + //Ps::Array mTempSpatialMatrix; - //Ps::Array mTempSpatialMatrix; + ArticulationLink* mLinks; + PxU32 mLinkCount; + ArticulationLinkData* mLinksData; + ArticulationJointCoreData* mJointData; + PxReal mDt; + PxU32 mDofs; + PxU32 mLocks; + const ArticulationCore* mCore; + Cm::SpatialVector* mExternalAcceleration; + PxU32 mSolverDataSize; + bool mDataDirty; //this means we need to call commonInit() + bool mJointDirty; //this means joint delta velocity has been changed by contacts so we need to update joint velocity/joint acceleration + FeatherstoneArticulation* mArticulation; - ArticulationLink* mLinks; - PxU32 mLinkCount; - ArticulationLinkData* mLinksData; - ArticulationJointCoreData* mJointData; - PxReal mDt; - PxU32 mDofs; - PxU32 mLocks; - const ArticulationCore* mCore; - Cm::SpatialVector* mExternalAcceleration; - PxU32 mSolverDataSize; - bool mDataDirty; //this means we need to call commonInit() - bool mJointDirty; //this means joint delta velocity has been changed by contacts so we need to update joint velocity/joint acceleration - FeatherstoneArticulation* mArticulation; + Ps::Array mAccumulatedPoses; + Ps::Array mDeltaQ; + PxReal mAccumulatedDt; - Ps::Array mAccumulatedPoses; - Ps::Array mDeltaQ; - PxReal mAccumulatedDt; - - //ArticulationTempData mTempData; - SpatialMatrix mBaseInvSpatialArticulatedInertia; + //ArticulationTempData mTempData; + SpatialMatrix mBaseInvSpatialArticulatedInertia; friend class FeatherstoneArticulation; - }; void ArticulationData::init() @@ -323,10 +312,8 @@ namespace Dy //zero joint velocity delta, which will be changed in pxcFsApplyImpulse if there are any contact with links PxMemZero(getJointDeltaVelocities(), sizeof(PxReal) * mDofs); mJointDirty = false; - } - struct ScratchData { public: @@ -360,7 +347,6 @@ namespace Dy PxReal* jointFrictionForces; }; - #if PX_VC #pragma warning(push) #pragma warning( disable : 4324 ) // Padding was added at the end of a structure because of a __declspec(align) value. @@ -375,16 +361,12 @@ namespace Dy FeatherstoneArticulation(Sc::ArticulationSim*); ~FeatherstoneArticulation(); - // get data sizes for allocation at higher levels - virtual void getDataSizes(PxU32 linkCount, - PxU32 &solverDataSize, - PxU32& totalSize, - PxU32& scratchSize); + virtual void getDataSizes(PxU32 linkCount, PxU32& solverDataSize, PxU32& totalSize, PxU32& scratchSize); - virtual bool resize(const PxU32 linkCount); + virtual bool resize(const PxU32 linkCount); - virtual void onUpdateSolverDesc(); + virtual void onUpdateSolverDesc(); virtual PxU32 getDofs(); @@ -457,9 +439,6 @@ namespace Dy virtual PxReal getLinkMaxPenBias(const PxU32 linkID) const; - - - static PxU32 computeUnconstrainedVelocities( const ArticulationSolverDesc& desc, PxReal dt, @@ -536,14 +515,12 @@ namespace Dy PxReal* jVelocities, PxReal* jAcceleration, PxReal* jPosition, PxReal* jointForce, const PxArticulationCacheFlags flag); - ArticulationData& getArticulationData() { return mArticulationData; } + PX_FORCE_INLINE ArticulationData& getArticulationData() { return mArticulationData; } - void setGpuRemapId(const PxU32 id) { mGpuRemapId = id; } - PxU32 getGpuRemapId() { return mGpuRemapId; } + PX_FORCE_INLINE void setGpuRemapId(const PxU32 id) { mGpuRemapId = id; } + PX_FORCE_INLINE PxU32 getGpuRemapId() const { return mGpuRemapId; } private: - - void constraintPrep(ArticulationLoopConstraint* lConstraints, const PxU32 nbJoints, Cm::SpatialVectorF* Z, PxSolverConstraintPrepDesc& prepDesc, PxSolverBody& sBody, PxSolverBodyData& sBodyData, PxSolverConstraintDesc* desc, PxConstraintAllocator& allocator); @@ -553,11 +530,7 @@ namespace Dy Cm::SpatialVectorF* Z, Cm::SpatialVectorF* DeltaV); - PxU32 computeUnconstrainedVelocitiesInternal( - const ArticulationSolverDesc& desc, - PxConstraintAllocator& allocator, - PxSolverConstraintDesc* constraintDesc, PxU32& acCount, const PxVec3& gravity, Cm::SpatialVectorF* Z, Cm::SpatialVectorF* DeltaV); @@ -565,9 +538,8 @@ namespace Dy void computeUnconstrainedVelocitiesTGSInternal(const PxVec3& gravity, Cm::SpatialVectorF* Z, Cm::SpatialVectorF* DeltaV); - //copy joint data from fromJointData to toJointData - void copyJointData(ArticulationData& data, PxReal* toJointData, PxReal* fromJointData); + void copyJointData(ArticulationData& data, PxReal* toJointData, const PxReal* fromJointData); void computeDofs(); //this function calculates motion subspace matrix(s) for all tree joint @@ -626,7 +598,6 @@ namespace Dy //void copyToBodyCore(); void updateBodies(); - void applyExternalImpulse(ArticulationLink* links, const PxU32 linkCount, const bool fixBase, ArticulationData& data, Cm::SpatialVectorF* Z, Cm::SpatialVectorF* deltaV, const PxReal dt, const PxVec3& gravity, Cm::SpatialVector* acceleration); @@ -687,7 +658,6 @@ namespace Dy Cm::SpatialVector& deltaV1, PxReal* jointVelocities); - Cm::SpatialVectorF getImpulseResponseInv(const bool fixBase, const PxU32 linkID, Cm::SpatialVectorF* Z, const Cm::SpatialVector& impulse, @@ -709,7 +679,6 @@ namespace Dy //provided joint velocity and joint acceleartion, compute link acceleration void computeLinkAccelerationInv(ArticulationData& data, ScratchData& scratchData); - void computeGeneralizedForceInv(ArticulationData& data, ScratchData& scratchData); void calculateMassMatrixColInv(ScratchData& scratchData); @@ -720,7 +689,6 @@ namespace Dy //joint limits void enforcePrismaticLimits(PxReal* jPosition, ArticulationJointCore* joint); - public: static void getImpulseSelfResponse(ArticulationLink* links, @@ -769,8 +737,6 @@ namespace Dy PxReal dt); PxU32 setupSolverConstraints( - PxConstraintAllocator& allocator, - PxSolverConstraintDesc* constraintDesc, ArticulationLink* links, const PxU32 linkCount, const bool fixBase, @@ -810,7 +776,6 @@ namespace Dy PxReal damping, PxReal dt); - //integration void propagateLinksDown(ArticulationData& data, PxReal* jointVelocities, PxReal* jointPositions, Cm::SpatialVectorF* motionVelocities); @@ -823,8 +788,8 @@ namespace Dy PxU8* allocateScratchSpatialData(PxcScratchAllocator* allocator, const PxU32 linkCount, ScratchData& scratchData, bool fallBackToHeap = false); - void allocateScratchSpatialData(DyScratchAllocator& allocator, - const PxU32 linkCount, ScratchData& scratchData); +// void allocateScratchSpatialData(DyScratchAllocator& allocator, +// const PxU32 linkCount, ScratchData& scratchData); //This method calculate the velocity change from parent to child using parent current motion velocity PxTransform propagateTransform(const PxU32 linkID, ArticulationLink* links, ArticulationJointCoreData& jointDatum, diff --git a/src/PhysX/physx/source/lowleveldynamics/include/DyFeatherstoneArticulationJointData.h b/src/PhysX/physx/source/lowleveldynamics/include/DyFeatherstoneArticulationJointData.h index 023757e6f..f6b78a4de 100644 --- a/src/PhysX/physx/source/lowleveldynamics/include/DyFeatherstoneArticulationJointData.h +++ b/src/PhysX/physx/source/lowleveldynamics/include/DyFeatherstoneArticulationJointData.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/include/DyFeatherstoneArticulationUtils.h b/src/PhysX/physx/source/lowleveldynamics/include/DyFeatherstoneArticulationUtils.h index 33db87784..12ee2e8df 100644 --- a/src/PhysX/physx/source/lowleveldynamics/include/DyFeatherstoneArticulationUtils.h +++ b/src/PhysX/physx/source/lowleveldynamics/include/DyFeatherstoneArticulationUtils.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/include/DySleepingConfigulation.h b/src/PhysX/physx/source/lowleveldynamics/include/DySleepingConfigulation.h index 70e0511bd..b2f0dc689 100644 --- a/src/PhysX/physx/source/lowleveldynamics/include/DySleepingConfigulation.h +++ b/src/PhysX/physx/source/lowleveldynamics/include/DySleepingConfigulation.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/include/DyThresholdTable.h b/src/PhysX/physx/source/lowleveldynamics/include/DyThresholdTable.h index b44a7eb9e..9f0387e5a 100644 --- a/src/PhysX/physx/source/lowleveldynamics/include/DyThresholdTable.h +++ b/src/PhysX/physx/source/lowleveldynamics/include/DyThresholdTable.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/include/DyVArticulation.h b/src/PhysX/physx/source/lowleveldynamics/include/DyVArticulation.h index 2a9bbe755..419e67166 100644 --- a/src/PhysX/physx/source/lowleveldynamics/include/DyVArticulation.h +++ b/src/PhysX/physx/source/lowleveldynamics/include/DyVArticulation.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -43,33 +43,19 @@ #include "DyArticulationCore.h" #include "DyArticulationJointCore.h" - namespace physx { - - class PxcRigidBody; struct PxsBodyCore; - - class PxcConstraintBlockStream; class PxcRigidBody; - class PxsConstraintBlockManager; - struct PxSolverConstraintDesc; - namespace Sc { class ArticulationSim; } - namespace Dy { - - struct PxcFsScratchAllocator; - struct PxTGSSolverConstraintDesc; - static const size_t DY_ARTICULATION_MAX_SIZE = 64; - struct ArticulationJointTransforms; class ArticulationJointCoreData; struct Constraint; class Context; @@ -119,8 +105,8 @@ namespace physx //Cm::markSerializedMem(this, sizeof(ArticulationJointCore)); parentPose = PxTransform(PxIdentity); childPose = PxTransform(PxIdentity); - internalCompliance = 0; - externalCompliance = 0; + internalCompliance = 0.0f; + externalCompliance = 0.0f; swingLimitContactDistance = 0.05f; twistLimitContactDistance = 0.05f; @@ -139,11 +125,9 @@ namespace physx relativeQuat = PxQuat(PxIdentity); jointOffset = 0; - } - ArticulationJointCore(const PxTransform& parentFrame, - const PxTransform& childFrame) + ArticulationJointCore(const PxTransform& parentFrame, const PxTransform& childFrame) { parentPose = parentFrame; childPose = childFrame; @@ -168,9 +152,8 @@ namespace physx targetV[i] = 0.f; } - - PxReal swingYLimit = PxPi / 4; - PxReal swingZLimit = PxPi / 4; + const PxReal swingYLimit = PxPi / 4.0f; + const PxReal swingZLimit = PxPi / 4.0f; limits[PxArticulationAxis::eSWING1].low = swingYLimit; limits[PxArticulationAxis::eSWING2].low = swingZLimit; @@ -180,23 +163,20 @@ namespace physx tangentialStiffness = 0.0f; tangentialDamping = 0.0f; - PxReal twistLimitLow = -PxPi / 4; - PxReal twistLimitHigh = PxPi / 4; + const PxReal twistLimitLow = -PxPi / 4.0f; + const PxReal twistLimitHigh = PxPi / 4.0f; limits[PxArticulationAxis::eTWIST].low = twistLimitLow; limits[PxArticulationAxis::eTWIST].high = twistLimitHigh; twistLimitContactDistance = 0.05f; twistLimited = false; + tanQSwingY = PxTan(swingYLimit / 4.0f); + tanQSwingZ = PxTan(swingZLimit / 4.0f); + tanQSwingPad = PxTan(swingLimitContactDistance / 4.0f); - tanQSwingY = PxTan(swingYLimit / 4); - tanQSwingZ = PxTan(swingZLimit / 4); - tanQSwingPad = PxTan(swingLimitContactDistance / 4); - - tanQTwistHigh = PxTan(twistLimitHigh / 4); - tanQTwistLow = PxTan(twistLimitLow / 4); - tanQTwistPad = PxTan(twistLimitContactDistance / 4); - - + tanQTwistHigh = PxTan(twistLimitHigh / 4.0f); + tanQTwistLow = PxTan(twistLimitLow / 4.0f); + tanQTwistPad = PxTan(twistLimitContactDistance / 4.0f); prismaticLimited = false; @@ -213,7 +193,6 @@ namespace physx relativeQuat = (childFrame.q * (parentFrame.q.getConjugate())).getNormalized(); jointOffset = 0; - } void setJointPose(ArticulationJointCoreData& jointDatum); @@ -221,7 +200,6 @@ namespace physx // PX_SERIALIZATION ArticulationJointCore(const PxEMPTY&) {} //~PX_SERIALIZATION - }; struct ArticulationLoopConstraint @@ -230,7 +208,6 @@ namespace physx PxU32 linkIndex0; PxU32 linkIndex1; Dy::Constraint* constraint; - }; #define DY_ARTICULATION_LINK_NONE 0xffffffff @@ -239,12 +216,12 @@ namespace physx struct ArticulationLink { - ArticulationBitField children; // child bitmap - ArticulationBitField pathToRoot; // path to root, including link and root - PxcRigidBody* body; - PxsBodyCore* bodyCore; - ArticulationJointCore* inboundJoint; - PxU32 parent; + ArticulationBitField children; // child bitmap + ArticulationBitField pathToRoot; // path to root, including link and root + PxcRigidBody* body; + PxsBodyCore* bodyCore; + ArticulationJointCore* inboundJoint; + PxU32 parent; }; typedef size_t ArticulationLinkHandle; @@ -293,7 +270,6 @@ namespace physx } }; - static const size_t DY_ARTICULATION_IDMASK = DY_ARTICULATION_MAX_SIZE - 1; #if PX_VC @@ -307,12 +283,13 @@ namespace physx // public interface - ArticulationV(Sc::ArticulationSim* sim, PxArticulationBase::Enum type) : mArticulationSim(sim), - mContext(NULL), - mType(type), - mUpdateSolverData(true), - mDirty(false), - mMaxDepth(0) + ArticulationV(Sc::ArticulationSim* sim, PxArticulationBase::Enum type) : + mArticulationSim (sim), + mContext (NULL), + mType (type), + mUpdateSolverData (true), + mDirty (false), + mMaxDepth (0) {} virtual ~ArticulationV() {} @@ -334,34 +311,33 @@ namespace physx mUpdateSolverData = true; } - bool updateSolverData() {return mUpdateSolverData;} + PX_FORCE_INLINE bool updateSolverData() { return mUpdateSolverData; } - void setDirty(const bool dirty) { mDirty = dirty; } - bool getDirty() { return mDirty; } + PX_FORCE_INLINE void setDirty(const bool dirty) { mDirty = dirty; } + PX_FORCE_INLINE bool getDirty() const { return mDirty; } - PX_FORCE_INLINE PxU32 getMaxDepth() { return mMaxDepth; } - PX_FORCE_INLINE void setMaxDepth(const PxU32 depth) { mMaxDepth = depth; } + PX_FORCE_INLINE PxU32 getMaxDepth() const { return mMaxDepth; } + PX_FORCE_INLINE void setMaxDepth(const PxU32 depth) { mMaxDepth = depth; } // solver methods - PX_FORCE_INLINE PxU32 getLinkIndex(ArticulationLinkHandle handle) const { return PxU32(handle&DY_ARTICULATION_IDMASK); } - PX_FORCE_INLINE PxU32 getBodyCount() const { return mSolverDesc.linkCount; } - PX_FORCE_INLINE PxU32 getSolverDataSize() const { return mSolverDesc.solverDataSize; } - PX_FORCE_INLINE PxU32 getTotalDataSize() const { return mSolverDesc.totalDataSize; } - PX_FORCE_INLINE void getSolverDesc(ArticulationSolverDesc& d) const { d = mSolverDesc; } - PX_FORCE_INLINE ArticulationSolverDesc& getSolverDesc() { return mSolverDesc; } + PX_FORCE_INLINE PxU32 getLinkIndex(ArticulationLinkHandle handle) const { return PxU32(handle&DY_ARTICULATION_IDMASK); } + PX_FORCE_INLINE PxU32 getBodyCount() const { return mSolverDesc.linkCount; } + PX_FORCE_INLINE PxU32 getSolverDataSize() const { return mSolverDesc.solverDataSize; } + PX_FORCE_INLINE PxU32 getTotalDataSize() const { return mSolverDesc.totalDataSize; } + PX_FORCE_INLINE void getSolverDesc(ArticulationSolverDesc& d) const { d = mSolverDesc; } + PX_FORCE_INLINE ArticulationSolverDesc& getSolverDesc() { return mSolverDesc; } - PX_FORCE_INLINE const ArticulationCore* getCore() const { return mSolverDesc.core; } - PX_FORCE_INLINE PxU16 getIterationCounts() const { return mSolverDesc.core->solverIterationCounts; } + PX_FORCE_INLINE const ArticulationCore* getCore() const { return mSolverDesc.core; } + PX_FORCE_INLINE PxU16 getIterationCounts() const { return mSolverDesc.core->solverIterationCounts; } - PX_FORCE_INLINE Sc::ArticulationSim* getArticulationSim() const { return mArticulationSim; } + PX_FORCE_INLINE Sc::ArticulationSim* getArticulationSim() const { return mArticulationSim; } - PX_FORCE_INLINE PxU32 getType() const { return mType; } + PX_FORCE_INLINE PxU32 getType() const { return mType; } + + PX_FORCE_INLINE void setDyContext(Dy::Context* context) { mContext = context; } // get data sizes for allocation at higher levels - virtual void getDataSizes(PxU32 linkCount, - PxU32 &solverDataSize, - PxU32& totalSize, - PxU32& scratchSize) = 0; + virtual void getDataSizes(PxU32 linkCount, PxU32& solverDataSize, PxU32& totalSize, PxU32& scratchSize) = 0; virtual PxU32 getDofs() { return 0; } @@ -417,7 +393,6 @@ namespace physx Cm::SpatialVector& deltaV0, Cm::SpatialVector& deltaV1) const = 0; - virtual Cm::SpatialVectorV getLinkVelocity(const PxU32 linkID) const = 0; virtual Cm::SpatialVectorV getLinkMotionVector(const PxU32 linkID) const = 0; @@ -447,24 +422,23 @@ namespace physx //this is called by island gen to determine whether the articulation should be awake or sleep virtual Cm::SpatialVector getMotionVelocity(const PxU32 linkID) const = 0; - void setDyContext(Dy::Context* context) { mContext = context; } //These variables are used in the constraint partition - PxU16 maxSolverFrictionProgress; - PxU16 maxSolverNormalProgress; - PxU32 solverProgress; - PxU8 numTotalConstraints; + PxU16 maxSolverFrictionProgress; + PxU16 maxSolverNormalProgress; + PxU32 solverProgress; + PxU8 numTotalConstraints; protected: - Sc::ArticulationSim* mArticulationSim; - Dy::Context* mContext; - PxU32 mType; - ArticulationSolverDesc mSolverDesc; + Sc::ArticulationSim* mArticulationSim; + Dy::Context* mContext; + PxU32 mType; + ArticulationSolverDesc mSolverDesc; - Ps::Array mAcceleration; // supplied by Sc-layer to feed into articulations + Ps::Array mAcceleration; // supplied by Sc-layer to feed into articulations - bool mUpdateSolverData; - bool mDirty; //any of links update configulations, the boolean will be set to true - PxU32 mMaxDepth; + bool mUpdateSolverData; + bool mDirty; //any of links update configulations, the boolean will be set to true + PxU32 mMaxDepth; private: PX_NOCOPY(ArticulationV) @@ -483,8 +457,6 @@ namespace physx { return !(handle & DY_ARTICULATION_IDMASK); } - - } } diff --git a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulation.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulation.cpp index d3bee470d..b9d73095c 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulation.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulation.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -46,7 +46,6 @@ #include "DyTGSDynamics.h" #include "common/PxProfileZone.h" - using namespace physx; // we encode articulation link handles in the lower bits of the pointer, so the @@ -86,7 +85,6 @@ namespace physx rows[0].inertia = Fns::invertInertia(rows[0].inertia); } - PX_COMPILE_TIME_ASSERT((sizeof(Articulation)&(DY_ARTICULATION_MAX_SIZE-1))==0); Articulation::Articulation(Sc::ArticulationSim* sim) @@ -106,7 +104,6 @@ Articulation::~Articulation() { } - #if DY_DEBUG_ARTICULATION void Articulation::computeResiduals(const Cm::SpatialVector *v, @@ -134,7 +131,6 @@ void Articulation::computeResiduals(const Cm::SpatialVector *v, printf("Energy %f, Error %f\n", energy, error); } - Cm::SpatialVector Articulation::computeMomentum(const FsInertia *inertia) const { typedef ArticulationFnsScalar Fns; @@ -146,8 +142,6 @@ Cm::SpatialVector Articulation::computeMomentum(const FsInertia *inertia) const return m; } - - void Articulation::checkLimits() const { for(PxU32 i=1;ilinkCount;i++) @@ -238,8 +232,6 @@ bool Dy::Articulation::resize(const PxU32 linkCount) mMotionVelocity.resize(linkCount, Cm::SpatialVector(PxVec3(0.0f), PxVec3(0.0f))); mSolverDesc.motionVelocity = mMotionVelocity.begin(); - - } Dy::ArticulationV::resize(linkCount); @@ -264,7 +256,6 @@ bool Dy::ArticulationV::resize(const PxU32 linkCount) return true; } - void PxvRegisterArticulations() { const PxU32 type = PxU32(PxArticulationBase::eMaximumCoordinate); @@ -283,7 +274,7 @@ void PxvRegisterArticulations() SolverCoreRegisterArticulationFnsCoulomb(); } -void Articulation::getDataSizes(PxU32 linkCount, PxU32 &solverDataSize, PxU32& totalSize, PxU32& scratchSize) +void Articulation::getDataSizes(PxU32 linkCount, PxU32& solverDataSize, PxU32& totalSize, PxU32& scratchSize) { solverDataSize = sizeof(FsData) // header + sizeof(Cm::SpatialVectorV) * linkCount // velocity @@ -304,7 +295,6 @@ void Articulation::getDataSizes(PxU32 linkCount, PxU32 &solverDataSize, PxU32& t + ((sizeof(ArticulationJointTransforms)+15)&~15) * linkCount + sizeof(Mat33V) * linkCount + ((sizeof(ArticulationJointTransforms)+15)&~15) * linkCount); - } void Articulation::getImpulseResponse( @@ -317,7 +307,7 @@ void Articulation::getImpulseResponse( ArticulationHelper::getImpulseResponse(matrix, linkID, impulse, deltaV); } -void Articulation::getImpulseSelfResponse( +void Articulation::getImpulseSelfResponse( PxU32 linkID0, PxU32 linkID1, Cm::SpatialVectorF* /*Z*/, @@ -333,7 +323,6 @@ void Articulation::getImpulseSelfResponse( reinterpret_cast(deltaV1)); } - Cm::SpatialVectorV Articulation::getLinkVelocity(const PxU32 linkID) const { FsData& matrix = *getFsDataPtr(); @@ -365,7 +354,6 @@ PxReal Articulation::getLinkMaxPenBias(const PxU32 linkID) const return maxPenBias[linkID]; } - PxU32 Articulation::getFsDataSize(PxU32 linkCount) { return sizeof(FsInertia) + sizeof(FsRow) * linkCount; @@ -376,9 +364,7 @@ PxU32 Articulation::getLtbDataSize(PxU32 linkCount) return sizeof(LtbRow) * linkCount; } -void Articulation::setInertia(FsInertia& inertia, - const PxsBodyCore& body, - const PxTransform& pose) +void Articulation::setInertia(FsInertia& inertia, const PxsBodyCore& body, const PxTransform& pose) { // assumes that elements that are supposed to be zero (i.e. la matrix and off diagonal elements of ll) are zero @@ -490,8 +476,7 @@ void Articulation::prepareDataBlock(FsData& fsData, } } -void Articulation::prepareFsData(FsData& fsData, - const ArticulationLink* links) +void Articulation::prepareFsData(FsData& fsData, const ArticulationLink* links) { typedef ArticulationFnsSimd Fns; @@ -641,7 +626,6 @@ void PxcLtbProject(const FsData& m, velocity[i] -= y[i]; } - void PxcFsComputeJointLoadsSimd(const FsData& matrix, const FsInertia*PX_RESTRICT baseInertia, Mat33V*PX_RESTRICT load, @@ -760,8 +744,7 @@ PX_FORCE_INLINE Cm::SpatialVectorV propagateDrivenImpulse(const FsRow& row, return result; } -void PxcFsApplyJointDrives(FsData& matrix, - const Vec3V* Q) +void PxcFsApplyJointDrives(FsData& matrix, const Vec3V* Q) { typedef ArticulationFnsSimd Fns; @@ -780,7 +763,6 @@ void PxcFsApplyJointDrives(FsData& matrix, for (PxU32 i = matrix.linkCount; i-->1;) Z[matrix.parent[i]] += propagateDrivenImpulse(rows[i], jointVectors[i], SZminusQ[i], Z[i], Q[i]); - dV[0] = Fns::multiply(getRootInverseInertia(matrix), -Z[0]); for (PxU32 i = 1; iinternalDriveIterations & 0xffff, allocator); - } { @@ -964,7 +941,6 @@ void Articulation::computeUnconstrainedVelocitiesInternal(const ArticulationSolv maxSolverFrictionProgress = 0; solverProgress = 0; - #if DY_ARTICULATION_DEBUG_VERIFY for (PxU32 i = 0; i(desc.articulation); @@ -1128,7 +1099,7 @@ void Articulation::recordDeltaMotion(const ArticulationSolverDesc &desc, const P PxQuat* deltaQ = desc.deltaQ; - Cm::SpatialVectorV* velocity = getVelocity(m); + const Cm::SpatialVectorV* velocity = getVelocity(m); Cm::SpatialVectorV* deltaMotion = getMotionVector(m); PxcFsFlushVelocity(m); @@ -1143,7 +1114,6 @@ void Articulation::recordDeltaMotion(const ArticulationSolverDesc &desc, const P PX_ASSERT(isFiniteVec3V(velocity[i].linear)); PX_ASSERT(isFiniteVec3V(velocity[i].angular)); } - } void Articulation::deltaMotionToMotionVelocity(const ArticulationSolverDesc& desc, PxReal invDt) @@ -1151,7 +1121,7 @@ void Articulation::deltaMotionToMotionVelocity(const ArticulationSolverDesc& des Articulation* articulation = static_cast(desc.articulation); FsData& m = *articulation->getFsDataPtr(); - Cm::SpatialVectorV* deltaMotion = getMotionVector(m); + const Cm::SpatialVectorV* deltaMotion = getMotionVector(m); Cm::SpatialVectorV* velocity = getVelocity(m); @@ -1224,7 +1194,6 @@ void Articulation::pxcFsApplyImpulse(PxU32 linkID, Ps::aos::Vec3V linear, matrix.dirty |= rows[linkID].pathToRoot; } - void Articulation::pxcFsGetVelocities(PxU32 linkID, PxU32 linkID1, Cm::SpatialVectorV& v0, Cm::SpatialVectorV& v1) { //Common case - linkID = parent of linkID1... @@ -1242,13 +1211,11 @@ void Articulation::pxcFsApplyImpulses(PxU32 linkID, const Ps::aos::Vec3V& linear pxcFsApplyImpulse(linkID2, linear2, angular2, Z, deltaV); } - void Articulation::solveInternalConstraints(const PxReal /*dt*/, const PxReal /*invDt*/, Cm::SpatialVectorF* /*impulses*/, Cm::SpatialVectorF* /*DeltaV*/, bool) { } - Cm::SpatialVectorV Articulation::pxcFsGetVelocity(PxU32 linkID) { FsData& matrix = *getFsDataPtr(); @@ -1263,7 +1230,6 @@ Cm::SpatialVectorV Articulation::pxcFsGetVelocity(PxU32 linkID) // find the dirty node on the path (including the root) with the lowest index ArticulationBitField toUpdate = rows[linkID].pathToRoot & matrix.dirty; - if (toUpdate) { // store the dV elements densely and use an array map to decode - hopefully cache friendlier @@ -1304,7 +1270,6 @@ Cm::SpatialVectorV Articulation::pxcFsGetVelocity(PxU32 linkID) p--; } - while (p) // using "for(;p;p &= (p-1))" here generates LHSs from the ArticulationLowestSetBit { PxU32 i = ArticulationLowestSetBit(p); @@ -1605,7 +1570,6 @@ void Articulation::updateBodies(const ArticulationSolverDesc& desc, PxReal dt) } } - void PxvArticulationDriveCache::initialize( FsData &fsData, PxU16 linkCount, @@ -1639,7 +1603,7 @@ void PxvArticulationDriveCache::initialize( //ArticulationHelper::initializeDriveCache(articulation, cache, linkCount, links, compliance, iterations, scratchMemory, scratchMemorySize); } -PxU32 PxvArticulationDriveCache::getLinkCount(const FsData& cache) +PxU32 PxvArticulationDriveCache::getLinkCount(const FsData& cache) { return cache.linkCount; } @@ -1652,7 +1616,7 @@ void PxvArticulationDriveCache::applyImpulses(const FsData& cache, Articulation::applyImpulses(cache, Z, V); } -void PxvArticulationDriveCache::getImpulseResponse(const FsData& cache, +void PxvArticulationDriveCache::getImpulseResponse(const FsData& cache, PxU32 linkID, const Cm::SpatialVectorV& impulse, Cm::SpatialVectorV& deltaV) diff --git a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationContactPrep.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationContactPrep.cpp index a95815885..759a3a766 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationContactPrep.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationContactPrep.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -269,8 +269,10 @@ void setupFinalizeExtSolverContacts( const Gu::ContactPoint* contactBase0 = buffer + c.contactPatches[c.correlationListHeads[i]].start; const PxReal combinedRestitution = contactBase0->restitution; - const PxReal staticFriction = contactBase0->staticFriction; - const PxReal dynamicFriction = contactBase0->dynamicFriction; + PxReal coefficient = (contactBase0->materialFlags & PxMaterialFlag::eIMPROVED_PATCH_FRICTION && frictionPatch.anchorCount == 2) ? 0.5f : 1.f; + + const PxReal staticFriction = contactBase0->staticFriction * coefficient; + const PxReal dynamicFriction = contactBase0->dynamicFriction * coefficient; const bool disableStrongFriction = !!(contactBase0->materialFlags & PxMaterialFlag::eDISABLE_FRICTION); staticFrictionX_dynamicFrictionY_dominance0Z_dominance1W=V4SetX(staticFrictionX_dynamicFrictionY_dominance0Z_dominance1W, FLoad(staticFriction)); staticFrictionX_dynamicFrictionY_dominance0Z_dominance1W=V4SetY(staticFrictionX_dynamicFrictionY_dominance0Z_dominance1W, FLoad(dynamicFriction)); diff --git a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationContactPrep.h b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationContactPrep.h index 3d9fc7abe..6b129b7e7 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationContactPrep.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationContactPrep.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationContactPrepPF.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationContactPrepPF.cpp index af2c30d54..5805d3ea3 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationContactPrepPF.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationContactPrepPF.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationFnsDebug.h b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationFnsDebug.h index 676eb8a98..ff9437716 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationFnsDebug.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationFnsDebug.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationFnsScalar.h b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationFnsScalar.h index 24a8d3f02..34be07d5c 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationFnsScalar.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationFnsScalar.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationFnsSimd.h b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationFnsSimd.h index cf3bfef99..c1c2f41fb 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationFnsSimd.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationFnsSimd.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationHelper.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationHelper.cpp index 4653413c3..868055df6 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationHelper.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationHelper.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationHelper.h b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationHelper.h index 0775d4066..dfc22445c 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationHelper.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationHelper.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationPImpl.h b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationPImpl.h index 917c49682..f1501ae06 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationPImpl.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationPImpl.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationReference.h b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationReference.h index cece78469..0e2b4b2de 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationReference.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationReference.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationSIMD.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationSIMD.cpp index d5b5466c8..a45c83905 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationSIMD.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationSIMD.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationScalar.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationScalar.cpp index 5889bb330..03ebb9021 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationScalar.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationScalar.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationScalar.h b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationScalar.h index c548161b9..0285a3e4b 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationScalar.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationScalar.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationUtils.h b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationUtils.h index 7ac2ee46c..d23b38567 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationUtils.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyArticulationUtils.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyBodyCoreIntegrator.h b/src/PhysX/physx/source/lowleveldynamics/src/DyBodyCoreIntegrator.h index e8cf685e4..d872e0839 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyBodyCoreIntegrator.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyBodyCoreIntegrator.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintPartition.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintPartition.cpp index 5d95b8e69..ca6805e6f 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintPartition.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintPartition.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #include "DyConstraintPartition.h" #include "DyArticulationUtils.h" diff --git a/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintPartition.h b/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintPartition.h index a66cd6993..93c767502 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintPartition.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintPartition.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintPrep.h b/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintPrep.h index 27d6190bd..943c908fc 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintPrep.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintPrep.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintSetup.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintSetup.cpp index 911f76e58..004fa94f2 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintSetup.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintSetup.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintSetupBlock.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintSetupBlock.cpp index 68010cce9..c1dafbd22 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintSetupBlock.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyConstraintSetupBlock.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep.cpp index 0b02e9eed..803b2dd0e 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -239,9 +239,12 @@ static void setupFinalizeSolverConstraints(Sc::ShapeInteraction* shapeInteractio PxF32* forceBuffers = reinterpret_cast(ptr); PxMemZero(forceBuffers, sizeof(PxF32) * contactCount); ptr += ((contactCount + 3) & (~3)) * sizeof(PxF32); // jump to next 16-byte boundary + + const PxReal frictionCoefficient = (contactBase0->materialFlags & PxMaterialFlag::eIMPROVED_PATCH_FRICTION && frictionPatch.anchorCount == 2) ? 0.5f : 1.f; + + const PxReal staticFriction = contactBase0->staticFriction * frictionCoefficient; + const PxReal dynamicFriction = contactBase0->dynamicFriction* frictionCoefficient; - const PxReal staticFriction = contactBase0->staticFriction; - const PxReal dynamicFriction = contactBase0->dynamicFriction; const bool disableStrongFriction = !!(contactBase0->materialFlags & PxMaterialFlag::eDISABLE_FRICTION); staticFrictionX_dynamicFrictionY_dominance0Z_dominance1W=V4SetX(staticFrictionX_dynamicFrictionY_dominance0Z_dominance1W, FLoad(staticFriction)); staticFrictionX_dynamicFrictionY_dominance0Z_dominance1W=V4SetY(staticFrictionX_dynamicFrictionY_dominance0Z_dominance1W, FLoad(dynamicFriction)); @@ -264,7 +267,7 @@ static void setupFinalizeSolverConstraints(Sc::ShapeInteraction* shapeInteractio //const Vec3V normal = Vec3V_From_PxVec3_Aligned(buffer.contacts[c.contactPatches[c.correlationListHeads[i]].start].normal); const FloatV orthoThreshold = FLoad(0.70710678f); - const FloatV p1 = FLoad(0.1f); + const FloatV p1 = FLoad(0.0001f); // fallback: normal.cross((1,0,0)) or normal.cross((0,0,1)) const FloatV normalX = V3GetX(normal); const FloatV normalY = V3GetY(normal); diff --git a/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep.h b/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep.h index 9edef9ee7..11b6b58bd 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep4.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep4.cpp index d8fea61a1..1b87984df 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep4.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep4.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -287,7 +287,7 @@ static void setupFinalizeSolverConstraints4(PxSolverContactDesc* PX_RESTRICT des PxU32 maxPatches = PxMax(descs[0].numFrictionPatches, PxMax(descs[1].numFrictionPatches, PxMax(descs[2].numFrictionPatches, descs[3].numFrictionPatches))); - const Vec4V p1 = V4Splat(FLoad(0.1f)); + const Vec4V p1 = V4Splat(FLoad(0.0001f)); const Vec4V orthoThreshold = V4Splat(FLoad(0.70710678f)); @@ -647,15 +647,6 @@ static void setupFinalizeSolverConstraints4(PxSolverContactDesc* PX_RESTRICT des Vec4V maxImpulseScale = V4One(); { - const Vec4V staticFriction = V4LoadXYZW(contactBase0->staticFriction, contactBase1->staticFriction, - contactBase2->staticFriction, contactBase3->staticFriction); - - const Vec4V dynamicFriction = V4LoadXYZW(contactBase0->dynamicFriction, contactBase1->dynamicFriction, - contactBase2->dynamicFriction, contactBase3->dynamicFriction); - - PX_ASSERT(totalContacts == contactCount); - header->dynamicFriction = dynamicFriction; - header->staticFriction = staticFriction; const FrictionPatch& frictionPatch0 = c.frictionPatches[frictionIndex0]; const FrictionPatch& frictionPatch1 = c.frictionPatches[frictionIndex1]; @@ -671,9 +662,26 @@ static void setupFinalizeSolverConstraints4(PxSolverContactDesc* PX_RESTRICT des PxU32 clampedAnchorCount1 = hasFinished1 || (contactBase1->materialFlags & PxMaterialFlag::eDISABLE_FRICTION) ? 0 : anchorCount1; PxU32 clampedAnchorCount2 = hasFinished2 || (contactBase2->materialFlags & PxMaterialFlag::eDISABLE_FRICTION) ? 0 : anchorCount2; PxU32 clampedAnchorCount3 = hasFinished3 || (contactBase3->materialFlags & PxMaterialFlag::eDISABLE_FRICTION) ? 0 : anchorCount3; - + const PxU32 maxAnchorCount = PxMax(clampedAnchorCount0, PxMax(clampedAnchorCount1, PxMax(clampedAnchorCount2, clampedAnchorCount3))); + PxReal coefficient0 = (contactBase0->materialFlags & PxMaterialFlag::eIMPROVED_PATCH_FRICTION && anchorCount0 == 2) ? 0.5f : 1.f; + PxReal coefficient1 = (contactBase1->materialFlags & PxMaterialFlag::eIMPROVED_PATCH_FRICTION && anchorCount1 == 2) ? 0.5f : 1.f; + PxReal coefficient2 = (contactBase2->materialFlags & PxMaterialFlag::eIMPROVED_PATCH_FRICTION && anchorCount2 == 2) ? 0.5f : 1.f; + PxReal coefficient3 = (contactBase3->materialFlags & PxMaterialFlag::eIMPROVED_PATCH_FRICTION && anchorCount3 == 2) ? 0.5f : 1.f; + + const Vec4V staticFriction = V4LoadXYZW(contactBase0->staticFriction*coefficient0, contactBase1->staticFriction*coefficient1, + contactBase2->staticFriction*coefficient2, contactBase3->staticFriction*coefficient3); + + const Vec4V dynamicFriction = V4LoadXYZW(contactBase0->dynamicFriction*coefficient0, contactBase1->dynamicFriction*coefficient1, + contactBase2->dynamicFriction*coefficient2, contactBase3->dynamicFriction*coefficient3); + + PX_ASSERT(totalContacts == contactCount); + header->dynamicFriction = dynamicFriction; + header->staticFriction = staticFriction; + + + //if(clampedAnchorCount0 != clampedAnchorCount1 || clampedAnchorCount0 != clampedAnchorCount2 || clampedAnchorCount0 != clampedAnchorCount3) // Ps::debugBreak(); diff --git a/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep4PF.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep4PF.cpp index 0965f438c..ab03e6401 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep4PF.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrep4PF.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrepPF.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrepPF.cpp index 1b0803c9d..8fcca5da2 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrepPF.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrepPF.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrepShared.h b/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrepShared.h index e9684ba38..44430659a 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrepShared.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyContactPrepShared.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyContactReduction.h b/src/PhysX/physx/source/lowleveldynamics/src/DyContactReduction.h index 8ac9d62d4..312c6a0df 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyContactReduction.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyContactReduction.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyCorrelationBuffer.h b/src/PhysX/physx/source/lowleveldynamics/src/DyCorrelationBuffer.h index 4a091de52..7f161f98b 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyCorrelationBuffer.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyCorrelationBuffer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyDynamics.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyDynamics.cpp index 46df6a084..3e8df09ae 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyDynamics.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyDynamics.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyDynamics.h b/src/PhysX/physx/source/lowleveldynamics/src/DyDynamics.h index 22bddcbab..04d2ba6b2 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyDynamics.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyDynamics.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneArticulation.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneArticulation.cpp index c32da63c6..f82fbfcda 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneArticulation.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneArticulation.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -52,7 +52,6 @@ #define FEATURESTONE_DEBUG 0 #endif - // we encode articulation link handles in the lower bits of the pointer, so the // articulation has to be aligned, which in an aligned pool means we need to size it // appropriately @@ -68,7 +67,7 @@ namespace Dy void PxvRegisterArticulationsReducedCoordinate() { - PxArticulationBase::Enum type = PxArticulationBase::eReducedCoordinate; + const PxArticulationBase::Enum type = PxArticulationBase::eReducedCoordinate; ArticulationPImpl::sComputeUnconstrainedVelocities[type] = &FeatherstoneArticulation::computeUnconstrainedVelocities; ArticulationPImpl::sUpdateBodies[type] = &FeatherstoneArticulation::updateBodies; ArticulationPImpl::sUpdateBodiesTGS[type] = &FeatherstoneArticulation::updateBodiesTGS; @@ -84,10 +83,8 @@ namespace Dy SolverCoreRegisterArticulationFnsCoulomb(); } - ArticulationData::~ArticulationData() { - if (mLinksData) PX_FREE_AND_RESET(mLinksData); @@ -130,7 +127,6 @@ namespace Dy mJointTransmittedForce.reserve(linkCount); mJointTransmittedForce.forceSize_Unsafe(linkCount); - if (mLinksData) PX_FREE_AND_RESET(mLinksData); @@ -140,7 +136,6 @@ namespace Dy mLinksData = PX_PLACEMENT_NEW(PX_ALLOC(sizeof(ArticulationLinkData) * linkCount, PX_DEBUG_EXP("ArticulationLinkData")), ArticulationLinkData)(); mJointData = PX_PLACEMENT_NEW(PX_ALLOC(sizeof(ArticulationJointCoreData) * linkCount, PX_DEBUG_EXP("ArticulationJointCoreData")), ArticulationJointCoreData)(); - const PxU32 size = sizeof(Cm::SpatialVectorF) * linkCount; PxMemZero(mMotionVelocities.begin(), size); @@ -153,8 +148,6 @@ namespace Dy PxMemZero(mLinksData, sizeof(ArticulationLinkData) * linkCount); PxMemZero(mJointData, sizeof(ArticulationJointCoreData) * linkCount); - - } void ArticulationData::resizeJointData(const PxU32 dofs) @@ -180,7 +173,6 @@ namespace Dy mPosIterJointDeltaVelocities.reserve(dofs); mPosIterJointDeltaVelocities.forceSize_Unsafe(dofs); - /*mTempData.mJointForce.reserve(dofs); mTempData.mJointForce.forceSize_Unsafe(dofs);*/ @@ -230,7 +222,7 @@ namespace Dy { } - void FeatherstoneArticulation::copyJointData(ArticulationData& data, PxReal* toJointData, PxReal* fromJointData) + void FeatherstoneArticulation::copyJointData(ArticulationData& data, PxReal* toJointData, const PxReal* fromJointData) { const PxU32 linkCount = data.getLinkCount(); @@ -240,7 +232,7 @@ namespace Dy PxReal* dest = &toJointData[jointDatum.jointOffset]; - PxReal* source = &fromJointData[jointDatum.jointOffset]; + const PxReal* source = &fromJointData[jointDatum.jointOffset]; for (PxU32 ind = 0; ind < jointDatum.dof; ++ind) { @@ -300,10 +292,8 @@ namespace Dy return false; } - - void FeatherstoneArticulation::getDataSizes(PxU32 linkCount, PxU32 &solverDataSize, PxU32& totalSize, PxU32& scratchSize) + void FeatherstoneArticulation::getDataSizes(PxU32 /*linkCount*/, PxU32& solverDataSize, PxU32& totalSize, PxU32& scratchSize) { - PX_UNUSED(linkCount); solverDataSize = 0; totalSize = 0; scratchSize = 0; @@ -542,9 +532,6 @@ namespace Dy PxMemZero(deferredZ, sizeof(Cm::SpatialVectorF)*linkCount); } - - - void FeatherstoneArticulation::recordDeltaMotion(const ArticulationSolverDesc& desc, const PxReal dt, Cm::SpatialVectorF* deltaV) { @@ -563,7 +550,6 @@ namespace Dy PxReal* jointVelocities = data.getJointVelocities(); PxReal* jointDeltaVelocities = data.getJointDeltaVelocities(); - data.mAccumulatedDt += dt; data.setDt(dt); @@ -600,8 +586,6 @@ namespace Dy deltaMotion[0] += motionVelocity * dt; /*deltaMotion[0].top = ang; deltaMotion[0].bottom = lin;*/ - - } for (PxU32 linkID = 1; linkID < linkCount; linkID++) @@ -625,12 +609,10 @@ namespace Dy jointDeltaVelocities[idx] = 0.f; } - PxVec3 lin, ang; calculateNewVelocity(newPose, data.mPreTransform[linkID], 1.f, lin, ang); - deltaMotion[linkID].top = ang;// motionVeloties[linkID].top * dt; deltaMotion[linkID].bottom = lin;// motionVeloties[linkID].top * dt; @@ -638,8 +620,6 @@ namespace Dy data.mAccumulatedPoses[linkID] = newPose; #if 0 - - ArticulationLink& link = data.getLink(linkID); if (link.inboundJoint->jointType != PxArticulationJointType::eSPHERICAL) @@ -678,7 +658,6 @@ namespace Dy void FeatherstoneArticulation::deltaMotionToMotionVelocity(const ArticulationSolverDesc& desc, PxReal invDt) { - FeatherstoneArticulation* articulation = static_cast(desc.articulation); ArticulationData& data = articulation->mArticulationData; const PxU32 linkCount = data.getLinkCount(); @@ -694,15 +673,12 @@ namespace Dy v = delta; desc.motionVelocity[linkID] = reinterpret_cast(delta); - } } - //This is used in the solveExt1D, solveExtContact Cm::SpatialVectorV FeatherstoneArticulation::pxcFsGetVelocity(PxU32 linkID) { - Cm::SpatialVectorF* deferredZ = mArticulationData.getSpatialZAVectors(); const bool fixBase = mArticulationData.getCore()->flags & PxArticulationFlag::eFIX_BASE; @@ -839,7 +815,6 @@ namespace Dy deltaV1 = propagateVelocityTestImpulse(tLinkDatum, tJointDatum, deferredZ[index], deltaV1); } - //ArticulationLink& link = mArticulationData.getLink(linkID); //PxTransform& body2World = link.bodyCore->body2World; //PxTransform& body2World = mArticulationData.getAccumulatedPoses()[linkID]; @@ -919,7 +894,6 @@ namespace Dy Z0 = propagateImpulse(tLinkDatum, jointDatum, Z0); deferredZ[tLink.parent] += Z0; } - } void FeatherstoneArticulation::pxcFsApplyImpulses(Cm::SpatialVectorF* Z) @@ -950,7 +924,6 @@ namespace Dy } deferredZ[0] += Z[0]; - } void FeatherstoneArticulation::pxcFsApplyImpulses(PxU32 linkID, const Ps::aos::Vec3V& linear, @@ -993,8 +966,6 @@ namespace Dy PxTransform& body2World = data.getPreTransform(linkID); PxTransform& body2World2 = data.getPreTransform(linkID2); - - PxU64 commonId = links[linkID].pathToRoot & links[linkID2].pathToRoot; PxU32 commonLink = Dy::ArticulationHighestSetBit(commonId); //Now, work from one to that common, then the other to that common, then go from there upwards... @@ -1152,9 +1123,6 @@ namespace Dy jVelocity[0] += jDeltaVelocity[0]; jDeltaVelocity[0] = 0.f; - - - newParentToChild = joint->relativeQuat; const PxVec3 e = newParentToChild.rotate(parentOffset); const PxVec3 d = childOffset; @@ -1233,9 +1201,7 @@ namespace Dy if (jRotation.w < 0) //shortest angle. jRotation = -jRotation; - jointRotation = jointRotation * jRotation; - - + jointRotation = jointRotation * jRotation; } newParentToChild = (jointRotation * joint->relativeQuat).getNormalized(); const PxVec3 e = newParentToChild.rotate(parentOffset); @@ -1243,12 +1209,9 @@ namespace Dy r = e + d; PX_ASSERT(r.isFinite()); - } else { - - PxVec3 worldAngVel = motionVelocities[linkID].top; newWorldQ = Ps::exp(worldAngVel*dt) * currentTransform.q; @@ -1314,7 +1277,6 @@ namespace Dy return cBody2World; } - const PxTransform& FeatherstoneArticulation::getCurrentTransform(PxU32 linkID) const { return mArticulationData.mAccumulatedPoses[linkID]; @@ -1329,7 +1291,6 @@ namespace Dy Cm::SpatialVectorF FeatherstoneArticulation::propagateVelocity(const ArticulationLinkData& linkDatum, const ArticulationJointCoreData& jointDatum, const Cm::SpatialVectorF& Z, PxReal* jointVelocity, const Cm::SpatialVectorF& hDeltaV) { - Cm::SpatialVectorF pDeltaV = linkDatum.childToParent.transposeTransform(hDeltaV); //parent velocity change Cm::SpatialVectorF temp = linkDatum.spatialArticulatedInertia * pDeltaV + Z; @@ -1362,12 +1323,10 @@ namespace Dy return pDeltaV + jointSpatialDeltaV; } - //This method calculate the velocity change due to collision/constraint impulse Cm::SpatialVectorF FeatherstoneArticulation::propagateVelocityTestImpulse(const ArticulationLinkData& linkDatum, const ArticulationJointCoreData& jointDatum, const Cm::SpatialVectorF& Z, const Cm::SpatialVectorF& hDeltaV) { - const SpatialTransform& c2p = linkDatum.childToParent; Cm::SpatialVectorF pDeltaV = c2p.transposeTransform(hDeltaV); //parent velocity change @@ -1430,7 +1389,6 @@ namespace Dy Cm::SpatialVectorF FeatherstoneArticulation::propagateImpulse(const ArticulationLinkData& linkDatum, const ArticulationJointCoreData& jointDatum, const Cm::SpatialVectorF& Z) { - Cm::SpatialVectorF temp(PxVec3(0.f), PxVec3(0.f)); for (PxU32 ind = 0; ind < jointDatum.dof; ++ind) @@ -1448,7 +1406,6 @@ namespace Dy const ArticulationData& data, Cm::SpatialVectorF* Z, PxReal* jointVelocities) { - Cm::SpatialVectorF deltaV = Cm::SpatialVectorF::Zero(); if (!fixBase) { @@ -1473,7 +1430,6 @@ namespace Dy Cm::SpatialVectorF FeatherstoneArticulation::getDeltaV(const bool fixBase, const PxU32 linkID, const ArticulationData& data, Cm::SpatialVectorF* Z) { - Cm::SpatialVectorF deltaV = Cm::SpatialVectorF::Zero(); if (!fixBase) { @@ -1525,7 +1481,6 @@ namespace Dy return getDeltaV(fixBase, linkID, data, Z); } - //This method use in impulse self response. The input impulse is in the link space Cm::SpatialVectorF FeatherstoneArticulation::getImpulseResponseWithJ( const PxU32 linkID, @@ -1542,7 +1497,6 @@ namespace Dy void FeatherstoneArticulation::saveVelocity(const ArticulationSolverDesc& d, Cm::SpatialVectorF* deltaV) { - FeatherstoneArticulation* arti = static_cast(d.articulation); ArticulationData& data = arti->mArticulationData; @@ -1561,7 +1515,7 @@ namespace Dy PxReal* jPosDeltaVels = data.getPosIterJointDeltaVelocities(); - PxReal* jDeltaVels = data.getJointDeltaVelocities(); + const PxReal* jDeltaVels = data.getJointDeltaVelocities(); PxMemCopy(jPosDeltaVels, jDeltaVels, sizeof(PxReal) * dofs); @@ -1569,8 +1523,6 @@ namespace Dy { PX_ASSERT(PxAbs(jPosDeltaVels[i]) < 30.f); }*/ - - } void FeatherstoneArticulation::saveVelocityTGS(const ArticulationSolverDesc& d, PxReal invDtF32) @@ -1579,7 +1531,6 @@ namespace Dy PX_UNUSED(invDtF32); } - void FeatherstoneArticulation::getImpulseSelfResponse( PxU32 linkID0, PxU32 linkID1, @@ -1595,7 +1546,6 @@ namespace Dy reinterpret_cast(deltaV1)); } - void getImpulseResponseSlow(Dy::ArticulationLink* links, const ArticulationData& data, PxU32 linkID0_, @@ -1605,7 +1555,6 @@ namespace Dy const Cm::SpatialVector& impulse1, Cm::SpatialVector& deltaV1) { - PxU32 stack[DY_ARTICULATION_MAX_SIZE]; Cm::SpatialVectorF Z[DY_ARTICULATION_MAX_SIZE]; //Cm::SpatialVectorF ZZV[DY_ARTICULATION_MAX_SIZE]; @@ -1615,7 +1564,6 @@ namespace Dy PxU32 linkID0 = linkID0_; PxU32 linkID1 = linkID1_; - const PxTransform& transform0 = data.getLink(linkID0_).bodyCore->body2World; const PxTransform& transform1 = data.getLink(linkID1_).bodyCore->body2World; @@ -1669,7 +1617,6 @@ namespace Dy for (PxU32 index = ic; (index--) > i1;) v = FeatherstoneArticulation::propagateVelocityTestImpulse(data.getLinkData(stack[index]), data.getJointData(stack[index]), Z[stack[index]], v); - Cm::SpatialVectorF dv1 = v; for (PxU32 index = i1; (index--) > i0;) dv1 = FeatherstoneArticulation::propagateVelocityTestImpulse(data.getLinkData(stack[index]), data.getJointData(stack[index]), Z[stack[index]], dv1); @@ -1683,10 +1630,8 @@ namespace Dy deltaV1.linear = transform1.rotate(dv1.bottom); deltaV1.angular = transform1.rotate(dv1.top); - } - void FeatherstoneArticulation::getImpulseSelfResponse(ArticulationLink* links, const bool fixBase, Cm::SpatialVectorF* Z, @@ -1791,12 +1736,10 @@ namespace Dy { init(s, PxVec3(0), PxVec3(0), axis, axis, 0, PX_MAX_F32); - FeatherstoneArticulation::getImpulseSelfResponse(links, fixBase, Z, data, links[linkIndex].parent, Cm::SpatialVector(PxVec3(0), axis), s.deltaVA, linkIndex, Cm::SpatialVector(PxVec3(0), -axis), s.deltaVB); - const PxReal unitResponse = axis.dot(reinterpret_cast(s.deltaVA.angular)) - axis.dot(reinterpret_cast(s.deltaVB.angular)); if (unitResponse<0.0f) Ps::getFoundation().error(PxErrorCode::eDEBUG_WARNING, __FILE__, __LINE__, "Warning: articulation ill-conditioned or under severe stress, joint limit ignored"); @@ -1809,7 +1752,6 @@ namespace Dy s.impulseMultiplier = 1.0f; } - void FeatherstoneArticulation::createHardLimits( SolverConstraint1DExt& s0, SolverConstraint1DExt& s1, @@ -1840,7 +1782,6 @@ namespace Dy s1.impulseMultiplier = 1.0f; } - void FeatherstoneArticulation::createTangentialSpring( ArticulationLink* links, const bool fixBase, @@ -1900,7 +1841,6 @@ namespace Dy c.ang0Writeback = c.ang0; } - void createSpringDrive(Dy::SolverConstraint1DExt& c, PxReal error, PxReal targetVelocity, PxReal maxImpulse, PxReal stiffness, PxReal damping, PxReal dt, const Cm::SpatialVectorV& deltaVA, const Cm::SpatialVectorV& deltaVB, const PxReal unitResponse) @@ -1954,7 +1894,6 @@ namespace Dy c.flags = 0; } - void createDriveOrLimit(Dy::SolverConstraint1DExtStep& c, PxReal error, const PxReal minImpulse, const PxReal maxImpulse, bool keepBias, PxReal maxBias, const PxReal velTarget, const PxReal biasCoefficient, bool isLimit, const Cm::SpatialVectorV& deltaVA, const Cm::SpatialVectorV& deltaVB, PxReal recipResponse) @@ -2034,13 +1973,12 @@ namespace Dy ArticulationInternalConstraint* constraints = data.mInternalConstraints.begin(); ArticulationInternalLockedAxis* locks = data.mInternalLockedAxes.begin(); - for (PxU16 linkID = 1; linkID < linkCount; linkID++) { const ArticulationLink& link = links[linkID]; ArticulationJointCoreData& jointDatum = data.getJointData(linkID); - PxReal* jPosition = &jointPositions[jointDatum.jointOffset]; + const PxReal* jPosition = &jointPositions[jointDatum.jointOffset]; PX_UNUSED(jPosition); const ArticulationLink& pLink = links[link.parent]; @@ -2049,7 +1987,7 @@ namespace Dy //const bool jointDrive = (j.driveType != PxArticulationJointDriveType::eNONE); - bool hasFriction = j.frictionCoefficient > 0.f; + const bool hasFriction = j.frictionCoefficient > 0.f; const PxReal fCoefficient = j.frictionCoefficient * dt; const PxReal transmissionForce = jointTransmittedForce[linkID].magnitude() * fCoefficient; @@ -2058,7 +1996,6 @@ namespace Dy const PxU32 limitedRows = 2u * jointDatum.limitedAxes; const PxU32 lockedRows = jointDatum.lockedAxes; - PxU8 driveRows = 0; for (PxU32 i = 0; i < PxArticulationAxis::eCOUNT; ++i) @@ -2088,7 +2025,7 @@ namespace Dy { if (j.motion[i] != PxArticulationMotion::eLOCKED) { - bool hasDrive = (j.motion[i] != PxArticulationMotion::eLOCKED && j.drives[i].maxForce > 0.f && (j.drives[i].stiffness > 0.f || j.drives[i].damping > 0.f)); + const bool hasDrive = (j.motion[i] != PxArticulationMotion::eLOCKED && j.drives[i].maxForce > 0.f && (j.drives[i].stiffness > 0.f || j.drives[i].damping > 0.f)); if (j.motion[i] == PxArticulationMotion::eLIMITED || hasDrive || frictionRows) { @@ -2110,13 +2047,13 @@ namespace Dy if (ratio < 1e-4f) unitResponse = 0.f;*/ - Cm::SpatialVector& deltaV0 = unsimdRef(deltaVA); - Cm::SpatialVector& deltaV1 = unsimdRef(deltaVB); + const Cm::SpatialVector& deltaV0 = unsimdRef(deltaVA); + const Cm::SpatialVector& deltaV1 = unsimdRef(deltaVB); - PxReal r0 = deltaV0.angular.dot(axis); - PxReal r1 = deltaV1.angular.dot(axis); + const PxReal r0 = deltaV0.angular.dot(axis); + const PxReal r1 = deltaV1.angular.dot(axis); - PxReal unitResponse = r0 - r1; + const PxReal unitResponse = r0 - r1; //Cm::SpatialVector rem0(deltaV0.linear, deltaV0.angular - (axis * r0)); //Cm::SpatialVector rem1(deltaV1.linear, deltaV1.angular - (axis*r1)); @@ -2159,19 +2096,18 @@ namespace Dy constraints->frictionForce = 0.f; constraints->maxFrictionForce = hasFriction ? transmissionForce/dt : 0.f; constraints->frictionForceCoefficient = isTGSSolver ? 0.f : 1.f; - if (hasDrive) { - PxReal targetVelocity = jointDatum.targetJointVelocity[dofId]; + const PxReal targetVelocity = jointDatum.targetJointVelocity[dofId]; PxReal targetPos = jointDatum.targetJointPosition[dofId]; //KS - clamp drive target within limits - no point in having 2 parts fight against each-other if (j.motion[i] == PxArticulationMotion::eLIMITED) targetPos = PxClamp(targetPos, j.limits[i].low, j.limits[i].high); - PxReal a = dt * dt * j.drives[i].stiffness + dt * j.drives[i].damping; - PxReal b = dt * (j.drives[i].damping * targetVelocity /*+ j.drives[i].stiffness * (targetPos - jointPos)*/); + const PxReal a = dt * dt * j.drives[i].stiffness + dt * j.drives[i].damping; + const PxReal b = dt * (j.drives[i].damping * targetVelocity /*+ j.drives[i].stiffness * (targetPos - jointPos)*/); PxReal x = 0.f; if (!j.drives[i].isAcceleration) @@ -2214,7 +2150,7 @@ namespace Dy { if (j.motion[i] != PxArticulationMotion::eLOCKED) { - bool hasDrive = (j.motion[i] != PxArticulationMotion::eLOCKED && j.drives[i].maxForce > 0.f && (j.drives[i].stiffness > 0.f || j.drives[i].damping > 0.f)); + const bool hasDrive = (j.motion[i] != PxArticulationMotion::eLOCKED && j.drives[i].maxForce > 0.f && (j.drives[i].stiffness > 0.f || j.drives[i].damping > 0.f)); if (j.motion[i] == PxArticulationMotion::eLIMITED || hasDrive || frictionRows) { @@ -2232,14 +2168,14 @@ namespace Dy //Now add in friction rows, then limit rows, then drives... - Cm::SpatialVector& deltaV0 = unsimdRef(deltaVA); - Cm::SpatialVector& deltaV1 = unsimdRef(deltaVB); + const Cm::SpatialVector& deltaV0 = unsimdRef(deltaVA); + const Cm::SpatialVector& deltaV1 = unsimdRef(deltaVB); - PxReal r0 = deltaV0.linear.dot(axis) + deltaV0.angular.dot(ang0); - PxReal r1 = deltaV1.linear.dot(axis) + + const PxReal r0 = deltaV0.linear.dot(axis) + deltaV0.angular.dot(ang0); + const PxReal r1 = deltaV1.linear.dot(axis) + deltaV1.angular.dot(ang1); - PxReal unitResponse = r0 - r1; + const PxReal unitResponse = r0 - r1; //Cm::SpatialVector rem0(deltaV0.linear - axis * r0, deltaV0.angular - (ang0 * r0)); //Cm::SpatialVector rem1(deltaV1.linear - axis * r1, deltaV1.angular - (ang1*r1)); @@ -2296,15 +2232,15 @@ namespace Dy if (hasDrive) { - PxReal targetVelocity = -jointDatum.targetJointVelocity[dofId]; + const PxReal targetVelocity = -jointDatum.targetJointVelocity[dofId]; PxReal targetPos = jointDatum.targetJointPosition[dofId]; //KS - clamp drive target within limits - no point in having 2 parts fight against each-other if (j.motion[i] == PxArticulationMotion::eLIMITED) targetPos = PxClamp(targetPos, j.limits[i].low, j.limits[i].high); - PxReal a = dt * dt * j.drives[i].stiffness + dt * j.drives[i].damping; - PxReal b = dt * (j.drives[i].damping * targetVelocity /*+ j.drives[i].stiffness * (targetPos - jointPos)*/); + const PxReal a = dt * dt * j.drives[i].stiffness + dt * j.drives[i].damping; + const PxReal b = dt * (j.drives[i].damping * targetVelocity /*+ j.drives[i].stiffness * (targetPos - jointPos)*/); PxReal x = 0.f; if (!j.drives[i].isAcceleration) @@ -2374,13 +2310,13 @@ namespace Dy if (ratio < 1e-4f) unitResponse = 0.f;*/ - Cm::SpatialVector& deltaV0 = unsimdRef(deltaVA); - Cm::SpatialVector& deltaV1 = unsimdRef(deltaVB); + const Cm::SpatialVector& deltaV0 = unsimdRef(deltaVA); + const Cm::SpatialVector& deltaV1 = unsimdRef(deltaVB); - PxReal r0 = deltaV0.angular.dot(axis); - PxReal r1 = deltaV1.angular.dot(axis); + const PxReal r0 = deltaV0.angular.dot(axis); + const PxReal r1 = deltaV1.angular.dot(axis); - PxReal unitResponse = r0 - r1; + const PxReal unitResponse = r0 - r1; //Cm::SpatialVector rem0(deltaV0.linear, deltaV0.angular - (axis * r0)); //Cm::SpatialVector rem1(deltaV1.linear, deltaV1.angular - (axis * r1)); @@ -2416,8 +2352,6 @@ namespace Dy #if 1 PxU32 FeatherstoneArticulation::setupSolverConstraints( - PxConstraintAllocator& /*allocator*/, - PxSolverConstraintDesc* /*constraintDesc*/, ArticulationLink* links, const PxU32 linkCount, const bool fixBase, @@ -2434,7 +2368,6 @@ namespace Dy #else - PxU32 FeatherstoneArticulation::setupSolverConstraints( PxConstraintAllocator& allocator, PxSolverConstraintDesc* constraintDesc, @@ -3101,7 +3034,6 @@ namespace Dy #endif - void FeatherstoneArticulation::createHardLimitTGS( SolverConstraint1DExtStep& s, const PxVec3& axis, @@ -3116,7 +3048,6 @@ namespace Dy s.deltaVA = deltaVA; s.deltaVB = deltaVB; - s.error = error; s.biasScale = -recipDt*0.7f; @@ -3146,7 +3077,7 @@ namespace Dy init(s, PxVec3(0), PxVec3(0), axis, axis, -PX_MAX_F32, PX_MAX_F32); Cm::SpatialVector axis6(PxVec3(0), axis); - PxU32 parent = links[linkIndex].parent; + const PxU32 parent = links[linkIndex].parent; FeatherstoneArticulation::getImpulseSelfResponse(links, fixBase, Z, data, parent, axis6, s.deltaVA, linkIndex, -axis6, s.deltaVB); const PxReal unitResponse = axis.dot(reinterpret_cast(s.deltaVA.angular)) - axis.dot(reinterpret_cast(s.deltaVB.angular)); @@ -3193,13 +3124,12 @@ namespace Dy ArticulationJointCore* joint = link.inboundJoint; - PxReal* jPosition = &jointPositions[jointDatum.jointOffset]; + const PxReal* jPosition = &jointPositions[jointDatum.jointOffset]; PxQuat newParentToChild; PxQuat newWorldQ; PxVec3 r; - const PxVec3 childOffset = -joint->childPose.p; const PxVec3 parentOffset = joint->parentPose.p; @@ -3274,8 +3204,7 @@ namespace Dy } void FeatherstoneArticulation::jcalc(ArticulationData& data) - { - + { if (getDirty()) { ArticulationLink* links = data.getLinks(); @@ -3349,7 +3278,6 @@ namespace Dy void FeatherstoneArticulation::computeZ(ArticulationData& data, const PxVec3& gravity, ScratchData& scratchData) { - Cm::SpatialVectorF* motionVelocities = scratchData.motionVelocities; Cm::SpatialVectorF* spatialZAForces = scratchData.spatialZAVectors; Cm::SpatialVector* externalAccels = scratchData.externalAccels; @@ -3402,7 +3330,7 @@ namespace Dy const PxReal m = core.inverseMass == 0.f ? 0.f : 1.0f / core.inverseMass; - PxMat33& I = linkDatum.spatialInertia.bottomLeft; + const PxMat33& I = linkDatum.spatialInertia.bottomLeft; const PxVec3 inertiaTensor(I.column0.x, I.column1.y, I.column2.z); @@ -3431,9 +3359,11 @@ namespace Dy { Cm::SpatialVectorF* motionVelocities = scratchData.motionVelocities; - Cm::SpatialVectorF* dragForces = Z; + Cm::SpatialVectorF* dragImpulse = Z; - PxMemZero(dragForces, sizeof(Cm::SpatialVectorF)*data.getLinkCount()); + Cm::SpatialVectorF* ZAForces = scratchData.spatialZAVectors; + + PxMemZero(dragImpulse, sizeof(Cm::SpatialVectorF)*data.getLinkCount()); const PxReal dt = data.getDt(); @@ -3449,18 +3379,21 @@ namespace Dy const PxReal m = core.inverseMass == 0.f ? 0.f : 1.0f / core.inverseMass; //PxMat33& I = linkDatum.spatialArticulatedInertia.bottomLeft; - PxVec3 I = PxVec3(1.f / core.inverseInertia.x, 1.f / core.inverseInertia.y, 1.f / core.inverseInertia.z); + const PxVec3 I = PxVec3(1.f / core.inverseInertia.x, 1.f / core.inverseInertia.y, 1.f / core.inverseInertia.z); - Cm::SpatialVectorF& d = dragForces[linkID]; + Cm::SpatialVectorF& d = dragImpulse[linkID]; Cm::SpatialVectorF v; v.top = body2World.rotateInv(motionVelocities[linkID].top); - v.bottom = body2World.rotateInv(motionVelocities[linkID].bottom); + v.bottom = body2World.rotateInv(motionVelocities[linkID].bottom); if (core.linearDamping > 0.f || core.angularDamping > 0.f) { - d.top += (v.bottom * core.linearDamping*m*dt); - d.bottom += I.multiply(v.top* core.angularDamping*dt); + const PxReal linDamp = PxMin(core.linearDamping*dt, 1.f); + const PxReal angDamp = PxMin(core.angularDamping*dt, 1.f); + + d.top += (v.bottom * linDamp*m) -ZAForces[linkID].top * dt * linDamp; + d.bottom += I.multiply(v.top* angDamp) -ZAForces[linkID].bottom * dt * angDamp; bAppliedImpusle = true; } @@ -3472,11 +3405,10 @@ namespace Dy if (angMag > maxAng || linMag > maxLin) { - if (angMag > maxAng) { - PxReal scale = 1.f - PxSqrt(maxAng) / PxSqrt(angMag); - PxVec3 tmpaccelerationAng = (I.multiply(v.top)*scale); + const PxReal scale = 1.f - PxSqrt(maxAng) / PxSqrt(angMag); + const PxVec3 tmpaccelerationAng = (I.multiply(v.top)*scale); PX_UNUSED(tmpaccelerationAng); d.bottom = tmpaccelerationAng; @@ -3485,20 +3417,19 @@ namespace Dy if (linMag > maxLin) { - PxReal scale = 1.f - (PxSqrt(maxLin) / PxSqrt(linMag))*0.8f; - PxVec3 tmpaccelerationLin = (v.bottom*m*scale); + const PxReal scale = 1.f - (PxSqrt(maxLin) / PxSqrt(linMag))*0.8f; + const PxVec3 tmpaccelerationLin = (v.bottom*m*scale); PX_UNUSED(tmpaccelerationLin); d.top = tmpaccelerationLin; bAppliedImpusle = true; - } } } if (bAppliedImpusle) { - applyImpulses(dragForces, DeltaV); + applyImpulses(dragImpulse, DeltaV); PxReal* deltaV = data.getJointDeltaVelocities(); PxReal* jointV = data.getJointVelocities(); @@ -3551,7 +3482,6 @@ namespace Dy relVel += jointDatum.motionMatrix[ind] * jV; } - const PxVec3 aVec = relVel.top; const PxVec3 force = pAngular.cross(aVec); @@ -3562,7 +3492,6 @@ namespace Dy const PxVec3 temp2 = aVec.cross(lVel); const PxVec3 torque = temp0 + temp1 + temp2; coriolis = Cm::SpatialVectorF(force, torque); - #else coriolis = Cm::SpatialVectorF(PxVec3(0.f), temp0); @@ -3600,16 +3529,13 @@ namespace Dy { PxMemZero(coriolisVectors, sizeof(Cm::SpatialVectorF)*linkCount); } - } static PxMat33 constructSkewSymmetricMatrix(const PxVec3 r) { - PxMat33 temp; - temp.column0 = PxVec3(0.f, r.z, -r.y); - temp.column1 = PxVec3(-r.z, 0.f, r.x); - temp.column2 = PxVec3(r.y, -r.x, 0.f); - return temp; + return PxMat33( PxVec3(0.0f, r.z, -r.y), + PxVec3(-r.z, 0.0f, r.x), + PxVec3(r.y, -r.x, 0.0f)); } void FeatherstoneArticulation::computeRelativeTransformC2P(ArticulationData& data) @@ -3630,7 +3556,7 @@ namespace Dy PxsBodyCore& pBodyCore = *pLink.bodyCore; const PxTransform& pBody2World = pBodyCore.body2World; - PxTransform tC2P = pBody2World.transformInv(body2World).getNormalized(); + const PxTransform tC2P = pBody2World.transformInv(body2World).getNormalized(); linkDatum.childToParent.R = PxMat33(tC2P.q); linkDatum.childToParent.q = tC2P.q; @@ -3640,7 +3566,7 @@ namespace Dy //child to parent rotation matrix const PxMat33& c2p = linkDatum.childToParent.R; //r is in link body space - PxMat33 skewMatrixPR = -constructSkewSymmetricMatrix(linkDatum.r); + const PxMat33 skewMatrixPR = -constructSkewSymmetricMatrix(linkDatum.r); //rotation matrix cToP's inverse is rotation matrix pToC linkDatum.childToParent.T = c2p * (-skewMatrixPR); @@ -3674,7 +3600,7 @@ namespace Dy const PxTransform& body2World = bodyCore.body2World; - PxTransform tC2B = bBody2World.transformInv(body2World).getNormalized(); + const PxTransform tC2B = bBody2World.transformInv(body2World).getNormalized(); linkDatum.childToBase.R= PxMat33(tC2B.q); linkDatum.childToBase.q = tC2B.q; const PxVec3 r = body2World.rotateInv(body2World.p - bBody2World.p);//body space of link i @@ -3682,18 +3608,16 @@ namespace Dy //child to parent rotation matrix const PxMat33& c2b = linkDatum.childToParent.R; //r is in link body space - PxMat33 skewMatrixPR = -constructSkewSymmetricMatrix(r); + const PxMat33 skewMatrixPR = -constructSkewSymmetricMatrix(r); //rotation matrix cToP's inverse is rotation matrix pToC linkDatum.childToBase.T = c2b * (-skewMatrixPR); } } - //compute all links velocities void FeatherstoneArticulation::computeLinkVelocities(ArticulationData& data, ScratchData& scratchData) { - ArticulationLink* links = data.getLinks(); ArticulationLinkData* linkData = data.getLinkData(); const PxU32 linkCount = data.getLinkCount(); @@ -3774,7 +3698,6 @@ namespace Dy if (count <= 1) return; - const bool fixBase = mArticulationData.getCore()->flags & PxArticulationFlag::eFIX_BASE; ////(1) Flush velocities first...TODO - incorporate into code below properly...done! @@ -3791,19 +3714,15 @@ namespace Dy PX_UNUSED(baseVelocities); PX_UNUSED(transforms); - //PxMemZero(DeltaV, sizeof(Cm::SpatialVector)*count); Cm::SpatialVectorF* deferredZ = mArticulationData.getSpatialZAVectors(); bool impulse = false; { - impulses[0].top = PxVec3(0.f); impulses[0].bottom = PxVec3(0.f); - - if (!fixBase) { //ArticulationLink& link = links[0]; @@ -3819,8 +3738,6 @@ namespace Dy DeltaV[0].bottom = PxVec3(0.f); } - - PxU32 dofId = 0; PxU32 lockId = 0; for (PxU32 linkID = 1; linkID < count; ++linkID) @@ -3839,13 +3756,11 @@ namespace Dy Cm::UnAlignedSpatialVector i1(PxVec3(0.f), PxVec3(0.f)); - Cm::SpatialVectorF parentV = DeltaV[link.parent] + baseVelocities[link.parent]; + const Cm::SpatialVectorF localParentAccel = DeltaV[link.parent].rotateInv(transforms[link.parent]); - Cm::SpatialVectorF localParentAccel = DeltaV[link.parent].rotateInv(transforms[link.parent]); - - Cm::SpatialVectorF parentVelContrib = propagateVelocityTestImpulse(linkDatum, jointDatum, deferredZ[linkID], localParentAccel).rotate(transforms[linkID]); + const Cm::SpatialVectorF parentVelContrib = propagateVelocityTestImpulse(linkDatum, jointDatum, deferredZ[linkID], localParentAccel).rotate(transforms[linkID]); //Cm::SpatialVectorF parentVelContrib = ComputeDeltaVelocity(linkDatum, jointDatum, localParentAccel).rotate(transforms[linkID]); //DeltaV[linkID] will always be zero so doesn't need to be used in here... @@ -3855,7 +3770,6 @@ namespace Dy //constraint could have done, and this could lead to something not being accumulated. Cm::UnAlignedSpatialVector dv1(parentVelContrib.top, parentVelContrib.bottom); - if (jointDatum.dofInternalConstraintMask || jointDatum.lockedAxes) { Cm::UnAlignedSpatialVector i0(PxVec3(0.f), PxVec3(0.f)); @@ -3904,21 +3818,19 @@ namespace Dy const PxReal appliedFriction = constraint.frictionForce*constraint.frictionForceCoefficient; - PxReal frictionForce = PxClamp(-jointV *constraint.recipResponse + appliedFriction, + const PxReal frictionForce = PxClamp(-jointV *constraint.recipResponse + appliedFriction, -constraint.maxFrictionForce*dt, constraint.maxFrictionForce*dt); - PxReal frictionDeltaF = frictionForce - appliedFriction; + const PxReal frictionDeltaF = frictionForce - appliedFriction; constraint.frictionForce += frictionDeltaF; jointV += frictionDeltaF * constraint.response; - - - PxReal unclampedForce = constraint.driveImpulseMultiplier * constraint.driveForce + + const PxReal unclampedForce = constraint.driveImpulseMultiplier * constraint.driveForce + jointV * constraint.driveVelMultiplier + constraint.driveTargetVel + error * constraint.driveBiasCoefficient; - PxReal clampedForce = PxClamp(unclampedForce, -constraint.maxDriveForce, constraint.maxDriveForce); + const PxReal clampedForce = PxClamp(unclampedForce, -constraint.maxDriveForce, constraint.maxDriveForce); PxReal driveDeltaF = (clampedForce - constraint.driveForce); //Where we will be next frame - we use this to compute error bias terms to correct limits and drives... @@ -3927,7 +3839,6 @@ namespace Dy driveDeltaF += frictionDeltaF; - PxReal deltaF = 0.f; if (velocityIteration) @@ -3936,22 +3847,21 @@ namespace Dy } else { - PxReal futureP = jointP + jointV * dt; + const PxReal futureP = jointP + jointV * dt; if (futureP > constraint.highLimit) { - PxReal erp = jointP > constraint.highLimit ? constraint.erp : 1.f; + const PxReal erp = jointP > constraint.highLimit ? constraint.erp : 1.f; //PxReal deltaV = (constraint.highLimit - jointP)*invDt*erp - jointV; - PxReal deltaV = (constraint.highLimit - futureP)*invDt*erp; + const PxReal deltaV = (constraint.highLimit - futureP)*invDt*erp; deltaF = PxMin(constraint.highImpulse + deltaV * constraint.recipResponse, 0.f) - constraint.highImpulse; constraint.highImpulse += deltaF; - } else if (futureP < constraint.lowLimit) { - PxReal erp = jointP < constraint.lowLimit ? constraint.erp : 1.f; + const PxReal erp = jointP < constraint.lowLimit ? constraint.erp : 1.f; //PxReal deltaV = (constraint.lowLimit - jointP)*invDt*erp - jointV; - PxReal deltaV = (constraint.lowLimit - futureP)*invDt*erp; + const PxReal deltaV = (constraint.lowLimit - futureP)*invDt*erp; deltaF = PxMax(constraint.lowImpulse + deltaV * constraint.recipResponse, 0.f) - constraint.lowImpulse; constraint.lowImpulse += deltaF; } @@ -3975,8 +3885,7 @@ namespace Dy parentV += Cm::SpatialVectorF(deltaVP.top, deltaVP.bottom); childV += Cm::SpatialVectorF(deltaVC.top, deltaVC.bottom); - } - + } } } @@ -3986,9 +3895,9 @@ namespace Dy { ArticulationInternalLockedAxis& lockAxis = mArticulationData.mInternalLockedAxes[lockId++]; - PxReal jointV = lockAxis.axis.dot(childV.top) - lockAxis.axis.dot(parentV.top); + const PxReal jointV = lockAxis.axis.dot(childV.top) - lockAxis.axis.dot(parentV.top); - PxReal deltaJointP = lockAxis.axis.dot(deltaP[linkID].top) - lockAxis.axis.dot(deltaP[link.parent].top); + const PxReal deltaJointP = lockAxis.axis.dot(deltaP[linkID].top) - lockAxis.axis.dot(deltaP[link.parent].top); PX_UNUSED(deltaJointP); PxReal deltaV = -jointV; @@ -3999,7 +3908,7 @@ namespace Dy //deltaV = PxClamp(deltaV, -5.f, 5.f); - PxReal deltaF = deltaV * lockAxis.recipResponse; + const PxReal deltaF = deltaV * lockAxis.recipResponse; if (deltaF != 0.f) { @@ -4020,7 +3929,6 @@ namespace Dy parentV += deltaVP; childV += deltaVC; } - } DeltaV[link.parent] += Cm::SpatialVectorF(dv0.top, dv0.bottom); @@ -4172,7 +4080,6 @@ namespace Dy PxU8* FeatherstoneArticulation::allocateScratchSpatialData(PxcScratchAllocator* allocator, const PxU32 linkCount, ScratchData& scratchData, bool fallBackToHeap) { - const PxU32 size = sizeof(Cm::SpatialVectorF) * linkCount; const PxU32 totalSize = size * 4 + sizeof(Dy::SpatialMatrix) * linkCount; @@ -4191,7 +4098,7 @@ namespace Dy return tempMemory; } - void FeatherstoneArticulation::allocateScratchSpatialData(DyScratchAllocator& allocator, +/* void FeatherstoneArticulation::allocateScratchSpatialData(DyScratchAllocator& allocator, const PxU32 linkCount, ScratchData& scratchData) { const PxU32 size = sizeof(Cm::SpatialVectorF) * linkCount; @@ -4211,7 +4118,7 @@ namespace Dy offset += size; scratchData.compositeSpatialInertias = reinterpret_cast(tempMemory + offset); - } + }*/ }//namespace Dy diff --git a/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneArticulationLink.h b/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneArticulationLink.h index 7eecc4d42..ef0b01d24 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneArticulationLink.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneArticulationLink.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneForwardDynamic.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneForwardDynamic.cpp index b6d38acd8..6237e3129 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneForwardDynamic.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneForwardDynamic.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -86,7 +86,6 @@ namespace Dy computeArticulatedSpatialZ(mArticulationData, scratchData); } - #if (FEATHERSTONE_DEBUG && (PX_DEBUG || PX_CHECKED)) static bool isSpatialVectorEqual(Cm::SpatialVectorF& t0, Cm::SpatialVectorF& t1) { @@ -672,15 +671,15 @@ namespace Dy { PX_UNUSED(contextID); PX_UNUSED(desc); + PX_UNUSED(allocator); + PX_UNUSED(constraintDesc); FeatherstoneArticulation* articulation = static_cast(desc.articulation); ArticulationData& data = articulation->mArticulationData; data.setDt(dt); - return articulation->computeUnconstrainedVelocitiesInternal(desc, allocator, constraintDesc, - acCount, gravity, Z, deltaV); + return articulation->computeUnconstrainedVelocitiesInternal(acCount, gravity, Z, deltaV); } - void FeatherstoneArticulation::computeUnconstrainedVelocitiesTGS( const ArticulationSolverDesc& desc, PxReal dt, const PxVec3& gravity, @@ -870,18 +869,13 @@ namespace Dy //} } - PxU32 FeatherstoneArticulation::computeUnconstrainedVelocitiesInternal( - const ArticulationSolverDesc& desc, - PxConstraintAllocator& allocator, - PxSolverConstraintDesc* constraintDesc, PxU32& acCount, const PxVec3& gravity, Cm::SpatialVectorF* Z, Cm::SpatialVectorF* DeltaV) { PX_PROFILE_ZONE("Articulations:computeUnconstrainedVelocities", 0); - PX_UNUSED(desc); ArticulationLink* links = mArticulationData.getLinks(); const PxU32 linkCount = mArticulationData.getLinkCount(); const bool fixBase = mArticulationData.getCore()->flags & PxArticulationFlag::eFIX_BASE; @@ -928,11 +922,9 @@ namespace Dy mArticulationData.mDeltaQ[a] = PxQuat(PxIdentity); } - return setupSolverConstraints(allocator, constraintDesc, links, linkCount, - fixBase, mArticulationData, Z, acCount); + return setupSolverConstraints(links, linkCount, fixBase, mArticulationData, Z, acCount); } - void FeatherstoneArticulation::computeUnconstrainedVelocitiesTGSInternal(const PxVec3& gravity, Cm::SpatialVectorF* Z, Cm::SpatialVectorF* DeltaV) { @@ -1329,7 +1321,7 @@ namespace Dy const PxTransform& preTrans = link.bodyCore->body2World; - Cm::SpatialVectorF& posVel = data.getPosIterMotionVelocity(0); + const Cm::SpatialVectorF& posVel = data.getPosIterMotionVelocity(0); updateRootBody(posVel, preTrans, data, dt); } diff --git a/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneInverseDynamic.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneInverseDynamic.cpp index 5d45c0b82..24eb0c083 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneInverseDynamic.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyFeatherstoneInverseDynamic.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -598,6 +598,8 @@ namespace Dy static void computeJacobian(PxKinematicJacobian& jacobian, ArticulationJointCoreData& jointDatum, const PxTransform& body2World) { + jacobian.nbColumns = jointDatum.motionMatrix.getNumColumns(); + for (PxU32 ind = 0; ind < jointDatum.motionMatrix.getNumColumns(); ++ind) { PxReal* jacoColumn = jacobian.j[ind]; diff --git a/src/PhysX/physx/source/lowleveldynamics/src/DyFrictionCorrelation.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyFrictionCorrelation.cpp index 35bbfeac5..d3bc8cb81 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyFrictionCorrelation.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyFrictionCorrelation.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyFrictionPatch.h b/src/PhysX/physx/source/lowleveldynamics/src/DyFrictionPatch.h index 5bf28a293..5745c4495 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyFrictionPatch.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyFrictionPatch.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyFrictionPatchStreamPair.h b/src/PhysX/physx/source/lowleveldynamics/src/DyFrictionPatchStreamPair.h index 461e9b9bb..ca039dd49 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyFrictionPatchStreamPair.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyFrictionPatchStreamPair.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyRigidBodyToSolverBody.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyRigidBodyToSolverBody.cpp index 8efc7e170..7fa94e78f 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyRigidBodyToSolverBody.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyRigidBodyToSolverBody.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -34,7 +34,7 @@ using namespace physx; -// PT: TODO: SIMDify all this... So far I only took care of the quat-to-matrix transform +// PT: TODO: SIMDify all this... void Dy::copyToSolverBodyData(const PxVec3& linearVelocity, const PxVec3& angularVelocity, const PxReal invMass, const PxVec3& invInertia, const PxTransform& globalPose, const PxReal maxDepenetrationVelocity, const PxReal maxContactImpulse, const PxU32 nodeIndex, const PxReal reportThreshold, PxSolverBodyData& data, PxU32 lockFlags) { @@ -42,6 +42,7 @@ void Dy::copyToSolverBodyData(const PxVec3& linearVelocity, const PxVec3& angula const PxVec3 safeSqrtInvInertia = computeSafeSqrtInertia(invInertia); + // PT: TODO: re-SIMDify this one const PxMat33 rotation(globalPose.q); Cm::transformInertiaTensor(safeSqrtInvInertia, rotation, data.sqrtInvInertia); diff --git a/src/PhysX/physx/source/lowleveldynamics/src/DySolverBody.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverBody.h index 148f23fc5..f80cb2f56 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverBody.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverBody.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraint1D.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraint1D.h index 303b4d0d0..ff5b74216 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraint1D.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraint1D.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraint1D4.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraint1D4.h index 0da65a22a..d24742e34 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraint1D4.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraint1D4.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraint1DStep.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraint1DStep.h index b2f7e25e4..fdd478d54 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraint1DStep.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraint1DStep.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintDesc.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintDesc.h index 6f6408260..f14c388c9 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintDesc.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintDesc.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintExtShared.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintExtShared.h index 007bd5972..d2206256d 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintExtShared.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintExtShared.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintTypes.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintTypes.h index 6b857c781..a1c8c3cdb 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintTypes.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintTypes.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraints.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraints.cpp index ca0027eba..f8e61b106 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraints.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraints.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintsBlock.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintsBlock.cpp index fb196cb62..801f409e5 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintsBlock.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintsBlock.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintsShared.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintsShared.h index ed3d9e838..a6300d23a 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintsShared.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverConstraintsShared.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverContact.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverContact.h index d70360a99..6950d99e5 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverContact.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverContact.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverContact4.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverContact4.h index 354ebb57e..b870d2a5d 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverContact4.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverContact4.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverContactPF.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverContactPF.h index ebf9f6427..c0f165ad7 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverContactPF.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverContactPF.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverContactPF4.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverContactPF4.h index 97620dc27..7f9d09429 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverContactPF4.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverContactPF4.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverContext.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverContext.h index 736810e35..00f161663 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverContext.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverContext.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverControl.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DySolverControl.cpp index 683163704..4d9e63f4c 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverControl.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverControl.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverControl.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverControl.h index f9315a33c..a47f69ca8 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverControl.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverControl.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverControlPF.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DySolverControlPF.cpp index 853ce9e15..a4b924c7c 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverControlPF.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverControlPF.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverControlPF.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverControlPF.h index 7ab760bef..3ac4311cc 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverControlPF.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverControlPF.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverCore.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverCore.h index dbe1da918..6a07cca69 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverCore.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverCore.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverExt.h b/src/PhysX/physx/source/lowleveldynamics/src/DySolverExt.h index ae5703433..3733247bb 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverExt.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverExt.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverPFConstraints.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DySolverPFConstraints.cpp index a7e6c018d..91100b509 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverPFConstraints.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverPFConstraints.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySolverPFConstraintsBlock.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DySolverPFConstraintsBlock.cpp index 65b28464e..3e61e7ba7 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySolverPFConstraintsBlock.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySolverPFConstraintsBlock.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DySpatial.h b/src/PhysX/physx/source/lowleveldynamics/src/DySpatial.h index 0196bdb97..040c763ff 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DySpatial.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DySpatial.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyTGSContactPrep.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyTGSContactPrep.cpp index ee854ae3b..084f42b31 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyTGSContactPrep.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyTGSContactPrep.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -627,7 +627,7 @@ namespace Dy //const Vec3V normal = Vec3V_From_PxVec3_Aligned(buffer.contacts[c.contactPatches[c.correlationListHeads[i]].start].normal); const FloatV orthoThreshold = FLoad(0.70710678f); - const FloatV p1 = FLoad(0.1f); + const FloatV p1 = FLoad(0.0001f); // fallback: normal.cross((1,0,0)) or normal.cross((0,0,1)) const FloatV normalX = V3GetX(normal); const FloatV normalY = V3GetY(normal); @@ -643,7 +643,7 @@ namespace Dy const VecCrossV t0Cross = V3PrepareCross(t0); - const Vec3V t1 = V3Cross(norCross, t0Cross); + const Vec3V t1 = V3Normalize(V3Cross(norCross, t0Cross)); //const VecCrossV t1Cross = V3PrepareCross(t1); @@ -672,6 +672,8 @@ namespace Dy header->frictionBrokenWritebackByte = writeback; + PxReal frictionScale = (contactBase0->materialFlags & PxMaterialFlag::eIMPROVED_PATCH_FRICTION && frictionPatch.anchorCount == 2) ? 0.5f : 1.f; + for (PxU32 j = 0; j < frictionPatch.anchorCount; j++) { Ps::prefetchLine(ptr, 256); @@ -725,7 +727,7 @@ namespace Dy f0->raXnI_targetVelW = V4SetW(raXnInertia, targetVel); f0->rbXnI_velMultiplierW = V4SetW(rbXnInertia, velMultiplier); f0->appliedForce = 0.f; - f0->frictionScale = 1.f; + f0->frictionScale = frictionScale; f0->biasScale = frictionBiasScale; } @@ -759,7 +761,7 @@ namespace Dy f1->raXnI_targetVelW = V4SetW(raXnInertia, targetVel); f1->rbXnI_velMultiplierW = V4SetW(rbXnInertia, velMultiplier); f1->appliedForce = 0.f; - f1->frictionScale = 1.f; + f1->frictionScale = frictionScale; f1->biasScale = frictionBiasScale; } } @@ -1035,8 +1037,11 @@ namespace Dy const Gu::ContactPoint* contactBase0 = buffer + c.contactPatches[c.correlationListHeads[i]].start; const PxReal combinedRestitution = contactBase0->restitution; - const PxReal staticFriction = contactBase0->staticFriction; - const PxReal dynamicFriction = contactBase0->dynamicFriction; + const bool useImprovedFrictionPatch = !!(contactBase0->materialFlags & PxMaterialFlag::eIMPROVED_PATCH_FRICTION); + PxReal coefficient = useImprovedFrictionPatch ? 1.f/frictionPatch.anchorCount : 1.f; + + const PxReal staticFriction = contactBase0->staticFriction*coefficient; + const PxReal dynamicFriction = contactBase0->dynamicFriction*coefficient; const bool disableStrongFriction = !!(contactBase0->materialFlags & PxMaterialFlag::eDISABLE_FRICTION); staticFrictionX_dynamicFrictionY_dominance0Z_dominance1W = V4SetX(staticFrictionX_dynamicFrictionY_dominance0Z_dominance1W, FLoad(staticFriction)); staticFrictionX_dynamicFrictionY_dominance0Z_dominance1W = V4SetY(staticFrictionX_dynamicFrictionY_dominance0Z_dominance1W, FLoad(dynamicFriction)); @@ -1253,8 +1258,6 @@ namespace Dy if (hasTorsionalFriction && frictionPatch.anchorCount == 1) { - header->numFrictionConstr++; - const FloatV torsionalPatchRadius = FLoad(torsionalPatchRadiusF32); const FloatV minTorsionalPatchRadius = FLoad(minTorsionalPatchRadiusF32); const FloatV torsionalFriction = FMax(minTorsionalPatchRadius, FSqrt(FMul(FMax(zero, FNeg(maxPenetration)), torsionalPatchRadius))); @@ -1309,7 +1312,7 @@ namespace Dy f->normalXYZ_ErrorW = V4SetW(V3Zero(), FLoad(-angle)); f->raXnI_targetVelW = V4SetW(V3LoadA(resp0.angular), zero); - f->rbXnI_velMultiplierW = V4SetW(V3LoadA(resp1.angular), velMultiplier); + f->rbXnI_velMultiplierW = V4SetW(V4Neg(Vec4V_From_Vec3V(V3LoadA(resp1.angular))), velMultiplier); f->biasScale = frictionBiasScale; f->appliedForce = 0.f; FStore(torsionalFriction, &f->frictionScale); diff --git a/src/PhysX/physx/source/lowleveldynamics/src/DyTGSContactPrepBlock.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyTGSContactPrepBlock.cpp index 9263d1244..e8b8a7399 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyTGSContactPrepBlock.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyTGSContactPrepBlock.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -451,7 +451,7 @@ static void setupFinalizeSolverConstraints4Step(PxTGSSolverContactDesc* PX_RESTR PxU32 maxPatches = PxMax(descs[0].numFrictionPatches, PxMax(descs[1].numFrictionPatches, PxMax(descs[2].numFrictionPatches, descs[3].numFrictionPatches))); - const Vec4V p1 = V4Splat(FLoad(0.1f)); + const Vec4V p1 = V4Splat(FLoad(0.0001f)); const Vec4V orthoThreshold = V4Splat(FLoad(0.70710678f)); @@ -525,6 +525,8 @@ static void setupFinalizeSolverConstraints4Step(PxTGSSolverContactDesc* PX_RESTR header->shapeInteraction[0] = descs[0].shapeInteraction; header->shapeInteraction[1] = descs[1].shapeInteraction; header->shapeInteraction[2] = descs[2].shapeInteraction; header->shapeInteraction[3] = descs[3].shapeInteraction; + + Vec4V* maxImpulse = reinterpret_cast(ptr + constraintSize * totalContacts); header->restitution = restitution; @@ -816,15 +818,6 @@ static void setupFinalizeSolverConstraints4Step(PxTGSSolverContactDesc* PX_RESTR Vec4V maxImpulseScale = V4One(); { - const Vec4V staticFriction = V4LoadXYZW(contactBase0->staticFriction, contactBase1->staticFriction, - contactBase2->staticFriction, contactBase3->staticFriction); - - const Vec4V dynamicFriction = V4LoadXYZW(contactBase0->dynamicFriction, contactBase1->dynamicFriction, - contactBase2->dynamicFriction, contactBase3->dynamicFriction); - - PX_ASSERT(totalContacts == contactCount); - header->dynamicFriction = dynamicFriction; - header->staticFriction = staticFriction; const FrictionPatch& frictionPatch0 = c.frictionPatches[frictionIndex0]; const FrictionPatch& frictionPatch1 = c.frictionPatches[frictionIndex1]; @@ -843,11 +836,28 @@ static void setupFinalizeSolverConstraints4Step(PxTGSSolverContactDesc* PX_RESTR const PxU32 maxAnchorCount = PxMax(clampedAnchorCount0, PxMax(clampedAnchorCount1, PxMax(clampedAnchorCount2, clampedAnchorCount3))); - //if(clampedAnchorCount0 != clampedAnchorCount1 || clampedAnchorCount0 != clampedAnchorCount2 || clampedAnchorCount0 != clampedAnchorCount3) - // Ps::debugBreak(); + PX_ALIGN(16, PxReal staticFriction[4]); + PX_ALIGN(16, PxReal dynamicFriction[4]); + //for (PxU32 f = 0; f < 4; ++f) + { + PxReal coeff0 = (contactBase0->materialFlags & PxMaterialFlag::eIMPROVED_PATCH_FRICTION && clampedAnchorCount0 == 2) ? 0.5f : 1.f; + PxReal coeff1 = (contactBase1->materialFlags & PxMaterialFlag::eIMPROVED_PATCH_FRICTION && clampedAnchorCount1 == 2) ? 0.5f : 1.f; + PxReal coeff2 = (contactBase2->materialFlags & PxMaterialFlag::eIMPROVED_PATCH_FRICTION && clampedAnchorCount2 == 2) ? 0.5f : 1.f; + PxReal coeff3 = (contactBase3->materialFlags & PxMaterialFlag::eIMPROVED_PATCH_FRICTION && clampedAnchorCount3 == 2) ? 0.5f : 1.f; - //const bool haveFriction = maxAnchorCount != 0; + staticFriction[0] = contactBase0->staticFriction * coeff0; + dynamicFriction[0] = contactBase0->dynamicFriction * coeff0; + staticFriction[1] = contactBase1->staticFriction * coeff1; + dynamicFriction[1] = contactBase1->dynamicFriction * coeff1; + staticFriction[2] = contactBase2->staticFriction * coeff2; + dynamicFriction[2] = contactBase2->dynamicFriction * coeff2; + staticFriction[3] = contactBase3->staticFriction * coeff3; + dynamicFriction[3] = contactBase3->dynamicFriction * coeff3; + } + + PX_ASSERT(totalContacts == contactCount); + header->numFrictionConstr = Ps::to8(maxAnchorCount * 2); header->numFrictionConstrs[0] = Ps::to8(clampedAnchorCount0 * 2); header->numFrictionConstrs[1] = Ps::to8(clampedAnchorCount1 * 2); @@ -1226,6 +1236,9 @@ static void setupFinalizeSolverConstraints4Step(PxTGSSolverContactDesc* PX_RESTR } } + header->dynamicFriction = V4LoadA(dynamicFriction); + header->staticFriction = V4LoadA(staticFriction); + frictionPatchWritebackAddrIndex0++; frictionPatchWritebackAddrIndex1++; frictionPatchWritebackAddrIndex2++; diff --git a/src/PhysX/physx/source/lowleveldynamics/src/DyTGSDynamics.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyTGSDynamics.cpp index 2c779c754..8d0c49407 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyTGSDynamics.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyTGSDynamics.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyTGSDynamics.h b/src/PhysX/physx/source/lowleveldynamics/src/DyTGSDynamics.h index 6d2754074..443e26e7e 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyTGSDynamics.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyTGSDynamics.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyTGSPartition.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyTGSPartition.cpp index 2b65cafdf..fa71bf8e0 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyTGSPartition.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyTGSPartition.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #include "DyTGSPartition.h" #include "DyArticulationUtils.h" diff --git a/src/PhysX/physx/source/lowleveldynamics/src/DyTGSPartition.h b/src/PhysX/physx/source/lowleveldynamics/src/DyTGSPartition.h index 538309d2a..531710ec7 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyTGSPartition.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyTGSPartition.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyThreadContext.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyThreadContext.cpp index 8c9e172c3..2e0edcb59 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyThreadContext.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyThreadContext.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyThreadContext.h b/src/PhysX/physx/source/lowleveldynamics/src/DyThreadContext.h index 7a77339fe..4b896d4d9 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyThreadContext.h +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyThreadContext.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/lowleveldynamics/src/DyThresholdTable.cpp b/src/PhysX/physx/source/lowleveldynamics/src/DyThresholdTable.cpp index bb4cd3018..7ef5fa0d5 100644 --- a/src/PhysX/physx/source/lowleveldynamics/src/DyThresholdTable.cpp +++ b/src/PhysX/physx/source/lowleveldynamics/src/DyThresholdTable.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpActor.cpp b/src/PhysX/physx/source/physx/src/NpActor.cpp index 910b7958d..27f958431 100644 --- a/src/PhysX/physx/source/physx/src/NpActor.cpp +++ b/src/PhysX/physx/source/physx/src/NpActor.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpActor.h b/src/PhysX/physx/source/physx/src/NpActor.h index a4151a4c5..9b1e76efe 100644 --- a/src/PhysX/physx/source/physx/src/NpActor.h +++ b/src/PhysX/physx/source/physx/src/NpActor.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpActorTemplate.h b/src/PhysX/physx/source/physx/src/NpActorTemplate.h index 9f95ee971..649ea50c5 100644 --- a/src/PhysX/physx/source/physx/src/NpActorTemplate.h +++ b/src/PhysX/physx/source/physx/src/NpActorTemplate.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -65,9 +65,11 @@ class NpActorTemplate : public APIClass, public NpActor, public Ps::UserAllocate public: // PX_SERIALIZATION NpActorTemplate(PxBaseFlags baseFlags) : APIClass(baseFlags), NpActor(PxEmpty) {} - virtual void exportExtraData(PxSerializationContext& stream) { NpActor::exportExtraData(stream); } - void importExtraData(PxDeserializationContext& context) { NpActor::importExtraData(context); } - virtual void resolveReferences(PxDeserializationContext& context) { NpActor::resolveReferences(context); } + + virtual void exportData(PxSerializationContext& context) const = 0; + virtual void exportExtraData(PxSerializationContext& context) { NpActor::exportExtraData(context); } + virtual void importExtraData(PxDeserializationContext& context) { NpActor::importExtraData(context); } + virtual void resolveReferences(PxDeserializationContext& context) { NpActor::resolveReferences(context); } //~PX_SERIALIZATION NpActorTemplate(PxType concreteType, PxBaseFlags baseFlags, const char* name, void* userData); diff --git a/src/PhysX/physx/source/physx/src/NpAggregate.cpp b/src/PhysX/physx/source/physx/src/NpAggregate.cpp index 2154fadd4..ee776beee 100644 --- a/src/PhysX/physx/source/physx/src/NpAggregate.cpp +++ b/src/PhysX/physx/source/physx/src/NpAggregate.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpAggregate.h b/src/PhysX/physx/source/physx/src/NpAggregate.h index 11200dc35..0054916d9 100644 --- a/src/PhysX/physx/source/physx/src/NpAggregate.h +++ b/src/PhysX/physx/source/physx/src/NpAggregate.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpArticulation.cpp b/src/PhysX/physx/source/physx/src/NpArticulation.cpp index 4ce735c67..044b9d0c0 100644 --- a/src/PhysX/physx/source/physx/src/NpArticulation.cpp +++ b/src/PhysX/physx/source/physx/src/NpArticulation.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -86,7 +86,6 @@ NpArticulation* NpArticulation::createObject(PxU8*& address, PxDeserializationCo NpArticulation::NpArticulation() : NpArticulationTemplate(PxConcreteType::eARTICULATION, PxBaseFlag::eOWNS_MEMORY | PxBaseFlag::eIS_RELEASABLE) { - PxArticulationBase::userData = NULL; mType = PxArticulationBase::eMaximumCoordinate; mImpl.mArticulation.setArticulationType(PxArticulationBase::eMaximumCoordinate); } diff --git a/src/PhysX/physx/source/physx/src/NpArticulation.h b/src/PhysX/physx/source/physx/src/NpArticulation.h index 8192e4373..9915cc20e 100644 --- a/src/PhysX/physx/source/physx/src/NpArticulation.h +++ b/src/PhysX/physx/source/physx/src/NpArticulation.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -67,71 +67,66 @@ class NpArticulation : public NpArticulationTemplate //================================================================================================== public: - virtual ~NpArticulation(); + virtual ~NpArticulation(); // PX_SERIALIZATION - NpArticulation(PxBaseFlags baseFlags) : NpArticulationTemplate(baseFlags) - {} + NpArticulation(PxBaseFlags baseFlags) : NpArticulationTemplate(baseFlags){} - virtual void exportExtraData(PxSerializationContext& stream); - void importExtraData(PxDeserializationContext& context); - void resolveReferences(PxDeserializationContext& context); - virtual void requiresObjects(PxProcessPxBaseCallback& c); - static NpArticulation* createObject(PxU8*& address, PxDeserializationContext& context); - static void getBinaryMetaData(PxOutputStream& stream); + virtual void exportExtraData(PxSerializationContext& stream); + void importExtraData(PxDeserializationContext& context); + void resolveReferences(PxDeserializationContext& context); + virtual void requiresObjects(PxProcessPxBaseCallback& c); + static NpArticulation* createObject(PxU8*& address, PxDeserializationContext& context); + static void getBinaryMetaData(PxOutputStream& stream); //~PX_SERIALIZATION //--------------------------------------------------------------------------------- // PxArticulation implementation //--------------------------------------------------------------------------------- - virtual PxU32 getInternalDriveIterations() const; - virtual void setInternalDriveIterations(PxU32 iterations); + virtual PxU32 getInternalDriveIterations() const; + virtual void setInternalDriveIterations(PxU32 iterations); - virtual PxU32 getExternalDriveIterations() const; - virtual void setExternalDriveIterations(PxU32 iterations); + virtual PxU32 getExternalDriveIterations() const; + virtual void setExternalDriveIterations(PxU32 iterations); - virtual PxU32 getMaxProjectionIterations() const; - virtual void setMaxProjectionIterations(PxU32 iterations); + virtual PxU32 getMaxProjectionIterations() const; + virtual void setMaxProjectionIterations(PxU32 iterations); - virtual PxReal getSeparationTolerance() const; - virtual void setSeparationTolerance(PxReal tolerance); + virtual PxReal getSeparationTolerance() const; + virtual void setSeparationTolerance(PxReal tolerance); - virtual PxArticulationDriveCache* - createDriveCache(PxReal compliance, PxU32 driveIterations) const; + virtual PxArticulationDriveCache* createDriveCache(PxReal compliance, PxU32 driveIterations) const; - virtual void updateDriveCache(PxArticulationDriveCache& cache, PxReal compliance, PxU32 driveIterations) const; + virtual void updateDriveCache(PxArticulationDriveCache& cache, PxReal compliance, PxU32 driveIterations) const; - virtual void releaseDriveCache(PxArticulationDriveCache&) const; + virtual void releaseDriveCache(PxArticulationDriveCache&) const; - virtual void applyImpulse(PxArticulationLink*, - const PxArticulationDriveCache& driveCache, - const PxVec3& force, - const PxVec3& torque); + virtual void applyImpulse( PxArticulationLink*, + const PxArticulationDriveCache& driveCache, + const PxVec3& force, + const PxVec3& torque); - virtual void computeImpulseResponse(PxArticulationLink*, - PxVec3& linearResponse, - PxVec3& angularResponse, - const PxArticulationDriveCache& driveCache, - const PxVec3& force, - const PxVec3& torque) const; + virtual void computeImpulseResponse( PxArticulationLink*, + PxVec3& linearResponse, + PxVec3& angularResponse, + const PxArticulationDriveCache& driveCache, + const PxVec3& force, + const PxVec3& torque) const; - virtual const char* getConcreteTypeName() const { return "PxArticulation"; } + virtual const char* getConcreteTypeName() const { return "PxArticulation"; } //--------------------------------------------------------------------------------- // Miscellaneous //--------------------------------------------------------------------------------- - NpArticulation(); + NpArticulation(); + virtual bool isKindOf(const char* name) const { return !::strcmp("PxArticulation", name) || PxBase::isKindOf(name); } - virtual bool isKindOf(const char* name) const { return !::strcmp("PxArticulation", name) || PxBase::isKindOf(name); } - - virtual PxArticulationJointBase* createArticulationJoint(PxArticulationLink& parent, - const PxTransform& parentFrame, - PxArticulationLink& child, - const PxTransform& childFrame); - virtual void releaseArticulationJoint(PxArticulationJointBase* joint); +private: + virtual PxArticulationJointBase* createArticulationJoint(PxArticulationLink& parent, const PxTransform& parentFrame, PxArticulationLink& child, const PxTransform& childFrame); + virtual void releaseArticulationJoint(PxArticulationJointBase* joint); }; #if PX_VC diff --git a/src/PhysX/physx/source/physx/src/NpArticulationJoint.cpp b/src/PhysX/physx/source/physx/src/NpArticulationJoint.cpp index eea8fe4cb..6c72b6982 100644 --- a/src/PhysX/physx/source/physx/src/NpArticulationJoint.cpp +++ b/src/PhysX/physx/source/physx/src/NpArticulationJoint.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpArticulationJoint.h b/src/PhysX/physx/source/physx/src/NpArticulationJoint.h index 1c4189771..b252ec51f 100644 --- a/src/PhysX/physx/source/physx/src/NpArticulationJoint.h +++ b/src/PhysX/physx/source/physx/src/NpArticulationJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpArticulationJointReducedCoordinate.cpp b/src/PhysX/physx/source/physx/src/NpArticulationJointReducedCoordinate.cpp index 41345a0b3..a7c2a824f 100644 --- a/src/PhysX/physx/source/physx/src/NpArticulationJointReducedCoordinate.cpp +++ b/src/PhysX/physx/source/physx/src/NpArticulationJointReducedCoordinate.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpArticulationJointReducedCoordinate.h b/src/PhysX/physx/source/physx/src/NpArticulationJointReducedCoordinate.h index f2b1d19cc..2e8396a99 100644 --- a/src/PhysX/physx/source/physx/src/NpArticulationJointReducedCoordinate.h +++ b/src/PhysX/physx/source/physx/src/NpArticulationJointReducedCoordinate.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpArticulationLink.cpp b/src/PhysX/physx/source/physx/src/NpArticulationLink.cpp index 3d215a7a0..90f8d7739 100644 --- a/src/PhysX/physx/source/physx/src/NpArticulationLink.cpp +++ b/src/PhysX/physx/source/physx/src/NpArticulationLink.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -49,6 +49,20 @@ void NpArticulationLink::requiresObjects(PxProcessPxBaseCallback& c) c.process(*mInboundJoint); } +void NpArticulationLink::exportData(PxSerializationContext& context) const +{ + //Clearing the aggregate ID for serialization so we avoid having a stale + //reference after deserialization. The aggregate ID get's reset on readding to the + //scene anyway. + Sc::ActorCore& actorCore = const_cast(getScbActorFast().getActorCore()); + PxU32 backupAggregateID = actorCore.getAggregateID(); + actorCore.setAggregateID(PX_INVALID_U32); + + context.writeData(this, sizeof(NpArticulationLink)); + + actorCore.setAggregateID(backupAggregateID); +} + void NpArticulationLink::exportExtraData(PxSerializationContext& stream) { NpArticulationLinkT::exportExtraData(stream); diff --git a/src/PhysX/physx/source/physx/src/NpArticulationLink.h b/src/PhysX/physx/source/physx/src/NpArticulationLink.h index d525cb0c6..68cc5cf41 100644 --- a/src/PhysX/physx/source/physx/src/NpArticulationLink.h +++ b/src/PhysX/physx/source/physx/src/NpArticulationLink.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -77,6 +77,7 @@ class NpArticulationLink : public NpArticulationLinkT public: // PX_SERIALIZATION NpArticulationLink(PxBaseFlags baseFlags) : NpArticulationLinkT(baseFlags), mChildLinks(PxEmpty) {} + virtual void exportData(PxSerializationContext& context) const; virtual void exportExtraData(PxSerializationContext& stream); void importExtraData(PxDeserializationContext& context); void registerReferences(PxSerializationContext& stream); diff --git a/src/PhysX/physx/source/physx/src/NpArticulationReducedCoordinate.cpp b/src/PhysX/physx/source/physx/src/NpArticulationReducedCoordinate.cpp index 765f89c0d..3ed04f39d 100644 --- a/src/PhysX/physx/source/physx/src/NpArticulationReducedCoordinate.cpp +++ b/src/PhysX/physx/source/physx/src/NpArticulationReducedCoordinate.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -41,384 +41,369 @@ #include "PxPvdDataStream.h" #include "extensions/PxJoint.h" -namespace physx +using namespace physx; + +class LLReducedArticulationPool : public Ps::Pool > { +public: + LLReducedArticulationPool() {} +}; - class LLReducedArticulationPool : public Ps::Pool > - { - public: - LLReducedArticulationPool() {} - }; +NpArticulationReducedCoordinate::NpArticulationReducedCoordinate() + : NpArticulationTemplate(PxConcreteType::eARTICULATION, PxBaseFlag::eOWNS_MEMORY | PxBaseFlag::eIS_RELEASABLE) +{ + mType = PxArticulationBase::eReducedCoordinate; + mImpl.mArticulation.setArticulationType(PxArticulationBase::eReducedCoordinate); +} +void NpArticulationReducedCoordinate::setArticulationFlags(PxArticulationFlags flags) +{ + NP_WRITE_CHECK(mImpl.getOwnerScene()); + mImpl.getArticulation().setArticulationFlags(flags); +} - NpArticulationReducedCoordinate::NpArticulationReducedCoordinate() - : NpArticulationTemplate(PxConcreteType::eARTICULATION, PxBaseFlag::eOWNS_MEMORY | PxBaseFlag::eIS_RELEASABLE) - { - PxArticulationBase::userData = NULL; - mType = PxArticulationBase::eReducedCoordinate; - mImpl.mArticulation.setArticulationType(PxArticulationBase::eReducedCoordinate); - } +void NpArticulationReducedCoordinate::setArticulationFlag(PxArticulationFlag::Enum flag, bool value) +{ + NP_WRITE_CHECK(mImpl.getOwnerScene()); + PxArticulationFlags flags = mImpl.getArticulation().getArticulationFlags(); + if(value) + flags |= flag; + else + flags &= (~flag); - void NpArticulationReducedCoordinate::setArticulationFlags(PxArticulationFlags flags) - { - NP_WRITE_CHECK(mImpl.getOwnerScene()); - mImpl.getArticulation().setArticulationFlags(flags); - } + mImpl.getArticulation().setArticulationFlags(flags); +} - void NpArticulationReducedCoordinate::setArticulationFlag(PxArticulationFlag::Enum flag, bool value) - { - NP_WRITE_CHECK(mImpl.getOwnerScene()); - PxArticulationFlags flags = mImpl.getArticulation().getArticulationFlags(); +PxArticulationFlags NpArticulationReducedCoordinate::getArticulationFlags() const +{ + NP_READ_CHECK(mImpl.getOwnerScene()); + return mImpl.getArticulation().getArticulationFlags(); +} - if(value) - flags |= flag; - else - flags &= (~flag); +PxU32 NpArticulationReducedCoordinate::getDofs() const +{ + NP_READ_CHECK(mImpl.getOwnerScene()); + return mImpl.mArticulation.getScArticulation().getDofs(); +} - mImpl.getArticulation().setArticulationFlags(flags); - } +PxArticulationCache* NpArticulationReducedCoordinate::createCache() const +{ + PX_CHECK_AND_RETURN_NULL(mImpl.getAPIScene(), "PxArticulation::createCache: object must be in a scene"); + NP_READ_CHECK(mImpl.getOwnerScene()); // doesn't modify the scene, only reads - PxArticulationFlags NpArticulationReducedCoordinate::getArticulationFlags() const - { - NP_READ_CHECK(mImpl.getOwnerScene()); - return mImpl.getArticulation().getArticulationFlags(); - } + PxArticulationCache* cache = mImpl.mArticulation.getScArticulation().createCache(); + cache->version = mImpl.mCacheVersion; - PxU32 NpArticulationReducedCoordinate::getDofs() const - { - NP_READ_CHECK(mImpl.getOwnerScene()); - return mImpl.mArticulation.getScArticulation().getDofs(); - } + return cache; +} - PxArticulationCache* NpArticulationReducedCoordinate::createCache() const - { - PX_CHECK_AND_RETURN_NULL(mImpl.getAPIScene(), "PxArticulation::createCache: object must be in a scene"); - NP_READ_CHECK(mImpl.getOwnerScene()); // doesn't modify the scene, only reads +PxU32 NpArticulationReducedCoordinate::getCacheDataSize() const +{ + PX_CHECK_AND_RETURN_NULL(mImpl.getAPIScene(), "PxArticulation::getCacheDataSize: object must be in a scene"); + NP_READ_CHECK(mImpl.getOwnerScene()); // doesn't modify the scene, only reads - PxArticulationCache* cache = mImpl.mArticulation.getScArticulation().createCache(); - cache->version = mImpl.mCacheVersion; + return mImpl.mArticulation.getScArticulation().getCacheDataSize(); +} - return cache; - } +void NpArticulationReducedCoordinate::zeroCache(PxArticulationCache& cache) +{ + NP_READ_CHECK(mImpl.getOwnerScene()); // doesn't modify the scene, only reads + return mImpl.mArticulation.getScArticulation().zeroCache(cache); +} - PxU32 NpArticulationReducedCoordinate::getCacheDataSize() const - { - PX_CHECK_AND_RETURN_NULL(mImpl.getAPIScene(), "PxArticulation::getCacheDataSize: object must be in a scene"); - NP_READ_CHECK(mImpl.getOwnerScene()); // doesn't modify the scene, only reads +void NpArticulationReducedCoordinate::applyCache(PxArticulationCache& cache, const PxArticulationCacheFlags flag, bool autowake) +{ + PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::applyCache: object must be in a scene"); - return mImpl.mArticulation.getScArticulation().getCacheDataSize(); - } + PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::applyCache : cache is invalid, articulation configuration has changed! ") - void NpArticulationReducedCoordinate::zeroCache(PxArticulationCache& cache) - { - NP_READ_CHECK(mImpl.getOwnerScene()); // doesn't modify the scene, only reads - return mImpl.mArticulation.getScArticulation().zeroCache(cache); - } - - void NpArticulationReducedCoordinate::applyCache(PxArticulationCache& cache, const PxArticulationCacheFlags flag, bool autowake) - { - PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::applyCache: object must be in a scene"); - - PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::applyCache : cache is invalid, articulation configuration has changed! ") - - //if we try to do a bulk op when sim is running, return with error - if (static_cast(getScene())->getSimulationStage() != Sc::SimulationStage::eCOMPLETE) - { - Ps::getFoundation().error(PxErrorCode::eDEBUG_WARNING, __FILE__, __LINE__, - "NpArticulation::applyCache() not allowed while simulation is running."); - return; - } - - mImpl.mArticulation.getScArticulation().applyCache(cache, flag); - - if (flag & PxArticulationCache::ePOSITION) + //if we try to do a bulk op when sim is running, return with error + if (static_cast(getScene())->getSimulationStage() != Sc::SimulationStage::eCOMPLETE) { - const PxU32 linkCount = mImpl.mArticulationLinks.size(); - - for (PxU32 i = 0; i < linkCount; ++i) - { - NpArticulationLink* link = mImpl.mArticulationLinks[i]; - //in the lowlevel articulation, we have already updated bodyCore's body2World - const PxTransform internalPose = link->getScbBodyFast().getScBody().getBody2World(); - link->getScbBodyFast().setBody2World(internalPose, false); - } + Ps::getFoundation().error(PxErrorCode::eDEBUG_WARNING, __FILE__, __LINE__, + "NpArticulation::applyCache() not allowed while simulation is running."); + return; } - mImpl.wakeUpInternal(false, autowake); + mImpl.mArticulation.getScArticulation().applyCache(cache, flag); - } - - void NpArticulationReducedCoordinate::copyInternalStateToCache(PxArticulationCache& cache, const PxArticulationCacheFlags flag) const + if (flag & PxArticulationCache::ePOSITION) { - PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::copyInternalStateToCache: object must be in a scene"); + const PxU32 linkCount = mImpl.mArticulationLinks.size(); - PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::applyCache : cache is invalid, articulation configuration has changed! ") - - mImpl.mArticulation.getScArticulation().copyInternalStateToCache(cache, flag); - } - - void NpArticulationReducedCoordinate::releaseCache(PxArticulationCache& cache) const - { - PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::releaseCache: object must be in a scene"); - NP_READ_CHECK(mImpl.getOwnerScene()); // doesn't modify the scene, only reads - - mImpl.mArticulation.getScArticulation().releaseCache(cache); - } - - void NpArticulationReducedCoordinate::packJointData(const PxReal* maximum, PxReal* reduced) const - { - PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::packJointData: object must be in a scene"); - NP_READ_CHECK(mImpl.getOwnerScene()); - - mImpl.mArticulation.getScArticulation().packJointData(maximum, reduced); - } - - void NpArticulationReducedCoordinate::unpackJointData(const PxReal* reduced, PxReal* maximum) const - { - PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::unpackJointData: object must be in a scene"); - NP_READ_CHECK(mImpl.getOwnerScene()); - - mImpl.mArticulation.getScArticulation().unpackJointData(reduced, maximum); - } - - void NpArticulationReducedCoordinate::commonInit() const - { - PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::commonInit: object must be in a scene"); - NP_READ_CHECK(mImpl.getOwnerScene()); - - mImpl.mArticulation.getScArticulation().commonInit(); - } - - void NpArticulationReducedCoordinate::computeGeneralizedGravityForce(PxArticulationCache& cache) const - { - PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeGeneralisedGravityForce: object must be in a scene"); - NP_READ_CHECK(mImpl.getOwnerScene()); - - PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeGeneralisedGravityForce : cache is invalid, articulation configuration has changed! "); - - - mImpl.mArticulation.getScArticulation().computeGeneralizedGravityForce(cache); - } - - void NpArticulationReducedCoordinate::computeCoriolisAndCentrifugalForce(PxArticulationCache& cache) const - { - PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeCoriolisAndCentrifugalForce: object must be in a scene"); - NP_READ_CHECK(mImpl.getOwnerScene()); - - PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeCoriolisAndCentrifugalForce : cache is invalid, articulation configuration has changed! "); - - mImpl.mArticulation.getScArticulation().computeCoriolisAndCentrifugalForce(cache); - } - - void NpArticulationReducedCoordinate::computeGeneralizedExternalForce(PxArticulationCache& cache) const - { - PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeGeneralizedExternalForce: object must be in a scene"); - NP_READ_CHECK(mImpl.getOwnerScene()); - - PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeGeneralizedExternalForce : cache is invalid, articulation configuration has changed! "); - - mImpl.mArticulation.getScArticulation().computeGeneralizedExternalForce(cache); - } - - void NpArticulationReducedCoordinate::computeJointAcceleration(PxArticulationCache& cache) const - { - PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeJointAcceleration: object must be in a scene"); - NP_READ_CHECK(mImpl.getOwnerScene()); - - PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeJointAcceleration : cache is invalid, articulation configuration has changed! "); - - mImpl.mArticulation.getScArticulation().computeJointAcceleration(cache); - } - - void NpArticulationReducedCoordinate::computeJointForce(PxArticulationCache& cache) const - { - PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeJointForce: object must be in a scene"); - NP_READ_CHECK(mImpl.getOwnerScene()); - - PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeJointForce : cache is invalid, articulation configuration has changed! "); - - mImpl.mArticulation.getScArticulation().computeJointForce(cache); - } - - void NpArticulationReducedCoordinate::computeKinematicJacobian(const PxU32 linkID, PxArticulationCache& cache) const - { - PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeKenematicJacobian: object must be in a scene"); - NP_READ_CHECK(mImpl.getOwnerScene()); - - PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeKenematicJacobian : cache is invalid, articulation configuration has changed! "); - - mImpl.mArticulation.getScArticulation().computeKinematicJacobian(linkID, cache); - } - - void NpArticulationReducedCoordinate::computeCoefficentMatrix(PxArticulationCache& cache) const - { - PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeCoefficentMatrix: object must be in a scene"); - NP_READ_CHECK(mImpl.getOwnerScene()); - - PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeCoefficentMatrix : cache is invalid, articulation configuration has changed! "); - - for (PxU32 i = 0; i < mLoopJoints.size(); ++i) + for (PxU32 i = 0; i < linkCount; ++i) { - static_cast(mLoopJoints[i]->getConstraint())->updateConstants(); + NpArticulationLink* link = mImpl.mArticulationLinks[i]; + //in the lowlevel articulation, we have already updated bodyCore's body2World + const PxTransform internalPose = link->getScbBodyFast().getScBody().getBody2World(); + link->getScbBodyFast().setBody2World(internalPose, false); } - - mImpl.mArticulation.getScArticulation().computeCoefficentMatrix(cache); } - bool NpArticulationReducedCoordinate::computeLambda(PxArticulationCache& cache, PxArticulationCache& initialState, const PxReal* const jointTorque, const PxU32 maxIter) const - { + mImpl.wakeUpInternal(false, autowake); +} - if (!mImpl.getAPIScene()) - { - physx::shdfnd::getFoundation().error(physx::PxErrorCode::eINVALID_PARAMETER, __FILE__, __LINE__, "PxArticulation::computeLambda : object must be in a scened!"); - return false; - } +void NpArticulationReducedCoordinate::copyInternalStateToCache(PxArticulationCache& cache, const PxArticulationCacheFlags flag) const +{ + PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::copyInternalStateToCache: object must be in a scene"); + + PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::applyCache : cache is invalid, articulation configuration has changed! ") + + mImpl.mArticulation.getScArticulation().copyInternalStateToCache(cache, flag); +} + +void NpArticulationReducedCoordinate::releaseCache(PxArticulationCache& cache) const +{ + PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::releaseCache: object must be in a scene"); + NP_READ_CHECK(mImpl.getOwnerScene()); // doesn't modify the scene, only reads + + mImpl.mArticulation.getScArticulation().releaseCache(cache); +} + +void NpArticulationReducedCoordinate::packJointData(const PxReal* maximum, PxReal* reduced) const +{ + PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::packJointData: object must be in a scene"); + NP_READ_CHECK(mImpl.getOwnerScene()); + + mImpl.mArticulation.getScArticulation().packJointData(maximum, reduced); +} + +void NpArticulationReducedCoordinate::unpackJointData(const PxReal* reduced, PxReal* maximum) const +{ + PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::unpackJointData: object must be in a scene"); + NP_READ_CHECK(mImpl.getOwnerScene()); + + mImpl.mArticulation.getScArticulation().unpackJointData(reduced, maximum); +} + +void NpArticulationReducedCoordinate::commonInit() const +{ + PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::commonInit: object must be in a scene"); + NP_READ_CHECK(mImpl.getOwnerScene()); + + mImpl.mArticulation.getScArticulation().commonInit(); +} + +void NpArticulationReducedCoordinate::computeGeneralizedGravityForce(PxArticulationCache& cache) const +{ + PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeGeneralisedGravityForce: object must be in a scene"); + NP_READ_CHECK(mImpl.getOwnerScene()); + + PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeGeneralisedGravityForce : cache is invalid, articulation configuration has changed! "); + + mImpl.mArticulation.getScArticulation().computeGeneralizedGravityForce(cache); +} + +void NpArticulationReducedCoordinate::computeCoriolisAndCentrifugalForce(PxArticulationCache& cache) const +{ + PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeCoriolisAndCentrifugalForce: object must be in a scene"); + NP_READ_CHECK(mImpl.getOwnerScene()); + + PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeCoriolisAndCentrifugalForce : cache is invalid, articulation configuration has changed! "); + + mImpl.mArticulation.getScArticulation().computeCoriolisAndCentrifugalForce(cache); +} + +void NpArticulationReducedCoordinate::computeGeneralizedExternalForce(PxArticulationCache& cache) const +{ + PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeGeneralizedExternalForce: object must be in a scene"); + NP_READ_CHECK(mImpl.getOwnerScene()); + + PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeGeneralizedExternalForce : cache is invalid, articulation configuration has changed! "); + + mImpl.mArticulation.getScArticulation().computeGeneralizedExternalForce(cache); +} + +void NpArticulationReducedCoordinate::computeJointAcceleration(PxArticulationCache& cache) const +{ + PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeJointAcceleration: object must be in a scene"); + NP_READ_CHECK(mImpl.getOwnerScene()); + + PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeJointAcceleration : cache is invalid, articulation configuration has changed! "); + + mImpl.mArticulation.getScArticulation().computeJointAcceleration(cache); +} + +void NpArticulationReducedCoordinate::computeJointForce(PxArticulationCache& cache) const +{ + PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeJointForce: object must be in a scene"); + NP_READ_CHECK(mImpl.getOwnerScene()); + + PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeJointForce : cache is invalid, articulation configuration has changed! "); + + mImpl.mArticulation.getScArticulation().computeJointForce(cache); +} + +void NpArticulationReducedCoordinate::computeKinematicJacobian(const PxU32 linkID, PxArticulationCache& cache) const +{ + PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeKenematicJacobian: object must be in a scene"); + NP_READ_CHECK(mImpl.getOwnerScene()); + + PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeKenematicJacobian : cache is invalid, articulation configuration has changed! "); + + mImpl.mArticulation.getScArticulation().computeKinematicJacobian(linkID, cache); +} + +void NpArticulationReducedCoordinate::computeCoefficentMatrix(PxArticulationCache& cache) const +{ + PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeCoefficentMatrix: object must be in a scene"); + NP_READ_CHECK(mImpl.getOwnerScene()); + + PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeCoefficentMatrix : cache is invalid, articulation configuration has changed! "); + + for (PxU32 i = 0; i < mLoopJoints.size(); ++i) + { + static_cast(mLoopJoints[i]->getConstraint())->updateConstants(); + } + + mImpl.mArticulation.getScArticulation().computeCoefficentMatrix(cache); +} + +bool NpArticulationReducedCoordinate::computeLambda(PxArticulationCache& cache, PxArticulationCache& initialState, const PxReal* const jointTorque, const PxU32 maxIter) const +{ + if (!mImpl.getAPIScene()) + { + physx::shdfnd::getFoundation().error(physx::PxErrorCode::eINVALID_PARAMETER, __FILE__, __LINE__, "PxArticulation::computeLambda : object must be in a scened!"); + return false; + } - NP_READ_CHECK(mImpl.getOwnerScene()); + NP_READ_CHECK(mImpl.getOwnerScene()); - if (cache.version != mImpl.mCacheVersion) - { - physx::shdfnd::getFoundation().error(physx::PxErrorCode::eINVALID_PARAMETER, __FILE__, __LINE__, "PxArticulation::computeLambda : cache is invalid, articulation configuration has changed!"); - return false; - } - - return mImpl.mArticulation.getScArticulation().computeLambda(cache, initialState, jointTorque, getScene()->getGravity(), maxIter); + if (cache.version != mImpl.mCacheVersion) + { + physx::shdfnd::getFoundation().error(physx::PxErrorCode::eINVALID_PARAMETER, __FILE__, __LINE__, "PxArticulation::computeLambda : cache is invalid, articulation configuration has changed!"); + return false; } - void NpArticulationReducedCoordinate::computeGeneralizedMassMatrix(PxArticulationCache& cache) const - { - PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeGeneralizedMassMatrix: object must be in a scene"); - NP_READ_CHECK(mImpl.getOwnerScene()); + return mImpl.mArticulation.getScArticulation().computeLambda(cache, initialState, jointTorque, getScene()->getGravity(), maxIter); +} - PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeGeneralizedMassMatrix : cache is invalid, articulation configuration has changed! "); +void NpArticulationReducedCoordinate::computeGeneralizedMassMatrix(PxArticulationCache& cache) const +{ + PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulation::computeGeneralizedMassMatrix: object must be in a scene"); + NP_READ_CHECK(mImpl.getOwnerScene()); - mImpl.mArticulation.getScArticulation().computeGeneralizedMassMatrix(cache); - } + PX_CHECK_AND_RETURN(cache.version == mImpl.mCacheVersion, "PxArticulation::computeGeneralizedMassMatrix : cache is invalid, articulation configuration has changed! "); - void NpArticulationReducedCoordinate::addLoopJoint(PxJoint* joint) - { - - NP_WRITE_CHECK(mImpl.getOwnerScene()); + mImpl.mArticulation.getScArticulation().computeGeneralizedMassMatrix(cache); +} + +void NpArticulationReducedCoordinate::addLoopJoint(PxJoint* joint) +{ + NP_WRITE_CHECK(mImpl.getOwnerScene()); #if PX_CHECKED - PxRigidActor* actor0; - PxRigidActor* actor1; + PxRigidActor* actor0; + PxRigidActor* actor1; - joint->getActors(actor0, actor1); + joint->getActors(actor0, actor1); - PxArticulationLink* link0 = NULL; - PxArticulationLink* link1 = NULL; + PxArticulationLink* link0 = NULL; + PxArticulationLink* link1 = NULL; - if(actor0) - link0 = actor0->is(); + if(actor0) + link0 = actor0->is(); - if(actor1) - link1 = actor1->is(); + if(actor1) + link1 = actor1->is(); - PX_CHECK_AND_RETURN((link0 || link1), "PxArticulation::addLoopJoint : at least one of the PxRigidActors need to be PxArticulationLink! "); + PX_CHECK_AND_RETURN((link0 || link1), "PxArticulation::addLoopJoint : at least one of the PxRigidActors need to be PxArticulationLink! "); - PxArticulationBase* base0 = NULL; - PxArticulationBase* base1 = NULL; - if (link0) - base0 = &link0->getArticulation(); + PxArticulationBase* base0 = NULL; + PxArticulationBase* base1 = NULL; + if (link0) + base0 = &link0->getArticulation(); - if (link1) - base1 = &link1->getArticulation(); - - PX_CHECK_AND_RETURN((base0 == this || base1 == this), "PxArticulation::addLoopJoint : at least one of the PxArticulationLink belongs to this articulation! "); - + if (link1) + base1 = &link1->getArticulation(); + PX_CHECK_AND_RETURN((base0 == this || base1 == this), "PxArticulation::addLoopJoint : at least one of the PxArticulationLink belongs to this articulation! "); #endif - - const PxU32 size = mLoopJoints.size(); - if (size >= mLoopJoints.capacity()) - { - mLoopJoints.reserve(size * 2 + 1); - } - - mLoopJoints.pushBack(joint); - - Scb::Articulation& scbArt = mImpl.getArticulation(); - Sc::ArticulationSim* scArtSim = scbArt.getScArticulation().getSim(); - - NpConstraint* constraint = static_cast(joint->getConstraint()); - Sc::ConstraintSim* cSim = constraint->getScbConstraint().getScConstraint().getSim(); - if(scArtSim) - scArtSim->addLoopConstraint(cSim); - } - - void NpArticulationReducedCoordinate::removeLoopJoint(PxJoint* joint) + const PxU32 size = mLoopJoints.size(); + if (size >= mLoopJoints.capacity()) { - NP_WRITE_CHECK(mImpl.getOwnerScene()); - - mLoopJoints.findAndReplaceWithLast(joint); - - Scb::Articulation& scbArt = mImpl.getArticulation(); - Sc::ArticulationSim* scArtSim = scbArt.getScArticulation().getSim(); - - NpConstraint* constraint = static_cast(joint->getConstraint()); - Sc::ConstraintSim* cSim = constraint->getScbConstraint().getScConstraint().getSim(); - scArtSim->removeLoopConstraint(cSim); + mLoopJoints.reserve(size * 2 + 1); } + mLoopJoints.pushBack(joint); - PxU32 NpArticulationReducedCoordinate::getNbLoopJoints() const - { - NP_READ_CHECK(mImpl.getOwnerScene()); - - return mLoopJoints.size(); - } - - PxU32 NpArticulationReducedCoordinate::getLoopJoints(PxJoint** userBuffer, PxU32 bufferSize, PxU32 startIndex) const - { - NP_READ_CHECK(mImpl.getOwnerScene()); - - return Cm::getArrayOfPointers(userBuffer, bufferSize, startIndex, mLoopJoints.begin(), mLoopJoints.size()); - } - - PxU32 NpArticulationReducedCoordinate::getCoefficentMatrixSize() const - { - NP_READ_CHECK(mImpl.getOwnerScene()); - - return mImpl.mArticulation.getScArticulation().getCoefficentMatrixSize(); - } - - void NpArticulationReducedCoordinate::teleportRootLink(const PxTransform& pose, bool autowake) - { - PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulationReducedCoordinate::teleportRootLink: object must be in a scene"); - - PX_CHECK_AND_RETURN(pose.isValid(), "PxArticulationReducedCoordinate::teleportRootLink pose is not valid."); - - NP_WRITE_CHECK(mImpl.getOwnerScene()); - - NpArticulationLink* root = mImpl.mArticulationLinks[0]; - - root->setGlobalPoseInternal(pose, autowake); - } - - - NpArticulationReducedCoordinate::~NpArticulationReducedCoordinate() - { - NpFactory::getInstance().onArticulationRelease(this); - } - - PxArticulationJointBase* NpArticulationReducedCoordinate::createArticulationJoint(PxArticulationLink& parent, - const PxTransform& parentFrame, - PxArticulationLink& child, - const PxTransform& childFrame) - { - - return NpFactory::getInstance().createNpArticulationJointRC(static_cast(parent), parentFrame, static_cast(child), childFrame); - } - - void NpArticulationReducedCoordinate::releaseArticulationJoint(PxArticulationJointBase* joint) - { - NpFactory::getInstance().releaseArticulationJointRCToPool(*static_cast(joint)); - } + Scb::Articulation& scbArt = mImpl.getArticulation(); + Sc::ArticulationSim* scArtSim = scbArt.getScArticulation().getSim(); + NpConstraint* constraint = static_cast(joint->getConstraint()); + Sc::ConstraintSim* cSim = constraint->getScbConstraint().getScConstraint().getSim(); + if(scArtSim) + scArtSim->addLoopConstraint(cSim); } +void NpArticulationReducedCoordinate::removeLoopJoint(PxJoint* joint) +{ + NP_WRITE_CHECK(mImpl.getOwnerScene()); + + mLoopJoints.findAndReplaceWithLast(joint); + + Scb::Articulation& scbArt = mImpl.getArticulation(); + Sc::ArticulationSim* scArtSim = scbArt.getScArticulation().getSim(); + + NpConstraint* constraint = static_cast(joint->getConstraint()); + Sc::ConstraintSim* cSim = constraint->getScbConstraint().getScConstraint().getSim(); + scArtSim->removeLoopConstraint(cSim); +} + +PxU32 NpArticulationReducedCoordinate::getNbLoopJoints() const +{ + NP_READ_CHECK(mImpl.getOwnerScene()); + + return mLoopJoints.size(); +} + +PxU32 NpArticulationReducedCoordinate::getLoopJoints(PxJoint** userBuffer, PxU32 bufferSize, PxU32 startIndex) const +{ + NP_READ_CHECK(mImpl.getOwnerScene()); + + return Cm::getArrayOfPointers(userBuffer, bufferSize, startIndex, mLoopJoints.begin(), mLoopJoints.size()); +} + +PxU32 NpArticulationReducedCoordinate::getCoefficentMatrixSize() const +{ + NP_READ_CHECK(mImpl.getOwnerScene()); + + return mImpl.mArticulation.getScArticulation().getCoefficentMatrixSize(); +} + +void NpArticulationReducedCoordinate::teleportRootLink(const PxTransform& pose, bool autowake) +{ + PX_CHECK_AND_RETURN(mImpl.getAPIScene(), "PxArticulationReducedCoordinate::teleportRootLink: object must be in a scene"); + + PX_CHECK_AND_RETURN(pose.isValid(), "PxArticulationReducedCoordinate::teleportRootLink pose is not valid."); + + NP_WRITE_CHECK(mImpl.getOwnerScene()); + + NpArticulationLink* root = mImpl.mArticulationLinks[0]; + + root->setGlobalPoseInternal(pose, autowake); +} + +NpArticulationReducedCoordinate::~NpArticulationReducedCoordinate() +{ + NpFactory::getInstance().onArticulationRelease(this); +} + +PxArticulationJointBase* NpArticulationReducedCoordinate::createArticulationJoint(PxArticulationLink& parent, + const PxTransform& parentFrame, + PxArticulationLink& child, + const PxTransform& childFrame) +{ + return NpFactory::getInstance().createNpArticulationJointRC(static_cast(parent), parentFrame, static_cast(child), childFrame); +} + +void NpArticulationReducedCoordinate::releaseArticulationJoint(PxArticulationJointBase* joint) +{ + NpFactory::getInstance().releaseArticulationJointRCToPool(*static_cast(joint)); +} + + diff --git a/src/PhysX/physx/source/physx/src/NpArticulationReducedCoordinate.h b/src/PhysX/physx/source/physx/src/NpArticulationReducedCoordinate.h index 718e31fa1..5280c71ba 100644 --- a/src/PhysX/physx/source/physx/src/NpArticulationReducedCoordinate.h +++ b/src/PhysX/physx/source/physx/src/NpArticulationReducedCoordinate.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpArticulationTemplate.h b/src/PhysX/physx/source/physx/src/NpArticulationTemplate.h index fbe4dc68b..df148c61f 100644 --- a/src/PhysX/physx/source/physx/src/NpArticulationTemplate.h +++ b/src/PhysX/physx/source/physx/src/NpArticulationTemplate.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -42,7 +42,6 @@ namespace physx { - class NpArticulationLink; class NpScene; class NpAggregate; @@ -125,15 +124,13 @@ public: PX_FORCE_INLINE Scb::Articulation& getScbArticulation() { return mArticulation; } PX_FORCE_INLINE const Scb::Articulation& getScbArticulation() const { return mArticulation; } - void increaseCacheVersion() { mCacheVersion++; } - + PX_FORCE_INLINE void increaseCacheVersion() { mCacheVersion++; } #if PX_ENABLE_DEBUG_VISUALIZATION public: PX_INLINE void visualize(Cm::RenderOutput& out, NpScene* scene); #endif - Scb::Articulation mArticulation; NpArticulationLinkArray mArticulationLinks; NpAggregate* mAggregate; @@ -159,7 +156,6 @@ public: NpArticulationTemplate(PxBaseFlags baseFlags) : APIClass(baseFlags), mImpl(PxEmpty) {} //~PX_SERIALIZATION - virtual void release(); virtual PxScene* getScene() const { return mImpl.getScene(); } @@ -196,7 +192,6 @@ public: virtual PxArticulationLink* createLink(PxArticulationLink* parent, const PxTransform& pose); - //--------------------------------------------------------------------------------- // Miscellaneous //--------------------------------------------------------------------------------- @@ -208,26 +203,20 @@ public: virtual PxArticulationBase::Enum getType() const { return PxArticulationBase::Enum(mType); } - #if PX_ENABLE_DEBUG_VISUALIZATION public: void visualize(Cm::RenderOutput& out, NpScene* scene) { mImpl.visualize(out, scene); } #endif public: - PxU32 mType; PxArticulationImpl mImpl; - - }; - template NpArticulationTemplate::NpArticulationTemplate() : APIClass(PxConcreteType::eARTICULATION, PxBaseFlag::eOWNS_MEMORY | PxBaseFlag::eIS_RELEASABLE) { - PxArticulationBase::userData = NULL; mType = PxArticulationBase::eMaximumCoordinate; } @@ -328,7 +317,6 @@ void PxArticulationImpl::setSolverIterationCounts(PxU32 positionIters, PxU32 vel getArticulation().setSolverIterationCounts((velocityIters & 0xff) << 8 | (positionIters & 0xff)); } - void PxArticulationImpl::getSolverIterationCounts(PxU32 & positionIters, PxU32 & velocityIters) const { NP_READ_CHECK(getOwnerScene()); @@ -337,7 +325,6 @@ void PxArticulationImpl::getSolverIterationCounts(PxU32 & positionIters, PxU32 & positionIters = PxU32(x & 0xff); } - void PxArticulationImpl::setGlobalPose() { PX_CHECK_AND_RETURN(getAPIScene(), "PxArticulation::setGlobalPose: object must be in a scene"); @@ -361,7 +348,6 @@ void PxArticulationImpl::setGlobalPose() } } - bool PxArticulationImpl::isSleeping() const { NP_READ_CHECK(getOwnerScene()); @@ -370,36 +356,30 @@ bool PxArticulationImpl::isSleeping() const return getArticulation().isSleeping(); } - void PxArticulationImpl::setSleepThreshold(PxReal threshold) { NP_WRITE_CHECK(getOwnerScene()); getArticulation().setSleepThreshold(threshold); } - PxReal PxArticulationImpl::getSleepThreshold() const { NP_READ_CHECK(getOwnerScene()); return getArticulation().getSleepThreshold(); } - void PxArticulationImpl::setStabilizationThreshold(PxReal threshold) { NP_WRITE_CHECK(getOwnerScene()); getArticulation().setFreezeThreshold(threshold); } - PxReal PxArticulationImpl::getStabilizationThreshold() const { NP_READ_CHECK(getOwnerScene()); return getArticulation().getFreezeThreshold(); } - - void PxArticulationImpl::setWakeCounter(PxReal wakeCounterValue) { NP_WRITE_CHECK(getOwnerScene()); @@ -412,14 +392,12 @@ void PxArticulationImpl::setWakeCounter(PxReal wakeCounterValue) getArticulation().setWakeCounter(wakeCounterValue); } - PxReal PxArticulationImpl::getWakeCounter() const { NP_READ_CHECK(getOwnerScene()); return getArticulation().getWakeCounter(); } - void PxArticulationImpl::wakeUpInternal(bool forceWakeUp, bool autowake) { NpScene* scene = getAPIScene(); @@ -447,7 +425,6 @@ void PxArticulationImpl::wakeUpInternal(bool forceWakeUp, bool autowake) } } - void PxArticulationImpl::wakeUp() { NpScene* scene = getAPIScene(); @@ -463,7 +440,6 @@ void PxArticulationImpl::wakeUp() getArticulation().wakeUp(); } - void PxArticulationImpl::putToSleep() { NP_WRITE_CHECK(getOwnerScene()); @@ -477,21 +453,18 @@ void PxArticulationImpl::putToSleep() getArticulation().putToSleep(); } - PxU32 PxArticulationImpl::getNbLinks() const { NP_READ_CHECK(getOwnerScene()); return mArticulationLinks.size(); } - PxU32 PxArticulationImpl::getLinks(PxArticulationLink** userBuffer, PxU32 bufferSize, PxU32 startIndex) const { NP_READ_CHECK(getOwnerScene()); return Cm::getArrayOfPointers(userBuffer, bufferSize, startIndex, mArticulationLinks.begin(), mArticulationLinks.size()); } - PxBounds3 PxArticulationImpl::getWorldBounds(float inflation) const { NP_READ_CHECK(getOwnerScene()); @@ -509,40 +482,34 @@ PxBounds3 PxArticulationImpl::getWorldBounds(float inflation) const return PxBounds3::centerExtents(center, inflatedExtents); } - PxAggregate* PxArticulationImpl::getAggregate() const { NP_READ_CHECK(getOwnerScene()); return mAggregate; } - void PxArticulationImpl::setName(const char* debugName) { NP_WRITE_CHECK(getOwnerScene()); mName = debugName; } - const char* PxArticulationImpl::getName() const { NP_READ_CHECK(getOwnerScene()); return mName; } - NpScene* PxArticulationImpl::getAPIScene() const { return static_cast(mArticulation.getScbSceneForAPI() ? mArticulation.getScbSceneForAPI()->getPxScene() : NULL); } - NpScene* PxArticulationImpl::getOwnerScene() const { return static_cast(mArticulation.getScbScene() ? mArticulation.getScbScene()->getPxScene() : NULL); } - #if PX_ENABLE_DEBUG_VISUALIZATION void PxArticulationImpl::visualize(Cm::RenderOutput& out, NpScene* scene) @@ -552,7 +519,6 @@ void PxArticulationImpl::visualize(Cm::RenderOutput& out, NpScene* scene) } #endif // PX_ENABLE_DEBUG_VISUALIZATION - NpArticulationLink* PxArticulationImpl::getRoot() { if (!mArticulationLinks.size()) diff --git a/src/PhysX/physx/source/physx/src/NpBatchQuery.cpp b/src/PhysX/physx/source/physx/src/NpBatchQuery.cpp index b31ea85a9..76edaa6b7 100644 --- a/src/PhysX/physx/source/physx/src/NpBatchQuery.cpp +++ b/src/PhysX/physx/source/physx/src/NpBatchQuery.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpBatchQuery.h b/src/PhysX/physx/source/physx/src/NpBatchQuery.h index 4bc3c6f9c..6d015f77f 100644 --- a/src/PhysX/physx/source/physx/src/NpBatchQuery.h +++ b/src/PhysX/physx/source/physx/src/NpBatchQuery.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpCast.h b/src/PhysX/physx/source/physx/src/NpCast.h index 4ae9476ec..5663614d2 100644 --- a/src/PhysX/physx/source/physx/src/NpCast.h +++ b/src/PhysX/physx/source/physx/src/NpCast.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpConnector.h b/src/PhysX/physx/source/physx/src/NpConnector.h index d404153d8..da4553445 100644 --- a/src/PhysX/physx/source/physx/src/NpConnector.h +++ b/src/PhysX/physx/source/physx/src/NpConnector.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpConstraint.cpp b/src/PhysX/physx/source/physx/src/NpConstraint.cpp index 7e7d3a1e8..344a46b3a 100644 --- a/src/PhysX/physx/source/physx/src/NpConstraint.cpp +++ b/src/PhysX/physx/source/physx/src/NpConstraint.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpConstraint.h b/src/PhysX/physx/source/physx/src/NpConstraint.h index 4738b4cb4..1bbec1250 100644 --- a/src/PhysX/physx/source/physx/src/NpConstraint.h +++ b/src/PhysX/physx/source/physx/src/NpConstraint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpFactory.cpp b/src/PhysX/physx/source/physx/src/NpFactory.cpp index 416bcd125..a351501d4 100644 --- a/src/PhysX/physx/source/physx/src/NpFactory.cpp +++ b/src/PhysX/physx/source/physx/src/NpFactory.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpFactory.h b/src/PhysX/physx/source/physx/src/NpFactory.h index d36249995..76920eb4f 100644 --- a/src/PhysX/physx/source/physx/src/NpFactory.h +++ b/src/PhysX/physx/source/physx/src/NpFactory.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpMaterial.cpp b/src/PhysX/physx/source/physx/src/NpMaterial.cpp index b743c15cb..ec55138f9 100644 --- a/src/PhysX/physx/source/physx/src/NpMaterial.cpp +++ b/src/PhysX/physx/source/physx/src/NpMaterial.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpMaterial.h b/src/PhysX/physx/source/physx/src/NpMaterial.h index 722b9b379..a7d4f2b93 100644 --- a/src/PhysX/physx/source/physx/src/NpMaterial.h +++ b/src/PhysX/physx/source/physx/src/NpMaterial.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpMaterialManager.h b/src/PhysX/physx/source/physx/src/NpMaterialManager.h index d3c38a842..2179a0f57 100644 --- a/src/PhysX/physx/source/physx/src/NpMaterialManager.h +++ b/src/PhysX/physx/source/physx/src/NpMaterialManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpMetaData.cpp b/src/PhysX/physx/source/physx/src/NpMetaData.cpp index 4eb7c0e99..20ec8b712 100644 --- a/src/PhysX/physx/source/physx/src/NpMetaData.cpp +++ b/src/PhysX/physx/source/physx/src/NpMetaData.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpPhysics.cpp b/src/PhysX/physx/source/physx/src/NpPhysics.cpp index 8db81f7f5..8b5e56ea0 100644 --- a/src/PhysX/physx/source/physx/src/NpPhysics.cpp +++ b/src/PhysX/physx/source/physx/src/NpPhysics.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpPhysics.h b/src/PhysX/physx/source/physx/src/NpPhysics.h index 084f3ce0d..b314d7476 100644 --- a/src/PhysX/physx/source/physx/src/NpPhysics.h +++ b/src/PhysX/physx/source/physx/src/NpPhysics.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpPhysicsInsertionCallback.h b/src/PhysX/physx/source/physx/src/NpPhysicsInsertionCallback.h index aba7297f1..78141e9b6 100644 --- a/src/PhysX/physx/source/physx/src/NpPhysicsInsertionCallback.h +++ b/src/PhysX/physx/source/physx/src/NpPhysicsInsertionCallback.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpPtrTableStorageManager.h b/src/PhysX/physx/source/physx/src/NpPtrTableStorageManager.h index 91e66adc0..f3b7c8bbc 100644 --- a/src/PhysX/physx/source/physx/src/NpPtrTableStorageManager.h +++ b/src/PhysX/physx/source/physx/src/NpPtrTableStorageManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpPvdSceneQueryCollector.cpp b/src/PhysX/physx/source/physx/src/NpPvdSceneQueryCollector.cpp index 64de49aae..8d74ad341 100644 --- a/src/PhysX/physx/source/physx/src/NpPvdSceneQueryCollector.cpp +++ b/src/PhysX/physx/source/physx/src/NpPvdSceneQueryCollector.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpPvdSceneQueryCollector.h b/src/PhysX/physx/source/physx/src/NpPvdSceneQueryCollector.h index 3290c884d..794623d67 100644 --- a/src/PhysX/physx/source/physx/src/NpPvdSceneQueryCollector.h +++ b/src/PhysX/physx/source/physx/src/NpPvdSceneQueryCollector.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpQueryShared.h b/src/PhysX/physx/source/physx/src/NpQueryShared.h index 531cf17a7..3dff64ac0 100644 --- a/src/PhysX/physx/source/physx/src/NpQueryShared.h +++ b/src/PhysX/physx/source/physx/src/NpQueryShared.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpReadCheck.cpp b/src/PhysX/physx/source/physx/src/NpReadCheck.cpp index 3610823cf..a9c4220dc 100644 --- a/src/PhysX/physx/source/physx/src/NpReadCheck.cpp +++ b/src/PhysX/physx/source/physx/src/NpReadCheck.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpReadCheck.h b/src/PhysX/physx/source/physx/src/NpReadCheck.h index a3303b905..61a8d6b7d 100644 --- a/src/PhysX/physx/source/physx/src/NpReadCheck.h +++ b/src/PhysX/physx/source/physx/src/NpReadCheck.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpRigidActorTemplate.h b/src/PhysX/physx/source/physx/src/NpRigidActorTemplate.h index 6cacd67cf..c61e46c58 100644 --- a/src/PhysX/physx/source/physx/src/NpRigidActorTemplate.h +++ b/src/PhysX/physx/source/physx/src/NpRigidActorTemplate.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpRigidActorTemplateInternal.h b/src/PhysX/physx/source/physx/src/NpRigidActorTemplateInternal.h index f53f334b5..f2488def8 100644 --- a/src/PhysX/physx/source/physx/src/NpRigidActorTemplateInternal.h +++ b/src/PhysX/physx/source/physx/src/NpRigidActorTemplateInternal.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpRigidBodyTemplate.h b/src/PhysX/physx/source/physx/src/NpRigidBodyTemplate.h index dea694f13..d84cc948b 100644 --- a/src/PhysX/physx/source/physx/src/NpRigidBodyTemplate.h +++ b/src/PhysX/physx/source/physx/src/NpRigidBodyTemplate.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -156,7 +156,7 @@ public: void visualize(Cm::RenderOutput& out, NpScene* scene); #endif - PX_FORCE_INLINE bool isKinematic() + PX_FORCE_INLINE bool isKinematic() const { return (APIClass::getConcreteType() == PxConcreteType::eRIGID_DYNAMIC) && (getScbBodyFast().getFlags() & PxRigidBodyFlag::eKINEMATIC); } diff --git a/src/PhysX/physx/source/physx/src/NpRigidDynamic.cpp b/src/PhysX/physx/source/physx/src/NpRigidDynamic.cpp index f0c4573b9..0e50bdc84 100644 --- a/src/PhysX/physx/source/physx/src/NpRigidDynamic.cpp +++ b/src/PhysX/physx/source/physx/src/NpRigidDynamic.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -47,6 +47,33 @@ void NpRigidDynamic::requiresObjects(PxProcessPxBaseCallback& c) NpRigidDynamicT::requiresObjects(c); } +void NpRigidDynamic::exportData(PxSerializationContext& context) const +{ + //Clearing the aggregate ID for serialization so we avoid having a stale + //reference after deserialization. The aggregate ID get's reset on readding to the + //scene anyway. + //Also restore dynamic data in case the actor is configured as a kinematic. + //otherwise we would loose the data for switching the kinematic actor back to dynamic + //after deserialization. + Sc::BodyCore& bodyCore = const_cast(getScbBodyFast().getScBody()); + Sc::ActorCore& actorCore = const_cast(getScbActorFast().getActorCore()); + if (isKinematic()) + { + bodyCore.restoreDynamicData(); + } + PxU32 backupAggregateID = actorCore.getAggregateID(); + actorCore.setAggregateID(PX_INVALID_U32); + + context.writeData(this, sizeof(NpRigidDynamic)); + + actorCore.setAggregateID(backupAggregateID); + + if (isKinematic()) + { + bodyCore.backupDynamicData(); + } +} + NpRigidDynamic* NpRigidDynamic::createObject(PxU8*& address, PxDeserializationContext& context) { NpRigidDynamic* obj = new (address) NpRigidDynamic(PxBaseFlag::eIS_RELEASABLE); diff --git a/src/PhysX/physx/source/physx/src/NpRigidDynamic.h b/src/PhysX/physx/source/physx/src/NpRigidDynamic.h index ea9aaa914..749fd333d 100644 --- a/src/PhysX/physx/source/physx/src/NpRigidDynamic.h +++ b/src/PhysX/physx/source/physx/src/NpRigidDynamic.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -54,6 +54,7 @@ public: // PX_SERIALIZATION NpRigidDynamic(PxBaseFlags baseFlags) : NpRigidDynamicT(baseFlags) {} + virtual void exportData(PxSerializationContext& context) const; virtual void requiresObjects(PxProcessPxBaseCallback& c); static NpRigidDynamic* createObject(PxU8*& address, PxDeserializationContext& context); diff --git a/src/PhysX/physx/source/physx/src/NpRigidStatic.cpp b/src/PhysX/physx/source/physx/src/NpRigidStatic.cpp index 34af3d241..40148b4a6 100644 --- a/src/PhysX/physx/source/physx/src/NpRigidStatic.cpp +++ b/src/PhysX/physx/source/physx/src/NpRigidStatic.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -47,6 +47,20 @@ NpRigidStatic::~NpRigidStatic() } // PX_SERIALIZATION +void NpRigidStatic::exportData(PxSerializationContext& context) const +{ + //Clearing the aggregate ID for serialization so we avoid having a stale + //reference after deserialization. The aggregate ID get's reset on readding to the + //scene anyway. + Sc::ActorCore& actorCore = const_cast(getScbActorFast().getActorCore()); + PxU32 backupAggregateID = actorCore.getAggregateID(); + actorCore.setAggregateID(PX_INVALID_U32); + + context.writeData(this, sizeof(NpRigidStatic)); + + actorCore.setAggregateID(backupAggregateID); +} + void NpRigidStatic::requiresObjects(PxProcessPxBaseCallback& c) { NpRigidStaticT::requiresObjects(c); diff --git a/src/PhysX/physx/source/physx/src/NpRigidStatic.h b/src/PhysX/physx/source/physx/src/NpRigidStatic.h index 7da078970..16ef2bcc3 100644 --- a/src/PhysX/physx/source/physx/src/NpRigidStatic.h +++ b/src/PhysX/physx/source/physx/src/NpRigidStatic.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -59,6 +59,7 @@ class NpRigidStatic : public NpRigidStaticT public: // PX_SERIALIZATION NpRigidStatic(PxBaseFlags baseFlags) : NpRigidStaticT(baseFlags), mRigidStatic(PxEmpty) {} + virtual void exportData(PxSerializationContext& context) const; virtual void requiresObjects(PxProcessPxBaseCallback& c); static NpRigidStatic* createObject(PxU8*& address, PxDeserializationContext& context); static void getBinaryMetaData(PxOutputStream& stream); diff --git a/src/PhysX/physx/source/physx/src/NpScene.cpp b/src/PhysX/physx/source/physx/src/NpScene.cpp index d6f6d9f35..0b26e83f0 100644 --- a/src/PhysX/physx/source/physx/src/NpScene.cpp +++ b/src/PhysX/physx/source/physx/src/NpScene.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -835,30 +835,36 @@ void NpScene::addArticulation(PxArticulationBase& articulation) Ps::getFoundation().error(PxErrorCode::eINVALID_OPERATION, __FILE__, __LINE__, "PxScene::addArticulation(): Articulation already assigned to a scene. Call will be ignored!"); } +static void checkArticulationLink(NpScene* scene, NpArticulationLink* link) +{ +#if PX_CHECKED + scene->checkPositionSanity(*link, link->getGlobalPose(), "PxScene::addArticulation or PxScene::addAggregate"); +#else + PX_UNUSED(scene); +#endif + if(link->getMass()==0.0f) + { + Ps::getFoundation().error(PxErrorCode::eDEBUG_WARNING, __FILE__, __LINE__, "PxScene::addArticulation(): Articulation link with zero mass added to scene; defaulting mass to 1"); + link->setMass(1.0f); + } + + const PxVec3 inertia0 = link->getMassSpaceInertiaTensor(); + if(inertia0.x == 0.0f || inertia0.y == 0.0f || inertia0.z == 0.0f) + { + Ps::getFoundation().error(PxErrorCode::eDEBUG_WARNING, __FILE__, __LINE__, "PxScene::addArticulation(): Articulation link with zero moment of inertia added to scene; defaulting inertia to (1,1,1)"); + link->setMassSpaceInertiaTensor(PxVec3(1.0f, 1.0f, 1.0f)); + } +} + void NpScene::addArticulationInternal(PxArticulationBase& npa) { - // Add root link first PxU32 nbLinks = npa.getNbLinks(); PX_ASSERT(nbLinks > 0); PxArticulationImpl* impl = reinterpret_cast(npa.getImpl()); NpArticulationLink* rootLink = static_cast(impl->getRoot()); -#if PX_CHECKED - checkPositionSanity(*rootLink, rootLink->getGlobalPose(), "PxScene::addArticulation or PxScene::addAggregate"); -#endif - if(rootLink->getMass()==0) - { - Ps::getFoundation().error(PxErrorCode::eDEBUG_WARNING, __FILE__, __LINE__, "PxScene::addArticulation(): Articulation link with zero mass added to scene; defaulting mass to 1"); - rootLink->setMass(1.0f); - } - - PxVec3 inertia0 = rootLink->getMassSpaceInertiaTensor(); - if(inertia0.x == 0.0f || inertia0.y == 0.0f || inertia0.z == 0.0f) - { - Ps::getFoundation().error(PxErrorCode::eDEBUG_WARNING, __FILE__, __LINE__, "PxScene::addArticulation(): Articulation link with zero moment of inertia added to scene; defaulting inertia to (1,1,1)"); - rootLink->setMassSpaceInertiaTensor(PxVec3(1.0f, 1.0f, 1.0f)); - } + checkArticulationLink(this, rootLink); bool linkTriggersWakeUp = !rootLink->getScbBodyFast().checkSleepReadinessBesidesWakeCounter(); @@ -897,21 +903,7 @@ void NpScene::addArticulationInternal(PxArticulationBase& npa) { NpArticulationLink* child = children[i]; -#if PX_CHECKED - checkPositionSanity(*child, child->getGlobalPose(), "PxScene::addArticulation"); -#endif - if(child->getMass()==0) - { - Ps::getFoundation().error(PxErrorCode::eDEBUG_WARNING, __FILE__, __LINE__, "PxScene::addArticulation(): Articulation link with zero mass added to scene; defaulting mass to 1"); - child->setMass(1.0f); - } - - PxVec3 inertia = child->getMassSpaceInertiaTensor(); - if(inertia.x == 0.0f || inertia.y == 0.0f || inertia.z == 0.0f) - { - Ps::getFoundation().error(PxErrorCode::eDEBUG_WARNING, __FILE__, __LINE__, "PxScene::addArticulation(): Articulation link with zero moment of inertia added to scene; defaulting inertia to (1,1,1)"); - child->setMassSpaceInertiaTensor(PxVec3(1.0f, 1.0f, 1.0f)); - } + checkArticulationLink(this, child); linkTriggersWakeUp = linkTriggersWakeUp || (!child->getScbBodyFast().checkSleepReadinessBesidesWakeCounter()); @@ -955,8 +947,44 @@ void NpScene::addArticulationInternal(PxArticulationBase& npa) for (PxU32 i = 0; i < l->getNbChildren(); i++) { NpArticulationLink* child = children[i]; + child->setInboundJointDof(scArtSim->getDof(child->getLinkIndex())); + if (npa.getType() == PxArticulationBase::eReducedCoordinate) + { + PxArticulationJointReducedCoordinate* joint = static_cast(child->getInboundJoint()); + PxArticulationJointType::Enum jointType = joint->getJointType(); + + if (jointType == PxArticulationJointType::eUNDEFINED) + { + Ps::getFoundation().error(PxErrorCode::eDEBUG_WARNING, __FILE__, __LINE__, "PxScene::addArticulation(): The application need to set joint type. defaulting joint type to eFix"); + joint->setJointType(PxArticulationJointType::eFIX); + child->setInboundJointDof(0); + } + + if (jointType != PxArticulationJointType::eFIX) + { + + PxArticulationMotion::Enum motionX = joint->getMotion(PxArticulationAxis::eX); + PxArticulationMotion::Enum motionY = joint->getMotion(PxArticulationAxis::eY); + PxArticulationMotion::Enum motionZ = joint->getMotion(PxArticulationAxis::eZ); + + PxArticulationMotion::Enum motionSwing1 = joint->getMotion(PxArticulationAxis::eSWING1); + PxArticulationMotion::Enum motionSwing2 = joint->getMotion(PxArticulationAxis::eSWING2); + PxArticulationMotion::Enum motionTwist = joint->getMotion(PxArticulationAxis::eTWIST); + + //PxArticulationMotion::eLOCKED is 0 + if (!(motionX | motionY | motionZ | motionSwing1 | motionSwing2 | motionTwist)) + { + //if all axis are locked, which means the user doesn't set the motion. In this case, we should change the joint type to be + //fix to avoid crash in the solver + Ps::getFoundation().error(PxErrorCode::eDEBUG_WARNING, __FILE__, __LINE__, "PxScene::addArticulation(): The application need to set joint motion. defaulting joint type to eFix"); + joint->setJointType(PxArticulationJointType::eFIX); + child->setInboundJointDof(0); + } + } + } + linkStack[stackSize] = child; stackSize++; } @@ -1871,20 +1899,15 @@ void NpScene::simulateOrCollide(PxReal elapsedTime, physx::PxBaseTask* completio mSceneCollide.setContinuation(&mCollisionCompletion); //Initialize scene completion task mSceneCompletion.setContinuation(*mTaskManager, NULL); - } - else - { - mSceneCompletion.setContinuation(*mTaskManager, completionTask); - mSceneExecution.setContinuation(*mTaskManager, &mSceneCompletion); - } - if (simStage == Sc::SimulationStage::eCOLLIDE) - { mCollisionCompletion.removeReference(); mSceneCollide.removeReference(); } else { + mSceneCompletion.setContinuation(*mTaskManager, completionTask); + mSceneExecution.setContinuation(*mTaskManager, &mSceneCompletion); + mSceneCompletion.removeReference(); mSceneExecution.removeReference(); } @@ -3020,3 +3043,4 @@ void NpScene::releaseBatchQuery(PxBatchQuery* sq) PX_UNUSED(found); PX_ASSERT(found); PX_DELETE_AND_RESET(npsq); } + diff --git a/src/PhysX/physx/source/physx/src/NpScene.h b/src/PhysX/physx/source/physx/src/NpScene.h index eca152c6e..a6c1aa002 100644 --- a/src/PhysX/physx/source/physx/src/NpScene.h +++ b/src/PhysX/physx/source/physx/src/NpScene.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -47,7 +47,6 @@ namespace physx { - class PhysicsThread; class PxBatchQueryDesc; class NpMaterial; @@ -75,18 +74,6 @@ class NpBatchQuery; class PxBatchQuery; -enum NpProfileZones -{ - NpScene_checkResults, - NpScene_reportContacts, - NpScene_reportProfiling, - NpScene_reportTriggers, - NpScene_stats, - - NpPrNumZones -}; - - class NpContactCallbackTask : public physx::PxLightCpuTask { NpScene* mScene; @@ -207,8 +194,6 @@ class NpScene : public NpSceneQueries, public Ps::UserAllocated virtual void processCallbacks(physx::PxBaseTask* continuation); virtual void fetchResultsFinish(PxU32* errorState = 0); - - virtual void flush(bool sendPendingReports) { flushSimulation(sendPendingReports); } virtual void flushSimulation(bool sendPendingReports); virtual void flushQueryUpdates(); @@ -369,8 +354,6 @@ private: void fetchResultsPreContactCallbacks(); void fetchResultsPostContactCallbacks(); - - void updateScbStateAndSetupSq(const PxRigidActor& rigidActor, Scb::Actor& actor, NpShapeManager& shapeManager, bool actorDynamic, const PxBounds3* bounds, bool hasPrunerStructure); PX_FORCE_INLINE void updateScbStateAndSetupSq(const PxRigidActor& rigidActor, Scb::Body& body, NpShapeManager& shapeManager, bool actorDynamic, const PxBounds3* bounds, bool hasPrunerStructure); @@ -391,14 +374,12 @@ private: Ps::Sync mCollisionDone; // physics thread signals this when all collisions ready Ps::Sync mSceneQueriesDone; // physics thread signals this when all scene queries update ready - //legacy timing settings: PxReal mElapsedTime; //needed to transfer the elapsed time param from the user to the sim thread. PxU32 mNbClients; // Tracks reserved clients for multiclient support. Ps::Array mClientBehaviorFlags;// Tracks behavior bits for clients. - struct SceneCompletion : public Cm::Task { SceneCompletion(PxU64 contextId, Ps::Sync& sync) : Cm::Task(contextId), mSync(sync){} @@ -433,7 +414,6 @@ private: typedef Cm::DelegateTask SceneCollide; typedef Cm::DelegateTask SceneAdvance; - PxTaskManager* mTaskManager; SceneCompletion mSceneCompletion; SceneCompletion mCollisionCompletion; @@ -461,13 +441,11 @@ private: bool mBuildFrozenActors; }; - PX_FORCE_INLINE void NpScene::addToConstraintList(PxConstraint& constraint) { mConstraints.insert(&constraint); } - PX_FORCE_INLINE void NpScene::removeFromConstraintList(PxConstraint& constraint) { const bool exists = mConstraints.erase(&constraint); @@ -475,7 +453,6 @@ PX_FORCE_INLINE void NpScene::removeFromConstraintList(PxConstraint& constraint) PX_UNUSED(exists); } - PX_FORCE_INLINE void NpScene::removeFromArticulationList(PxArticulationBase& articulation) { const bool exists = mArticulations.erase(&articulation); @@ -483,7 +460,6 @@ PX_FORCE_INLINE void NpScene::removeFromArticulationList(PxArticulationBase& art PX_UNUSED(exists); } - PX_FORCE_INLINE void NpScene::removeFromAggregateList(PxAggregate& aggregate) { const bool exists = mAggregates.erase(&aggregate); diff --git a/src/PhysX/physx/source/physx/src/NpSceneAccessor.h b/src/PhysX/physx/source/physx/src/NpSceneAccessor.h index b729b8c6d..0fd04a8d7 100644 --- a/src/PhysX/physx/source/physx/src/NpSceneAccessor.h +++ b/src/PhysX/physx/source/physx/src/NpSceneAccessor.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpSceneQueries.cpp b/src/PhysX/physx/source/physx/src/NpSceneQueries.cpp index 9cb098993..6c5877714 100644 --- a/src/PhysX/physx/source/physx/src/NpSceneQueries.cpp +++ b/src/PhysX/physx/source/physx/src/NpSceneQueries.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpSceneQueries.h b/src/PhysX/physx/source/physx/src/NpSceneQueries.h index e07fcfd73..87034250e 100644 --- a/src/PhysX/physx/source/physx/src/NpSceneQueries.h +++ b/src/PhysX/physx/source/physx/src/NpSceneQueries.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpSerializerAdapter.cpp b/src/PhysX/physx/source/physx/src/NpSerializerAdapter.cpp index eb48292b2..f4a0c3c1c 100644 --- a/src/PhysX/physx/source/physx/src/NpSerializerAdapter.cpp +++ b/src/PhysX/physx/source/physx/src/NpSerializerAdapter.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -54,23 +54,14 @@ namespace physx using namespace physx::Gu; template<> - void PxSerializerDefaultAdapter::exportData(PxBase& obj, PxSerializationContext& s) const + void PxSerializerDefaultAdapter::exportData(PxBase& obj, PxSerializationContext& s) const { - PxU32 classSize = sizeof(NpRigidDynamic); - NpRigidDynamic& dynamic = static_cast(obj); - - PxsBodyCore serialCore; - size_t address = dynamic.getScbBodyFast().getScBody().getSerialCore(serialCore); - PxU32 offset = PxU32(address - reinterpret_cast(&dynamic)); - PX_ASSERT(offset + sizeof(serialCore) <= classSize); - s.writeData(&dynamic, offset); - s.writeData(&serialCore, sizeof(serialCore)); - void* tail = reinterpret_cast(&dynamic) + offset + sizeof(serialCore); - s.writeData(tail, classSize - offset - sizeof(serialCore)); + NpRigidDynamic& rigidDynamic = static_cast(obj); + rigidDynamic.exportData(s); } template<> - void PxSerializerDefaultAdapter::registerReferences(PxBase& obj, PxSerializationContext& s) const + void PxSerializerDefaultAdapter::registerReferences(PxBase& obj, PxSerializationContext& s) const { NpRigidDynamic& dynamic = static_cast(obj); @@ -92,7 +83,21 @@ namespace physx } template<> - void PxSerializerDefaultAdapter::registerReferences(PxBase& obj, PxSerializationContext& s) const + void PxSerializerDefaultAdapter::exportData(PxBase& obj, PxSerializationContext& s) const + { + NpRigidStatic& rigidStatic = static_cast(obj); + rigidStatic.exportData(s); + } + + template<> + void PxSerializerDefaultAdapter::exportData(PxBase& obj, PxSerializationContext& s) const + { + NpArticulationLink& articulationLink = static_cast(obj); + articulationLink.exportData(s); + } + + template<> + void PxSerializerDefaultAdapter::registerReferences(PxBase& obj, PxSerializationContext& s) const { NpShape& shape = static_cast(obj); diff --git a/src/PhysX/physx/source/physx/src/NpShape.cpp b/src/PhysX/physx/source/physx/src/NpShape.cpp index fbbe27edc..5f56b1173 100644 --- a/src/PhysX/physx/source/physx/src/NpShape.cpp +++ b/src/PhysX/physx/source/physx/src/NpShape.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpShape.h b/src/PhysX/physx/source/physx/src/NpShape.h index ccc193ddf..d67be2902 100644 --- a/src/PhysX/physx/source/physx/src/NpShape.h +++ b/src/PhysX/physx/source/physx/src/NpShape.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpShapeManager.cpp b/src/PhysX/physx/source/physx/src/NpShapeManager.cpp index 0a37f728e..f68725194 100644 --- a/src/PhysX/physx/source/physx/src/NpShapeManager.cpp +++ b/src/PhysX/physx/source/physx/src/NpShapeManager.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpShapeManager.h b/src/PhysX/physx/source/physx/src/NpShapeManager.h index 52a840369..02855e59e 100644 --- a/src/PhysX/physx/source/physx/src/NpShapeManager.h +++ b/src/PhysX/physx/source/physx/src/NpShapeManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpWriteCheck.cpp b/src/PhysX/physx/source/physx/src/NpWriteCheck.cpp index f770f59da..397814ee7 100644 --- a/src/PhysX/physx/source/physx/src/NpWriteCheck.cpp +++ b/src/PhysX/physx/source/physx/src/NpWriteCheck.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/NpWriteCheck.h b/src/PhysX/physx/source/physx/src/NpWriteCheck.h index 5095a4c49..086126dd3 100644 --- a/src/PhysX/physx/source/physx/src/NpWriteCheck.h +++ b/src/PhysX/physx/source/physx/src/NpWriteCheck.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/PvdMetaDataBindingData.h b/src/PhysX/physx/source/physx/src/PvdMetaDataBindingData.h index 552b95a0b..3644ce56c 100644 --- a/src/PhysX/physx/source/physx/src/PvdMetaDataBindingData.h +++ b/src/PhysX/physx/source/physx/src/PvdMetaDataBindingData.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_META_DATA_PVD_BINDING_DATA_H diff --git a/src/PhysX/physx/source/physx/src/PvdMetaDataPvdBinding.cpp b/src/PhysX/physx/source/physx/src/PvdMetaDataPvdBinding.cpp index ee812cd5f..ffb3e6c5c 100644 --- a/src/PhysX/physx/source/physx/src/PvdMetaDataPvdBinding.cpp +++ b/src/PhysX/physx/source/physx/src/PvdMetaDataPvdBinding.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/PvdMetaDataPvdBinding.h b/src/PhysX/physx/source/physx/src/PvdMetaDataPvdBinding.h index 55df602b2..1ede5d99f 100644 --- a/src/PhysX/physx/source/physx/src/PvdMetaDataPvdBinding.h +++ b/src/PhysX/physx/source/physx/src/PvdMetaDataPvdBinding.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/PvdPhysicsClient.cpp b/src/PhysX/physx/source/physx/src/PvdPhysicsClient.cpp index 537cee7c2..044969654 100644 --- a/src/PhysX/physx/source/physx/src/PvdPhysicsClient.cpp +++ b/src/PhysX/physx/source/physx/src/PvdPhysicsClient.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/PvdPhysicsClient.h b/src/PhysX/physx/source/physx/src/PvdPhysicsClient.h index f4704b715..7e02bbc92 100644 --- a/src/PhysX/physx/source/physx/src/PvdPhysicsClient.h +++ b/src/PhysX/physx/source/physx/src/PvdPhysicsClient.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/PvdTypeNames.h b/src/PhysX/physx/source/physx/src/PvdTypeNames.h index d7a3b82f6..8ef01f1d1 100644 --- a/src/PhysX/physx/source/physx/src/PvdTypeNames.h +++ b/src/PhysX/physx/source/physx/src/PvdTypeNames.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PVD_TYPE_NAMES_H diff --git a/src/PhysX/physx/source/physx/src/buffering/ScbActor.cpp b/src/PhysX/physx/source/physx/src/buffering/ScbActor.cpp index 67a921c11..fb4ee229b 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbActor.cpp +++ b/src/PhysX/physx/source/physx/src/buffering/ScbActor.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbActor.h b/src/PhysX/physx/source/physx/src/buffering/ScbActor.h index bba2c17f5..c3d40319c 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbActor.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbActor.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbAggregate.cpp b/src/PhysX/physx/source/physx/src/buffering/ScbAggregate.cpp index 85dd5edf2..e46e701cb 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbAggregate.cpp +++ b/src/PhysX/physx/source/physx/src/buffering/ScbAggregate.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbAggregate.h b/src/PhysX/physx/source/physx/src/buffering/ScbAggregate.h index 28cf591cd..c478da3a8 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbAggregate.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbAggregate.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbArticulation.h b/src/PhysX/physx/source/physx/src/buffering/ScbArticulation.h index 3d1a13089..a206940cc 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbArticulation.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbArticulation.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbArticulationJoint.h b/src/PhysX/physx/source/physx/src/buffering/ScbArticulationJoint.h index 67e743665..141abde03 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbArticulationJoint.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbArticulationJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbBase.cpp b/src/PhysX/physx/source/physx/src/buffering/ScbBase.cpp index 6fc476f57..8b5561a14 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbBase.cpp +++ b/src/PhysX/physx/source/physx/src/buffering/ScbBase.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbBase.h b/src/PhysX/physx/source/physx/src/buffering/ScbBase.h index c8b160edd..53f81b45f 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbBase.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbBase.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbBody.h b/src/PhysX/physx/source/physx/src/buffering/ScbBody.h index 33bee2a54..c674ff961 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbBody.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbBody.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbConstraint.h b/src/PhysX/physx/source/physx/src/buffering/ScbConstraint.h index 129f68f8b..f5257dc3b 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbConstraint.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbConstraint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbDefs.h b/src/PhysX/physx/source/physx/src/buffering/ScbDefs.h index d8c8c1111..be99a84a7 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbDefs.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbDefs.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbMetaData.cpp b/src/PhysX/physx/source/physx/src/buffering/ScbMetaData.cpp index fe498ee04..31b871258 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbMetaData.cpp +++ b/src/PhysX/physx/source/physx/src/buffering/ScbMetaData.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbNpDeps.h b/src/PhysX/physx/source/physx/src/buffering/ScbNpDeps.h index e0868a82d..b21d7ee1e 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbNpDeps.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbNpDeps.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbRigidObject.h b/src/PhysX/physx/source/physx/src/buffering/ScbRigidObject.h index f4cc38003..5411684a5 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbRigidObject.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbRigidObject.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbRigidStatic.h b/src/PhysX/physx/source/physx/src/buffering/ScbRigidStatic.h index 7589faab3..6979e026f 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbRigidStatic.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbRigidStatic.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbScene.cpp b/src/PhysX/physx/source/physx/src/buffering/ScbScene.cpp index 751af5837..80081f5b4 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbScene.cpp +++ b/src/PhysX/physx/source/physx/src/buffering/ScbScene.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbScene.h b/src/PhysX/physx/source/physx/src/buffering/ScbScene.h index af3934ca7..8d4d32601 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbScene.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbScene.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbSceneBuffer.h b/src/PhysX/physx/source/physx/src/buffering/ScbSceneBuffer.h index 1fa8ad9d0..673013013 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbSceneBuffer.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbSceneBuffer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbScenePvdClient.cpp b/src/PhysX/physx/source/physx/src/buffering/ScbScenePvdClient.cpp index b9b1b4cc3..158247445 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbScenePvdClient.cpp +++ b/src/PhysX/physx/source/physx/src/buffering/ScbScenePvdClient.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbScenePvdClient.h b/src/PhysX/physx/source/physx/src/buffering/ScbScenePvdClient.h index d84414b2b..d9acaa50c 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbScenePvdClient.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbScenePvdClient.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbShape.cpp b/src/PhysX/physx/source/physx/src/buffering/ScbShape.cpp index ccae62a06..74aa0d8cf 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbShape.cpp +++ b/src/PhysX/physx/source/physx/src/buffering/ScbShape.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbShape.h b/src/PhysX/physx/source/physx/src/buffering/ScbShape.h index 1652c477e..d5aaa5239 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbShape.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbShape.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/buffering/ScbType.h b/src/PhysX/physx/source/physx/src/buffering/ScbType.h index f1108ae61..2b8a5c611 100644 --- a/src/PhysX/physx/source/physx/src/buffering/ScbType.h +++ b/src/PhysX/physx/source/physx/src/buffering/ScbType.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/device/PhysXIndicator.h b/src/PhysX/physx/source/physx/src/device/PhysXIndicator.h index 6bb76f239..fa8758129 100644 --- a/src/PhysX/physx/source/physx/src/device/PhysXIndicator.h +++ b/src/PhysX/physx/source/physx/src/device/PhysXIndicator.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/device/linux/PhysXIndicatorLinux.cpp b/src/PhysX/physx/source/physx/src/device/linux/PhysXIndicatorLinux.cpp index c21905982..40e99a130 100644 --- a/src/PhysX/physx/source/physx/src/device/linux/PhysXIndicatorLinux.cpp +++ b/src/PhysX/physx/source/physx/src/device/linux/PhysXIndicatorLinux.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/device/nvPhysXtoDrv.h b/src/PhysX/physx/source/physx/src/device/nvPhysXtoDrv.h index cbffc8292..ee0432c29 100644 --- a/src/PhysX/physx/source/physx/src/device/nvPhysXtoDrv.h +++ b/src/PhysX/physx/source/physx/src/device/nvPhysXtoDrv.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/device/windows/PhysXIndicatorWindows.cpp b/src/PhysX/physx/source/physx/src/device/windows/PhysXIndicatorWindows.cpp index 6357e936f..71fd0f9b6 100644 --- a/src/PhysX/physx/source/physx/src/device/windows/PhysXIndicatorWindows.cpp +++ b/src/PhysX/physx/source/physx/src/device/windows/PhysXIndicatorWindows.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physx/src/gpu/PxGpu.cpp b/src/PhysX/physx/source/physx/src/gpu/PxGpu.cpp index 6f8e5f3a5..35432d3f5 100644 --- a/src/PhysX/physx/source/physx/src/gpu/PxGpu.cpp +++ b/src/PhysX/physx/source/physx/src/gpu/PxGpu.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #include "PxPhysXConfig.h" diff --git a/src/PhysX/physx/source/physx/src/gpu/PxPhysXGpuModuleLoader.cpp b/src/PhysX/physx/source/physx/src/gpu/PxPhysXGpuModuleLoader.cpp index 288d812da..994576c65 100644 --- a/src/PhysX/physx/source/physx/src/gpu/PxPhysXGpuModuleLoader.cpp +++ b/src/PhysX/physx/source/physx/src/gpu/PxPhysXGpuModuleLoader.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #include "PxPhysXConfig.h" diff --git a/src/PhysX/physx/source/physx/src/windows/NpWindowsDelayLoadHook.cpp b/src/PhysX/physx/source/physx/src/windows/NpWindowsDelayLoadHook.cpp index 203a12cca..942cffe42 100644 --- a/src/PhysX/physx/source/physx/src/windows/NpWindowsDelayLoadHook.cpp +++ b/src/PhysX/physx/source/physx/src/windows/NpWindowsDelayLoadHook.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctBoxController.cpp b/src/PhysX/physx/source/physxcharacterkinematic/src/CctBoxController.cpp index f025526bb..39f3c2043 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctBoxController.cpp +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctBoxController.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctBoxController.h b/src/PhysX/physx/source/physxcharacterkinematic/src/CctBoxController.h index 46f6d238d..874ab20af 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctBoxController.h +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctBoxController.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctCapsuleController.cpp b/src/PhysX/physx/source/physxcharacterkinematic/src/CctCapsuleController.cpp index ea96dfb56..8f0cf345d 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctCapsuleController.cpp +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctCapsuleController.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctCapsuleController.h b/src/PhysX/physx/source/physxcharacterkinematic/src/CctCapsuleController.h index cefab7c38..bc35f1832 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctCapsuleController.h +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctCapsuleController.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterController.cpp b/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterController.cpp index 510ad5c0c..defaab48b 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterController.cpp +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterController.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterController.h b/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterController.h index b075a0ca3..c6aaa2cd8 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterController.h +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterController.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterControllerCallbacks.cpp b/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterControllerCallbacks.cpp index 893849a9c..105e8f79f 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterControllerCallbacks.cpp +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterControllerCallbacks.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterControllerManager.cpp b/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterControllerManager.cpp index 007b50603..6d0bc1ced 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterControllerManager.cpp +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterControllerManager.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -31,7 +31,6 @@ #include "CctBoxController.h" #include "CctCapsuleController.h" #include "CctObstacleContext.h" -#include "CmBoxPruning.h" #include "GuDistanceSegmentSegment.h" #include "GuDistanceSegmentBox.h" #include "PsUtilities.h" @@ -40,6 +39,7 @@ #include "PxScene.h" #include "PxPhysics.h" #include "PsFoundation.h" +#include "CmRadixSortBuffered.h" using namespace physx; using namespace Cct; @@ -606,6 +606,49 @@ static void InteractionCharacterCharacter(Controller* entity0, Controller* entit } } +// PT: TODO: this is the very old version, revisit with newer one +static void completeBoxPruning(const PxBounds3* bounds, PxU32 nb, Ps::Array& pairs) +{ + if(!nb) + return; + + pairs.clear(); + + float* PosList = reinterpret_cast(PX_ALLOC_TEMP(sizeof(float)*nb, "completeBoxPruning")); + + for(PxU32 i=0;i pairs; // PT: TODO: get rid of alloc - Cm::CompleteBoxPruning(boxes, nbEntities, pairs, Gu::Axes(physx::Gu::AXES_XZY)); // PT: TODO: revisit for variable up axis + completeBoxPruning(boxes, nbEntities, pairs); PxU32 nbPairs = pairs.size()>>1; const PxU32* indices = pairs.begin(); @@ -654,7 +697,7 @@ void CharacterControllerManager::computeInteractions(PxF32 elapsedTime, PxContro /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //Public factory methods -PX_C_EXPORT PX_PHYSX_CHARACTER_API PxControllerManager* PX_CALL_CONV PxCreateControllerManager(PxScene& scene, bool lockingEnabled) +PX_C_EXPORT PxControllerManager* PX_CALL_CONV PxCreateControllerManager(PxScene& scene, bool lockingEnabled) { Ps::Foundation::incRefCount(); return PX_NEW(CharacterControllerManager)(scene, lockingEnabled); diff --git a/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterControllerManager.h b/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterControllerManager.h index 94a64dfeb..10fbcf86b 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterControllerManager.h +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctCharacterControllerManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctController.cpp b/src/PhysX/physx/source/physxcharacterkinematic/src/CctController.cpp index 96cced109..5a27772bf 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctController.cpp +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctController.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctController.h b/src/PhysX/physx/source/physxcharacterkinematic/src/CctController.h index ab6a4c539..915e2dffc 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctController.h +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctController.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctInternalStructs.h b/src/PhysX/physx/source/physxcharacterkinematic/src/CctInternalStructs.h index 71452aa23..a76cafedb 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctInternalStructs.h +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctInternalStructs.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctObstacleContext.cpp b/src/PhysX/physx/source/physxcharacterkinematic/src/CctObstacleContext.cpp index 36575cd79..0e10d5506 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctObstacleContext.cpp +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctObstacleContext.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctObstacleContext.h b/src/PhysX/physx/source/physxcharacterkinematic/src/CctObstacleContext.h index d5626deae..90718a1d7 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctObstacleContext.h +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctObstacleContext.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptBox.cpp b/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptBox.cpp index d6731e02a..25aae1e1e 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptBox.cpp +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptBox.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptBox.h b/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptBox.h index 48ab0d954..2eb132cda 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptBox.h +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptBox.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptCapsule.cpp b/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptCapsule.cpp index f4d735d84..d2a31f31e 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptCapsule.cpp +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptCapsule.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptCapsule.h b/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptCapsule.h index 8c9a2d8a0..fb7328938 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptCapsule.h +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptCapsule.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptVolume.cpp b/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptVolume.cpp index 1d846b460..e4d8413b1 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptVolume.cpp +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptVolume.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptVolume.h b/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptVolume.h index a29435b04..2a721cf92 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptVolume.h +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctSweptVolume.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcharacterkinematic/src/CctUtils.h b/src/PhysX/physx/source/physxcharacterkinematic/src/CctUtils.h index 8ac1e7227..61cc0fe2e 100644 --- a/src/PhysX/physx/source/physxcharacterkinematic/src/CctUtils.h +++ b/src/PhysX/physx/source/physxcharacterkinematic/src/CctUtils.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/Adjacencies.cpp b/src/PhysX/physx/source/physxcooking/src/Adjacencies.cpp index 4db1c96da..18c472423 100644 --- a/src/PhysX/physx/source/physxcooking/src/Adjacencies.cpp +++ b/src/PhysX/physx/source/physxcooking/src/Adjacencies.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/Adjacencies.h b/src/PhysX/physx/source/physxcooking/src/Adjacencies.h index 3df99bf83..8c66fbe20 100644 --- a/src/PhysX/physx/source/physxcooking/src/Adjacencies.h +++ b/src/PhysX/physx/source/physxcooking/src/Adjacencies.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/BVHStructureBuilder.cpp b/src/PhysX/physx/source/physxcooking/src/BVHStructureBuilder.cpp index 77e9e5f3a..84bdc5ff3 100644 --- a/src/PhysX/physx/source/physxcooking/src/BVHStructureBuilder.cpp +++ b/src/PhysX/physx/source/physxcooking/src/BVHStructureBuilder.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/BVHStructureBuilder.h b/src/PhysX/physx/source/physxcooking/src/BVHStructureBuilder.h index 93bf575b4..0d791e8b9 100644 --- a/src/PhysX/physx/source/physxcooking/src/BVHStructureBuilder.h +++ b/src/PhysX/physx/source/physxcooking/src/BVHStructureBuilder.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/Cooking.cpp b/src/PhysX/physx/source/physxcooking/src/Cooking.cpp index a56376309..051a04608 100644 --- a/src/PhysX/physx/source/physxcooking/src/Cooking.cpp +++ b/src/PhysX/physx/source/physxcooking/src/Cooking.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/Cooking.h b/src/PhysX/physx/source/physxcooking/src/Cooking.h index 7ee48ba51..553141cf1 100644 --- a/src/PhysX/physx/source/physxcooking/src/Cooking.h +++ b/src/PhysX/physx/source/physxcooking/src/Cooking.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/CookingUtils.cpp b/src/PhysX/physx/source/physxcooking/src/CookingUtils.cpp index ed50a5c9d..f6074439b 100644 --- a/src/PhysX/physx/source/physxcooking/src/CookingUtils.cpp +++ b/src/PhysX/physx/source/physxcooking/src/CookingUtils.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/CookingUtils.h b/src/PhysX/physx/source/physxcooking/src/CookingUtils.h index 7f5544b71..c5542dd21 100644 --- a/src/PhysX/physx/source/physxcooking/src/CookingUtils.h +++ b/src/PhysX/physx/source/physxcooking/src/CookingUtils.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/EdgeList.cpp b/src/PhysX/physx/source/physxcooking/src/EdgeList.cpp index aca9db0d8..d95752cfc 100644 --- a/src/PhysX/physx/source/physxcooking/src/EdgeList.cpp +++ b/src/PhysX/physx/source/physxcooking/src/EdgeList.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/EdgeList.h b/src/PhysX/physx/source/physxcooking/src/EdgeList.h index 5133f66e9..c8b9a03bc 100644 --- a/src/PhysX/physx/source/physxcooking/src/EdgeList.h +++ b/src/PhysX/physx/source/physxcooking/src/EdgeList.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/MeshCleaner.cpp b/src/PhysX/physx/source/physxcooking/src/MeshCleaner.cpp index 0983bfe99..a59c7926e 100644 --- a/src/PhysX/physx/source/physxcooking/src/MeshCleaner.cpp +++ b/src/PhysX/physx/source/physxcooking/src/MeshCleaner.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/MeshCleaner.h b/src/PhysX/physx/source/physxcooking/src/MeshCleaner.h index 6e58f71ec..69a3fd4bb 100644 --- a/src/PhysX/physx/source/physxcooking/src/MeshCleaner.h +++ b/src/PhysX/physx/source/physxcooking/src/MeshCleaner.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/Quantizer.cpp b/src/PhysX/physx/source/physxcooking/src/Quantizer.cpp index 4939a211d..20f68e3ba 100644 --- a/src/PhysX/physx/source/physxcooking/src/Quantizer.cpp +++ b/src/PhysX/physx/source/physxcooking/src/Quantizer.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/Quantizer.h b/src/PhysX/physx/source/physxcooking/src/Quantizer.h index cbab0e12e..cf5da0628 100644 --- a/src/PhysX/physx/source/physxcooking/src/Quantizer.h +++ b/src/PhysX/physx/source/physxcooking/src/Quantizer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/BigConvexDataBuilder.cpp b/src/PhysX/physx/source/physxcooking/src/convex/BigConvexDataBuilder.cpp index 5db4c6abe..8daffb84c 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/BigConvexDataBuilder.cpp +++ b/src/PhysX/physx/source/physxcooking/src/convex/BigConvexDataBuilder.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/BigConvexDataBuilder.h b/src/PhysX/physx/source/physxcooking/src/convex/BigConvexDataBuilder.h index 3317fc2b6..21555ffbc 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/BigConvexDataBuilder.h +++ b/src/PhysX/physx/source/physxcooking/src/convex/BigConvexDataBuilder.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullBuilder.cpp b/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullBuilder.cpp index c7c43414e..f20f7ed40 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullBuilder.cpp +++ b/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullBuilder.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullBuilder.h b/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullBuilder.h index e68f5ed0f..d49efaa93 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullBuilder.h +++ b/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullBuilder.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullLib.cpp b/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullLib.cpp index f5b1033f3..169c34229 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullLib.cpp +++ b/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullLib.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullLib.h b/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullLib.h index 4d250f7c2..2c19adb87 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullLib.h +++ b/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullLib.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullUtils.cpp b/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullUtils.cpp index 89309da59..d56053e92 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullUtils.cpp +++ b/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullUtils.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullUtils.h b/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullUtils.h index c97ff2b61..09f78a7ac 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullUtils.h +++ b/src/PhysX/physx/source/physxcooking/src/convex/ConvexHullUtils.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/ConvexMeshBuilder.cpp b/src/PhysX/physx/source/physxcooking/src/convex/ConvexMeshBuilder.cpp index c484be77d..ca8de9a70 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/ConvexMeshBuilder.cpp +++ b/src/PhysX/physx/source/physxcooking/src/convex/ConvexMeshBuilder.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/ConvexMeshBuilder.h b/src/PhysX/physx/source/physxcooking/src/convex/ConvexMeshBuilder.h index 6c9a2a236..66cade0b5 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/ConvexMeshBuilder.h +++ b/src/PhysX/physx/source/physxcooking/src/convex/ConvexMeshBuilder.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/ConvexPolygonsBuilder.cpp b/src/PhysX/physx/source/physxcooking/src/convex/ConvexPolygonsBuilder.cpp index 072903ac6..7f585c2fb 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/ConvexPolygonsBuilder.cpp +++ b/src/PhysX/physx/source/physxcooking/src/convex/ConvexPolygonsBuilder.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/ConvexPolygonsBuilder.h b/src/PhysX/physx/source/physxcooking/src/convex/ConvexPolygonsBuilder.h index ee2f67452..378fe1a50 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/ConvexPolygonsBuilder.h +++ b/src/PhysX/physx/source/physxcooking/src/convex/ConvexPolygonsBuilder.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/QuickHullConvexHullLib.cpp b/src/PhysX/physx/source/physxcooking/src/convex/QuickHullConvexHullLib.cpp index 9b280d9e4..ded4c77dc 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/QuickHullConvexHullLib.cpp +++ b/src/PhysX/physx/source/physxcooking/src/convex/QuickHullConvexHullLib.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/QuickHullConvexHullLib.h b/src/PhysX/physx/source/physxcooking/src/convex/QuickHullConvexHullLib.h index 7d576ed1f..5d85e21c1 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/QuickHullConvexHullLib.h +++ b/src/PhysX/physx/source/physxcooking/src/convex/QuickHullConvexHullLib.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/VolumeIntegration.cpp b/src/PhysX/physx/source/physxcooking/src/convex/VolumeIntegration.cpp index 0c739bc90..ed5adb95f 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/VolumeIntegration.cpp +++ b/src/PhysX/physx/source/physxcooking/src/convex/VolumeIntegration.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/convex/VolumeIntegration.h b/src/PhysX/physx/source/physxcooking/src/convex/VolumeIntegration.h index b8ae55beb..d448d2586 100644 --- a/src/PhysX/physx/source/physxcooking/src/convex/VolumeIntegration.h +++ b/src/PhysX/physx/source/physxcooking/src/convex/VolumeIntegration.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/mesh/GrbTriangleMeshCooking.cpp b/src/PhysX/physx/source/physxcooking/src/mesh/GrbTriangleMeshCooking.cpp index c0f4beeea..0b5f01a6f 100644 --- a/src/PhysX/physx/source/physxcooking/src/mesh/GrbTriangleMeshCooking.cpp +++ b/src/PhysX/physx/source/physxcooking/src/mesh/GrbTriangleMeshCooking.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/mesh/GrbTriangleMeshCooking.h b/src/PhysX/physx/source/physxcooking/src/mesh/GrbTriangleMeshCooking.h index 5cc742b7a..d5f49299b 100644 --- a/src/PhysX/physx/source/physxcooking/src/mesh/GrbTriangleMeshCooking.h +++ b/src/PhysX/physx/source/physxcooking/src/mesh/GrbTriangleMeshCooking.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/mesh/HeightFieldCooking.cpp b/src/PhysX/physx/source/physxcooking/src/mesh/HeightFieldCooking.cpp index 2b6056b83..1333c0d7e 100644 --- a/src/PhysX/physx/source/physxcooking/src/mesh/HeightFieldCooking.cpp +++ b/src/PhysX/physx/source/physxcooking/src/mesh/HeightFieldCooking.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/mesh/HeightFieldCooking.h b/src/PhysX/physx/source/physxcooking/src/mesh/HeightFieldCooking.h index e3d5ef89f..4eb067ba7 100644 --- a/src/PhysX/physx/source/physxcooking/src/mesh/HeightFieldCooking.h +++ b/src/PhysX/physx/source/physxcooking/src/mesh/HeightFieldCooking.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/mesh/MeshBuilder.cpp b/src/PhysX/physx/source/physxcooking/src/mesh/MeshBuilder.cpp index 4da4ad3af..963a7a4c8 100644 --- a/src/PhysX/physx/source/physxcooking/src/mesh/MeshBuilder.cpp +++ b/src/PhysX/physx/source/physxcooking/src/mesh/MeshBuilder.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/mesh/MeshBuilder.h b/src/PhysX/physx/source/physxcooking/src/mesh/MeshBuilder.h index b7cb901c4..aad5e605e 100644 --- a/src/PhysX/physx/source/physxcooking/src/mesh/MeshBuilder.h +++ b/src/PhysX/physx/source/physxcooking/src/mesh/MeshBuilder.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/mesh/QuickSelect.h b/src/PhysX/physx/source/physxcooking/src/mesh/QuickSelect.h index e108f701a..35494bb2c 100644 --- a/src/PhysX/physx/source/physxcooking/src/mesh/QuickSelect.h +++ b/src/PhysX/physx/source/physxcooking/src/mesh/QuickSelect.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/mesh/RTreeCooking.cpp b/src/PhysX/physx/source/physxcooking/src/mesh/RTreeCooking.cpp index f42a1c3c3..ef00de68d 100644 --- a/src/PhysX/physx/source/physxcooking/src/mesh/RTreeCooking.cpp +++ b/src/PhysX/physx/source/physxcooking/src/mesh/RTreeCooking.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/mesh/RTreeCooking.h b/src/PhysX/physx/source/physxcooking/src/mesh/RTreeCooking.h index 6faf2f674..32254bdd0 100644 --- a/src/PhysX/physx/source/physxcooking/src/mesh/RTreeCooking.h +++ b/src/PhysX/physx/source/physxcooking/src/mesh/RTreeCooking.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/mesh/TriangleMeshBuilder.cpp b/src/PhysX/physx/source/physxcooking/src/mesh/TriangleMeshBuilder.cpp index 67cacd35f..79ad9ccee 100644 --- a/src/PhysX/physx/source/physxcooking/src/mesh/TriangleMeshBuilder.cpp +++ b/src/PhysX/physx/source/physxcooking/src/mesh/TriangleMeshBuilder.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/mesh/TriangleMeshBuilder.h b/src/PhysX/physx/source/physxcooking/src/mesh/TriangleMeshBuilder.h index 4b187ec9e..fb745723b 100644 --- a/src/PhysX/physx/source/physxcooking/src/mesh/TriangleMeshBuilder.h +++ b/src/PhysX/physx/source/physxcooking/src/mesh/TriangleMeshBuilder.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxcooking/src/windows/WindowsCookingDelayLoadHook.cpp b/src/PhysX/physx/source/physxcooking/src/windows/WindowsCookingDelayLoadHook.cpp index 177dbe40b..cf8e9e700 100644 --- a/src/PhysX/physx/source/physxcooking/src/windows/WindowsCookingDelayLoadHook.cpp +++ b/src/PhysX/physx/source/physxcooking/src/windows/WindowsCookingDelayLoadHook.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtBroadPhase.cpp b/src/PhysX/physx/source/physxextensions/src/ExtBroadPhase.cpp index ae638fb47..052d817b3 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtBroadPhase.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtBroadPhase.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtCollection.cpp b/src/PhysX/physx/source/physxextensions/src/ExtCollection.cpp index ee9de2ae2..761cfe757 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtCollection.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtCollection.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtConstraintHelper.h b/src/PhysX/physx/source/physxextensions/src/ExtConstraintHelper.h index f9cdb45a2..7bebe5fd5 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtConstraintHelper.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtConstraintHelper.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtContactJoint.cpp b/src/PhysX/physx/source/physxextensions/src/ExtContactJoint.cpp index 449eb6724..dadfdf0f5 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtContactJoint.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtContactJoint.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtContactJoint.h b/src/PhysX/physx/source/physxextensions/src/ExtContactJoint.h index 08ad31d10..f378ea8a1 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtContactJoint.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtContactJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtConvexMeshExt.cpp b/src/PhysX/physx/source/physxextensions/src/ExtConvexMeshExt.cpp index 97174e1e6..806a7cab4 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtConvexMeshExt.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtConvexMeshExt.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtCpuWorkerThread.cpp b/src/PhysX/physx/source/physxextensions/src/ExtCpuWorkerThread.cpp index 30e17c35a..4bdf74d6c 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtCpuWorkerThread.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtCpuWorkerThread.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtCpuWorkerThread.h b/src/PhysX/physx/source/physxextensions/src/ExtCpuWorkerThread.h index e3f37b3f4..96269df25 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtCpuWorkerThread.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtCpuWorkerThread.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtD6Joint.cpp b/src/PhysX/physx/source/physxextensions/src/ExtD6Joint.cpp index ac2e5fcea..065d26bad 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtD6Joint.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtD6Joint.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtD6Joint.h b/src/PhysX/physx/source/physxextensions/src/ExtD6Joint.h index 93d3da2c7..16a9199ba 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtD6Joint.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtD6Joint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtD6JointCreate.cpp b/src/PhysX/physx/source/physxextensions/src/ExtD6JointCreate.cpp index dc4e7205d..f9ecc6a85 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtD6JointCreate.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtD6JointCreate.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtDefaultCpuDispatcher.cpp b/src/PhysX/physx/source/physxextensions/src/ExtDefaultCpuDispatcher.cpp index e8a1470f4..f45245b2c 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtDefaultCpuDispatcher.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtDefaultCpuDispatcher.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtDefaultCpuDispatcher.h b/src/PhysX/physx/source/physxextensions/src/ExtDefaultCpuDispatcher.h index fce239635..970a64344 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtDefaultCpuDispatcher.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtDefaultCpuDispatcher.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtDefaultErrorCallback.cpp b/src/PhysX/physx/source/physxextensions/src/ExtDefaultErrorCallback.cpp index d938a28b0..4e81ce3c6 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtDefaultErrorCallback.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtDefaultErrorCallback.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtDefaultSimulationFilterShader.cpp b/src/PhysX/physx/source/physxextensions/src/ExtDefaultSimulationFilterShader.cpp index 16e28fba5..3711112bb 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtDefaultSimulationFilterShader.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtDefaultSimulationFilterShader.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtDefaultStreams.cpp b/src/PhysX/physx/source/physxextensions/src/ExtDefaultStreams.cpp index 44e5fb9c9..b16928cf6 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtDefaultStreams.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtDefaultStreams.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtDistanceJoint.cpp b/src/PhysX/physx/source/physxextensions/src/ExtDistanceJoint.cpp index 33e08fe1e..0349e9073 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtDistanceJoint.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtDistanceJoint.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtDistanceJoint.h b/src/PhysX/physx/source/physxextensions/src/ExtDistanceJoint.h index 09c136434..4cdcb2abf 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtDistanceJoint.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtDistanceJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtExtensions.cpp b/src/PhysX/physx/source/physxextensions/src/ExtExtensions.cpp index 05cd12411..6d6abc71c 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtExtensions.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtExtensions.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtFixedJoint.cpp b/src/PhysX/physx/source/physxextensions/src/ExtFixedJoint.cpp index ab9538df9..6228b5a10 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtFixedJoint.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtFixedJoint.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtFixedJoint.h b/src/PhysX/physx/source/physxextensions/src/ExtFixedJoint.h index 34b8e3397..78d4606df 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtFixedJoint.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtFixedJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtInertiaTensor.h b/src/PhysX/physx/source/physxextensions/src/ExtInertiaTensor.h index dcef2415c..7d6d94592 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtInertiaTensor.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtInertiaTensor.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtJoint.cpp b/src/PhysX/physx/source/physxextensions/src/ExtJoint.cpp index 32ee392b4..8b2c4c0d3 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtJoint.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtJoint.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtJoint.h b/src/PhysX/physx/source/physxextensions/src/ExtJoint.h index 0bce87e3b..aae7e8213 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtJoint.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtJointMetaDataExtensions.h b/src/PhysX/physx/source/physxextensions/src/ExtJointMetaDataExtensions.h index 8c35c211d..fd0ed8068 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtJointMetaDataExtensions.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtJointMetaDataExtensions.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtMetaData.cpp b/src/PhysX/physx/source/physxextensions/src/ExtMetaData.cpp index 411ede6b3..2b7eeeedd 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtMetaData.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtMetaData.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtPlatform.h b/src/PhysX/physx/source/physxextensions/src/ExtPlatform.h index 8a7701970..3812614e1 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtPlatform.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtPlatform.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtPrismaticJoint.cpp b/src/PhysX/physx/source/physxextensions/src/ExtPrismaticJoint.cpp index 86b9eaff5..18242e8c5 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtPrismaticJoint.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtPrismaticJoint.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtPrismaticJoint.h b/src/PhysX/physx/source/physxextensions/src/ExtPrismaticJoint.h index f03fca2e6..d32708aab 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtPrismaticJoint.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtPrismaticJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtPvd.cpp b/src/PhysX/physx/source/physxextensions/src/ExtPvd.cpp index ca1f40670..95a38384b 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtPvd.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtPvd.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtPvd.h b/src/PhysX/physx/source/physxextensions/src/ExtPvd.h index 1f9d5796b..f9bbf484e 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtPvd.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtPvd.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtPxStringTable.cpp b/src/PhysX/physx/source/physxextensions/src/ExtPxStringTable.cpp index 8d640a4ae..c44ead204 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtPxStringTable.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtPxStringTable.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtRaycastCCD.cpp b/src/PhysX/physx/source/physxextensions/src/ExtRaycastCCD.cpp index 64a97800d..f59276497 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtRaycastCCD.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtRaycastCCD.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtRevoluteJoint.cpp b/src/PhysX/physx/source/physxextensions/src/ExtRevoluteJoint.cpp index 39819b6a3..a2c96829e 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtRevoluteJoint.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtRevoluteJoint.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtRevoluteJoint.h b/src/PhysX/physx/source/physxextensions/src/ExtRevoluteJoint.h index 36fa1eefe..ad69a1b5f 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtRevoluteJoint.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtRevoluteJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtRigidActorExt.cpp b/src/PhysX/physx/source/physxextensions/src/ExtRigidActorExt.cpp index acfe736f6..b619949f3 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtRigidActorExt.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtRigidActorExt.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtRigidBodyExt.cpp b/src/PhysX/physx/source/physxextensions/src/ExtRigidBodyExt.cpp index 3f8e79259..6b1dea83a 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtRigidBodyExt.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtRigidBodyExt.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtSceneQueryExt.cpp b/src/PhysX/physx/source/physxextensions/src/ExtSceneQueryExt.cpp index 577f2ef34..316349061 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtSceneQueryExt.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtSceneQueryExt.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtSerialization.h b/src/PhysX/physx/source/physxextensions/src/ExtSerialization.h index 387566bf6..5a560a4e1 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtSerialization.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtSerialization.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtSharedQueueEntryPool.h b/src/PhysX/physx/source/physxextensions/src/ExtSharedQueueEntryPool.h index 9728df4d2..733e97958 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtSharedQueueEntryPool.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtSharedQueueEntryPool.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtSimpleFactory.cpp b/src/PhysX/physx/source/physxextensions/src/ExtSimpleFactory.cpp index 35f899e21..65460e4ce 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtSimpleFactory.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtSimpleFactory.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtSmoothNormals.cpp b/src/PhysX/physx/source/physxextensions/src/ExtSmoothNormals.cpp index fe2034ede..651b952e1 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtSmoothNormals.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtSmoothNormals.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtSphericalJoint.cpp b/src/PhysX/physx/source/physxextensions/src/ExtSphericalJoint.cpp index fc3c61ec9..f611feccf 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtSphericalJoint.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtSphericalJoint.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtSphericalJoint.h b/src/PhysX/physx/source/physxextensions/src/ExtSphericalJoint.h index 81694b529..e450a137d 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtSphericalJoint.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtSphericalJoint.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtTaskQueueHelper.h b/src/PhysX/physx/source/physxextensions/src/ExtTaskQueueHelper.h index 450382c73..1f51f0935 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtTaskQueueHelper.h +++ b/src/PhysX/physx/source/physxextensions/src/ExtTaskQueueHelper.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/ExtTriangleMeshExt.cpp b/src/PhysX/physx/source/physxextensions/src/ExtTriangleMeshExt.cpp index 6559d6346..832dd2aa0 100644 --- a/src/PhysX/physx/source/physxextensions/src/ExtTriangleMeshExt.cpp +++ b/src/PhysX/physx/source/physxextensions/src/ExtTriangleMeshExt.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnBinaryDeserialization.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnBinaryDeserialization.cpp index ecb87b4ca..223430a0e 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnBinaryDeserialization.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnBinaryDeserialization.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnBinarySerialization.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnBinarySerialization.cpp index 4c4d279d2..f08829c20 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnBinarySerialization.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnBinarySerialization.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX.cpp index 10ca76946..9f64282cd 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. /* - get rid of STL diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX.h b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX.h index 9b07a101c..b93325adc 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PX_CONVX_H #define PX_CONVX_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Align.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Align.cpp index 45579ba90..8f2c423c3 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Align.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Align.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #include "SnConvX.h" #include "SnConvX_Align.h" diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Align.h b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Align.h index d43e5896d..e4c7be79b 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Align.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Align.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PX_CONVX_ALIGN_H #define PX_CONVX_ALIGN_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Common.h b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Common.h index b803fd30b..f17daebf5 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Common.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Common.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PX_CONVX_COMMON_H #define PX_CONVX_COMMON_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Convert.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Convert.cpp index 8f7fcb888..0d3729202 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Convert.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Convert.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #include "foundation/PxErrorCallback.h" #include "SnConvX.h" @@ -581,11 +581,11 @@ bool Sn::ConvX::convertClass(const char* buffer, const MetaClass* mc, int offset if(strcmp(srcEntry.entry.mName, "mNbHullVertices")==0) { assert(srcEntry.entry.mSize==1); - const int nbVerts = int(*(buffer+modSrcOffsetCheck)); + const PxU8 nbVerts = static_cast(*(buffer+modSrcOffsetCheck)); assert(!foundNbVerts); foundNbVerts = true; - const int gaussMapLimit = getBinaryMetaData(META_DATA_DST)->getGaussMapLimit(); + const PxU8 gaussMapLimit = static_cast(getBinaryMetaData(META_DATA_DST)->getGaussMapLimit()); if(nbVerts > gaussMapLimit) { // We need a gauss map and we have one => keep it diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Error.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Error.cpp index f67666f88..92301e0e6 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Error.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Error.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #include "foundation/PxErrorCallback.h" #include "SnConvX.h" diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_MetaData.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_MetaData.cpp index 64fbb942a..2d1446802 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_MetaData.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_MetaData.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #include "foundation/PxIO.h" #include "foundation/PxMemory.h" diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_MetaData.h b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_MetaData.h index 8b1e5a1b6..84fe523ac 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_MetaData.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_MetaData.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PX_CONVX_METADATA_H #define PX_CONVX_METADATA_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Output.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Output.cpp index d9fb8dada..d174a0183 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Output.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Output.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #include "foundation/PxIO.h" #include "foundation/PxErrorCallback.h" diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Output.h b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Output.h index 18d03fc9f..7a6245322 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Output.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Output.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PX_CONVX_OUTPUT_H #define PX_CONVX_OUTPUT_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Union.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Union.cpp index d8dc6bdb1..0fc1827cc 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Union.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Union.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #include "SnConvX.h" #include diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Union.h b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Union.h index e25eda6c3..701e8cf87 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Union.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnConvX_Union.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PX_UNION_H #define PX_UNION_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnSerializationContext.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnSerializationContext.cpp index e7ed9d827..287db3453 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnSerializationContext.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnSerializationContext.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnSerializationContext.h b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnSerializationContext.h index 624b50f79..20642b89d 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnSerializationContext.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Binary/SnSerializationContext.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/serialization/File/SnFile.h b/src/PhysX/physx/source/physxextensions/src/serialization/File/SnFile.h index a4a08373c..5297d6bac 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/File/SnFile.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/File/SnFile.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/serialization/SnSerialUtils.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/SnSerialUtils.cpp index a7c73ce78..c560902e0 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/SnSerialUtils.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/SnSerialUtils.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -38,7 +38,7 @@ using namespace physx; namespace { -#define SN_NUM_BINARY_PLATFORMS 13 +#define SN_NUM_BINARY_PLATFORMS 14 const PxU32 sBinaryPlatformTags[SN_NUM_BINARY_PLATFORMS] = { PX_MAKE_FOURCC('W','_','3','2'), @@ -53,7 +53,8 @@ const PxU32 sBinaryPlatformTags[SN_NUM_BINARY_PLATFORMS] = PX_MAKE_FOURCC('A','A','6','4'), PX_MAKE_FOURCC('X','O','N','E'), PX_MAKE_FOURCC('N','X','3','2'), - PX_MAKE_FOURCC('N','X','6','4') + PX_MAKE_FOURCC('N','X','6','4'), + PX_MAKE_FOURCC('L','A','6','4') }; const char* sBinaryPlatformNames[SN_NUM_BINARY_PLATFORMS] = @@ -62,15 +63,16 @@ const char* sBinaryPlatformNames[SN_NUM_BINARY_PLATFORMS] = "win64", "linux32", "linux64", - "macOSX32", - "macOSX64", + "mac32", + "mac64", "ps4", "android", "ios", "ios64", "xboxone", "switch32", - "switch64" + "switch64", + "linuxaarch64" }; #define SN_NUM_BINARY_COMPATIBLE_VERSIONS 1 @@ -93,9 +95,9 @@ PxU32 getBinaryPlatformTag() return sBinaryPlatformTags[0]; #elif PX_WINDOWS && PX_X64 return sBinaryPlatformTags[1]; -#elif PX_LINUX && (PX_X86 || PX_ARM) +#elif PX_LINUX && PX_X86 return sBinaryPlatformTags[2]; -#elif PX_LINUX && (PX_X64 || PX_A64) +#elif PX_LINUX && PX_X64 return sBinaryPlatformTags[3]; #elif PX_OSX && PX_X86 return sBinaryPlatformTags[4]; @@ -115,6 +117,8 @@ PxU32 getBinaryPlatformTag() return sBinaryPlatformTags[11]; #elif PX_SWITCH && PX_A64 return sBinaryPlatformTags[12]; +#elif PX_LINUX && PX_A64 + return sBinaryPlatformTags[13]; #else #error Unknown binary platform #endif diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/SnSerialUtils.h b/src/PhysX/physx/source/physxextensions/src/serialization/SnSerialUtils.h index 63b6608df..4e8dcfbbc 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/SnSerialUtils.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/SnSerialUtils.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/serialization/SnSerialization.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/SnSerialization.cpp index 52a1f2816..1155859ed 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/SnSerialization.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/SnSerialization.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/serialization/SnSerializationRegistry.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/SnSerializationRegistry.cpp index 1e7debbd3..bcec9b1a2 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/SnSerializationRegistry.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/SnSerializationRegistry.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/serialization/SnSerializationRegistry.h b/src/PhysX/physx/source/physxextensions/src/serialization/SnSerializationRegistry.h index 8c660d294..7fa10e106 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/SnSerializationRegistry.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/SnSerializationRegistry.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnJointRepXSerializer.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnJointRepXSerializer.cpp index 924740be6..feddfc439 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnJointRepXSerializer.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnJointRepXSerializer.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #include "PxMetaDataObjects.h" diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnJointRepXSerializer.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnJointRepXSerializer.h index 3dd215690..6723fb3f3 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnJointRepXSerializer.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnJointRepXSerializer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef SN_JOINT_REPX_SERIALIZER_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnPxStreamOperators.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnPxStreamOperators.h index fbc666854..36f12a966 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnPxStreamOperators.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnPxStreamOperators.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_PXSTREAMOPERATORS_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepX1_0Defaults.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepX1_0Defaults.h index 4c8cd665e..af0305b3a 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepX1_0Defaults.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepX1_0Defaults.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepX3_1Defaults.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepX3_1Defaults.h index ed175fc4a..0d745a39a 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepX3_1Defaults.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepX3_1Defaults.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepX3_2Defaults.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepX3_2Defaults.h index ac656bfad..415519b98 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepX3_2Defaults.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepX3_2Defaults.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXCollection.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXCollection.h index 56e2a4b0a..25d1ce99b 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXCollection.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXCollection.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_REPXCOLLECTION_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXCoreSerializer.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXCoreSerializer.cpp index eb0ab6e8c..ef5cc5c7a 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXCoreSerializer.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXCoreSerializer.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXCoreSerializer.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXCoreSerializer.h index d04c46cd3..b06f24efa 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXCoreSerializer.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXCoreSerializer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef SN_REPX_CORE_SERIALIZER_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXSerializerImpl.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXSerializerImpl.h index 95f7a3448..e5c092ae9 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXSerializerImpl.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXSerializerImpl.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_REPX_SERIALIZER_IMPL_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXUpgrader.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXUpgrader.cpp index 978e98b2e..6fd948385 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXUpgrader.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXUpgrader.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXUpgrader.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXUpgrader.h index b105b6a5d..205f8b7cc 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXUpgrader.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnRepXUpgrader.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_REPX_UPGRADER_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnSimpleXmlWriter.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnSimpleXmlWriter.h index 8d465483b..75657d04a 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnSimpleXmlWriter.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnSimpleXmlWriter.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_SIMPLEXMLWRITER_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlDeserializer.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlDeserializer.h index cfad99207..7fdff2fd5 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlDeserializer.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlDeserializer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_XML_DESERIALIZER_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlImpl.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlImpl.h index 261ab313a..12eb246ad 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlImpl.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlImpl.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_XML_IMPL_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlMemoryAllocator.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlMemoryAllocator.h index a81e6141c..344bb1e74 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlMemoryAllocator.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlMemoryAllocator.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_XML_MEMORY_ALLOCATOR_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlMemoryPool.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlMemoryPool.h index 537ffb5ad..c4446cdb7 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlMemoryPool.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlMemoryPool.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_XML_MEMORYPOOL_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlMemoryPoolStreams.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlMemoryPoolStreams.h index a1e65dabd..06865c64e 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlMemoryPoolStreams.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlMemoryPoolStreams.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_XML_MEMORY_POOL_STREAMS_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlReader.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlReader.h index d5caa465b..907989725 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlReader.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlReader.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_XML_READER_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlSerialization.cpp b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlSerialization.cpp index dc9f7a87c..4b3b5be74 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlSerialization.cpp +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlSerialization.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #include "SnXmlImpl.h" @@ -595,7 +595,7 @@ namespace physx { namespace Sn { virtual void save( PxOutputStream& inStream ) { SimpleXmlWriterImpl theWriter( inStream, mAllocator.getAllocator() ); - theWriter.beginTag( "PhysX30Collection" ); + theWriter.beginTag( "PhysXCollection" ); theWriter.addAttribute( "version", mVersionStr ); { XmlWriterImpl theRepXWriter( &theWriter, &mPropertyBuffer ); diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlSerializer.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlSerializer.h index caf71e286..a3f4a0f46 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlSerializer.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlSerializer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_XML_SERIALIZER_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlSimpleXmlWriter.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlSimpleXmlWriter.h index 3de9049eb..235e73b83 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlSimpleXmlWriter.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlSimpleXmlWriter.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_SIMPLEXMLWRITER_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlStringToType.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlStringToType.h index aa594d868..c4de3a85d 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlStringToType.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlStringToType.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_XML_STRINGTOTYPE_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlVisitorReader.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlVisitorReader.h index 461be83b3..00bac567f 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlVisitorReader.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlVisitorReader.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_XML_VISITOR_READER_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlVisitorWriter.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlVisitorWriter.h index 5caacaf2d..a26f2cd23 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlVisitorWriter.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlVisitorWriter.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_XML_VISITOR_WRITER_H diff --git a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlWriter.h b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlWriter.h index 666374573..56014a06f 100644 --- a/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlWriter.h +++ b/src/PhysX/physx/source/physxextensions/src/serialization/Xml/SnXmlWriter.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_XML_WRITER_H diff --git a/src/PhysX/physx/source/physxgpu/include/PxPhysXGpu.h b/src/PhysX/physx/source/physxgpu/include/PxPhysXGpu.h index 57fb564d2..2c73f9d06 100644 --- a/src/PhysX/physx/source/physxgpu/include/PxPhysXGpu.h +++ b/src/PhysX/physx/source/physxgpu/include/PxPhysXGpu.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxmetadata/core/include/PvdMetaDataDefineProperties.h b/src/PhysX/physx/source/physxmetadata/core/include/PvdMetaDataDefineProperties.h index 27933da36..555c66711 100644 --- a/src/PhysX/physx/source/physxmetadata/core/include/PvdMetaDataDefineProperties.h +++ b/src/PhysX/physx/source/physxmetadata/core/include/PvdMetaDataDefineProperties.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxmetadata/core/include/PvdMetaDataExtensions.h b/src/PhysX/physx/source/physxmetadata/core/include/PvdMetaDataExtensions.h index 2e067ab49..9fb2728d9 100644 --- a/src/PhysX/physx/source/physxmetadata/core/include/PvdMetaDataExtensions.h +++ b/src/PhysX/physx/source/physxmetadata/core/include/PvdMetaDataExtensions.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxmetadata/core/include/PvdMetaDataPropertyVisitor.h b/src/PhysX/physx/source/physxmetadata/core/include/PvdMetaDataPropertyVisitor.h index 6509ef818..07eacc5a8 100644 --- a/src/PhysX/physx/source/physxmetadata/core/include/PvdMetaDataPropertyVisitor.h +++ b/src/PhysX/physx/source/physxmetadata/core/include/PvdMetaDataPropertyVisitor.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxmetadata/core/include/PxAutoGeneratedMetaDataObjectNames.h b/src/PhysX/physx/source/physxmetadata/core/include/PxAutoGeneratedMetaDataObjectNames.h index f8c538f75..a6500291f 100644 --- a/src/PhysX/physx/source/physxmetadata/core/include/PxAutoGeneratedMetaDataObjectNames.h +++ b/src/PhysX/physx/source/physxmetadata/core/include/PxAutoGeneratedMetaDataObjectNames.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -334,6 +334,7 @@ PxSceneDesc_MaxNbContactDataBlocks, PxSceneDesc_MaxBiasCoefficient, PxSceneDesc_ContactReportStreamBufferSize, PxSceneDesc_CcdMaxPasses, +PxSceneDesc_CcdThreshold, PxSceneDesc_WakeCounterResetValue, PxSceneDesc_SanityBounds, PxSceneDesc_GpuDynamicsConfig, diff --git a/src/PhysX/physx/source/physxmetadata/core/include/PxAutoGeneratedMetaDataObjects.h b/src/PhysX/physx/source/physxmetadata/core/include/PxAutoGeneratedMetaDataObjects.h index 2f8fd805a..5bfa3df56 100644 --- a/src/PhysX/physx/source/physxmetadata/core/include/PxAutoGeneratedMetaDataObjects.h +++ b/src/PhysX/physx/source/physxmetadata/core/include/PxAutoGeneratedMetaDataObjects.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -110,6 +110,7 @@ template<> struct PxEnumTraits< physx::PxShapeFlag::Enum > { PxEnumTraits() : Na static PxU32ToName g_physx__PxMaterialFlag__EnumConversion[] = { { "eDISABLE_FRICTION", static_cast( physx::PxMaterialFlag::eDISABLE_FRICTION ) }, { "eDISABLE_STRONG_FRICTION", static_cast( physx::PxMaterialFlag::eDISABLE_STRONG_FRICTION ) }, + { "eIMPROVED_PATCH_FRICTION", static_cast( physx::PxMaterialFlag::eIMPROVED_PATCH_FRICTION ) }, { NULL, 0 } }; @@ -2563,6 +2564,7 @@ template<> struct PxEnumTraits< physx::PxSolverType::Enum > { PxEnumTraits() : N PxReal MaxBiasCoefficient; PxU32 ContactReportStreamBufferSize; PxU32 CcdMaxPasses; + PxReal CcdThreshold; PxReal WakeCounterResetValue; PxBounds3 SanityBounds; PxgDynamicsMemoryConfig GpuDynamicsConfig; @@ -2603,6 +2605,7 @@ template<> struct PxEnumTraits< physx::PxSolverType::Enum > { PxEnumTraits() : N DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxSceneDesc, MaxBiasCoefficient, PxSceneDescGeneratedValues) DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxSceneDesc, ContactReportStreamBufferSize, PxSceneDescGeneratedValues) DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxSceneDesc, CcdMaxPasses, PxSceneDescGeneratedValues) + DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxSceneDesc, CcdThreshold, PxSceneDescGeneratedValues) DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxSceneDesc, WakeCounterResetValue, PxSceneDescGeneratedValues) DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxSceneDesc, SanityBounds, PxSceneDescGeneratedValues) DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxSceneDesc, GpuDynamicsConfig, PxSceneDescGeneratedValues) @@ -2646,6 +2649,7 @@ template<> struct PxEnumTraits< physx::PxSolverType::Enum > { PxEnumTraits() : N PxPropertyInfo MaxBiasCoefficient; PxPropertyInfo ContactReportStreamBufferSize; PxPropertyInfo CcdMaxPasses; + PxPropertyInfo CcdThreshold; PxPropertyInfo WakeCounterResetValue; PxPropertyInfo SanityBounds; PxPropertyInfo GpuDynamicsConfig; @@ -2670,7 +2674,7 @@ template<> struct PxEnumTraits< physx::PxSolverType::Enum > { PxEnumTraits() : N PX_UNUSED(inStartIndex); return inStartIndex; } - static PxU32 instancePropertyCount() { return 39; } + static PxU32 instancePropertyCount() { return 40; } static PxU32 totalPropertyCount() { return instancePropertyCount(); } template PxU32 visitInstanceProperties( TOperator inOperator, PxU32 inStartIndex = 0 ) const @@ -2711,12 +2715,13 @@ template<> struct PxEnumTraits< physx::PxSolverType::Enum > { PxEnumTraits() : N inOperator( MaxBiasCoefficient, inStartIndex + 31 );; inOperator( ContactReportStreamBufferSize, inStartIndex + 32 );; inOperator( CcdMaxPasses, inStartIndex + 33 );; - inOperator( WakeCounterResetValue, inStartIndex + 34 );; - inOperator( SanityBounds, inStartIndex + 35 );; - inOperator( GpuDynamicsConfig, inStartIndex + 36 );; - inOperator( GpuMaxNumPartitions, inStartIndex + 37 );; - inOperator( GpuComputeVersion, inStartIndex + 38 );; - return 39 + inStartIndex; + inOperator( CcdThreshold, inStartIndex + 34 );; + inOperator( WakeCounterResetValue, inStartIndex + 35 );; + inOperator( SanityBounds, inStartIndex + 36 );; + inOperator( GpuDynamicsConfig, inStartIndex + 37 );; + inOperator( GpuMaxNumPartitions, inStartIndex + 38 );; + inOperator( GpuComputeVersion, inStartIndex + 39 );; + return 40 + inStartIndex; } }; template<> struct PxClassInfoTraits diff --git a/src/PhysX/physx/source/physxmetadata/core/include/PxMetaDataCompare.h b/src/PhysX/physx/source/physxmetadata/core/include/PxMetaDataCompare.h index bdadf8d63..96533d5ce 100644 --- a/src/PhysX/physx/source/physxmetadata/core/include/PxMetaDataCompare.h +++ b/src/PhysX/physx/source/physxmetadata/core/include/PxMetaDataCompare.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxmetadata/core/include/PxMetaDataCppPrefix.h b/src/PhysX/physx/source/physxmetadata/core/include/PxMetaDataCppPrefix.h index c6190e35f..327eb339b 100644 --- a/src/PhysX/physx/source/physxmetadata/core/include/PxMetaDataCppPrefix.h +++ b/src/PhysX/physx/source/physxmetadata/core/include/PxMetaDataCppPrefix.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxmetadata/core/include/PxMetaDataObjects.h b/src/PhysX/physx/source/physxmetadata/core/include/PxMetaDataObjects.h index b4cc65bdf..8884a7693 100644 --- a/src/PhysX/physx/source/physxmetadata/core/include/PxMetaDataObjects.h +++ b/src/PhysX/physx/source/physxmetadata/core/include/PxMetaDataObjects.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxmetadata/core/include/RepXMetaDataPropertyVisitor.h b/src/PhysX/physx/source/physxmetadata/core/include/RepXMetaDataPropertyVisitor.h index 062300b3b..0f13cb617 100644 --- a/src/PhysX/physx/source/physxmetadata/core/include/RepXMetaDataPropertyVisitor.h +++ b/src/PhysX/physx/source/physxmetadata/core/include/RepXMetaDataPropertyVisitor.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxmetadata/core/src/PxAutoGeneratedMetaDataObjects.cpp b/src/PhysX/physx/source/physxmetadata/core/src/PxAutoGeneratedMetaDataObjects.cpp index b23f1cf6f..b957290a4 100644 --- a/src/PhysX/physx/source/physxmetadata/core/src/PxAutoGeneratedMetaDataObjects.cpp +++ b/src/PhysX/physx/source/physxmetadata/core/src/PxAutoGeneratedMetaDataObjects.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -1046,6 +1046,8 @@ inline PxU32 getPxSceneDescContactReportStreamBufferSize( const PxSceneDesc* inO inline void setPxSceneDescContactReportStreamBufferSize( PxSceneDesc* inOwner, PxU32 inData) { inOwner->contactReportStreamBufferSize = inData; } inline PxU32 getPxSceneDescCcdMaxPasses( const PxSceneDesc* inOwner ) { return inOwner->ccdMaxPasses; } inline void setPxSceneDescCcdMaxPasses( PxSceneDesc* inOwner, PxU32 inData) { inOwner->ccdMaxPasses = inData; } +inline PxReal getPxSceneDescCcdThreshold( const PxSceneDesc* inOwner ) { return inOwner->ccdThreshold; } +inline void setPxSceneDescCcdThreshold( PxSceneDesc* inOwner, PxReal inData) { inOwner->ccdThreshold = inData; } inline PxReal getPxSceneDescWakeCounterResetValue( const PxSceneDesc* inOwner ) { return inOwner->wakeCounterResetValue; } inline void setPxSceneDescWakeCounterResetValue( PxSceneDesc* inOwner, PxReal inData) { inOwner->wakeCounterResetValue = inData; } inline PxBounds3 getPxSceneDescSanityBounds( const PxSceneDesc* inOwner ) { return inOwner->sanityBounds; } @@ -1091,6 +1093,7 @@ PX_PHYSX_CORE_API PxSceneDescGeneratedInfo::PxSceneDescGeneratedInfo() , MaxBiasCoefficient( "MaxBiasCoefficient", setPxSceneDescMaxBiasCoefficient, getPxSceneDescMaxBiasCoefficient ) , ContactReportStreamBufferSize( "ContactReportStreamBufferSize", setPxSceneDescContactReportStreamBufferSize, getPxSceneDescContactReportStreamBufferSize ) , CcdMaxPasses( "CcdMaxPasses", setPxSceneDescCcdMaxPasses, getPxSceneDescCcdMaxPasses ) + , CcdThreshold( "CcdThreshold", setPxSceneDescCcdThreshold, getPxSceneDescCcdThreshold ) , WakeCounterResetValue( "WakeCounterResetValue", setPxSceneDescWakeCounterResetValue, getPxSceneDescWakeCounterResetValue ) , SanityBounds( "SanityBounds", setPxSceneDescSanityBounds, getPxSceneDescSanityBounds ) , GpuDynamicsConfig( "GpuDynamicsConfig", setPxSceneDescGpuDynamicsConfig, getPxSceneDescGpuDynamicsConfig ) @@ -1131,6 +1134,7 @@ PX_PHYSX_CORE_API PxSceneDescGeneratedValues::PxSceneDescGeneratedValues( const ,MaxBiasCoefficient( inSource->maxBiasCoefficient ) ,ContactReportStreamBufferSize( inSource->contactReportStreamBufferSize ) ,CcdMaxPasses( inSource->ccdMaxPasses ) + ,CcdThreshold( inSource->ccdThreshold ) ,WakeCounterResetValue( inSource->wakeCounterResetValue ) ,SanityBounds( inSource->sanityBounds ) ,GpuDynamicsConfig( inSource->gpuDynamicsConfig ) diff --git a/src/PhysX/physx/source/physxmetadata/core/src/PxMetaDataObjects.cpp b/src/PhysX/physx/source/physxmetadata/core/src/PxMetaDataObjects.cpp index 2717e54ae..673de8d66 100644 --- a/src/PhysX/physx/source/physxmetadata/core/src/PxMetaDataObjects.cpp +++ b/src/PhysX/physx/source/physxmetadata/core/src/PxMetaDataObjects.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxmetadata/extensions/include/PxExtensionAutoGeneratedMetaDataObjectNames.h b/src/PhysX/physx/source/physxmetadata/extensions/include/PxExtensionAutoGeneratedMetaDataObjectNames.h index 1de957676..2cf4c6596 100644 --- a/src/PhysX/physx/source/physxmetadata/extensions/include/PxExtensionAutoGeneratedMetaDataObjectNames.h +++ b/src/PhysX/physx/source/physxmetadata/extensions/include/PxExtensionAutoGeneratedMetaDataObjectNames.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxmetadata/extensions/include/PxExtensionAutoGeneratedMetaDataObjects.h b/src/PhysX/physx/source/physxmetadata/extensions/include/PxExtensionAutoGeneratedMetaDataObjects.h index ed59c9e9f..ee7517986 100644 --- a/src/PhysX/physx/source/physxmetadata/extensions/include/PxExtensionAutoGeneratedMetaDataObjects.h +++ b/src/PhysX/physx/source/physxmetadata/extensions/include/PxExtensionAutoGeneratedMetaDataObjects.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxmetadata/extensions/include/PxExtensionMetaDataObjects.h b/src/PhysX/physx/source/physxmetadata/extensions/include/PxExtensionMetaDataObjects.h index 12be4126c..4450e7dff 100644 --- a/src/PhysX/physx/source/physxmetadata/extensions/include/PxExtensionMetaDataObjects.h +++ b/src/PhysX/physx/source/physxmetadata/extensions/include/PxExtensionMetaDataObjects.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxmetadata/extensions/src/PxExtensionAutoGeneratedMetaDataObjects.cpp b/src/PhysX/physx/source/physxmetadata/extensions/src/PxExtensionAutoGeneratedMetaDataObjects.cpp index 3a9f74b1d..66b555161 100644 --- a/src/PhysX/physx/source/physxmetadata/extensions/src/PxExtensionAutoGeneratedMetaDataObjects.cpp +++ b/src/PhysX/physx/source/physxmetadata/extensions/src/PxExtensionAutoGeneratedMetaDataObjects.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleComponents.cpp b/src/PhysX/physx/source/physxvehicle/src/PxVehicleComponents.cpp index 12f67eab3..57c2fe917 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleComponents.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleComponents.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleDefaults.h b/src/PhysX/physx/source/physxvehicle/src/PxVehicleDefaults.h index d823f380a..8d1f9ff85 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleDefaults.h +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleDefaults.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleDrive.cpp b/src/PhysX/physx/source/physxvehicle/src/PxVehicleDrive.cpp index e92047d90..9f0357e42 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleDrive.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleDrive.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleDrive4W.cpp b/src/PhysX/physx/source/physxvehicle/src/PxVehicleDrive4W.cpp index 7bd0ad2b2..081a48c27 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleDrive4W.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleDrive4W.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleDriveNW.cpp b/src/PhysX/physx/source/physxvehicle/src/PxVehicleDriveNW.cpp index 8ca91c6f9..4fe5162e2 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleDriveNW.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleDriveNW.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleDriveTank.cpp b/src/PhysX/physx/source/physxvehicle/src/PxVehicleDriveTank.cpp index 30cb281d8..fcfa6a89e 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleDriveTank.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleDriveTank.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleLinearMath.h b/src/PhysX/physx/source/physxvehicle/src/PxVehicleLinearMath.h index 84c08f726..00f6eb3fe 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleLinearMath.h +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleLinearMath.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleMetaData.cpp b/src/PhysX/physx/source/physxvehicle/src/PxVehicleMetaData.cpp index 172b5f123..e67b6df21 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleMetaData.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleMetaData.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleNoDrive.cpp b/src/PhysX/physx/source/physxvehicle/src/PxVehicleNoDrive.cpp index a8a87f5fb..a01c814ab 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleNoDrive.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleNoDrive.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleSDK.cpp b/src/PhysX/physx/source/physxvehicle/src/PxVehicleSDK.cpp index 18310f07e..e158c1aa1 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleSDK.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleSDK.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleSerialization.cpp b/src/PhysX/physx/source/physxvehicle/src/PxVehicleSerialization.cpp index dbb616c9b..276947e80 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleSerialization.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleSerialization.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleSerialization.h b/src/PhysX/physx/source/physxvehicle/src/PxVehicleSerialization.h index 8e5914887..4008869e5 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleSerialization.h +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleSerialization.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleSuspLimitConstraintShader.h b/src/PhysX/physx/source/physxvehicle/src/PxVehicleSuspLimitConstraintShader.h index d8864054d..484dc3bf1 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleSuspLimitConstraintShader.h +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleSuspLimitConstraintShader.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleSuspWheelTire4.cpp b/src/PhysX/physx/source/physxvehicle/src/PxVehicleSuspWheelTire4.cpp index 61b61f176..2fe5f22a9 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleSuspWheelTire4.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleSuspWheelTire4.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleSuspWheelTire4.h b/src/PhysX/physx/source/physxvehicle/src/PxVehicleSuspWheelTire4.h index 776bb345d..794927be8 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleSuspWheelTire4.h +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleSuspWheelTire4.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleTireFriction.cpp b/src/PhysX/physx/source/physxvehicle/src/PxVehicleTireFriction.cpp index 57a5df790..78b69adba 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleTireFriction.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleTireFriction.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleUpdate.cpp b/src/PhysX/physx/source/physxvehicle/src/PxVehicleUpdate.cpp index ebf51924a..571038e56 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleUpdate.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleUpdate.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/PxVehicleWheels.cpp b/src/PhysX/physx/source/physxvehicle/src/PxVehicleWheels.cpp index 1b2a67be3..fe08e5ebf 100644 --- a/src/PhysX/physx/source/physxvehicle/src/PxVehicleWheels.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/PxVehicleWheels.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/VehicleUtilControl.cpp b/src/PhysX/physx/source/physxvehicle/src/VehicleUtilControl.cpp index 380ae49b8..a43ca62a0 100644 --- a/src/PhysX/physx/source/physxvehicle/src/VehicleUtilControl.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/VehicleUtilControl.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/VehicleUtilSetup.cpp b/src/PhysX/physx/source/physxvehicle/src/VehicleUtilSetup.cpp index 32604c924..a34b73b81 100644 --- a/src/PhysX/physx/source/physxvehicle/src/VehicleUtilSetup.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/VehicleUtilSetup.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/VehicleUtilTelemetry.cpp b/src/PhysX/physx/source/physxvehicle/src/VehicleUtilTelemetry.cpp index 459d26a2f..47c1e3e33 100644 --- a/src/PhysX/physx/source/physxvehicle/src/VehicleUtilTelemetry.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/VehicleUtilTelemetry.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/physxmetadata/include/PxVehicleAutoGeneratedMetaDataObjectNames.h b/src/PhysX/physx/source/physxvehicle/src/physxmetadata/include/PxVehicleAutoGeneratedMetaDataObjectNames.h index 92096b073..f644c0eb9 100644 --- a/src/PhysX/physx/source/physxvehicle/src/physxmetadata/include/PxVehicleAutoGeneratedMetaDataObjectNames.h +++ b/src/PhysX/physx/source/physxvehicle/src/physxmetadata/include/PxVehicleAutoGeneratedMetaDataObjectNames.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/physxmetadata/include/PxVehicleAutoGeneratedMetaDataObjects.h b/src/PhysX/physx/source/physxvehicle/src/physxmetadata/include/PxVehicleAutoGeneratedMetaDataObjects.h index 22275e592..101b12fb4 100644 --- a/src/PhysX/physx/source/physxvehicle/src/physxmetadata/include/PxVehicleAutoGeneratedMetaDataObjects.h +++ b/src/PhysX/physx/source/physxvehicle/src/physxmetadata/include/PxVehicleAutoGeneratedMetaDataObjects.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/physxmetadata/include/PxVehicleMetaDataObjects.h b/src/PhysX/physx/source/physxvehicle/src/physxmetadata/include/PxVehicleMetaDataObjects.h index 35d2b4760..e73866807 100644 --- a/src/PhysX/physx/source/physxvehicle/src/physxmetadata/include/PxVehicleMetaDataObjects.h +++ b/src/PhysX/physx/source/physxvehicle/src/physxmetadata/include/PxVehicleMetaDataObjects.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/physxmetadata/src/PxVehicleAutoGeneratedMetaDataObjects.cpp b/src/PhysX/physx/source/physxvehicle/src/physxmetadata/src/PxVehicleAutoGeneratedMetaDataObjects.cpp index 7056b9989..0d967be4f 100644 --- a/src/PhysX/physx/source/physxvehicle/src/physxmetadata/src/PxVehicleAutoGeneratedMetaDataObjects.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/physxmetadata/src/PxVehicleAutoGeneratedMetaDataObjects.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/physxvehicle/src/physxmetadata/src/PxVehicleMetaDataObjects.cpp b/src/PhysX/physx/source/physxvehicle/src/physxmetadata/src/PxVehicleMetaDataObjects.cpp index b8b2bf691..a15d027e2 100644 --- a/src/PhysX/physx/source/physxvehicle/src/physxmetadata/src/PxVehicleMetaDataObjects.cpp +++ b/src/PhysX/physx/source/physxvehicle/src/physxmetadata/src/PxVehicleMetaDataObjects.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/include/PsPvd.h b/src/PhysX/physx/source/pvd/include/PsPvd.h index 62b476bd2..02bfa7c91 100644 --- a/src/PhysX/physx/source/pvd/include/PsPvd.h +++ b/src/PhysX/physx/source/pvd/include/PsPvd.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/include/PxProfileAllocatorWrapper.h b/src/PhysX/physx/source/pvd/include/PxProfileAllocatorWrapper.h index 160ddded4..b06e9d195 100644 --- a/src/PhysX/physx/source/pvd/include/PxProfileAllocatorWrapper.h +++ b/src/PhysX/physx/source/pvd/include/PxProfileAllocatorWrapper.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/include/PxPvdClient.h b/src/PhysX/physx/source/pvd/include/PxPvdClient.h index 6ba6a3011..4eec5a56d 100644 --- a/src/PhysX/physx/source/pvd/include/PxPvdClient.h +++ b/src/PhysX/physx/source/pvd/include/PxPvdClient.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/include/PxPvdDataStream.h b/src/PhysX/physx/source/pvd/include/PxPvdDataStream.h index c16d35b46..4128324de 100644 --- a/src/PhysX/physx/source/pvd/include/PxPvdDataStream.h +++ b/src/PhysX/physx/source/pvd/include/PxPvdDataStream.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDDATASTREAM_H #define PXPVDSDK_PXPVDDATASTREAM_H diff --git a/src/PhysX/physx/source/pvd/include/PxPvdDataStreamHelpers.h b/src/PhysX/physx/source/pvd/include/PxPvdDataStreamHelpers.h index 503491b0c..e46ef70e5 100644 --- a/src/PhysX/physx/source/pvd/include/PxPvdDataStreamHelpers.h +++ b/src/PhysX/physx/source/pvd/include/PxPvdDataStreamHelpers.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDDATASTREAMHELPERS_H #define PXPVDSDK_PXPVDDATASTREAMHELPERS_H diff --git a/src/PhysX/physx/source/pvd/include/PxPvdErrorCodes.h b/src/PhysX/physx/source/pvd/include/PxPvdErrorCodes.h index 8865b6aa6..59ea52cbe 100644 --- a/src/PhysX/physx/source/pvd/include/PxPvdErrorCodes.h +++ b/src/PhysX/physx/source/pvd/include/PxPvdErrorCodes.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDERRORCODES_H #define PXPVDSDK_PXPVDERRORCODES_H diff --git a/src/PhysX/physx/source/pvd/include/PxPvdObjectModelBaseTypes.h b/src/PhysX/physx/source/pvd/include/PxPvdObjectModelBaseTypes.h index 66384a726..1d8bf022a 100644 --- a/src/PhysX/physx/source/pvd/include/PxPvdObjectModelBaseTypes.h +++ b/src/PhysX/physx/source/pvd/include/PxPvdObjectModelBaseTypes.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDOBJECTMODELBASETYPES_H #define PXPVDSDK_PXPVDOBJECTMODELBASETYPES_H diff --git a/src/PhysX/physx/source/pvd/include/PxPvdRenderBuffer.h b/src/PhysX/physx/source/pvd/include/PxPvdRenderBuffer.h index ef851c596..d86cf3410 100644 --- a/src/PhysX/physx/source/pvd/include/PxPvdRenderBuffer.h +++ b/src/PhysX/physx/source/pvd/include/PxPvdRenderBuffer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/include/PxPvdUserRenderer.h b/src/PhysX/physx/source/pvd/include/PxPvdUserRenderer.h index 9598fe410..11269756b 100644 --- a/src/PhysX/physx/source/pvd/include/PxPvdUserRenderer.h +++ b/src/PhysX/physx/source/pvd/include/PxPvdUserRenderer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDUSERRENDERER_H #define PXPVDSDK_PXPVDUSERRENDERER_H diff --git a/src/PhysX/physx/source/pvd/src/PxProfileContextProvider.h b/src/PhysX/physx/source/pvd/src/PxProfileContextProvider.h index 5ac872652..7b04bb944 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileContextProvider.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileContextProvider.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPROFILECONTEXTPROVIDER_H #define PXPVDSDK_PXPROFILECONTEXTPROVIDER_H diff --git a/src/PhysX/physx/source/pvd/src/PxProfileContextProviderImpl.h b/src/PhysX/physx/source/pvd/src/PxProfileContextProviderImpl.h index fdf68ec72..7ac44f58e 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileContextProviderImpl.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileContextProviderImpl.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPROFILECONTEXTPROVIDERIMPL_H #define PXPVDSDK_PXPROFILECONTEXTPROVIDERIMPL_H diff --git a/src/PhysX/physx/source/pvd/src/PxProfileDataBuffer.h b/src/PhysX/physx/source/pvd/src/PxProfileDataBuffer.h index 9b8d4c0cf..998ae05cf 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileDataBuffer.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileDataBuffer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxProfileDataParsing.h b/src/PhysX/physx/source/pvd/src/PxProfileDataParsing.h index a3e87860b..8d5a8c245 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileDataParsing.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileDataParsing.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxProfileEventBuffer.h b/src/PhysX/physx/source/pvd/src/PxProfileEventBuffer.h index 00c82db80..10f6414ad 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileEventBuffer.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileEventBuffer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxProfileEventBufferAtomic.h b/src/PhysX/physx/source/pvd/src/PxProfileEventBufferAtomic.h index 0d252f23e..f965ec28b 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileEventBufferAtomic.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileEventBufferAtomic.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxProfileEventBufferClient.h b/src/PhysX/physx/source/pvd/src/PxProfileEventBufferClient.h index 869fdbd36..970209926 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileEventBufferClient.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileEventBufferClient.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPROFILEEVENTBUFFERCLIENT_H #define PXPVDSDK_PXPROFILEEVENTBUFFERCLIENT_H diff --git a/src/PhysX/physx/source/pvd/src/PxProfileEventBufferClientManager.h b/src/PhysX/physx/source/pvd/src/PxProfileEventBufferClientManager.h index 86ed6fb24..3f822aca8 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileEventBufferClientManager.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileEventBufferClientManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPROFILEEVENTBUFFERCLIENTMANAGER_H #define PXPVDSDK_PXPROFILEEVENTBUFFERCLIENTMANAGER_H diff --git a/src/PhysX/physx/source/pvd/src/PxProfileEventId.h b/src/PhysX/physx/source/pvd/src/PxProfileEventId.h index 260abd55d..21711dbba 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileEventId.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileEventId.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPROFILEEVENTID_H #define PXPVDSDK_PXPROFILEEVENTID_H diff --git a/src/PhysX/physx/source/pvd/src/PxProfileEventImpl.cpp b/src/PhysX/physx/source/pvd/src/PxProfileEventImpl.cpp index 8b037e8e2..9f18b4631 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileEventImpl.cpp +++ b/src/PhysX/physx/source/pvd/src/PxProfileEventImpl.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #include "PxProfileEventBuffer.h" #include "PxProfileZoneImpl.h" diff --git a/src/PhysX/physx/source/pvd/src/PxProfileEventMutex.h b/src/PhysX/physx/source/pvd/src/PxProfileEventMutex.h index 287cb57e2..fa58765a0 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileEventMutex.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileEventMutex.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPROFILEEVENTMUTEX_H diff --git a/src/PhysX/physx/source/pvd/src/PxProfileEventNames.h b/src/PhysX/physx/source/pvd/src/PxProfileEventNames.h index 508252b9e..c7b6e6a44 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileEventNames.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileEventNames.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPROFILEEVENTNAMES_H #define PXPVDSDK_PXPROFILEEVENTNAMES_H diff --git a/src/PhysX/physx/source/pvd/src/PxProfileEventSender.h b/src/PhysX/physx/source/pvd/src/PxProfileEventSender.h index ee80096b6..effb0463b 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileEventSender.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileEventSender.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPROFILEEVENTSENDER_H #define PXPVDSDK_PXPROFILEEVENTSENDER_H diff --git a/src/PhysX/physx/source/pvd/src/PxProfileEventSerialization.h b/src/PhysX/physx/source/pvd/src/PxProfileEventSerialization.h index ca15a019e..17f59496f 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileEventSerialization.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileEventSerialization.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxProfileEvents.h b/src/PhysX/physx/source/pvd/src/PxProfileEvents.h index 9bf02ed8c..69f340d8c 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileEvents.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileEvents.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPROFILEEVENTS_H #define PXPVDSDK_PXPROFILEEVENTS_H diff --git a/src/PhysX/physx/source/pvd/src/PxProfileMemory.h b/src/PhysX/physx/source/pvd/src/PxProfileMemory.h index 604d5091e..0f69777d3 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileMemory.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileMemory.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxProfileMemoryBuffer.h b/src/PhysX/physx/source/pvd/src/PxProfileMemoryBuffer.h index ca986aad7..39b01b489 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileMemoryBuffer.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileMemoryBuffer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxProfileMemoryEventBuffer.h b/src/PhysX/physx/source/pvd/src/PxProfileMemoryEventBuffer.h index e3784f5ae..1a5804147 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileMemoryEventBuffer.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileMemoryEventBuffer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxProfileMemoryEvents.h b/src/PhysX/physx/source/pvd/src/PxProfileMemoryEvents.h index 4a206c70d..35bedb05b 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileMemoryEvents.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileMemoryEvents.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxProfileScopedEvent.h b/src/PhysX/physx/source/pvd/src/PxProfileScopedEvent.h index fe53314dd..68c89fa85 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileScopedEvent.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileScopedEvent.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPROFILESCOPEDEVENT_H #define PXPVDSDK_PXPROFILESCOPEDEVENT_H diff --git a/src/PhysX/physx/source/pvd/src/PxProfileScopedMutexLock.h b/src/PhysX/physx/source/pvd/src/PxProfileScopedMutexLock.h index dac1e4cb0..2f65b50e0 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileScopedMutexLock.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileScopedMutexLock.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxProfileZoneImpl.h b/src/PhysX/physx/source/pvd/src/PxProfileZoneImpl.h index cb768367b..b0e8ec799 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileZoneImpl.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileZoneImpl.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxProfileZoneManager.h b/src/PhysX/physx/source/pvd/src/PxProfileZoneManager.h index 5a1f37076..632545588 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileZoneManager.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileZoneManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPROFILEZONEMANAGER_H #define PXPVDSDK_PXPROFILEZONEMANAGER_H diff --git a/src/PhysX/physx/source/pvd/src/PxProfileZoneManagerImpl.h b/src/PhysX/physx/source/pvd/src/PxProfileZoneManagerImpl.h index a336a763c..163ba36b9 100644 --- a/src/PhysX/physx/source/pvd/src/PxProfileZoneManagerImpl.h +++ b/src/PhysX/physx/source/pvd/src/PxProfileZoneManagerImpl.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxPvd.cpp b/src/PhysX/physx/source/pvd/src/PxPvd.cpp index 7873e373a..eea1c05c7 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvd.cpp +++ b/src/PhysX/physx/source/pvd/src/PxPvd.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxPvdBits.h b/src/PhysX/physx/source/pvd/src/PxPvdBits.h index 2d2b93a7a..f0e6035d3 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdBits.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdBits.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDBITS_H #define PXPVDSDK_PXPVDBITS_H diff --git a/src/PhysX/physx/source/pvd/src/PxPvdByteStreams.h b/src/PhysX/physx/source/pvd/src/PxPvdByteStreams.h index 0a3d3fccc..e5dd84ee6 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdByteStreams.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdByteStreams.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDBYTESTREAMS_H #define PXPVDSDK_PXPVDBYTESTREAMS_H diff --git a/src/PhysX/physx/source/pvd/src/PxPvdCommStreamEventSink.h b/src/PhysX/physx/source/pvd/src/PxPvdCommStreamEventSink.h index d0b843680..7f66f98ac 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdCommStreamEventSink.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdCommStreamEventSink.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDCOMMSTREAMEVENTSINK_H #define PXPVDSDK_PXPVDCOMMSTREAMEVENTSINK_H diff --git a/src/PhysX/physx/source/pvd/src/PxPvdCommStreamEvents.h b/src/PhysX/physx/source/pvd/src/PxPvdCommStreamEvents.h index 89361be66..b592361bb 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdCommStreamEvents.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdCommStreamEvents.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDCOMMSTREAMEVENTS_H #define PXPVDSDK_PXPVDCOMMSTREAMEVENTS_H diff --git a/src/PhysX/physx/source/pvd/src/PxPvdCommStreamTypes.h b/src/PhysX/physx/source/pvd/src/PxPvdCommStreamTypes.h index b57075086..3799dc1ad 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdCommStreamTypes.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdCommStreamTypes.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDCOMMSTREAMTYPES_H #define PXPVDSDK_PXPVDCOMMSTREAMTYPES_H diff --git a/src/PhysX/physx/source/pvd/src/PxPvdDataStream.cpp b/src/PhysX/physx/source/pvd/src/PxPvdDataStream.cpp index 5195c7d44..fdf61527f 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdDataStream.cpp +++ b/src/PhysX/physx/source/pvd/src/PxPvdDataStream.cpp @@ -23,8 +23,9 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. +#include "foundation/PxAssert.h" #include "PxPvdCommStreamEventSink.h" #include "PxPvdDataStreamHelpers.h" #include "PxPvdObjectModelInternalTypes.h" diff --git a/src/PhysX/physx/source/pvd/src/PxPvdDefaultFileTransport.cpp b/src/PhysX/physx/source/pvd/src/PxPvdDefaultFileTransport.cpp index ba939b045..4a1a71e48 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdDefaultFileTransport.cpp +++ b/src/PhysX/physx/source/pvd/src/PxPvdDefaultFileTransport.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxPvdDefaultFileTransport.h b/src/PhysX/physx/source/pvd/src/PxPvdDefaultFileTransport.h index e64b4a0a7..a437120d8 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdDefaultFileTransport.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdDefaultFileTransport.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxPvdDefaultSocketTransport.cpp b/src/PhysX/physx/source/pvd/src/PxPvdDefaultSocketTransport.cpp index 3ed5d03d7..0b446e06d 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdDefaultSocketTransport.cpp +++ b/src/PhysX/physx/source/pvd/src/PxPvdDefaultSocketTransport.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxPvdDefaultSocketTransport.h b/src/PhysX/physx/source/pvd/src/PxPvdDefaultSocketTransport.h index d0d7d4b2a..2b18a25f7 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdDefaultSocketTransport.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdDefaultSocketTransport.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxPvdFoundation.h b/src/PhysX/physx/source/pvd/src/PxPvdFoundation.h index 52feeee57..db880eec8 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdFoundation.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdFoundation.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDFOUNDATION_H #define PXPVDSDK_PXPVDFOUNDATION_H diff --git a/src/PhysX/physx/source/pvd/src/PxPvdImpl.cpp b/src/PhysX/physx/source/pvd/src/PxPvdImpl.cpp index d6374584e..26929e8d0 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdImpl.cpp +++ b/src/PhysX/physx/source/pvd/src/PxPvdImpl.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxPvdImpl.h b/src/PhysX/physx/source/pvd/src/PxPvdImpl.h index ab19343d9..cf1fcf2f5 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdImpl.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdImpl.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxPvdInternalByteStreams.h b/src/PhysX/physx/source/pvd/src/PxPvdInternalByteStreams.h index 71bdcedd1..a83dc1504 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdInternalByteStreams.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdInternalByteStreams.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDINTERNALBYTESTREAMS_H #define PXPVDSDK_PXPVDINTERNALBYTESTREAMS_H diff --git a/src/PhysX/physx/source/pvd/src/PxPvdMarshalling.h b/src/PhysX/physx/source/pvd/src/PxPvdMarshalling.h index 8c80ddc27..b27aa1cb6 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdMarshalling.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdMarshalling.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDMARSHALLING_H #define PXPVDSDK_PXPVDMARSHALLING_H diff --git a/src/PhysX/physx/source/pvd/src/PxPvdMemClient.cpp b/src/PhysX/physx/source/pvd/src/PxPvdMemClient.cpp index f6e201982..de1bb9c7a 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdMemClient.cpp +++ b/src/PhysX/physx/source/pvd/src/PxPvdMemClient.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxPvdMemClient.h b/src/PhysX/physx/source/pvd/src/PxPvdMemClient.h index de4c202e8..1fd647156 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdMemClient.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdMemClient.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxPvdObjectModelInternalTypeDefs.h b/src/PhysX/physx/source/pvd/src/PxPvdObjectModelInternalTypeDefs.h index b273ca0f6..c1fb5b76a 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdObjectModelInternalTypeDefs.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdObjectModelInternalTypeDefs.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #define THERE_IS_NO_INCLUDE_GUARD_HERE_FOR_A_REASON diff --git a/src/PhysX/physx/source/pvd/src/PxPvdObjectModelInternalTypes.h b/src/PhysX/physx/source/pvd/src/PxPvdObjectModelInternalTypes.h index bf9b6870b..316a492b9 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdObjectModelInternalTypes.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdObjectModelInternalTypes.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDOBJECTMODELINTERNALTYPES_H #define PXPVDSDK_PXPVDOBJECTMODELINTERNALTYPES_H diff --git a/src/PhysX/physx/source/pvd/src/PxPvdObjectModelMetaData.cpp b/src/PhysX/physx/source/pvd/src/PxPvdObjectModelMetaData.cpp index 6d5635240..bc4d41015 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdObjectModelMetaData.cpp +++ b/src/PhysX/physx/source/pvd/src/PxPvdObjectModelMetaData.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #include "PxPvdObjectModelInternalTypes.h" #include "PxPvdObjectModelMetaData.h" diff --git a/src/PhysX/physx/source/pvd/src/PxPvdObjectModelMetaData.h b/src/PhysX/physx/source/pvd/src/PxPvdObjectModelMetaData.h index eb2baea83..56ea53501 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdObjectModelMetaData.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdObjectModelMetaData.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDOBJECTMODELMETADATA_H #define PXPVDSDK_PXPVDOBJECTMODELMETADATA_H diff --git a/src/PhysX/physx/source/pvd/src/PxPvdObjectRegistrar.cpp b/src/PhysX/physx/source/pvd/src/PxPvdObjectRegistrar.cpp index 3bdfaaf7f..a0b8c34f1 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdObjectRegistrar.cpp +++ b/src/PhysX/physx/source/pvd/src/PxPvdObjectRegistrar.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxPvdObjectRegistrar.h b/src/PhysX/physx/source/pvd/src/PxPvdObjectRegistrar.h index 5cf0e8549..59c41446d 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdObjectRegistrar.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdObjectRegistrar.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxPvdProfileZone.h b/src/PhysX/physx/source/pvd/src/PxPvdProfileZone.h index 555b64acd..238f52151 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdProfileZone.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdProfileZone.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDPROFILEZONE_H #define PXPVDSDK_PXPVDPROFILEZONE_H diff --git a/src/PhysX/physx/source/pvd/src/PxPvdProfileZoneClient.cpp b/src/PhysX/physx/source/pvd/src/PxPvdProfileZoneClient.cpp index ce22db789..1e3c10004 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdProfileZoneClient.cpp +++ b/src/PhysX/physx/source/pvd/src/PxPvdProfileZoneClient.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxPvdProfileZoneClient.h b/src/PhysX/physx/source/pvd/src/PxPvdProfileZoneClient.h index 4438b8101..0d9c00727 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdProfileZoneClient.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdProfileZoneClient.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/pvd/src/PxPvdUserRenderImpl.h b/src/PhysX/physx/source/pvd/src/PxPvdUserRenderImpl.h index 70b858400..636fa511c 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdUserRenderImpl.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdUserRenderImpl.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXPVDSDK_PXPVDUSERRENDERIMPL_H #define PXPVDSDK_PXPVDUSERRENDERIMPL_H diff --git a/src/PhysX/physx/source/pvd/src/PxPvdUserRenderTypes.h b/src/PhysX/physx/source/pvd/src/PxPvdUserRenderTypes.h index f313e66f0..de92be231 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdUserRenderTypes.h +++ b/src/PhysX/physx/source/pvd/src/PxPvdUserRenderTypes.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #define THERE_IS_NO_INCLUDE_GUARD_HERE_FOR_A_REASON #ifndef DECLARE_PVD_IMMEDIATE_RENDER_TYPE_NO_COMMA diff --git a/src/PhysX/physx/source/pvd/src/PxPvdUserRenderer.cpp b/src/PhysX/physx/source/pvd/src/PxPvdUserRenderer.cpp index 98c12eba9..7f1ad66d6 100644 --- a/src/PhysX/physx/source/pvd/src/PxPvdUserRenderer.cpp +++ b/src/PhysX/physx/source/pvd/src/PxPvdUserRenderer.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #include "PxPvdUserRenderImpl.h" #include "PxPvdInternalByteStreams.h" diff --git a/src/PhysX/physx/source/scenequery/include/SqPruner.h b/src/PhysX/physx/source/scenequery/include/SqPruner.h index 0a42b2e6b..0cb09cde5 100644 --- a/src/PhysX/physx/source/scenequery/include/SqPruner.h +++ b/src/PhysX/physx/source/scenequery/include/SqPruner.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/include/SqPrunerMergeData.h b/src/PhysX/physx/source/scenequery/include/SqPrunerMergeData.h index 5e1a9e0a5..9050d460c 100644 --- a/src/PhysX/physx/source/scenequery/include/SqPrunerMergeData.h +++ b/src/PhysX/physx/source/scenequery/include/SqPrunerMergeData.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/include/SqPruningStructure.h b/src/PhysX/physx/source/scenequery/include/SqPruningStructure.h index 259a28daa..b3bc07f7c 100644 --- a/src/PhysX/physx/source/scenequery/include/SqPruningStructure.h +++ b/src/PhysX/physx/source/scenequery/include/SqPruningStructure.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/include/SqSceneQueryManager.h b/src/PhysX/physx/source/scenequery/include/SqSceneQueryManager.h index 977eb4092..df62add25 100644 --- a/src/PhysX/physx/source/scenequery/include/SqSceneQueryManager.h +++ b/src/PhysX/physx/source/scenequery/include/SqSceneQueryManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqAABBPruner.cpp b/src/PhysX/physx/source/scenequery/src/SqAABBPruner.cpp index f61611555..116bd1017 100644 --- a/src/PhysX/physx/source/scenequery/src/SqAABBPruner.cpp +++ b/src/PhysX/physx/source/scenequery/src/SqAABBPruner.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqAABBPruner.h b/src/PhysX/physx/source/scenequery/src/SqAABBPruner.h index f575443db..f60c5d596 100644 --- a/src/PhysX/physx/source/scenequery/src/SqAABBPruner.h +++ b/src/PhysX/physx/source/scenequery/src/SqAABBPruner.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqAABBTree.cpp b/src/PhysX/physx/source/scenequery/src/SqAABBTree.cpp index 8faec8104..a0c4bba6d 100644 --- a/src/PhysX/physx/source/scenequery/src/SqAABBTree.cpp +++ b/src/PhysX/physx/source/scenequery/src/SqAABBTree.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqAABBTree.h b/src/PhysX/physx/source/scenequery/src/SqAABBTree.h index bde284d65..7480e16ec 100644 --- a/src/PhysX/physx/source/scenequery/src/SqAABBTree.h +++ b/src/PhysX/physx/source/scenequery/src/SqAABBTree.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqAABBTreeUpdateMap.cpp b/src/PhysX/physx/source/scenequery/src/SqAABBTreeUpdateMap.cpp index e7512aaa6..019536464 100644 --- a/src/PhysX/physx/source/scenequery/src/SqAABBTreeUpdateMap.cpp +++ b/src/PhysX/physx/source/scenequery/src/SqAABBTreeUpdateMap.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqAABBTreeUpdateMap.h b/src/PhysX/physx/source/scenequery/src/SqAABBTreeUpdateMap.h index 7d1879c92..1ea5401b8 100644 --- a/src/PhysX/physx/source/scenequery/src/SqAABBTreeUpdateMap.h +++ b/src/PhysX/physx/source/scenequery/src/SqAABBTreeUpdateMap.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqBounds.cpp b/src/PhysX/physx/source/scenequery/src/SqBounds.cpp index a0f9cc0fa..a8489d6ec 100644 --- a/src/PhysX/physx/source/scenequery/src/SqBounds.cpp +++ b/src/PhysX/physx/source/scenequery/src/SqBounds.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqBounds.h b/src/PhysX/physx/source/scenequery/src/SqBounds.h index 592d13098..94c1297f5 100644 --- a/src/PhysX/physx/source/scenequery/src/SqBounds.h +++ b/src/PhysX/physx/source/scenequery/src/SqBounds.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqBucketPruner.cpp b/src/PhysX/physx/source/scenequery/src/SqBucketPruner.cpp index b36d60432..ac5328209 100644 --- a/src/PhysX/physx/source/scenequery/src/SqBucketPruner.cpp +++ b/src/PhysX/physx/source/scenequery/src/SqBucketPruner.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqBucketPruner.h b/src/PhysX/physx/source/scenequery/src/SqBucketPruner.h index e117500be..3fa517303 100644 --- a/src/PhysX/physx/source/scenequery/src/SqBucketPruner.h +++ b/src/PhysX/physx/source/scenequery/src/SqBucketPruner.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqCompoundPruner.cpp b/src/PhysX/physx/source/scenequery/src/SqCompoundPruner.cpp index 214633c7b..425ad3774 100644 --- a/src/PhysX/physx/source/scenequery/src/SqCompoundPruner.cpp +++ b/src/PhysX/physx/source/scenequery/src/SqCompoundPruner.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqCompoundPruner.h b/src/PhysX/physx/source/scenequery/src/SqCompoundPruner.h index 2c2663f62..4038e2acc 100644 --- a/src/PhysX/physx/source/scenequery/src/SqCompoundPruner.h +++ b/src/PhysX/physx/source/scenequery/src/SqCompoundPruner.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqCompoundPruningPool.cpp b/src/PhysX/physx/source/scenequery/src/SqCompoundPruningPool.cpp index be67e1a9e..93bb761df 100644 --- a/src/PhysX/physx/source/scenequery/src/SqCompoundPruningPool.cpp +++ b/src/PhysX/physx/source/scenequery/src/SqCompoundPruningPool.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqCompoundPruningPool.h b/src/PhysX/physx/source/scenequery/src/SqCompoundPruningPool.h index 059273e02..a55077c8e 100644 --- a/src/PhysX/physx/source/scenequery/src/SqCompoundPruningPool.h +++ b/src/PhysX/physx/source/scenequery/src/SqCompoundPruningPool.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqExtendedBucketPruner.cpp b/src/PhysX/physx/source/scenequery/src/SqExtendedBucketPruner.cpp index 136652d58..723c28cbd 100644 --- a/src/PhysX/physx/source/scenequery/src/SqExtendedBucketPruner.cpp +++ b/src/PhysX/physx/source/scenequery/src/SqExtendedBucketPruner.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqExtendedBucketPruner.h b/src/PhysX/physx/source/scenequery/src/SqExtendedBucketPruner.h index 8ebea6d66..e96ebc451 100644 --- a/src/PhysX/physx/source/scenequery/src/SqExtendedBucketPruner.h +++ b/src/PhysX/physx/source/scenequery/src/SqExtendedBucketPruner.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPruner.cpp b/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPruner.cpp index 1a90b2b9a..ad10d2d05 100644 --- a/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPruner.cpp +++ b/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPruner.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPruner.h b/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPruner.h index bb29d63d0..42f705667 100644 --- a/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPruner.h +++ b/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPruner.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPrunerCore.cpp b/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPrunerCore.cpp index cf9e17420..9c41c8245 100644 --- a/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPrunerCore.cpp +++ b/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPrunerCore.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPrunerCore.h b/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPrunerCore.h index 4308a5e02..247df19d3 100644 --- a/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPrunerCore.h +++ b/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBPrunerCore.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBTree.cpp b/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBTree.cpp index a1d1fd43b..82be0ab19 100644 --- a/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBTree.cpp +++ b/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBTree.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBTree.h b/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBTree.h index 6f5602739..149e3983d 100644 --- a/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBTree.h +++ b/src/PhysX/physx/source/scenequery/src/SqIncrementalAABBTree.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqMetaData.cpp b/src/PhysX/physx/source/scenequery/src/SqMetaData.cpp index e5a57940f..56a882c05 100644 --- a/src/PhysX/physx/source/scenequery/src/SqMetaData.cpp +++ b/src/PhysX/physx/source/scenequery/src/SqMetaData.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqPruningPool.cpp b/src/PhysX/physx/source/scenequery/src/SqPruningPool.cpp index 327d5ebf0..ecf612b8c 100644 --- a/src/PhysX/physx/source/scenequery/src/SqPruningPool.cpp +++ b/src/PhysX/physx/source/scenequery/src/SqPruningPool.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqPruningPool.h b/src/PhysX/physx/source/scenequery/src/SqPruningPool.h index 9886f8a23..dbca5480b 100644 --- a/src/PhysX/physx/source/scenequery/src/SqPruningPool.h +++ b/src/PhysX/physx/source/scenequery/src/SqPruningPool.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqPruningStructure.cpp b/src/PhysX/physx/source/scenequery/src/SqPruningStructure.cpp index 2d4efc342..a300d932b 100644 --- a/src/PhysX/physx/source/scenequery/src/SqPruningStructure.cpp +++ b/src/PhysX/physx/source/scenequery/src/SqPruningStructure.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqSceneQueryManager.cpp b/src/PhysX/physx/source/scenequery/src/SqSceneQueryManager.cpp index 9449ac4c1..28909db85 100644 --- a/src/PhysX/physx/source/scenequery/src/SqSceneQueryManager.cpp +++ b/src/PhysX/physx/source/scenequery/src/SqSceneQueryManager.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/scenequery/src/SqTypedef.h b/src/PhysX/physx/source/scenequery/src/SqTypedef.h index 0bcb5e0f1..a0da0c1b2 100644 --- a/src/PhysX/physx/source/scenequery/src/SqTypedef.h +++ b/src/PhysX/physx/source/scenequery/src/SqTypedef.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/include/ScActorCore.h b/src/PhysX/physx/source/simulationcontroller/include/ScActorCore.h index 3dc4f4101..560a6ff0d 100644 --- a/src/PhysX/physx/source/simulationcontroller/include/ScActorCore.h +++ b/src/PhysX/physx/source/simulationcontroller/include/ScActorCore.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/include/ScArticulationCore.h b/src/PhysX/physx/source/simulationcontroller/include/ScArticulationCore.h index 5f02cfeb7..888f649d0 100644 --- a/src/PhysX/physx/source/simulationcontroller/include/ScArticulationCore.h +++ b/src/PhysX/physx/source/simulationcontroller/include/ScArticulationCore.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -45,7 +45,6 @@ namespace IG class NodeIndex; } - namespace Sc { typedef Dy::FsData ArticulationDriveCache; @@ -78,39 +77,38 @@ namespace Sc //--------------------------------------------------------------------------------- // External API //--------------------------------------------------------------------------------- - PxU32 getInternalDriveIterations() const; - void setInternalDriveIterations(const PxU32 v); + PX_FORCE_INLINE PxU32 getInternalDriveIterations() const { return mCore.internalDriveIterations; } + PX_FORCE_INLINE void setInternalDriveIterations(const PxU32 v) { mCore.internalDriveIterations = v; } - PxU32 getExternalDriveIterations() const; - void setExternalDriveIterations(const PxU32 v); + PX_FORCE_INLINE PxU32 getExternalDriveIterations() const { return mCore.externalDriveIterations; } + PX_FORCE_INLINE void setExternalDriveIterations(const PxU32 v) { mCore.externalDriveIterations = v; } - PxU32 getMaxProjectionIterations() const; - void setMaxProjectionIterations(const PxU32 v); + PX_FORCE_INLINE PxU32 getMaxProjectionIterations() const { return mCore.maxProjectionIterations; } + PX_FORCE_INLINE void setMaxProjectionIterations(const PxU32 v) { mCore.maxProjectionIterations = v; } - PxReal getSeparationTolerance() const; - void setSeparationTolerance(const PxReal v); + PX_FORCE_INLINE PxReal getSeparationTolerance() const { return mCore.separationTolerance; } + PX_FORCE_INLINE void setSeparationTolerance(const PxReal v) { mCore.separationTolerance = v; } - PxReal getSleepThreshold() const; - void setSleepThreshold(const PxReal v); + PX_FORCE_INLINE PxReal getSleepThreshold() const { return mCore.sleepThreshold; } + PX_FORCE_INLINE void setSleepThreshold(const PxReal v) { mCore.sleepThreshold = v; } - PxReal getFreezeThreshold() const; - void setFreezeThreshold(const PxReal v); + PX_FORCE_INLINE PxReal getFreezeThreshold() const { return mCore.freezeThreshold; } + PX_FORCE_INLINE void setFreezeThreshold(const PxReal v) { mCore.freezeThreshold = v; } - PxReal getWakeCounter() const; + PX_FORCE_INLINE PxU16 getSolverIterationCounts() const { return mCore.solverIterationCounts; } + PX_FORCE_INLINE void setSolverIterationCounts(PxU16 c) { mCore.solverIterationCounts = c; } + + PX_FORCE_INLINE PxReal getWakeCounter() const { return mCore.wakeCounter; } + PX_FORCE_INLINE void setWakeCounterInternal(const PxReal v) { mCore.wakeCounter = v; } void setWakeCounter(const PxReal v); - void setWakeCounterInternal(const PxReal v); bool isSleeping() const; void wakeUp(PxReal wakeCounter); void putToSleep(); - PxU16 getSolverIterationCounts() const; - void setSolverIterationCounts(PxU16 c); - PxArticulation* getPxArticulation(); const PxArticulation* getPxArticulation() const; - //--------------------------------------------------------------------------------- // Drive Cache API //--------------------------------------------------------------------------------- @@ -196,30 +194,25 @@ namespace Sc PX_FORCE_INLINE const Dy::ArticulationCore& getCore() { return mCore; } static PX_FORCE_INLINE ArticulationCore& getArticulationCore(ArticulationCore& core) - { - size_t offset = PX_OFFSET_OF(ArticulationCore, mCore); - return *reinterpret_cast(reinterpret_cast(&core) - offset); - } + { + const size_t offset = PX_OFFSET_OF(ArticulationCore, mCore); + return *reinterpret_cast(reinterpret_cast(&core) - offset); + } - PX_INLINE PxArticulationBase::Enum getArticulationType() const { return PxArticulationBase::Enum(mType); } - PX_INLINE void setArticulationType(PxArticulationBase::Enum type) { mType = type; } + PX_INLINE PxArticulationBase::Enum getArticulationType() const { return PxArticulationBase::Enum(mType); } + PX_INLINE void setArticulationType(PxArticulationBase::Enum type) { mType = type; } + IG::NodeIndex getIslandNodeIndex() const; - IG::NodeIndex getIslandNodeIndex() const; - - void setGlobalPose(); - - void setDirty(const bool dirty); - + void setGlobalPose(); + void setDirty(const bool dirty); private: - ArticulationSim* mSim; - Dy::ArticulationCore mCore; - PxU32 mType; + ArticulationSim* mSim; + Dy::ArticulationCore mCore; + PxU32 mType; }; - - } // namespace Sc } diff --git a/src/PhysX/physx/source/simulationcontroller/include/ScArticulationJointCore.h b/src/PhysX/physx/source/simulationcontroller/include/ScArticulationJointCore.h index fbb96b8d0..6f4115a6f 100644 --- a/src/PhysX/physx/source/simulationcontroller/include/ScArticulationJointCore.h +++ b/src/PhysX/physx/source/simulationcontroller/include/ScArticulationJointCore.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/include/ScBodyCore.h b/src/PhysX/physx/source/simulationcontroller/include/ScBodyCore.h index f8592b67f..c643ca8dd 100644 --- a/src/PhysX/physx/source/simulationcontroller/include/ScBodyCore.h +++ b/src/PhysX/physx/source/simulationcontroller/include/ScBodyCore.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -71,7 +71,9 @@ namespace Sc BodyCore(const PxEMPTY) : RigidCore(PxEmpty), mCore(PxEmpty), mSimStateData(NULL) {} static void getBinaryMetaData(PxOutputStream& stream); void disableInternalCaching(bool disable); - size_t getSerialCore(PxsBodyCore& serialCore); + void restoreDynamicData(); + void backupDynamicData(); + //~PX_SERIALIZATION BodyCore(PxActorType::Enum type, const PxTransform& bodyPose); /*virtual*/ ~BodyCore(); diff --git a/src/PhysX/physx/source/simulationcontroller/include/ScConstraintCore.h b/src/PhysX/physx/source/simulationcontroller/include/ScConstraintCore.h index 5520b6497..484703ed3 100644 --- a/src/PhysX/physx/source/simulationcontroller/include/ScConstraintCore.h +++ b/src/PhysX/physx/source/simulationcontroller/include/ScConstraintCore.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/include/ScIterators.h b/src/PhysX/physx/source/simulationcontroller/include/ScIterators.h index 30905476f..d8b77350c 100644 --- a/src/PhysX/physx/source/simulationcontroller/include/ScIterators.h +++ b/src/PhysX/physx/source/simulationcontroller/include/ScIterators.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/include/ScMaterialCore.h b/src/PhysX/physx/source/simulationcontroller/include/ScMaterialCore.h index 16d033448..2279279c9 100644 --- a/src/PhysX/physx/source/simulationcontroller/include/ScMaterialCore.h +++ b/src/PhysX/physx/source/simulationcontroller/include/ScMaterialCore.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/include/ScPhysics.h b/src/PhysX/physx/source/simulationcontroller/include/ScPhysics.h index 465f107fd..c6a61606e 100644 --- a/src/PhysX/physx/source/simulationcontroller/include/ScPhysics.h +++ b/src/PhysX/physx/source/simulationcontroller/include/ScPhysics.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/include/ScRigidCore.h b/src/PhysX/physx/source/simulationcontroller/include/ScRigidCore.h index 732b9f97b..5f7a68c0b 100644 --- a/src/PhysX/physx/source/simulationcontroller/include/ScRigidCore.h +++ b/src/PhysX/physx/source/simulationcontroller/include/ScRigidCore.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/include/ScScene.h b/src/PhysX/physx/source/simulationcontroller/include/ScScene.h index 912b2c897..95bc4d58f 100644 --- a/src/PhysX/physx/source/simulationcontroller/include/ScScene.h +++ b/src/PhysX/physx/source/simulationcontroller/include/ScScene.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -317,8 +317,8 @@ namespace Sc PxU32 getCCDMaxPasses() const; // Broad-phase callback - void setBroadPhaseCallback(PxBroadPhaseCallback* callback); - PxBroadPhaseCallback* getBroadPhaseCallback() const; + PX_FORCE_INLINE void setBroadPhaseCallback(PxBroadPhaseCallback* callback) { mBroadPhaseCallback = callback; } + PX_FORCE_INLINE PxBroadPhaseCallback* getBroadPhaseCallback() const { return mBroadPhaseCallback; } // Broad-phase management void finishBroadPhase(PxBaseTask* continuation); @@ -662,7 +662,6 @@ namespace Sc PX_FORCE_INLINE void wakeObjectsUp(PxU32 infoFlag); void collectPostSolverVelocitiesBeforeCCD(); - void updateFromVisualizationParameters(); void clearSleepWakeBodies(void); PX_INLINE void cleanUpSleepBodies(); diff --git a/src/PhysX/physx/source/simulationcontroller/include/ScShapeCore.h b/src/PhysX/physx/source/simulationcontroller/include/ScShapeCore.h index ce52fa86f..700cc3a9a 100644 --- a/src/PhysX/physx/source/simulationcontroller/include/ScShapeCore.h +++ b/src/PhysX/physx/source/simulationcontroller/include/ScShapeCore.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/include/ScStaticCore.h b/src/PhysX/physx/source/simulationcontroller/include/ScStaticCore.h index 198488be4..0287f6428 100644 --- a/src/PhysX/physx/source/simulationcontroller/include/ScStaticCore.h +++ b/src/PhysX/physx/source/simulationcontroller/include/ScStaticCore.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScActorCore.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScActorCore.cpp index b6ac47aeb..119070ced 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScActorCore.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScActorCore.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScActorPair.h b/src/PhysX/physx/source/simulationcontroller/src/ScActorPair.h index 1d8b26fef..daf3044aa 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScActorPair.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScActorPair.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScActorSim.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScActorSim.cpp index a58394641..f2254f8f5 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScActorSim.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScActorSim.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScActorSim.h b/src/PhysX/physx/source/simulationcontroller/src/ScActorSim.h index 578695629..b793701c3 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScActorSim.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScActorSim.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScArticulationCore.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScArticulationCore.cpp index 0f73f27bb..195bf8bcc 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScArticulationCore.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScArticulationCore.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -47,75 +47,23 @@ Sc::ArticulationCore::ArticulationCore() : mCore.internalDriveIterations = 4; mCore.externalDriveIterations = 4; mCore.maxProjectionIterations = 4; - mCore.separationTolerance = 0.1f * scale.length; mCore.solverIterationCounts = 1<<8 | 4; + mCore.separationTolerance = 0.1f * scale.length; mCore.sleepThreshold = 5e-5f * scale.speed * scale.speed; - mCore.wakeCounter = Physics::sWakeCounterOnCreation; mCore.freezeThreshold = 5e-6f * scale.speed * scale.speed; + mCore.wakeCounter = Physics::sWakeCounterOnCreation; } - Sc::ArticulationCore::~ArticulationCore() { } - //-------------------------------------------------------------- // // ArticulationCore interface implementation // //-------------------------------------------------------------- -PxU32 Sc::ArticulationCore::getInternalDriveIterations() const -{ - return mCore.internalDriveIterations; -} - -void Sc::ArticulationCore::setInternalDriveIterations(const PxU32 v) -{ - mCore.internalDriveIterations = v; -} - -PxU32 Sc::ArticulationCore::getExternalDriveIterations() const -{ - return mCore.externalDriveIterations; -} - -void Sc::ArticulationCore::setExternalDriveIterations(const PxU32 v) -{ - mCore.externalDriveIterations = v; -} - -PxU32 Sc::ArticulationCore::getMaxProjectionIterations() const -{ - return mCore.maxProjectionIterations; -} - -void Sc::ArticulationCore::setMaxProjectionIterations(const PxU32 v) -{ - mCore.maxProjectionIterations = v; -} - -PxReal Sc::ArticulationCore::getSeparationTolerance() const -{ - return mCore.separationTolerance; -} - -void Sc::ArticulationCore::setSeparationTolerance(const PxReal v) -{ - mCore.separationTolerance = v; -} - -PxReal Sc::ArticulationCore::getWakeCounter() const -{ - return mCore.wakeCounter; -} - -void Sc::ArticulationCore::setWakeCounterInternal(const PxReal v) -{ - mCore.wakeCounter = v; -} - void Sc::ArticulationCore::setWakeCounter(const PxReal v) { mCore.wakeCounter = v; @@ -151,43 +99,11 @@ void Sc::ArticulationCore::putToSleep() #endif } -PxReal Sc::ArticulationCore::getSleepThreshold() const -{ - return mCore.sleepThreshold; -} - -void Sc::ArticulationCore::setSleepThreshold(const PxReal v) -{ - mCore.sleepThreshold = v; -} - -PxReal Sc::ArticulationCore::getFreezeThreshold() const -{ - return mCore.freezeThreshold; -} - -void Sc::ArticulationCore::setFreezeThreshold(const PxReal v) -{ - mCore.freezeThreshold = v; -} - -PxU16 Sc::ArticulationCore::getSolverIterationCounts() const -{ - return mCore.solverIterationCounts; -} - -void Sc::ArticulationCore::setSolverIterationCounts(const PxU16 v) -{ - mCore.solverIterationCounts = v; -} - - PxArticulation* Sc::ArticulationCore::getPxArticulation() { return gOffsetTable.convertScArticulation2Px(this); } - const PxArticulation* Sc::ArticulationCore::getPxArticulation() const { return gOffsetTable.convertScArticulation2Px(this); @@ -199,7 +115,6 @@ Sc::ArticulationDriveCache* Sc::ArticulationCore::createDriveCache(PxReal compli return mSim? mSim->createDriveCache(compliance, driveIterations) : NULL; } - void Sc::ArticulationCore::updateDriveCache(ArticulationDriveCache& cache, PxReal compliance, PxU32 driveIterations) const @@ -207,14 +122,12 @@ void Sc::ArticulationCore::updateDriveCache(ArticulationDriveCache& cache, mSim->updateDriveCache(cache, compliance, driveIterations); } - void Sc::ArticulationCore::releaseDriveCache(Sc::ArticulationDriveCache& driveCache) const { if(mSim) mSim->releaseDriveCache(driveCache); } - PxU32 Sc::ArticulationCore::getCacheLinkCount(const ArticulationDriveCache& cache) const { return Dy::PxvArticulationDriveCache::getLinkCount(cache); @@ -333,7 +246,6 @@ void Sc::ArticulationCore::computeKinematicJacobian(const PxU32 linkID, PxArticu mSim->computeKinematicJacobian(linkID, cache); } - void Sc::ArticulationCore::computeCoefficentMatrix(PxArticulationCache& cache) const { if (mSim) @@ -343,9 +255,7 @@ void Sc::ArticulationCore::computeCoefficentMatrix(PxArticulationCache& cache) c bool Sc::ArticulationCore::computeLambda(PxArticulationCache& cache, PxArticulationCache& initialState, const PxReal* const jointTorque, const PxVec3 gravity, const PxU32 maxIter) const { if (mSim) - { return mSim->computeLambda(cache, initialState, jointTorque, gravity, maxIter); - } return false; } diff --git a/src/PhysX/physx/source/simulationcontroller/src/ScArticulationJointCore.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScArticulationJointCore.cpp index f9a01b3b9..60400babb 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScArticulationJointCore.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScArticulationJointCore.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScArticulationJointSim.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScArticulationJointSim.cpp index a0127f707..bba62b3a1 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScArticulationJointSim.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScArticulationJointSim.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScArticulationJointSim.h b/src/PhysX/physx/source/simulationcontroller/src/ScArticulationJointSim.h index 7924b3c18..014dd7923 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScArticulationJointSim.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScArticulationJointSim.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScArticulationSim.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScArticulationSim.cpp index d89b6ce2e..20404afdf 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScArticulationSim.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScArticulationSim.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -48,15 +48,14 @@ using namespace physx; using namespace physx::Dy; - Sc::ArticulationSim::ArticulationSim(ArticulationCore& core, Scene& scene, BodyCore& root) : - mLLArticulation(NULL), - mScene(scene), - mCore(core), - mLinks (PX_DEBUG_EXP("ScArticulationSim::links")), - mBodies (PX_DEBUG_EXP("ScArticulationSim::bodies")), - mJoints (PX_DEBUG_EXP("ScArticulationSim::joints")), - mMaxDepth(0) + mLLArticulation (NULL), + mScene (scene), + mCore (core), + mLinks (PX_DEBUG_EXP("ScArticulationSim::links")), + mBodies (PX_DEBUG_EXP("ScArticulationSim::bodies")), + mJoints (PX_DEBUG_EXP("ScArticulationSim::joints")), + mMaxDepth (0) { mLinks.reserve(16); mJoints.reserve(16); @@ -64,7 +63,6 @@ Sc::ArticulationSim::ArticulationSim(ArticulationCore& core, Scene& scene, BodyC mLLArticulation = mScene.createLLArticulation(this); - mIslandNodeIndex = scene.getSimpleIslandManager()->addArticulation(this, mLLArticulation, false); if(!mLLArticulation) @@ -79,8 +77,6 @@ Sc::ArticulationSim::ArticulationSim(ArticulationCore& core, Scene& scene, BodyC addBody(*root.getSim(), NULL, NULL); - - mCore.setSim(this); mLLArticulation->setDyContext(mScene.getDynamicsContext()); @@ -100,7 +96,6 @@ Sc::ArticulationSim::ArticulationSim(ArticulationCore& core, Scene& scene, BodyC //mLLArticulation->onUpdateSolverDesc(); } - Sc::ArticulationSim::~ArticulationSim() { if (!mLLArticulation) @@ -194,20 +189,18 @@ ArticulationLinkHandle Sc::ArticulationSim::getLinkHandle(BodySim &body) const return reinterpret_cast(mLLArticulation) | findBodyIndex(body); } -void Sc::ArticulationSim::addBody(BodySim& body, - BodySim* parent, - ArticulationJointSim* joint) +void Sc::ArticulationSim::addBody(BodySim& body, BodySim* parent, ArticulationJointSim* joint) { mBodies.pushBack(&body); mJoints.pushBack(joint); mLLArticulation->addBody(); - PxU32 index = mLinks.size(); + const PxU32 index = mLinks.size(); PX_ASSERT((((index==0) && (joint == 0)) && (parent == 0)) || (((index!=0) && joint) && (parent && (parent->getArticulation() == this)))); - ArticulationLink &link = mLinks.insert(); + ArticulationLink& link = mLinks.insert(); link.body = &body.getLowLevelBody(); link.bodyCore = &body.getBodyCore().getCore(); link.children = 0; @@ -253,7 +246,6 @@ void Sc::ArticulationSim::addBody(BodySim& body, body.setArticulation(this, wakeCounter, shouldSleep, index); } - void Sc::ArticulationSim::removeBody(BodySim &body) { PX_ASSERT(body.getArticulation() == this); @@ -299,7 +291,6 @@ void Sc::ArticulationSim::removeBody(BodySim &body) mLLArticulation->removeBody(); } - void Sc::ArticulationSim::checkResize() const { if(!mBodies.size()) @@ -308,8 +299,8 @@ void Sc::ArticulationSim::checkResize() const //if this is needed, we need to re-allocated the link data mLLArticulation->resize(mLinks.size()); - mLLArticulation->getSolverDesc().links = const_cast(mLinks.begin()); - mLLArticulation->getSolverDesc().linkCount = Ps::to8(mLinks.size()); + mLLArticulation->getSolverDesc().links = const_cast(mLinks.begin()); + mLLArticulation->getSolverDesc().linkCount = Ps::to8(mLinks.size()); //if this is needed, we need to re-allocated the joint data mLLArticulation->onUpdateSolverDesc(); @@ -356,7 +347,7 @@ void Sc::ArticulationSim::sleepCheck(PxReal dt) if(!mBodies[0]->isActive()) return; - PxReal sleepThreshold = getCore().getCore().sleepThreshold; + const PxReal sleepThreshold = getCore().getCore().sleepThreshold; PxReal maxTimer = 0.0f, minTimer = PX_MAX_F32; @@ -424,7 +415,6 @@ void Sc::ArticulationSim::updateForces(PxReal dt, bool simUsesAdaptiveForce) { PxU32 count = 0; - for(PxU32 i=0;igetDataSizes(mLinks.size(), solverDataSize, totalSize, scratchSize); @@ -471,27 +458,19 @@ Sc::ArticulationDriveCache* Sc::ArticulationSim::createDriveCache(PxReal complia return data; } - -void Sc::ArticulationSim::updateDriveCache(ArticulationDriveCache& cache, - PxReal compliance, - PxU32 driveIterations) const +void Sc::ArticulationSim::updateDriveCache(ArticulationDriveCache& cache, PxReal compliance, PxU32 driveIterations) const { checkResize(); PxvArticulationDriveCache::initialize(cache, Ps::to16(mLinks.size()), mLinks.begin(), compliance, driveIterations, mLLArticulation->getSolverDesc().scratchMemory, mLLArticulation->getSolverDesc().scratchMemorySize); } - void Sc::ArticulationSim::releaseDriveCache(Sc::ArticulationDriveCache& driveCache) const { PX_FREE(&driveCache); } - -void Sc::ArticulationSim::applyImpulse(Sc::BodyCore& link, - const Sc::ArticulationDriveCache& driveCache, - const PxVec3& force, - const PxVec3& torque) +void Sc::ArticulationSim::applyImpulse(Sc::BodyCore& link, const Sc::ArticulationDriveCache& driveCache, const PxVec3& force, const PxVec3& torque) { Cm::SpatialVectorV v[DY_ARTICULATION_MAX_SIZE], z[DY_ARTICULATION_MAX_SIZE]; PxMemZero(z, mLinks.size()*sizeof(Cm::SpatialVector)); @@ -539,7 +518,6 @@ PxU32 Sc::ArticulationSim::getDof(const PxU32 linkID) const PxArticulationCache* Sc::ArticulationSim::createCache() const { - checkResize(); PxU32 totalSize = getCacheDataSize() + sizeof(PxArticulationCache); @@ -629,7 +607,6 @@ PxU32 Sc::ArticulationSim::getScratchMemorySize() const return totalSize; } - void Sc::ArticulationSim::zeroCache(PxArticulationCache& cache) const { const PxU32 cacheDataSize = getCacheDataSize(); @@ -722,15 +699,12 @@ bool Sc::ArticulationSim::computeLambda(PxArticulationCache& cache, PxArticulati const PxReal* const jointTorque, const PxVec3 gravity, const PxU32 maxIter) { return mLLArticulation->getLambda(mLoopConstraints.begin(), mLoopConstraints.size(), cache, initialState, jointTorque, gravity, maxIter); - } void Sc::ArticulationSim::computeGeneralizedMassMatrix(PxArticulationCache& cache) { - mLLArticulation->getGeneralizedMassMatrixCRB(cache); - /*const PxU32 totalDofs = mLLArticulation->getDofs(); PxReal* massMatrix = reinterpret_cast(PX_ALLOC(sizeof(PxReal) * totalDofs * totalDofs, "MassMatrix")); @@ -756,7 +730,6 @@ void Sc::ArticulationSim::computeGeneralizedMassMatrix(PxArticulationCache& cach } PX_FREE(massMatrix);*/ - } PxU32 Sc::ArticulationSim::getCoefficentMatrixSize() const diff --git a/src/PhysX/physx/source/simulationcontroller/src/ScArticulationSim.h b/src/PhysX/physx/source/simulationcontroller/src/ScArticulationSim.h index e52000b5d..f37d1b5f9 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScArticulationSim.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScArticulationSim.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScBodyCore.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScBodyCore.cpp index 289716af7..01a95a541 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScBodyCore.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScBodyCore.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -70,7 +70,6 @@ Sc::BodyCore::BodyCore(PxActorType::Enum type, const PxTransform& bodyPose) mCore.mFlags = PxRigidBodyFlags(); mCore.linearVelocity = PxVec3(0.0f); mCore.angularVelocity = PxVec3(0.0f); - mCore.linearDamping = 0.0f; mCore.solverIterationCounts = (1 << 8) | 4; mCore.contactReportThreshold = PX_MAX_F32; mCore.setBody2Actor(PxTransform(PxIdentity)); @@ -81,6 +80,7 @@ Sc::BodyCore::BodyCore(PxActorType::Enum type, const PxTransform& bodyPose) if(type == PxActorType::eRIGID_DYNAMIC) { + mCore.linearDamping = 0.0f; mCore.angularDamping = 0.05f; mCore.maxAngularVelocitySq = 100.0f * 100.0f; // mCore.maxAngularVelocitySq = 7.0f * 7.0f; @@ -106,20 +106,16 @@ Sc::BodySim* Sc::BodyCore::getSim() const return static_cast(Sc::ActorCore::getSim()); } -size_t Sc::BodyCore::getSerialCore(PxsBodyCore& serialCore) +void Sc::BodyCore::restoreDynamicData() { - serialCore = mCore; - if(mSimStateData && mSimStateData->isKine()) - { - const Kinematic* kine = mSimStateData->getKinematicData(); - serialCore.inverseMass = kine->backupInvMass; - serialCore.inverseInertia = kine->backupInverseInertia; - serialCore.linearDamping = kine->backupLinearDamping; - serialCore.angularDamping = kine->backupAngularDamping; - serialCore.maxAngularVelocitySq = kine->backupMaxAngVelSq; - serialCore.maxLinearVelocitySq = kine->backupMaxLinVelSq; - } - return reinterpret_cast(&mCore); + PX_ASSERT(mSimStateData && mSimStateData->isKine()); + restore(); +} + +void Sc::BodyCore::backupDynamicData() +{ + PX_ASSERT(mSimStateData && mSimStateData->isKine()); + backup(*mSimStateData); } //-------------------------------------------------------------- diff --git a/src/PhysX/physx/source/simulationcontroller/src/ScBodySim.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScBodySim.cpp index 612f4c99d..434b0576c 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScBodySim.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScBodySim.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScBodySim.h b/src/PhysX/physx/source/simulationcontroller/src/ScBodySim.h index f72f73af3..7f3c4cc15 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScBodySim.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScBodySim.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScClient.h b/src/PhysX/physx/source/simulationcontroller/src/ScClient.h index f19bc3154..6eff41315 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScClient.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScClient.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScConstraintCore.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintCore.cpp index 55009e5e7..0570a9722 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScConstraintCore.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintCore.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScConstraintGroupNode.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintGroupNode.cpp index 9177013ff..ee2ee1b58 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScConstraintGroupNode.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintGroupNode.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScConstraintGroupNode.h b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintGroupNode.h index 144ffaecc..a3287c6de 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScConstraintGroupNode.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintGroupNode.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScConstraintInteraction.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintInteraction.cpp index c2562d8d3..765363f18 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScConstraintInteraction.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintInteraction.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScConstraintInteraction.h b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintInteraction.h index b6d38d795..2fdca72d4 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScConstraintInteraction.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintInteraction.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionManager.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionManager.cpp index 4b69fd29c..715f0bc49 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionManager.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionManager.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionManager.h b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionManager.h index 34a0c8185..b67e538ef 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionManager.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionTree.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionTree.cpp index 9dc2d245c..781deac7f 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionTree.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionTree.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionTree.h b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionTree.h index a13aaf5f8..b01bda050 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionTree.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintProjectionTree.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScConstraintSim.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintSim.cpp index 79c255ca0..f95a5c047 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScConstraintSim.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintSim.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScConstraintSim.h b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintSim.h index 30e3462cd..c7377db79 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScConstraintSim.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScConstraintSim.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScContactReportBuffer.h b/src/PhysX/physx/source/simulationcontroller/src/ScContactReportBuffer.h index 84e95bc82..8cf2a5aac 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScContactReportBuffer.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScContactReportBuffer.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScContactStream.h b/src/PhysX/physx/source/simulationcontroller/src/ScContactStream.h index 0aa386fa8..6ca4cfa8b 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScContactStream.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScContactStream.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScElementInteractionMarker.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScElementInteractionMarker.cpp index 7bf63fd1e..e2abdb289 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScElementInteractionMarker.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScElementInteractionMarker.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScElementInteractionMarker.h b/src/PhysX/physx/source/simulationcontroller/src/ScElementInteractionMarker.h index 5af3eba15..ea88a4f17 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScElementInteractionMarker.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScElementInteractionMarker.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScElementSim.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScElementSim.cpp index 717295989..ee44d4db5 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScElementSim.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScElementSim.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScElementSim.h b/src/PhysX/physx/source/simulationcontroller/src/ScElementSim.h index 61cf51868..4bc09d1ed 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScElementSim.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScElementSim.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScElementSimInteraction.h b/src/PhysX/physx/source/simulationcontroller/src/ScElementSimInteraction.h index ccb52bbe0..388b839a2 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScElementSimInteraction.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScElementSimInteraction.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScInteraction.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScInteraction.cpp index 360db5796..e07336923 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScInteraction.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScInteraction.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScInteraction.h b/src/PhysX/physx/source/simulationcontroller/src/ScInteraction.h index effdddd5b..8ae12699b 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScInteraction.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScInteraction.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScInteractionFlags.h b/src/PhysX/physx/source/simulationcontroller/src/ScInteractionFlags.h index cd2b8eaa9..a4605f060 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScInteractionFlags.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScInteractionFlags.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScIterators.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScIterators.cpp index 2b4ad6153..2d29d5d6d 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScIterators.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScIterators.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScMetaData.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScMetaData.cpp index 1a7105e97..61ff6bae0 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScMetaData.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScMetaData.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScNPhaseCore.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScNPhaseCore.cpp index a6f8b3165..3f25f02f1 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScNPhaseCore.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScNPhaseCore.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScNPhaseCore.h b/src/PhysX/physx/source/simulationcontroller/src/ScNPhaseCore.h index 852975781..aca2f2e65 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScNPhaseCore.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScNPhaseCore.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScObjectIDTracker.h b/src/PhysX/physx/source/simulationcontroller/src/ScObjectIDTracker.h index 9f3b43add..c57ce8190 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScObjectIDTracker.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScObjectIDTracker.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScPhysics.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScPhysics.cpp index 7fd2884de..924bb6f7d 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScPhysics.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScPhysics.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScRigidCore.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScRigidCore.cpp index 03f6672e7..5e3322c06 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScRigidCore.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScRigidCore.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScRigidSim.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScRigidSim.cpp index 2ffeda1aa..d5a786901 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScRigidSim.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScRigidSim.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScRigidSim.h b/src/PhysX/physx/source/simulationcontroller/src/ScRigidSim.h index 830b80973..f9fda6d40 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScRigidSim.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScRigidSim.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScScene.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScScene.cpp index fc554f6e9..f790cb87e 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScScene.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScScene.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -276,7 +276,7 @@ public: } private: - ScAfterIntegrationTask& operator = (const ScAfterIntegrationTask&); + PX_NOCOPY(ScAfterIntegrationTask) }; class ScSimulationControllerCallback : public PxsSimulationControllerCallback @@ -467,7 +467,7 @@ public: } private: - PxgUpdateBodyAndShapeStatusTask& operator = (const PxgUpdateBodyAndShapeStatusTask&); + PX_NOCOPY(PxgUpdateBodyAndShapeStatusTask) }; class PxgSimulationControllerCallback : public PxsSimulationControllerCallback @@ -860,7 +860,8 @@ Sc::Scene::Scene(const PxSceneDesc& desc, PxU64 contextID) : mLLContext->createTransformCache(*allocatorCallback); mLLContext->setContactDistance(mContactDistance); - mCCDContext = physx::PxsCCDContext::create(mLLContext, mDynamicsContext->getThresholdStream(), *mLLContext->getNphaseImplementationContext()); + mCCDContext = physx::PxsCCDContext::create(mLLContext, mDynamicsContext->getThresholdStream(), *mLLContext->getNphaseImplementationContext(), + desc.ccdThreshold); setSolverBatchSize(desc.solverBatchSize); mDynamicsContext->setFrictionOffsetThreshold(desc.frictionOffsetThreshold); @@ -1472,17 +1473,22 @@ void Sc::Scene::prepareCollide() getRenderBuffer().clear(); - ///clear broken constraint list: + // Clear broken constraint list: clearBrokenConstraintBuffer(); - updateFromVisualizationParameters(); + // Update from visualization parameters + if(mVisualizationParameterChanged) + { + mVisualizationParameterChanged = false; + + // Update SIPs if visualization is enabled + if( getVisualizationParameter(PxVisualizationParameter::eCONTACT_POINT) || getVisualizationParameter(PxVisualizationParameter::eCONTACT_NORMAL) || + getVisualizationParameter(PxVisualizationParameter::eCONTACT_ERROR) || getVisualizationParameter(PxVisualizationParameter::eCONTACT_FORCE)) + mInternalFlags |= SceneInternalFlag::eSCENE_SIP_STATES_DIRTY_VISUALIZATION; + } visualizeStartStep(); -#ifdef DUMP_PROFILER - dumpProfiler(this); -#endif - PxcClearContactCacheStats(); } @@ -1514,8 +1520,7 @@ void Sc::Scene::advance(PxReal timeStep, PxBaseTask* continuation) mAdvanceStep.setContinuation(continuation); - stepSetupSolve(&mAdvanceStep); - + stepSetupSolve(&mAdvanceStep); mAdvanceStep.removeReference(); } @@ -1680,16 +1685,6 @@ PxU32 Sc::Scene::getCCDMaxPasses() const return mCCDContext->getCCDMaxPasses(); } -void Sc::Scene::setBroadPhaseCallback(PxBroadPhaseCallback* callback) -{ - mBroadPhaseCallback = callback; -} - -PxBroadPhaseCallback* Sc::Scene::getBroadPhaseCallback() const -{ - return mBroadPhaseCallback; -} - void Sc::Scene::removeBody(BodySim& body) //this also notifies any connected joints! { ConstraintGroupNode* node = body.getConstraintGroup(); @@ -1830,10 +1825,6 @@ void Sc::Scene::deallocateConstraintBlock(void* ptr, PxU32 size) PX_FREE(ptr); } -//int testAxisConstraint(Sc::Scene& scene); -//int testCasts(Shape* shape); -//int testCasts(Shape& shape); - /*-------------------------------*\ | Adam's explanation of the RB solver: | This is a novel idea of mine, @@ -1988,7 +1979,6 @@ void Sc::Scene::postBroadPhase(PxBaseTask* continuation) //Notify narrow phase that broad phase has completed mLLContext->getNphaseImplementationContext()->postBroadPhaseUpdateContactManager(); mAABBManager->postBroadPhase(continuation, &mRigidBodyNPhaseUnlock, *getFlushPool()); - } void Sc::Scene::postBroadPhaseContinuation(PxBaseTask* continuation) @@ -2081,7 +2071,7 @@ class SpeculativeCCDContactDistanceUpdateTask : public Cm::Task public: static const PxU32 MaxBodies = 128; PxReal* mContactDistances; - PxReal mDt; + const PxReal mDt; Sc::BodySim* mBodySims[MaxBodies]; PxU32 mNbBodies; @@ -2114,7 +2104,7 @@ class SpeculativeCCDContactDistanceArticulationUpdateTask : public Cm::Task { public: PxReal* mContactDistances; - PxReal mDt; + const PxReal mDt; Sc::ArticulationSim* mArticulation; Bp::BoundsArray& mBoundsArray; @@ -2170,7 +2160,8 @@ void Sc::Scene::preRigidBodyNarrowPhase(PxBaseTask* continuation) ElementSim* current = bodySim->getElements_(); while (current) { - changedMap.growAndSet(current->getElementID()); + if (static_cast(current)->getFlags() & PxShapeFlag::eSIMULATION_SHAPE) + changedMap.growAndSet(current->getElementID()); current = current->mNextInActor; } @@ -2570,7 +2561,7 @@ PX_FORCE_INLINE void Sc::Scene::putInteractionsToSleep() //joints should have been deactivated. { - PxU32 nbDeactivatingEdges = islandSim.getNbDeactivatingEdges(IG::Edge::eCONTACT_MANAGER); + const PxU32 nbDeactivatingEdges = islandSim.getNbDeactivatingEdges(IG::Edge::eCONTACT_MANAGER); const IG::EdgeIndex* deactivatingEdgeIds = islandSim.getDeactivatingEdges(IG::Edge::eCONTACT_MANAGER); for (PxU32 i = 0; i < nbDeactivatingEdges; ++i) @@ -2622,14 +2613,10 @@ PX_FORCE_INLINE void Sc::Scene::wakeObjectsUp(PxU32 infoFlag) void Sc::Scene::postIslandGen(PxBaseTask* continuationTask) { - { - PX_PROFILE_ZONE("Sim.postIslandGen", getContextId()); + PX_PROFILE_ZONE("Sim.postIslandGen", getContextId()); - // - Performs collision detection for trigger interactions - { - mNPhaseCore->processTriggerInteractions(continuationTask); - } - } + // - Performs collision detection for trigger interactions + mNPhaseCore->processTriggerInteractions(continuationTask); } void Sc::Scene::solver(PxBaseTask* continuation) @@ -2697,69 +2684,15 @@ void Sc::Scene::processLostContacts(PxBaseTask* continuation) void Sc::Scene::lostTouchReports(PxBaseTask*) { + PX_PROFILE_ZONE("Sim.lostTouchReports", getContextId()); + PxsContactManagerOutputIterator outputs = mLLContext->getNphaseImplementationContext()->getContactManagerOutputs(); + + bool useAdaptiveForce = mPublicFlags & PxSceneFlag::eADAPTIVE_FORCE; + + Bp::AABBManager* aabbMgr = mAABBManager; + PxU32 destroyedOverlapCount; + { - PX_PROFILE_ZONE("Sim.lostTouchReports", getContextId()); - PxsContactManagerOutputIterator outputs = mLLContext->getNphaseImplementationContext()->getContactManagerOutputs(); - - bool useAdaptiveForce = mPublicFlags & PxSceneFlag::eADAPTIVE_FORCE; - - Bp::AABBManager* aabbMgr = mAABBManager; - PxU32 destroyedOverlapCount; - - { - const Bp::AABBOverlap* PX_RESTRICT p = aabbMgr->getDestroyedOverlaps(Bp::ElementType::eSHAPE, destroyedOverlapCount); - while(destroyedOverlapCount--) - { - if(p->mPairUserData) - { - Sc::ElementSimInteraction* elemInteraction = reinterpret_cast(p->mPairUserData); - if(elemInteraction->getType() == Sc::InteractionType::eOVERLAP) - mNPhaseCore->lostTouchReports(static_cast(elemInteraction), PxU32(PairReleaseFlag::eWAKE_ON_LOST_TOUCH), 0, outputs, useAdaptiveForce); - } - p++; - } - } - } -} - -void Sc::Scene::unregisterInteractions(PxBaseTask*) -{ - { - PX_PROFILE_ZONE("Sim.unregisterInteractions", getContextId()); - - Bp::AABBManager* aabbMgr = mAABBManager; - PxU32 destroyedOverlapCount; - - { - const Bp::AABBOverlap* PX_RESTRICT p = aabbMgr->getDestroyedOverlaps(Bp::ElementType::eSHAPE, destroyedOverlapCount); - while(destroyedOverlapCount--) - { - if(p->mPairUserData) - { - Sc::ElementSimInteraction* elemInteraction = reinterpret_cast(p->mPairUserData); - if(elemInteraction->getType() == Sc::InteractionType::eOVERLAP || elemInteraction->getType() == Sc::InteractionType::eMARKER) - { - unregisterInteraction(elemInteraction); - mNPhaseCore->unregisterInteraction(elemInteraction); - } - } - p++; - } - } - } -} - -void Sc::Scene::destroyManagers(PxBaseTask*) -{ - { - PX_PROFILE_ZONE("Sim.destroyManagers", getContextId()); - - mPostThirdPassIslandGenTask.setContinuation(mProcessLostContactsTask3.getContinuation()); - - mSimpleIslandManager->thirdPassIslandGen(&mPostThirdPassIslandGenTask); - - Bp::AABBManager* aabbMgr = mAABBManager; - PxU32 destroyedOverlapCount; const Bp::AABBOverlap* PX_RESTRICT p = aabbMgr->getDestroyedOverlaps(Bp::ElementType::eSHAPE, destroyedOverlapCount); while(destroyedOverlapCount--) { @@ -2767,10 +2700,31 @@ void Sc::Scene::destroyManagers(PxBaseTask*) { Sc::ElementSimInteraction* elemInteraction = reinterpret_cast(p->mPairUserData); if(elemInteraction->getType() == Sc::InteractionType::eOVERLAP) + mNPhaseCore->lostTouchReports(static_cast(elemInteraction), PxU32(PairReleaseFlag::eWAKE_ON_LOST_TOUCH), 0, outputs, useAdaptiveForce); + } + p++; + } + } +} + +void Sc::Scene::unregisterInteractions(PxBaseTask*) +{ + PX_PROFILE_ZONE("Sim.unregisterInteractions", getContextId()); + + Bp::AABBManager* aabbMgr = mAABBManager; + PxU32 destroyedOverlapCount; + + { + const Bp::AABBOverlap* PX_RESTRICT p = aabbMgr->getDestroyedOverlaps(Bp::ElementType::eSHAPE, destroyedOverlapCount); + while(destroyedOverlapCount--) + { + if(p->mPairUserData) + { + Sc::ElementSimInteraction* elemInteraction = reinterpret_cast(p->mPairUserData); + if(elemInteraction->getType() == Sc::InteractionType::eOVERLAP || elemInteraction->getType() == Sc::InteractionType::eMARKER) { - Sc::ShapeInteraction* si = static_cast(elemInteraction); - if(si->getContactManager()) - si->destroyManager(); + unregisterInteraction(elemInteraction); + mNPhaseCore->unregisterInteraction(elemInteraction); } } p++; @@ -2778,6 +2732,33 @@ void Sc::Scene::destroyManagers(PxBaseTask*) } } +void Sc::Scene::destroyManagers(PxBaseTask*) +{ + PX_PROFILE_ZONE("Sim.destroyManagers", getContextId()); + + mPostThirdPassIslandGenTask.setContinuation(mProcessLostContactsTask3.getContinuation()); + + mSimpleIslandManager->thirdPassIslandGen(&mPostThirdPassIslandGenTask); + + Bp::AABBManager* aabbMgr = mAABBManager; + PxU32 destroyedOverlapCount; + const Bp::AABBOverlap* PX_RESTRICT p = aabbMgr->getDestroyedOverlaps(Bp::ElementType::eSHAPE, destroyedOverlapCount); + while(destroyedOverlapCount--) + { + if(p->mPairUserData) + { + Sc::ElementSimInteraction* elemInteraction = reinterpret_cast(p->mPairUserData); + if(elemInteraction->getType() == Sc::InteractionType::eOVERLAP) + { + Sc::ShapeInteraction* si = static_cast(elemInteraction); + if(si->getContactManager()) + si->destroyManager(); + } + } + p++; + } +} + void Sc::Scene::processLostContacts2(PxBaseTask* continuation) { mDestroyManagersTask.setContinuation(continuation); @@ -3174,12 +3155,12 @@ void Sc::Scene::integrateKinematicPose() { PX_PROFILE_ZONE("Sim.integrateKinematicPose", getContextId()); - PxU32 nbKinematics = getActiveKinematicBodiesCount(); + const PxU32 nbKinematics = getActiveKinematicBodiesCount(); BodyCore*const* kinematics = getActiveKinematicBodies(); Cm::FlushPool& flushPool = mLLContext->getTaskPool(); - for(PxU32 i = 0; i < nbKinematics; i+= ScKinematicPoseUpdateTask::NbKinematicsPerTask) + for(PxU32 i=0; igetTaskPool(); - PxU32 startIndex = 0; PxU32 nbShapes = 0; { PX_PROFILE_ZONE("ShapeUpdate", getContextId()); - for (PxU32 i = 0; i < nbKinematics; i++) + for(PxU32 i=0; igetSim(); @@ -3259,7 +3239,7 @@ void Sc::Scene::updateKinematicCached(PxBaseTask* continuation) } } - if (nbShapes) + if(nbShapes) { ScKinematicShapeUpdateTask* task = PX_PLACEMENT_NEW(flushPool.allocate(sizeof(ScKinematicShapeUpdateTask)), ScKinematicShapeUpdateTask) (kinematics + startIndex, nbKinematics - startIndex, mLLContext->getTransformCache(), *mBoundsArray, mContextId); @@ -3269,7 +3249,7 @@ void Sc::Scene::updateKinematicCached(PxBaseTask* continuation) } } - if (nbKinematics) + if(nbKinematics) { Cm::BitMapPinned& changedAABBMap = mAABBManager->getChangedAABBMgActorHandleMap(); mLLContext->getTransformCache().setChangedState(); @@ -3313,7 +3293,7 @@ void Sc::Scene::updateKinematicCached(PxBaseTask* continuation) class ConstraintProjectionTask : public Cm::Task { private: - ConstraintProjectionTask& operator = (const ConstraintProjectionTask&); + PX_NOCOPY(ConstraintProjectionTask) public: ConstraintProjectionTask(Sc::ConstraintGroupNode* const* projectionRoots, PxU32 projectionRootCount, Ps::Array& projectedBodies, PxsContext* llContext) : @@ -3605,11 +3585,13 @@ void Sc::Scene::syncSceneQueryBounds(SqBoundsSync& sync, SqRefFinder& finder) class ScKinematicUpdateTask : public Cm::Task { - Sc::BodyCore*const* mKinematics; - PxU32 mNbKinematics; - PxReal mOneOverDt; + Sc::BodyCore*const* mKinematics; + const PxU32 mNbKinematics; + const PxReal mOneOverDt; + PX_NOCOPY(ScKinematicUpdateTask) public: + static const PxU32 NbKinematicsPerTask = 1024; ScKinematicUpdateTask(Sc::BodyCore*const* kinematics, PxU32 nbKinematics, PxReal oneOverDt, PxU64 contextID) : @@ -3619,13 +3601,17 @@ public: virtual void runInternal() { - for (PxU32 a = 0; a < mNbKinematics; ++a) + Sc::BodyCore*const* kinematics = mKinematics; + PxU32 nb = mNbKinematics; + const float oneOverDt = mOneOverDt; + + while(nb--) { - Sc::BodyCore* b = mKinematics[a]; + Sc::BodyCore* b = *kinematics++; PX_ASSERT(b->getSim()->isKinematic()); PX_ASSERT(b->getSim()->isActive()); - b->getSim()->calculateKinematicVelocity(mOneOverDt); + b->getSim()->calculateKinematicVelocity(oneOverDt); } } @@ -3638,7 +3624,7 @@ public: class ScKinematicAddDynamicTask : public Cm::Task { Sc::BodyCore*const* mKinematics; - PxU32 mNbKinematics; + const PxU32 mNbKinematics; PxsSimulationController& mSimulationController; PX_NOCOPY(ScKinematicAddDynamicTask) @@ -3652,9 +3638,13 @@ public: virtual void runInternal() { - for (PxU32 a = 0; a < mNbKinematics; ++a) + Sc::BodyCore*const* kinematics = mKinematics; + PxU32 nb = mNbKinematics; + + while(nb--) { - Sc::BodySim* bodySim = mKinematics[a]->getSim(); + Sc::BodyCore* b = *kinematics++; + Sc::BodySim* bodySim = b->getSim(); mSimulationController.updateDynamic(false, bodySim->getNodeIndex()); } } @@ -3763,7 +3753,7 @@ public: const PxReal mDt; IG::SimpleIslandManager* mIslandManager; PxsSimulationController* mSimulationController; - bool mSimUsesAdaptiveForce; + const bool mSimUsesAdaptiveForce; public: @@ -3786,9 +3776,11 @@ public: PxU32 updatedBodyNodeIndices[MaxBodiesPerTask]; PxU32 nbUpdatedBodySims = 0; - for(PxU32 i = 0; i < mNumBodies; i++) + PxU32 nb = mNumBodies; + const IG::NodeIndex* bodies = mBodies;; + while(nb--) { - IG::NodeIndex index = mBodies[i]; + const IG::NodeIndex index = *bodies++; if(islandSim.getActiveNodeIndex(index) != IG_INVALID_NODE) { if (islandSim.getNode(index).mType == IG::Node::eRIGID_BODY_TYPE) @@ -3810,7 +3802,7 @@ public: } private: - ScBeforeSolverTask& operator = (const ScBeforeSolverTask&); + PX_NOCOPY(ScBeforeSolverTask) }; @@ -3818,10 +3810,10 @@ class ScArticBeforeSolverTask : public Cm::Task { public: const IG::NodeIndex* const mArticIndices; - PxU32 mNumArticulations; + const PxU32 mNumArticulations; const PxReal mDt; IG::SimpleIslandManager* mIslandManager; - bool mSimUsesAdaptiveForce; + const bool mSimUsesAdaptiveForce; public: @@ -3855,7 +3847,7 @@ public: } private: - ScArticBeforeSolverTask& operator = (const ScArticBeforeSolverTask&); + PX_NOCOPY(ScArticBeforeSolverTask) }; @@ -3938,9 +3930,11 @@ void Sc::Scene::beforeSolver(PxBaseTask* continuation) class UpdatProjectedPoseTask : public Cm::Task { Sc::BodySim** mProjectedBodies; - PxU32 mNbBodiesToProcess; + const PxU32 mNbBodiesToProcess; + PX_NOCOPY(UpdatProjectedPoseTask) public: + UpdatProjectedPoseTask(PxU64 contextID, Sc::BodySim** projectedBodies, PxU32 nbBodiesToProcess) : Cm::Task (contextID), mProjectedBodies (projectedBodies), @@ -3965,13 +3959,17 @@ public: class UpdateArticulationTask : public Cm::Task { Sc::ArticulationCore* const* mArticList; - PxU32 mNbArticulations; - PxReal mDt; + const PxU32 mNbArticulations; + const PxReal mDt; + PX_NOCOPY(UpdateArticulationTask) public: - UpdateArticulationTask(PxU64 contextId, Sc::ArticulationCore* const* articList, PxU32 nbArticulations, PxReal dt) : Cm::Task(contextId), mArticList(articList), mNbArticulations(nbArticulations), - mDt(dt) + UpdateArticulationTask(PxU64 contextId, Sc::ArticulationCore* const* articList, PxU32 nbArticulations, PxReal dt) : + Cm::Task (contextId), + mArticList (articList), + mNbArticulations (nbArticulations), + mDt (dt) { } @@ -4001,7 +3999,6 @@ void Sc::Scene::afterIntegration(PxBaseTask* continuation) PX_PROFILE_ZONE("AfterIntegration::lockStage", getContextId()); mLLContext->getLock().lock(); - mSimulationController->udpateScBodyAndShapeSim(cache, boundArray, continuation); const IG::IslandSim& islandSim = mSimpleIslandManager->getAccurateIslandSim(); @@ -4031,7 +4028,6 @@ void Sc::Scene::afterIntegration(PxBaseTask* continuation) //if(!islandSim.getNode(bodySim->getNodeIndex()).isActive()) rigid->setPose(rigid->getLastCCDTransform()); - bodySim->updateCached(&changedAABBMgrActorHandles); mSimulationController->updateDynamic(bodySim->isArticulationLink(), bodySim->getNodeIndex()); @@ -4140,7 +4136,6 @@ void Sc::Scene::afterIntegration(PxBaseTask* continuation) mLLContext->getLock().lock(); Cm::BitMapPinned& changedAABBMgrActorHandles = mAABBManager->getChangedAABBMgActorHandleMap(); - Sc::BodySim* ccdBodySims[DY_ARTICULATION_MAX_SIZE]; for(PxU32 i=0;imarkShapesUpdated(&changedAABBMgrActorHandles); - } mLLContext->getLock().unlock(); } @@ -5428,19 +5422,6 @@ PX_INLINE void Sc::Scene::clearBrokenConstraintBuffer() mBrokenConstraints.clear(); } -void Sc::Scene::updateFromVisualizationParameters() -{ - if (!mVisualizationParameterChanged) // All up to date - return; - - // Update SIPs if visualization is enabled - if (getVisualizationParameter(PxVisualizationParameter::eCONTACT_POINT) || getVisualizationParameter(PxVisualizationParameter::eCONTACT_NORMAL) || - getVisualizationParameter(PxVisualizationParameter::eCONTACT_ERROR) || getVisualizationParameter(PxVisualizationParameter::eCONTACT_FORCE)) - mInternalFlags |= SceneInternalFlag::eSCENE_SIP_STATES_DIRTY_VISUALIZATION; - - mVisualizationParameterChanged = false; -} - void Sc::Scene::addToLostTouchList(BodySim* body1, BodySim* body2) { PX_ASSERT(body1 != 0); diff --git a/src/PhysX/physx/source/simulationcontroller/src/ScShapeCore.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScShapeCore.cpp index 5d53be878..b0ac51218 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScShapeCore.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScShapeCore.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScShapeInteraction.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScShapeInteraction.cpp index d9c9af0b9..3be8f3e6c 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScShapeInteraction.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScShapeInteraction.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -326,21 +326,18 @@ void Sc::ShapeInteraction::processUserNotificationSync() void Sc::ShapeInteraction::processUserNotificationAsync(PxU32 contactEvent, PxU16 infoFlags, bool touchLost, const PxU32 ccdPass, const bool useCurrentTransform, PxsContactManagerOutputIterator& outputs, ContactReportAllocationManager* alloc) { - contactEvent = (!ccdPass) ? contactEvent : (contactEvent | PxPairFlag::eNOTIFY_TOUCH_CCD); - if (mActorPair == NULL) - { + if(!mActorPair) return; - } ActorPairReport& aPairReport = getActorPairReport(); Scene& scene = getScene(); NPhaseCore* npcore = scene.getNPhaseCore(); ContactStreamManager& cs = aPairReport.createContactStreamManager(*npcore); // Prepare user notification - PxU32 timeStamp = scene.getTimeStamp(); - PxU32 shapePairTimeStamp = scene.getReportShapePairTimeStamp(); + const PxU32 timeStamp = scene.getTimeStamp(); + const PxU32 shapePairTimeStamp = scene.getReportShapePairTimeStamp(); const PxU32 pairFlags = getPairFlags(); PX_ASSERT(pairFlags & contactEvent); diff --git a/src/PhysX/physx/source/simulationcontroller/src/ScShapeInteraction.h b/src/PhysX/physx/source/simulationcontroller/src/ScShapeInteraction.h index 9e18b98a9..5c45cdc7d 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScShapeInteraction.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScShapeInteraction.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScShapeSim.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScShapeSim.cpp index 7752c395d..34249e58f 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScShapeSim.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScShapeSim.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScShapeSim.h b/src/PhysX/physx/source/simulationcontroller/src/ScShapeSim.h index eadc1a2da..b8cc5fd89 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScShapeSim.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScShapeSim.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScSimStateData.h b/src/PhysX/physx/source/simulationcontroller/src/ScSimStateData.h index 97be8b629..e022219f3 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScSimStateData.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScSimStateData.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScSimStats.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScSimStats.cpp index b246dfbbd..9ee8f37d6 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScSimStats.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScSimStats.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScSimStats.h b/src/PhysX/physx/source/simulationcontroller/src/ScSimStats.h index 06356e815..5efbfac47 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScSimStats.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScSimStats.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScSimulationController.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScSimulationController.cpp index 952436230..72d360f72 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScSimulationController.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScSimulationController.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScSimulationController.h b/src/PhysX/physx/source/simulationcontroller/src/ScSimulationController.h index 6360c4dbf..fbf69b7c6 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScSimulationController.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScSimulationController.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScSqBoundsManager.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScSqBoundsManager.cpp index 7676fcd57..3f0ddd948 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScSqBoundsManager.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScSqBoundsManager.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScSqBoundsManager.h b/src/PhysX/physx/source/simulationcontroller/src/ScSqBoundsManager.h index 74d16425b..411c0f681 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScSqBoundsManager.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScSqBoundsManager.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScStaticCore.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScStaticCore.cpp index 12ff0e08f..2c51452cc 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScStaticCore.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScStaticCore.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScStaticSim.h b/src/PhysX/physx/source/simulationcontroller/src/ScStaticSim.h index f57cf6369..4a13a4182 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScStaticSim.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScStaticSim.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScTriggerInteraction.cpp b/src/PhysX/physx/source/simulationcontroller/src/ScTriggerInteraction.cpp index a4f5ce858..b23869453 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScTriggerInteraction.cpp +++ b/src/PhysX/physx/source/simulationcontroller/src/ScTriggerInteraction.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScTriggerInteraction.h b/src/PhysX/physx/source/simulationcontroller/src/ScTriggerInteraction.h index 5de0fee14..718a72060 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScTriggerInteraction.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScTriggerInteraction.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/simulationcontroller/src/ScTriggerPairs.h b/src/PhysX/physx/source/simulationcontroller/src/ScTriggerPairs.h index dbbbbc819..590869830 100644 --- a/src/PhysX/physx/source/simulationcontroller/src/ScTriggerPairs.h +++ b/src/PhysX/physx/source/simulationcontroller/src/ScTriggerPairs.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/physx/source/task/src/TaskManager.cpp b/src/PhysX/physx/source/task/src/TaskManager.cpp index e5cd3fdf2..2279e5142 100644 --- a/src/PhysX/physx/source/task/src/TaskManager.cpp +++ b/src/PhysX/physx/source/task/src/TaskManager.cpp @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #include "task/PxTask.h" #include "task/PxTaskDefine.h" diff --git a/src/PhysX/physx/tools/physxmetadatagenerator/PxBoilerPlate.h b/src/PhysX/physx/tools/physxmetadatagenerator/PxBoilerPlate.h index 6be095b2f..ede1c3d4c 100644 --- a/src/PhysX/physx/tools/physxmetadatagenerator/PxBoilerPlate.h +++ b/src/PhysX/physx/tools/physxmetadatagenerator/PxBoilerPlate.h @@ -23,4 +23,4 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. diff --git a/src/PhysX/physx/tools/physxmetadatagenerator/PxExtensionsCommon.h b/src/PhysX/physx/tools/physxmetadatagenerator/PxExtensionsCommon.h index 4f5178e6a..ce3c31d45 100644 --- a/src/PhysX/physx/tools/physxmetadatagenerator/PxExtensionsCommon.h +++ b/src/PhysX/physx/tools/physxmetadatagenerator/PxExtensionsCommon.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_EXTENSIONS_COMMON_H diff --git a/src/PhysX/physx/tools/physxmetadatagenerator/PxPhysicsWithExtensionsAPI.h b/src/PhysX/physx/tools/physxmetadatagenerator/PxPhysicsWithExtensionsAPI.h index 88dc86ac6..ee06aa80e 100644 --- a/src/PhysX/physx/tools/physxmetadatagenerator/PxPhysicsWithExtensionsAPI.h +++ b/src/PhysX/physx/tools/physxmetadatagenerator/PxPhysicsWithExtensionsAPI.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_PHYSICS_NXPHYSICSWITHEXTENSIONS_API diff --git a/src/PhysX/physx/tools/physxmetadatagenerator/PxVehicleExtensionAPI.h b/src/PhysX/physx/tools/physxmetadatagenerator/PxVehicleExtensionAPI.h index 0e0cfb1b7..a000a2229 100644 --- a/src/PhysX/physx/tools/physxmetadatagenerator/PxVehicleExtensionAPI.h +++ b/src/PhysX/physx/tools/physxmetadatagenerator/PxVehicleExtensionAPI.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #ifndef PX_PHYSICS_NXPHYSICSWITHVEHICLEEXTENSIONS_API diff --git a/src/PhysX/physx/tools/physxmetadatagenerator/generateMetaData.bat b/src/PhysX/physx/tools/physxmetadatagenerator/generateMetaData.bat index 651051768..1413ebf2e 100644 --- a/src/PhysX/physx/tools/physxmetadatagenerator/generateMetaData.bat +++ b/src/PhysX/physx/tools/physxmetadatagenerator/generateMetaData.bat @@ -23,7 +23,7 @@ :: (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE :: OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. :: -:: Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +:: Copyright (c) 2016-2019 NVIDIA Corporation. All rights reserved. @echo off setlocal EnableDelayedExpansion diff --git a/src/PhysX/physx/tools/physxmetadatagenerator/generateMetaData.py b/src/PhysX/physx/tools/physxmetadatagenerator/generateMetaData.py index 7af2f264c..81e837364 100644 --- a/src/PhysX/physx/tools/physxmetadatagenerator/generateMetaData.py +++ b/src/PhysX/physx/tools/physxmetadatagenerator/generateMetaData.py @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2016-2019 NVIDIA Corporation. All rights reserved. from __future__ import print_function diff --git a/src/PhysX/physx/tools/physxmetadatagenerator/generateMetaData.sh b/src/PhysX/physx/tools/physxmetadatagenerator/generateMetaData.sh index 149b523a4..7e2b124a1 100644 --- a/src/PhysX/physx/tools/physxmetadatagenerator/generateMetaData.sh +++ b/src/PhysX/physx/tools/physxmetadatagenerator/generateMetaData.sh @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. #!/bin/bash diff --git a/src/PhysX/physx/tools/physxmetadatagenerator/helper.sh b/src/PhysX/physx/tools/physxmetadatagenerator/helper.sh index 95b193442..6087bbccc 100644 --- a/src/PhysX/physx/tools/physxmetadatagenerator/helper.sh +++ b/src/PhysX/physx/tools/physxmetadatagenerator/helper.sh @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. #!/bin/bash diff --git a/src/PhysX/physx/tools/physxmetadatagenerator/lib/compare.py b/src/PhysX/physx/tools/physxmetadatagenerator/lib/compare.py index a7657a8c8..78f052657 100644 --- a/src/PhysX/physx/tools/physxmetadatagenerator/lib/compare.py +++ b/src/PhysX/physx/tools/physxmetadatagenerator/lib/compare.py @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2016-2019 NVIDIA Corporation. All rights reserved. # general utility module from __future__ import print_function diff --git a/src/PhysX/physx/tools/physxmetadatagenerator/lib/utils.py b/src/PhysX/physx/tools/physxmetadatagenerator/lib/utils.py index 1d3a786b5..5ab148482 100644 --- a/src/PhysX/physx/tools/physxmetadatagenerator/lib/utils.py +++ b/src/PhysX/physx/tools/physxmetadatagenerator/lib/utils.py @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2016-2019 NVIDIA Corporation. All rights reserved. # general utility module from __future__ import print_function diff --git a/src/PhysX/physx/tools/physxmetadatagenerator/readme.txt b/src/PhysX/physx/tools/physxmetadatagenerator/readme.txt index fa569f54c..e9009512a 100644 --- a/src/PhysX/physx/tools/physxmetadatagenerator/readme.txt +++ b/src/PhysX/physx/tools/physxmetadatagenerator/readme.txt @@ -23,7 +23,7 @@ ## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +## Copyright (c) 2018-2019 NVIDIA Corporation. All rights reserved. If the Physx API is changed, the API level serialization meta data files need to be updated. This can be done by running: diff --git a/src/PhysX/pxshared/include/foundation/Px.h b/src/PhysX/pxshared/include/foundation/Px.h index 28c744853..cac0bd960 100644 --- a/src/PhysX/pxshared/include/foundation/Px.h +++ b/src/PhysX/pxshared/include/foundation/Px.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/pxshared/include/foundation/PxAllocatorCallback.h b/src/PhysX/pxshared/include/foundation/PxAllocatorCallback.h index d9350ce2e..db5987f55 100644 --- a/src/PhysX/pxshared/include/foundation/PxAllocatorCallback.h +++ b/src/PhysX/pxshared/include/foundation/PxAllocatorCallback.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/pxshared/include/foundation/PxBitAndData.h b/src/PhysX/pxshared/include/foundation/PxBitAndData.h index be7699e49..a1f355935 100644 --- a/src/PhysX/pxshared/include/foundation/PxBitAndData.h +++ b/src/PhysX/pxshared/include/foundation/PxBitAndData.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/pxshared/include/foundation/PxBounds3.h b/src/PhysX/pxshared/include/foundation/PxBounds3.h index 7a071c3ab..cf4d44d38 100644 --- a/src/PhysX/pxshared/include/foundation/PxBounds3.h +++ b/src/PhysX/pxshared/include/foundation/PxBounds3.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -321,40 +321,40 @@ PX_CUDA_CALLABLE PX_FORCE_INLINE void PxBounds3::setMaximal() PX_CUDA_CALLABLE PX_FORCE_INLINE void PxBounds3::include(const PxVec3& v) { - PX_ASSERT(isValid()); + PX_SHARED_ASSERT(isValid()); minimum = minimum.minimum(v); maximum = maximum.maximum(v); } PX_CUDA_CALLABLE PX_FORCE_INLINE void PxBounds3::include(const PxBounds3& b) { - PX_ASSERT(isValid()); + PX_SHARED_ASSERT(isValid()); minimum = minimum.minimum(b.minimum); maximum = maximum.maximum(b.maximum); } PX_CUDA_CALLABLE PX_FORCE_INLINE bool PxBounds3::isEmpty() const { - PX_ASSERT(isValid()); + PX_SHARED_ASSERT(isValid()); return minimum.x > maximum.x; } PX_CUDA_CALLABLE PX_FORCE_INLINE bool PxBounds3::intersects(const PxBounds3& b) const { - PX_ASSERT(isValid() && b.isValid()); + PX_SHARED_ASSERT(isValid() && b.isValid()); return !(b.minimum.x > maximum.x || minimum.x > b.maximum.x || b.minimum.y > maximum.y || minimum.y > b.maximum.y || b.minimum.z > maximum.z || minimum.z > b.maximum.z); } PX_CUDA_CALLABLE PX_FORCE_INLINE bool PxBounds3::intersects1D(const PxBounds3& a, uint32_t axis) const { - PX_ASSERT(isValid() && a.isValid()); + PX_SHARED_ASSERT(isValid() && a.isValid()); return maximum[axis] >= a.minimum[axis] && a.maximum[axis] >= minimum[axis]; } PX_CUDA_CALLABLE PX_FORCE_INLINE bool PxBounds3::contains(const PxVec3& v) const { - PX_ASSERT(isValid()); + PX_SHARED_ASSERT(isValid()); return !(v.x < minimum.x || v.x > maximum.x || v.y < minimum.y || v.y > maximum.y || v.z < minimum.z || v.z > maximum.z); @@ -362,7 +362,7 @@ PX_CUDA_CALLABLE PX_FORCE_INLINE bool PxBounds3::contains(const PxVec3& v) const PX_CUDA_CALLABLE PX_FORCE_INLINE bool PxBounds3::isInside(const PxBounds3& box) const { - PX_ASSERT(isValid() && box.isValid()); + PX_SHARED_ASSERT(isValid() && box.isValid()); if(box.minimum.x > minimum.x) return false; if(box.minimum.y > minimum.y) @@ -380,57 +380,57 @@ PX_CUDA_CALLABLE PX_FORCE_INLINE bool PxBounds3::isInside(const PxBounds3& box) PX_CUDA_CALLABLE PX_FORCE_INLINE PxVec3 PxBounds3::getCenter() const { - PX_ASSERT(isValid()); + PX_SHARED_ASSERT(isValid()); return (minimum + maximum) * 0.5f; } PX_CUDA_CALLABLE PX_FORCE_INLINE float PxBounds3::getCenter(uint32_t axis) const { - PX_ASSERT(isValid()); + PX_SHARED_ASSERT(isValid()); return (minimum[axis] + maximum[axis]) * 0.5f; } PX_CUDA_CALLABLE PX_FORCE_INLINE float PxBounds3::getExtents(uint32_t axis) const { - PX_ASSERT(isValid()); + PX_SHARED_ASSERT(isValid()); return (maximum[axis] - minimum[axis]) * 0.5f; } PX_CUDA_CALLABLE PX_FORCE_INLINE PxVec3 PxBounds3::getDimensions() const { - PX_ASSERT(isValid()); + PX_SHARED_ASSERT(isValid()); return maximum - minimum; } PX_CUDA_CALLABLE PX_FORCE_INLINE PxVec3 PxBounds3::getExtents() const { - PX_ASSERT(isValid()); + PX_SHARED_ASSERT(isValid()); return getDimensions() * 0.5f; } PX_CUDA_CALLABLE PX_FORCE_INLINE void PxBounds3::scaleSafe(float scale) { - PX_ASSERT(isValid()); + PX_SHARED_ASSERT(isValid()); if(!isEmpty()) scaleFast(scale); } PX_CUDA_CALLABLE PX_FORCE_INLINE void PxBounds3::scaleFast(float scale) { - PX_ASSERT(isValid()); + PX_SHARED_ASSERT(isValid()); *this = centerExtents(getCenter(), getExtents() * scale); } PX_CUDA_CALLABLE PX_FORCE_INLINE void PxBounds3::fattenSafe(float distance) { - PX_ASSERT(isValid()); + PX_SHARED_ASSERT(isValid()); if(!isEmpty()) fattenFast(distance); } PX_CUDA_CALLABLE PX_FORCE_INLINE void PxBounds3::fattenFast(float distance) { - PX_ASSERT(isValid()); + PX_SHARED_ASSERT(isValid()); minimum.x -= distance; minimum.y -= distance; minimum.z -= distance; @@ -442,25 +442,25 @@ PX_CUDA_CALLABLE PX_FORCE_INLINE void PxBounds3::fattenFast(float distance) PX_CUDA_CALLABLE PX_INLINE PxBounds3 PxBounds3::transformSafe(const PxMat33& matrix, const PxBounds3& bounds) { - PX_ASSERT(bounds.isValid()); + PX_SHARED_ASSERT(bounds.isValid()); return !bounds.isEmpty() ? transformFast(matrix, bounds) : bounds; } PX_CUDA_CALLABLE PX_INLINE PxBounds3 PxBounds3::transformFast(const PxMat33& matrix, const PxBounds3& bounds) { - PX_ASSERT(bounds.isValid()); + PX_SHARED_ASSERT(bounds.isValid()); return PxBounds3::basisExtent(matrix * bounds.getCenter(), matrix, bounds.getExtents()); } PX_CUDA_CALLABLE PX_INLINE PxBounds3 PxBounds3::transformSafe(const PxTransform& transform, const PxBounds3& bounds) { - PX_ASSERT(bounds.isValid()); + PX_SHARED_ASSERT(bounds.isValid()); return !bounds.isEmpty() ? transformFast(transform, bounds) : bounds; } PX_CUDA_CALLABLE PX_INLINE PxBounds3 PxBounds3::transformFast(const PxTransform& transform, const PxBounds3& bounds) { - PX_ASSERT(bounds.isValid()); + PX_SHARED_ASSERT(bounds.isValid()); return PxBounds3::basisExtent(transform.transform(bounds.getCenter()), PxMat33(transform.q), bounds.getExtents()); } diff --git a/src/PhysX/pxshared/include/foundation/PxErrorCallback.h b/src/PhysX/pxshared/include/foundation/PxErrorCallback.h index 554c76c8a..b573d86e0 100644 --- a/src/PhysX/pxshared/include/foundation/PxErrorCallback.h +++ b/src/PhysX/pxshared/include/foundation/PxErrorCallback.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/pxshared/include/foundation/PxErrors.h b/src/PhysX/pxshared/include/foundation/PxErrors.h index eaedc50fd..c0cb9c9c1 100644 --- a/src/PhysX/pxshared/include/foundation/PxErrors.h +++ b/src/PhysX/pxshared/include/foundation/PxErrors.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/pxshared/include/foundation/PxFlags.h b/src/PhysX/pxshared/include/foundation/PxFlags.h index 58d456cf5..780fb2705 100644 --- a/src/PhysX/pxshared/include/foundation/PxFlags.h +++ b/src/PhysX/pxshared/include/foundation/PxFlags.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/pxshared/include/foundation/PxIO.h b/src/PhysX/pxshared/include/foundation/PxIO.h index 4000c9bcd..e5e2fef9d 100644 --- a/src/PhysX/pxshared/include/foundation/PxIO.h +++ b/src/PhysX/pxshared/include/foundation/PxIO.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/pxshared/include/foundation/PxIntrinsics.h b/src/PhysX/pxshared/include/foundation/PxIntrinsics.h index d4257168d..270b34bd6 100644 --- a/src/PhysX/pxshared/include/foundation/PxIntrinsics.h +++ b/src/PhysX/pxshared/include/foundation/PxIntrinsics.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/pxshared/include/foundation/PxMat33.h b/src/PhysX/pxshared/include/foundation/PxMat33.h index 6cf4257f1..d97d925cc 100644 --- a/src/PhysX/pxshared/include/foundation/PxMat33.h +++ b/src/PhysX/pxshared/include/foundation/PxMat33.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/pxshared/include/foundation/PxMat44.h b/src/PhysX/pxshared/include/foundation/PxMat44.h index 91500ae67..0b6403e40 100644 --- a/src/PhysX/pxshared/include/foundation/PxMat44.h +++ b/src/PhysX/pxshared/include/foundation/PxMat44.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -301,7 +301,7 @@ class PxMat44 PX_CUDA_CALLABLE PX_INLINE const PxVec3 getBasis(int num) const { - PX_ASSERT(num >= 0 && num < 3); + PX_SHARED_ASSERT(num >= 0 && num < 3); return (&column0)[num].getXYZ(); } diff --git a/src/PhysX/pxshared/include/foundation/PxMath.h b/src/PhysX/pxshared/include/foundation/PxMath.h index 6f4817fcb..fc51373b0 100644 --- a/src/PhysX/pxshared/include/foundation/PxMath.h +++ b/src/PhysX/pxshared/include/foundation/PxMath.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -47,7 +47,7 @@ #include #include "foundation/PxIntrinsics.h" -#include "foundation/PxAssert.h" +#include "foundation/PxSharedAssert.h" #if !PX_DOXYGEN namespace physx @@ -136,7 +136,7 @@ PX_CUDA_CALLABLE PX_FORCE_INLINE int32_t PxAbs(int32_t a) template PX_CUDA_CALLABLE PX_FORCE_INLINE T PxClamp(T v, T lo, T hi) { - PX_ASSERT(lo <= hi); + PX_SHARED_ASSERT(lo <= hi); return PxMin(hi, PxMax(lo, v)); } diff --git a/src/PhysX/pxshared/include/foundation/PxMemory.h b/src/PhysX/pxshared/include/foundation/PxMemory.h index 68d721def..2aacd8803 100644 --- a/src/PhysX/pxshared/include/foundation/PxMemory.h +++ b/src/PhysX/pxshared/include/foundation/PxMemory.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/pxshared/include/foundation/PxPlane.h b/src/PhysX/pxshared/include/foundation/PxPlane.h index 618d3f077..7d39323d3 100644 --- a/src/PhysX/pxshared/include/foundation/PxPlane.h +++ b/src/PhysX/pxshared/include/foundation/PxPlane.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/pxshared/include/foundation/PxPreprocessor.h b/src/PhysX/pxshared/include/foundation/PxPreprocessor.h index 13d84d93a..314627fc6 100644 --- a/src/PhysX/pxshared/include/foundation/PxPreprocessor.h +++ b/src/PhysX/pxshared/include/foundation/PxPreprocessor.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -293,31 +293,6 @@ DLL export macros #define PX_DLL_IMPORT #endif -/** -Define API function declaration - -PX_FOUNDATION_DLL=1 - used by the DLL library (PhysXCommon) to export the API -PX_FOUNDATION_DLL=0 - for windows configurations where the PX_FOUNDATION_API is linked through standard static linking -no definition - this will allow DLLs and libraries to use the exported API from PhysXCommon - -*/ - -#if PX_WINDOWS_FAMILY && !PX_ARM_FAMILY -#ifndef PX_FOUNDATION_DLL -#define PX_FOUNDATION_API PX_DLL_IMPORT -#elif PX_FOUNDATION_DLL -#define PX_FOUNDATION_API PX_DLL_EXPORT -#endif -#elif PX_UNIX_FAMILY -#ifdef PX_FOUNDATION_DLL -#define PX_FOUNDATION_API PX_UNIX_EXPORT -#endif -#endif - -#ifndef PX_FOUNDATION_API -#define PX_FOUNDATION_API -#endif - /** Calling convention */ diff --git a/src/PhysX/pxshared/include/foundation/PxProfiler.h b/src/PhysX/pxshared/include/foundation/PxProfiler.h index 82d978807..5c063d1c4 100644 --- a/src/PhysX/pxshared/include/foundation/PxProfiler.h +++ b/src/PhysX/pxshared/include/foundation/PxProfiler.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. #ifndef PXFOUNDATION_PXPROFILER_H #define PXFOUNDATION_PXPROFILER_H diff --git a/src/PhysX/pxshared/include/foundation/PxQuat.h b/src/PhysX/pxshared/include/foundation/PxQuat.h index 7ae30e9cb..fa2c6c89d 100644 --- a/src/PhysX/pxshared/include/foundation/PxQuat.h +++ b/src/PhysX/pxshared/include/foundation/PxQuat.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -87,7 +87,7 @@ class PxQuat */ PX_CUDA_CALLABLE PX_INLINE PxQuat(float angleRadians, const PxVec3& unitAxis) { - PX_ASSERT(PxAbs(1.0f - unitAxis.magnitude()) < 1e-3f); + PX_SHARED_ASSERT(PxAbs(1.0f - unitAxis.magnitude()) < 1e-3f); const float a = angleRadians * 0.5f; const float s = PxSin(a); w = PxCos(a); diff --git a/src/PhysX/pxshared/include/foundation/PxSharedAssert.h b/src/PhysX/pxshared/include/foundation/PxSharedAssert.h new file mode 100644 index 000000000..1cb05cb2e --- /dev/null +++ b/src/PhysX/pxshared/include/foundation/PxSharedAssert.h @@ -0,0 +1,46 @@ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// * Neither the name of NVIDIA CORPORATION nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. +// Copyright (c) 2001-2004 NovodeX AG. All rights reserved. + +#ifndef PXFOUNDATION_PXASSERT_H +#define PXFOUNDATION_PXASSERT_H + +/** \addtogroup foundation +@{ */ + +#include "foundation/Px.h" + +#if !PX_ENABLE_ASSERTS + #define PX_SHARED_ASSERT(exp) ((void)0) +#else + #include + #define PX_SHARED_ASSERT(exp) assert(exp); +#endif // !PX_ENABLE_ASSERTS + +/** @} */ +#endif // #ifndef PXFOUNDATION_PXASSERT_H diff --git a/src/PhysX/pxshared/include/foundation/PxSimpleTypes.h b/src/PhysX/pxshared/include/foundation/PxSimpleTypes.h index 162b788f5..5649c91f1 100644 --- a/src/PhysX/pxshared/include/foundation/PxSimpleTypes.h +++ b/src/PhysX/pxshared/include/foundation/PxSimpleTypes.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/pxshared/include/foundation/PxStrideIterator.h b/src/PhysX/pxshared/include/foundation/PxStrideIterator.h index 786938e3d..ed66f8c1c 100644 --- a/src/PhysX/pxshared/include/foundation/PxStrideIterator.h +++ b/src/PhysX/pxshared/include/foundation/PxStrideIterator.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -31,7 +31,7 @@ #define PXFOUNDATION_PXSTRIDEITERATOR_H #include "foundation/Px.h" -#include "foundation/PxAssert.h" +#include "foundation/PxSharedAssert.h" /** \addtogroup foundation @{ @@ -106,7 +106,7 @@ class PxStrideIterator */ explicit PX_INLINE PxStrideIterator(T* ptr = NULL, PxU32 stride = sizeof(T)) : mPtr(ptr), mStride(stride) { - PX_ASSERT(mStride == 0 || sizeof(T) <= mStride); + PX_SHARED_ASSERT(mStride == 0 || sizeof(T) <= mStride); } /** @@ -117,7 +117,7 @@ class PxStrideIterator PX_INLINE PxStrideIterator(const PxStrideIterator::Type>& strideIterator) : mPtr(strideIterator.ptr()), mStride(strideIterator.stride()) { - PX_ASSERT(mStride == 0 || sizeof(T) <= mStride); + PX_SHARED_ASSERT(mStride == 0 || sizeof(T) <= mStride); } /** @@ -237,7 +237,7 @@ class PxStrideIterator */ PX_INLINE int operator-(const PxStrideIterator& other) const { - PX_ASSERT(isCompatible(other)); + PX_SHARED_ASSERT(isCompatible(other)); int byteDiff = static_cast(reinterpret_cast(mPtr) - reinterpret_cast(other.mPtr)); return byteDiff / static_cast(stride()); } @@ -247,7 +247,7 @@ class PxStrideIterator */ PX_INLINE bool operator==(const PxStrideIterator& other) const { - PX_ASSERT(isCompatible(other)); + PX_SHARED_ASSERT(isCompatible(other)); return mPtr == other.mPtr; } @@ -256,7 +256,7 @@ class PxStrideIterator */ PX_INLINE bool operator!=(const PxStrideIterator& other) const { - PX_ASSERT(isCompatible(other)); + PX_SHARED_ASSERT(isCompatible(other)); return mPtr != other.mPtr; } @@ -265,7 +265,7 @@ class PxStrideIterator */ PX_INLINE bool operator<(const PxStrideIterator& other) const { - PX_ASSERT(isCompatible(other)); + PX_SHARED_ASSERT(isCompatible(other)); return mPtr < other.mPtr; } @@ -274,7 +274,7 @@ class PxStrideIterator */ PX_INLINE bool operator>(const PxStrideIterator& other) const { - PX_ASSERT(isCompatible(other)); + PX_SHARED_ASSERT(isCompatible(other)); return mPtr > other.mPtr; } @@ -283,7 +283,7 @@ class PxStrideIterator */ PX_INLINE bool operator<=(const PxStrideIterator& other) const { - PX_ASSERT(isCompatible(other)); + PX_SHARED_ASSERT(isCompatible(other)); return mPtr <= other.mPtr; } @@ -292,7 +292,7 @@ class PxStrideIterator */ PX_INLINE bool operator>=(const PxStrideIterator& other) const { - PX_ASSERT(isCompatible(other)); + PX_SHARED_ASSERT(isCompatible(other)); return mPtr >= other.mPtr; } diff --git a/src/PhysX/pxshared/include/foundation/PxTransform.h b/src/PhysX/pxshared/include/foundation/PxTransform.h index 8b29584f3..2164ca3c1 100644 --- a/src/PhysX/pxshared/include/foundation/PxTransform.h +++ b/src/PhysX/pxshared/include/foundation/PxTransform.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -66,7 +66,7 @@ class PxTransform PX_CUDA_CALLABLE PX_FORCE_INLINE explicit PxTransform(const PxQuat& orientation) : q(orientation), p(0) { - PX_ASSERT(orientation.isSane()); + PX_SHARED_ASSERT(orientation.isSane()); } PX_CUDA_CALLABLE PX_FORCE_INLINE PxTransform(float x, float y, float z, PxQuat aQ = PxQuat(PxIdentity)) @@ -76,7 +76,7 @@ class PxTransform PX_CUDA_CALLABLE PX_FORCE_INLINE PxTransform(const PxVec3& p0, const PxQuat& q0) : q(q0), p(p0) { - PX_ASSERT(q0.isSane()); + PX_SHARED_ASSERT(q0.isSane()); } PX_CUDA_CALLABLE PX_FORCE_INLINE explicit PxTransform(const PxMat44& m); // defined in PxMat44.h @@ -91,7 +91,7 @@ class PxTransform PX_CUDA_CALLABLE PX_FORCE_INLINE PxTransform operator*(const PxTransform& x) const { - PX_ASSERT(x.isSane()); + PX_SHARED_ASSERT(x.isSane()); return transform(x); } @@ -104,39 +104,39 @@ class PxTransform PX_CUDA_CALLABLE PX_FORCE_INLINE PxTransform getInverse() const { - PX_ASSERT(isFinite()); + PX_SHARED_ASSERT(isFinite()); return PxTransform(q.rotateInv(-p), q.getConjugate()); } PX_CUDA_CALLABLE PX_FORCE_INLINE PxVec3 transform(const PxVec3& input) const { - PX_ASSERT(isFinite()); + PX_SHARED_ASSERT(isFinite()); return q.rotate(input) + p; } PX_CUDA_CALLABLE PX_FORCE_INLINE PxVec3 transformInv(const PxVec3& input) const { - PX_ASSERT(isFinite()); + PX_SHARED_ASSERT(isFinite()); return q.rotateInv(input - p); } PX_CUDA_CALLABLE PX_FORCE_INLINE PxVec3 rotate(const PxVec3& input) const { - PX_ASSERT(isFinite()); + PX_SHARED_ASSERT(isFinite()); return q.rotate(input); } PX_CUDA_CALLABLE PX_FORCE_INLINE PxVec3 rotateInv(const PxVec3& input) const { - PX_ASSERT(isFinite()); + PX_SHARED_ASSERT(isFinite()); return q.rotateInv(input); } //! Transform transform to parent (returns compound transform: first src, then *this) PX_CUDA_CALLABLE PX_FORCE_INLINE PxTransform transform(const PxTransform& src) const { - PX_ASSERT(src.isSane()); - PX_ASSERT(isSane()); + PX_SHARED_ASSERT(src.isSane()); + PX_SHARED_ASSERT(isSane()); // src = [srct, srcr] -> [r*srct + t, r*srcr] return PxTransform(q.rotate(src.p) + p, q * src.q); } @@ -171,8 +171,8 @@ class PxTransform //! Transform transform from parent (returns compound transform: first src, then this->inverse) PX_CUDA_CALLABLE PX_FORCE_INLINE PxTransform transformInv(const PxTransform& src) const { - PX_ASSERT(src.isSane()); - PX_ASSERT(isFinite()); + PX_SHARED_ASSERT(src.isSane()); + PX_SHARED_ASSERT(isFinite()); // src = [srct, srcr] -> [r^-1*(srct-t), r^-1*srcr] PxQuat qinv = q.getConjugate(); return PxTransform(qinv.rotate(src.p - p), qinv * src.q); diff --git a/src/PhysX/pxshared/include/foundation/PxUnionCast.h b/src/PhysX/pxshared/include/foundation/PxUnionCast.h index ec35911e0..6ae6c72d2 100644 --- a/src/PhysX/pxshared/include/foundation/PxUnionCast.h +++ b/src/PhysX/pxshared/include/foundation/PxUnionCast.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 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/src/PhysX/pxshared/include/foundation/PxVec2.h b/src/PhysX/pxshared/include/foundation/PxVec2.h index 0736eddb8..82d6be4eb 100644 --- a/src/PhysX/pxshared/include/foundation/PxVec2.h +++ b/src/PhysX/pxshared/include/foundation/PxVec2.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -109,7 +109,7 @@ class PxVec2 */ PX_CUDA_CALLABLE PX_FORCE_INLINE float& operator[](int index) { - PX_ASSERT(index >= 0 && index <= 1); + PX_SHARED_ASSERT(index >= 0 && index <= 1); return reinterpret_cast(this)[index]; } @@ -119,7 +119,7 @@ class PxVec2 */ PX_CUDA_CALLABLE PX_FORCE_INLINE const float& operator[](int index) const { - PX_ASSERT(index >= 0 && index <= 1); + PX_SHARED_ASSERT(index >= 0 && index <= 1); return reinterpret_cast(this)[index]; } diff --git a/src/PhysX/pxshared/include/foundation/PxVec3.h b/src/PhysX/pxshared/include/foundation/PxVec3.h index 9ba01a091..3e19f0066 100644 --- a/src/PhysX/pxshared/include/foundation/PxVec3.h +++ b/src/PhysX/pxshared/include/foundation/PxVec3.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -111,7 +111,7 @@ class PxVec3 */ PX_CUDA_CALLABLE PX_FORCE_INLINE float& operator[](unsigned int index) { - PX_ASSERT(index <= 2); + PX_SHARED_ASSERT(index <= 2); return reinterpret_cast(this)[index]; } @@ -121,7 +121,7 @@ class PxVec3 */ PX_CUDA_CALLABLE PX_FORCE_INLINE const float& operator[](unsigned int index) const { - PX_ASSERT(index <= 2); + PX_SHARED_ASSERT(index <= 2); return reinterpret_cast(this)[index]; } @@ -325,7 +325,7 @@ class PxVec3 PX_CUDA_CALLABLE PX_FORCE_INLINE float normalizeFast() { const float mag = magnitude(); - PX_ASSERT(mag >= PX_NORMALIZATION_EPSILON); + PX_SHARED_ASSERT(mag >= PX_NORMALIZATION_EPSILON); *this *= 1.0f / mag; return mag; } diff --git a/src/PhysX/pxshared/include/foundation/PxVec4.h b/src/PhysX/pxshared/include/foundation/PxVec4.h index dd7ebdfa6..264a88eff 100644 --- a/src/PhysX/pxshared/include/foundation/PxVec4.h +++ b/src/PhysX/pxshared/include/foundation/PxVec4.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -34,7 +34,7 @@ */ #include "foundation/PxMath.h" #include "foundation/PxVec3.h" -#include "foundation/PxAssert.h" +#include "foundation/PxSharedAssert.h" /** \brief 4 Element vector class. @@ -132,7 +132,7 @@ class PxVec4 */ PX_CUDA_CALLABLE PX_INLINE float& operator[](unsigned int index) { - PX_ASSERT(index <= 3); + PX_SHARED_ASSERT(index <= 3); return reinterpret_cast(this)[index]; } @@ -142,7 +142,7 @@ class PxVec4 */ PX_CUDA_CALLABLE PX_INLINE const float& operator[](unsigned int index) const { - PX_ASSERT(index <= 3); + PX_SHARED_ASSERT(index <= 3); return reinterpret_cast(this)[index]; } diff --git a/src/PhysX/pxshared/include/foundation/unix/PxUnixIntrinsics.h b/src/PhysX/pxshared/include/foundation/unix/PxUnixIntrinsics.h index 64c1367b7..c0a01ba75 100644 --- a/src/PhysX/pxshared/include/foundation/unix/PxUnixIntrinsics.h +++ b/src/PhysX/pxshared/include/foundation/unix/PxUnixIntrinsics.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -31,7 +31,7 @@ #define PXFOUNDATION_PXUNIXINTRINSICS_H #include "foundation/Px.h" -#include "foundation/PxAssert.h" +#include "foundation/PxSharedAssert.h" #if !(PX_LINUX || PX_ANDROID || PX_PS4 || PX_APPLE_FAMILY) #error "This file should only be included by Unix builds!!" @@ -175,7 +175,7 @@ Set 128B to zero starting at \c dst+offset. Must be aligned. */ PX_FORCE_INLINE void memZero128(void* dest, uint32_t offset = 0) { - PX_ASSERT(((size_t(dest) + offset) & 0x7f) == 0); + PX_SHARED_ASSERT(((size_t(dest) + offset) & 0x7f) == 0); memSet(reinterpret_cast(dest) + offset, 0, 128); } diff --git a/src/PhysX/pxshared/include/foundation/windows/PxWindowsIntrinsics.h b/src/PhysX/pxshared/include/foundation/windows/PxWindowsIntrinsics.h index 3705b26e9..b206bb7aa 100644 --- a/src/PhysX/pxshared/include/foundation/windows/PxWindowsIntrinsics.h +++ b/src/PhysX/pxshared/include/foundation/windows/PxWindowsIntrinsics.h @@ -23,7 +23,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -31,7 +31,7 @@ #define PXFOUNDATION_PXWINDOWSINTRINSICS_H #include "foundation/Px.h" -#include "foundation/PxAssert.h" +#include "foundation/PxSharedAssert.h" #if !PX_WINDOWS_FAMILY #error "This file should only be included by Windows builds!!" @@ -176,7 +176,7 @@ Set 128B to zero starting at \c dst+offset. Must be aligned. */ PX_FORCE_INLINE void memZero128(void* dest, uint32_t offset = 0) { - PX_ASSERT(((size_t(dest) + offset) & 0x7f) == 0); + PX_SHARED_ASSERT(((size_t(dest) + offset) & 0x7f) == 0); memSet(reinterpret_cast(dest) + offset, 0, 128); }