From ca32c59a58d37c1822e185a2d5f3d0d3e8943593 Mon Sep 17 00:00:00 2001
From: Marijn Tamis <mtamis@nvidia.com>
Date: Thu, 3 May 2018 18:22:48 +0200
Subject: NvCloth 1.1.4 Release. (24070740)

---
 NvCloth/src/SwCloth.cpp | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'NvCloth/src/SwCloth.cpp')

diff --git a/NvCloth/src/SwCloth.cpp b/NvCloth/src/SwCloth.cpp
index 6077ada..46a7784 100644
--- a/NvCloth/src/SwCloth.cpp
+++ b/NvCloth/src/SwCloth.cpp
@@ -269,28 +269,13 @@ void SwCloth::setVirtualParticles(Range<const uint32_t[4]> indices, Range<const
 
 	// shuffle indices to form independent SIMD sets
 	uint16_t numParticles = uint16_t(mCurParticles.size());
-	TripletScheduler scheduler(indices);
+	TripletScheduler scheduler(indices); //the TripletScheduler makes a copy so indices is not modified
 	scheduler.simd(numParticles, 4);
 
-	// convert indices to byte offset
-	Vec4us dummy(numParticles, uint16_t(numParticles + 1), uint16_t(numParticles + 2), 0);
-	Vector<uint32_t>::Type::ConstIterator sIt = scheduler.mSetSizes.begin();
-	Vector<uint32_t>::Type::ConstIterator sEnd = scheduler.mSetSizes.end();
-	TripletScheduler::ConstTripletIter tIt = scheduler.mTriplets.begin(), tLast;
-	mVirtualParticleIndices.resize(0);
-	mVirtualParticleIndices.reserve(indices.size() + 3 * uint32_t(sEnd - sIt));
-	for (; sIt != sEnd; ++sIt)
-	{
-		uint32_t setSize = *sIt;
-		for (tLast = tIt + setSize; tIt != tLast; ++tIt, ++mNumVirtualParticles)
-			mVirtualParticleIndices.pushBack(Vec4us(*tIt));
-		mVirtualParticleIndices.resize((mVirtualParticleIndices.size() + 3) & ~3, dummy);
-	}
-	Vector<Vec4us>::Type(mVirtualParticleIndices.begin(), mVirtualParticleIndices.end())
-	    .swap(mVirtualParticleIndices);
+	mVirtualParticleIndices.swap(scheduler.mPaddedTriplets);
 
 	// precompute 1/dot(w,w)
-	Vector<PxVec4>::Type().swap(mVirtualParticleWeights);
+	Vector<PxVec4>::Type().swap(mVirtualParticleWeights); //clear and trim
 	mVirtualParticleWeights.reserve(weights.size());
 	for (; !weights.empty(); weights.popFront())
 	{
-- 
cgit v1.2.3