minor code cleanup, see #258

phetsims · Jul 1, 2024 · e989593 · e989593
1 parent b6d5434
commit e989593
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/js/balance-point/view/BalancePointScreenView.ts b/js/balance-point/view/BalancePointScreenView.ts
@@ -44,8 +44,10 @@ export default class BalancePointScreenView extends SoccerScreenView<BalancePoin
 
     super( model, options );
 
-    // There is only one scene in the balance point screen.
+    // By design, there is only one scene model used on this screen, and the code throughout this file assumes that this
+    // is the case.
     const sceneModel = model.selectedSceneModelProperty.value;
+
     const sceneView = new BalancePointSceneView(
       model,
       sceneModel,
@@ -113,13 +115,13 @@ export default class BalancePointScreenView extends SoccerScreenView<BalancePoin
     } );
 
     const kickButton = new KickButton( {
-      visibleProperty: model.selectedSceneModelProperty.value.hasKickableSoccerBallsProperty,
+      visibleProperty: sceneModel.hasKickableSoccerBallsProperty,
       content: new Text( MeanShareAndBalanceStrings.kickStringProperty, {
         font: KICK_BUTTON_FONT,
         maxWidth: 60
       } ),
       multiKick: false,
-      listener: () => model.selectedSceneModelProperty.value.targetNumberOfBallsProperty.value++,
+      listener: () => sceneModel.targetNumberOfBallsProperty.value++,
       leftTop: this.modelViewTransform.modelToViewXY( -2, 0 ).plusXY( 0, 8 ),
       accessibleName: MeanShareAndBalanceStrings.kickStringProperty,
       tandem: options.tandem.createTandem( 'kickButton' )
@@ -143,15 +145,15 @@ export default class BalancePointScreenView extends SoccerScreenView<BalancePoin
     const notepadNodeBounds = notepadNode.bounds;
     const calculationDependencies = [
       model.selectedSceneModelProperty,
-      ...model.selectedSceneModelProperty.value.soccerBalls.map( ball => ball.valueProperty ),
-      ...model.selectedSceneModelProperty.value.soccerBalls.map( ball => ball.soccerBallPhaseProperty )
+      ...sceneModel.soccerBalls.map( ball => ball.valueProperty ),
+      ...sceneModel.soccerBalls.map( ball => ball.soccerBallPhaseProperty )
     ];
 
     const meanInfoPanel = new MeanInfoPanel(
       calculationDependencies,
-      model.selectedSceneModelProperty.value.meanValueProperty,
-      () => model.selectedSceneModelProperty.value.getStackedObjects().map( ball => ball.valueProperty.value! ),
-      () => model.selectedSceneModelProperty.value.getStackedObjects().length,
+      sceneModel.meanValueProperty,
+      () => sceneModel.getStackedObjects().map( ball => ball.valueProperty.value! ),
+      () => sceneModel.getStackedObjects().length,
       model.meanInfoPanelVisibleProperty, notepadNodeBounds,
       () => controls.infoButton!.focus(),
       {

diff --git a/js/level-out/view/LevelOutScreenView.ts b/js/level-out/view/LevelOutScreenView.ts
@@ -125,8 +125,11 @@ export default class LevelOutScreenView extends MeanShareAndBalanceScreenView {
       centerX: this.playAreaCenterX
     } );
 
-    const meanPredictSliderModelViewTransform = ModelViewTransform2.createSinglePointScaleInvertedYMapping( new Vector2( 0, 0 ),
-      new Vector2( this.playAreaCenterX, MeanShareAndBalanceConstants.NOTEPAD_CUPS_BOTTOM_Y ), MeanShareAndBalanceConstants.CUP_HEIGHT );
+    const meanPredictSliderModelViewTransform = ModelViewTransform2.createSinglePointScaleInvertedYMapping(
+      new Vector2( 0, 0 ),
+      new Vector2( this.playAreaCenterX, MeanShareAndBalanceConstants.NOTEPAD_CUPS_BOTTOM_Y ),
+      MeanShareAndBalanceConstants.CUP_HEIGHT
+    );
     const meanPredictionLine = new MeanPredictionLine(
       model.meanPredictionProperty,
       model.dragRange,