diff options
| author | Marijn Tamis <[email protected]> | 2018-05-03 18:22:48 +0200 |
|---|---|---|
| committer | Marijn Tamis <[email protected]> | 2018-05-03 18:22:48 +0200 |
| commit | ca32c59a58d37c1822e185a2d5f3d0d3e8943593 (patch) | |
| tree | b06b9eec03f34344ef8fc31aa147b2714d3962ee /NvCloth/src/dx/DxCloth.h | |
| parent | Forced rename of platform folders in cmake dir. Git didn't pick this up before. (diff) | |
| download | nvcloth-ca32c59a58d37c1822e185a2d5f3d0d3e8943593.tar.xz nvcloth-ca32c59a58d37c1822e185a2d5f3d0d3e8943593.zip | |
NvCloth 1.1.4 Release. (24070740)
Diffstat (limited to 'NvCloth/src/dx/DxCloth.h')
| -rw-r--r-- | NvCloth/src/dx/DxCloth.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/NvCloth/src/dx/DxCloth.h b/NvCloth/src/dx/DxCloth.h index 5e783fa..3a04734 100644 --- a/NvCloth/src/dx/DxCloth.h +++ b/NvCloth/src/dx/DxCloth.h @@ -91,11 +91,9 @@ class DxCloth : protected DxContextLock, public ClothImpl<DxCloth> typedef DxFabric FabricType; typedef DxContextLock ContextLockType; - template <typename> - struct MapTraits; - typedef DxVectorMap<DxBatchedVector<physx::PxVec3> > MappedVec3fVectorType; typedef DxVectorMap<DxBatchedVector<physx::PxVec4> > MappedVec4fVectorType; + typedef DxVectorMap<DxBatchedVector<Vec4us> > MappedVec4usVectorType; typedef DxVectorMap<DxBatchedVector<IndexPair> > MappedIndexVectorType; typedef DxVectorMap<DxBatchedVector<uint32_t> > MappedMaskVectorType; @@ -190,9 +188,9 @@ class DxCloth : protected DxContextLock, public ClothImpl<DxCloth> float mFriction; // virtual particles - DxDeviceVector<uint32_t> mVirtualParticleSetSizes; - DxDeviceVector<Vec4us> mVirtualParticleIndices; - DxDeviceVector<physx::PxVec4> mVirtualParticleWeights; + DxBatchedVector<uint32_t> mVirtualParticleSetSizes; + DxBatchedVector<Vec4us> mVirtualParticleIndices; + DxBatchedVector<physx::PxVec4> mVirtualParticleWeights; // self collision float mSelfCollisionDistance; |