rename param to collides(), #68

phetsims · Sep 26, 2024 · 239e665 · 239e665
1 parent c82aa90
commit 239e665
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/js/common/model/BohrModel.ts b/js/common/model/BohrModel.ts
@@ -206,8 +206,8 @@ export default class BohrModel extends HydrogenAtom {
   protected collides( photon: Photon ): boolean {
     const electronPosition = this.electron.positionProperty.value;
     const photonPosition = photon.positionProperty.value;
-    const collisionCloseness = photon.radius + this.electron.radius;
-    return this.pointsCollide( electronPosition, photonPosition, collisionCloseness );
+    const maxDistance = photon.radius + this.electron.radius;
+    return this.pointsCollide( electronPosition, photonPosition, maxDistance );
   }
 
   //--------------------------------------------------------------------------------------------------------------------

diff --git a/js/common/model/HydrogenAtom.ts b/js/common/model/HydrogenAtom.ts
@@ -112,10 +112,9 @@ export default abstract class HydrogenAtom extends PhetioObject {
 
   /**
    * Determines if two points collide.
-   * Any distance between the points that is <= threshold is considered a collision.
    */
-  protected pointsCollide( position1: Vector2, position2: Vector2, threshold: number ): boolean {
-    return position1.distance( position2 ) <= threshold;
+  protected pointsCollide( position1: Vector2, position2: Vector2, maxDistance: number ): boolean {
+    return position1.distance( position2 ) <= maxDistance;
   }
 
   /**

diff --git a/js/common/model/PlumPuddingModel.ts b/js/common/model/PlumPuddingModel.ts
@@ -282,9 +282,9 @@ export default class PlumPuddingModel extends HydrogenAtom {
 
       const electronPosition = this.electron.positionProperty.value;
       const photonPosition = photon.positionProperty.value;
-      const collisionCloseness = photon.radius + this.electron.radius;
+      const maxDistance = photon.radius + this.electron.radius;
 
-      if ( this.pointsCollide( electronPosition, photonPosition, collisionCloseness ) ) {
+      if ( this.pointsCollide( electronPosition, photonPosition, maxDistance ) ) {
         if ( dotRandom.nextDouble() < PHOTON_ABSORPTION_PROBABILITY ) {
           this.numberOfPhotonsAbsorbedProperty.value += 1;
           assert && assert( this.numberOfPhotonsAbsorbedProperty.value <= MAX_PHOTONS_ABSORBED );