Particles are added to bucket via Bucket.addParticleNearestAtom() in cases where resetting bucket state isn't important. #112

Author: Denz1994

js/common/model/Bucket.js

@@ -54,16 +54,21 @@ class Bucket extends SphereBucket {
 
     // Create the atoms for each element and add them to the bucket.
     for ( let i = 0; i < quantity; i++ ) {
-      this.addParticleFirstOpen( new Atom2( element, stepEmitter ), false );
+      this.addParticleNearestOpen( new Atom2( element, stepEmitter ), false );
     }
   }
 
   // Instantly place the atom in the correct position, whether or not it is in the bucket
-  placeAtom( atom ) {
+  placeAtom( atom, addFirstOpen ) {
     if ( this.containsParticle( atom ) ) {
       this.removeParticle( atom, true );
     }
-    this.addParticleFirstOpen( atom, false );
+    if ( addFirstOpen ) {
+      this.addParticleFirstOpen( atom, false );
+    }
+    else {
+      this.addParticleNearestOpen( atom, false );
+    }
   }
 
   /**
@@ -75,7 +80,7 @@ class Bucket extends SphereBucket {
     this.fullState.forEach( atom => {
       if ( !this.particleList.contains( atom ) ) {
         this.particleList.push( atom );
-        this.placeAtom( atom );
+        this.placeAtom( atom, true );
       }
     } );
   }

js/common/model/Kit.js

@@ -93,7 +93,7 @@ class Kit {
       atom.reset();
 
       // THEN place it so we overwrite its "bad" position and destination info
-      this.getBucketForElement( atom.element ).placeAtom( atom );
+      this.getBucketForElement( atom.element ).placeAtom( atom, true );
     } );
 
     // if reset kit ignores collection boxes, add in other atoms that are equivalent to how the bucket started

js/common/view/KitNode.js

@@ -128,7 +128,7 @@ class KitNode extends Node {
 
         // Add the particle to the bucket atom layer and the bucket's particles.
         this.atomLayer.addChild( atomNode );
-        bucket.placeAtom( atom );
+        bucket.placeAtom( atom, false );
 
         // Add a drag listener that will move the model element when the user
         // drags this atom.