Merge pull request #196 from cortex-command-community/penetrating-list

Missing atoms penetrating list

Author: garethyr

Entities/AtomGroup.cpp

@@ -1215,9 +1215,10 @@ float AtomGroup::Travel(Vector &position,
 
             // TERRAIN COLLISION RESPONSE /////////////////////////////////////////////////////
             // Determine which of the colliding Atom:s will penetrate the terrain.
-            do
+			bool somethingPenetrated = false;
+			do
             {
-                penetratingAtoms.clear();
+				somethingPenetrated = false;
 
                 distMass = mass / static_cast<float>(hitTerrAtoms.size() * (m_Resolution ? m_Resolution : 1));
                 distMI = m_MomInertia / static_cast<float>(hitTerrAtoms.size() * (m_Resolution ? m_Resolution : 1));
@@ -1242,11 +1243,12 @@ float AtomGroup::Travel(Vector &position,
                         // Move the penetrating atom to the pen. list from the coll. list.
 						penetratingAtoms.push_back(*aItr);
 						aItr = hitTerrAtoms.erase(aItr);
+						somethingPenetrated = true;
 					} else
 						++aItr;
                 }
             }
-            while (!hitTerrAtoms.empty() && !penetratingAtoms.empty());
+			while (!hitTerrAtoms.empty() && somethingPenetrated);
 
             // TERRAIN BOUNCE //////////////////////////////////////////////////////////////////
             // If some Atoms could not penetrate even though all the impulse was on them,
@@ -1937,8 +1939,9 @@ before adding them to the MovableMan.
 
             // TERRAIN COLLISION RESPONSE /////////////////////////////////////////////////////
             // Determine which of the colliding Atom:s will penetrate the terrain.
+			bool somethingPenetrated = false;
             do {
-                penetratingAtoms.clear();
+				somethingPenetrated = false;
 
                 massDist = mass / static_cast<float>(hitTerrAtoms.size() * (m_Resolution ? m_Resolution : 1));
 
@@ -1952,11 +1955,12 @@ before adding them to the MovableMan.
                         // Move the penetrating atom to the pen. list from the coll. list.
                         penetratingAtoms.push_back(pair<Atom *, Vector>((*aoItr).first, (*aoItr).second));
                         aoItr = hitTerrAtoms.erase(aoItr);
+						somethingPenetrated = true;
                     }
                     else
                         ++aoItr;
                 }
-            } while (!hitTerrAtoms.empty() && !penetratingAtoms.empty());
+			} while (!hitTerrAtoms.empty() && somethingPenetrated);
 
             // TERRAIN BOUNCE //////////////////////////////////////////////////////////////////
             // If some Atom:s could not penetrate even though all the mass was on them,