diff options
| author | Marijn Tamis <[email protected]> | 2019-04-01 14:21:09 +0200 |
|---|---|---|
| committer | Marijn Tamis <[email protected]> | 2019-04-01 14:21:09 +0200 |
| commit | d243404d4ba88bcf53f7310cc8980b4efe38c19f (patch) | |
| tree | dcc8ce2904e9f813e03f71f825c4d3c9ec565d91 /NvCloth/samples/SampleBase/task | |
| parent | Add new SetSpheres and SetPlanes api's to bring them in line with setTriangles. (diff) | |
| download | nvcloth-1.1.6.tar.xz nvcloth-1.1.6.zip | |
1.1.6 Release.1.1.6
Diffstat (limited to 'NvCloth/samples/SampleBase/task')
| -rw-r--r-- | NvCloth/samples/SampleBase/task/PxTask.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/NvCloth/samples/SampleBase/task/PxTask.h b/NvCloth/samples/SampleBase/task/PxTask.h index 85d91da..e2b19e2 100644 --- a/NvCloth/samples/SampleBase/task/PxTask.h +++ b/NvCloth/samples/SampleBase/task/PxTask.h @@ -32,7 +32,6 @@ #include "task/PxTaskManager.h" #include "task/PxCpuDispatcher.h" #include "task/PxGpuDispatcher.h" -#include "foundation/PxAssert.h" namespace physx { @@ -117,7 +116,7 @@ public: //! \brief Release method implementation virtual void release() { - PX_ASSERT(mTm); + NV_CLOTH_ASSERT(mTm); // clear mTm before calling taskCompleted() for safety PxTaskManager* save = mTm; @@ -129,7 +128,7 @@ public: // task is allowed to start. PX_INLINE void finishBefore( PxTaskID taskID ) { - PX_ASSERT(mTm); + NV_CLOTH_ASSERT(mTm); mTm->finishBefore( *this, taskID); } @@ -137,7 +136,7 @@ public: // task has completed. PX_INLINE void startAfter( PxTaskID taskID ) { - PX_ASSERT(mTm); + NV_CLOTH_ASSERT(mTm); mTm->startAfter( *this, taskID ); } @@ -147,7 +146,7 @@ public: */ PX_INLINE void addReference() { - PX_ASSERT(mTm); + NV_CLOTH_ASSERT(mTm); mTm->addReference( mTaskID ); } @@ -157,7 +156,7 @@ public: */ PX_INLINE void removeReference() { - PX_ASSERT(mTm); + NV_CLOTH_ASSERT(mTm); mTm->decrReference( mTaskID ); } @@ -244,7 +243,7 @@ public: */ PX_INLINE void setContinuation(PxTaskManager& tm, PxBaseTask* c) { - PX_ASSERT( mRefCount == 0 ); + NV_CLOTH_ASSERT( mRefCount == 0 ); mRefCount = 1; mCont = c; mTm = &tm; @@ -263,15 +262,15 @@ public: */ PX_INLINE void setContinuation( PxBaseTask* c ) { - PX_ASSERT( c ); - PX_ASSERT( mRefCount == 0 ); + NV_CLOTH_ASSERT( c ); + NV_CLOTH_ASSERT( mRefCount == 0 ); mRefCount = 1; mCont = c; if( mCont ) { mCont->addReference(); mTm = mCont->getTaskManager(); - PX_ASSERT( mTm ); + NV_CLOTH_ASSERT( mTm ); } } |