From b3d1c5a575226955613b6d556fb0d39062b2d107 Mon Sep 17 00:00:00 2001 From: Jesse Date: Wed, 21 Sep 2022 11:50:57 -0400 Subject: [PATCH] rename simSoundEnabledProperty to shapeSoundEnabledProperty, see https://github.com/phetsims/joist/issues/864 --- js/quadrilateral/model/QuadrilateralModel.ts | 6 +++--- js/quadrilateral/view/QuadrilateralScreenView.ts | 2 +- .../view/sound/QuadrilateralSoundView.ts | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/js/quadrilateral/model/QuadrilateralModel.ts b/js/quadrilateral/model/QuadrilateralModel.ts index 05d044f5..26815b93 100644 --- a/js/quadrilateral/model/QuadrilateralModel.ts +++ b/js/quadrilateral/model/QuadrilateralModel.ts @@ -103,7 +103,7 @@ class QuadrilateralModel { // Whether the simulation sound design is enabled to play as the shape changes. For now, // this only controls the "Tracks" sound designs in this simulation. When this is false, // we will still hear general and common code sounds. - public readonly simSoundEnabledProperty: BooleanProperty; + public readonly shapeSoundEnabledProperty: BooleanProperty; // Whether additional feedback (mostly sounds) are enabled to indicate shape changes. public shapeIdentificationFeedbackEnabledProperty: BooleanProperty; @@ -205,8 +205,8 @@ class QuadrilateralModel { tandem: tandem.createTandem( 'shapeNameVisibleProperty' ) } ); - this.simSoundEnabledProperty = new BooleanProperty( true, { - tandem: tandem.createTandem( 'simSoundEnabledProperty' ) + this.shapeSoundEnabledProperty = new BooleanProperty( true, { + tandem: tandem.createTandem( 'shapeSoundEnabledProperty' ) } ); this.firstModelStep = true; diff --git a/js/quadrilateral/view/QuadrilateralScreenView.ts b/js/quadrilateral/view/QuadrilateralScreenView.ts index 5cc01605..e0e61e36 100644 --- a/js/quadrilateral/view/QuadrilateralScreenView.ts +++ b/js/quadrilateral/view/QuadrilateralScreenView.ts @@ -94,7 +94,7 @@ class QuadrilateralScreenView extends ScreenView { } ); this.addChild( this.resetAllButton ); - const playMusicCheckbox = new PlayMusicCheckbox( model.simSoundEnabledProperty, tandem.createTandem( 'playMusicCheckbox' ) ); + const playMusicCheckbox = new PlayMusicCheckbox( model.shapeSoundEnabledProperty, tandem.createTandem( 'playMusicCheckbox' ) ); playMusicCheckbox.leftBottom = this.resetAllButton.leftTop.minusXY( 0, 45 ); this.addChild( playMusicCheckbox ); diff --git a/js/quadrilateral/view/sound/QuadrilateralSoundView.ts b/js/quadrilateral/view/sound/QuadrilateralSoundView.ts index 33d709ad..ed815e32 100644 --- a/js/quadrilateral/view/sound/QuadrilateralSoundView.ts +++ b/js/quadrilateral/view/sound/QuadrilateralSoundView.ts @@ -49,29 +49,29 @@ class QuadrilateralSoundView { this.activeSoundView = new SuccessSoundView( model, soundOptionsModel ); } else if ( soundDesign === SoundDesign.TRACKS_BUILD_UP ) { - this.activeSoundView = new TracksBuildUpSoundView( model.quadrilateralShapeModel, model.simSoundEnabledProperty, model.resetNotInProgressProperty, soundOptionsModel ); + this.activeSoundView = new TracksBuildUpSoundView( model.quadrilateralShapeModel, model.shapeSoundEnabledProperty, model.resetNotInProgressProperty, soundOptionsModel ); } else if ( soundDesign === SoundDesign.TRACKS_VOLUME_EMPHASIS ) { - this.activeSoundView = new TracksVolumeEmphasisSoundView( model.quadrilateralShapeModel, model.simSoundEnabledProperty, model.resetNotInProgressProperty, soundOptionsModel ); + this.activeSoundView = new TracksVolumeEmphasisSoundView( model.quadrilateralShapeModel, model.shapeSoundEnabledProperty, model.resetNotInProgressProperty, soundOptionsModel ); } else if ( soundDesign === SoundDesign.TRACKS_MELODY ) { - this.activeSoundView = new TracksMelodySoundView( model.quadrilateralShapeModel, model.simSoundEnabledProperty, model.resetNotInProgressProperty, soundOptionsModel ); + this.activeSoundView = new TracksMelodySoundView( model.quadrilateralShapeModel, model.shapeSoundEnabledProperty, model.resetNotInProgressProperty, soundOptionsModel ); } else if ( soundDesign === SoundDesign.TRACKS_ARPEGGIO ) { - this.activeSoundView = new TracksArpeggioSoundView( model.quadrilateralShapeModel, model.simSoundEnabledProperty, model.resetNotInProgressProperty, soundOptionsModel ); + this.activeSoundView = new TracksArpeggioSoundView( model.quadrilateralShapeModel, model.shapeSoundEnabledProperty, model.resetNotInProgressProperty, soundOptionsModel ); } else if ( soundDesign === SoundDesign.TRACKS_BUILD_UP_SIMPLE ) { - this.activeSoundView = new TracksBuildUpSoundView( model.quadrilateralShapeModel, model.simSoundEnabledProperty, model.resetNotInProgressProperty, soundOptionsModel, { + this.activeSoundView = new TracksBuildUpSoundView( model.quadrilateralShapeModel, model.shapeSoundEnabledProperty, model.resetNotInProgressProperty, soundOptionsModel, { simple: true } ); } else if ( soundDesign === SoundDesign.TRACKS_MELODY_SIMPLE ) { - this.activeSoundView = new TracksMelodySoundView( model.quadrilateralShapeModel, model.simSoundEnabledProperty, model.resetNotInProgressProperty, soundOptionsModel, { + this.activeSoundView = new TracksMelodySoundView( model.quadrilateralShapeModel, model.shapeSoundEnabledProperty, model.resetNotInProgressProperty, soundOptionsModel, { simple: true } ); } else if ( soundDesign === SoundDesign.TRACKS_MELODY_MAPPING ) { - this.activeSoundView = new TracksMelodyMappingSoundView( model.quadrilateralShapeModel, model.simSoundEnabledProperty, model.resetNotInProgressProperty, soundOptionsModel ); + this.activeSoundView = new TracksMelodyMappingSoundView( model.quadrilateralShapeModel, model.shapeSoundEnabledProperty, model.resetNotInProgressProperty, soundOptionsModel ); } } ); }