Skip to content

Commit

Permalink
rename simSoundEnabledProperty to shapeSoundEnabledProperty, see phet…
Browse files Browse the repository at this point in the history
  • Loading branch information
jessegreenberg committed Sep 21, 2022
1 parent 060c221 commit b3d1c5a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions js/quadrilateral/model/QuadrilateralModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion js/quadrilateral/view/QuadrilateralScreenView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

Expand Down
14 changes: 7 additions & 7 deletions js/quadrilateral/view/sound/QuadrilateralSoundView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}
} );
}
Expand Down

0 comments on commit b3d1c5a

Please sign in to comment.