samreid
commented
1 year ago In adding the initial submission above, I had to make numerous changes to update the code to work with current master. Not sure everything is working as expected. In particular, I don't hear sound and some things are not draggable.
It seems the files in the zip are timestamped Sept 9 2020, so that may indicate that time gap.
For transparency, here is a patch that "undoes" all the changes I had to apply to get this working in master again. Please note I also applied the code formatter (which is required for linting).
```diff
Index: js/SoundStrings.ts
===================================================================
diff --git a/js/SoundStrings.ts b/js/SoundStrings.ts
deleted file mode 100644
--- a/js/SoundStrings.ts (revision eb69a225ca9131538d4695288252930487bf6d1d)
+++ /dev/null (revision eb69a225ca9131538d4695288252930487bf6d1d)
@@ -1,104 +0,0 @@
-// Copyright 2022, University of Colorado Boulder
-
-/**
- * Auto-generated from modulify, DO NOT manually modify.
- */
-/* eslint-disable */
-import getStringModule from '../../chipper/js/getStringModule.js';
-import LinkableProperty from '../../axon/js/LinkableProperty.js';
-import sound from './sound.js';
-
-type StringsType = {
- 'sound': {
- 'title': string;
- 'titleStringProperty': LinkableProperty;
- };
- 'singleSource': {
- 'title': string;
- 'titleStringProperty': LinkableProperty;
- 'help': {
- 'listener': string;
- 'listenerStringProperty': LinkableProperty;
- }
- };
- 'measure': {
- 'title': string;
- 'titleStringProperty': LinkableProperty;
- 'clearWaves': string;
- 'clearWavesStringProperty': LinkableProperty;
- 'help': {
- 'stick': string;
- 'stickStringProperty': LinkableProperty;
- 'blueLines': string;
- 'blueLinesStringProperty': LinkableProperty;
- }
- };
- 'twoSource': {
- 'title': string;
- 'titleStringProperty': LinkableProperty;
- 'help': {
- 'upperSpeaker': string;
- 'upperSpeakerStringProperty': LinkableProperty;
- 'listener': string;
- 'listenerStringProperty': LinkableProperty;
- }
- };
- 'reflection': {
- 'title': string;
- 'titleStringProperty': LinkableProperty;
- };
- 'atm': string;
- 'atmStringProperty': LinkableProperty;
- 'hz': string;
- 'hzStringProperty': LinkableProperty;
- 'airPressure': {
- 'title': string;
- 'titleStringProperty': LinkableProperty;
- };
- 'audioControlPanel': {
- 'title': string;
- 'titleStringProperty': LinkableProperty;
- 'audioEnabled': string;
- 'audioEnabledStringProperty': LinkableProperty;
- 'speaker': string;
- 'speakerStringProperty': LinkableProperty;
- 'listener': string;
- 'listenerStringProperty': LinkableProperty;
- };
- 'soundModeControlPanel': {
- 'title': string;
- 'titleStringProperty': LinkableProperty;
- 'continuous': string;
- 'continuousStringProperty': LinkableProperty;
- 'pulse': string;
- 'pulseStringProperty': LinkableProperty;
- 'firePulse': string;
- 'firePulseStringProperty': LinkableProperty;
- };
- 'reflectionControlPanel': {
- 'positionSlider': string;
- 'positionSliderStringProperty': LinkableProperty;
- 'rotationSlider': string;
- 'rotationSliderStringProperty': LinkableProperty;
- };
- 'airDensityControlPanel': {
- 'title': string;
- 'titleStringProperty': LinkableProperty;
- 'removeAir': string;
- 'removeAirStringProperty': LinkableProperty;
- 'addAir': string;
- 'addAirStringProperty': LinkableProperty;
- 'reset': string;
- 'resetStringProperty': LinkableProperty;
- };
- 'amplitude': string;
- 'amplitudeStringProperty': LinkableProperty;
- 'frequency': string;
- 'frequencyStringProperty': LinkableProperty;
-};
-
-const SoundStrings = getStringModule( 'SOUND' ) as StringsType;
-
-// sound.register( 'SoundStrings', SoundStrings );
-
-export default SoundStrings;
Index: js/sound/view/TwoSourceView.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/js/sound/view/TwoSourceView.js b/js/sound/view/TwoSourceView.js
--- a/js/sound/view/TwoSourceView.js (revision eb69a225ca9131538d4695288252930487bf6d1d)
+++ b/js/sound/view/TwoSourceView.js (date 1599660663000)
@@ -1,5 +1,5 @@
// Copyright 2020, University of Colorado Boulder
-/* eslint-disable default-import-match-filename */ // TODO Re-enable
+
/**
* @author Piet Goris
* View for the two source screen.
@@ -7,7 +7,7 @@
import Bounds2 from '../../../../dot/js/Bounds2.js';
import Vector2 from '../../../../dot/js/Vector2.js';
-import { Image } from '../../../../scenery/js/imports.js';
+import Image from '../../../../scenery/js/nodes/Image.js';
import listenerImage from '../../../images/girl_png.js';
import SoundConstants from '../../common/SoundConstants.js';
import MovableNode from '../../common/view/MovableNode.js';
@@ -17,27 +17,27 @@
import SoundScreenView from './SoundScreenView.js';
class TwoSourceView extends SoundScreenView {
- constructor( model ) {
+ constructor(model) {
assert && assert( model instanceof TwoSourceModel, 'invalid model' );
- super( model );
+ super(model);
// Second speaker
const bounds = new Bounds2( model.speaker1Position.x, 0, 1, model.getWaveAreaBounds().height );
- const speaker = new SpeakerNode( model.oscillatorProperty );
- this.speakerNode2 = new MovableNode( model.speaker2PositionProperty, bounds, model.modelViewTransform, speaker );
- speaker.setRightCenter( new Vector2( SoundConstants.SPEAKER_OFFSET, 0 ) );
- this.addChild( this.speakerNode2 );
+ const speaker = new SpeakerNode(model.oscillatorProperty);
+ this.speakerNode2 = new MovableNode(model.speaker2PositionProperty, bounds, model.modelViewTransform, speaker);
+ speaker.setRightCenter(new Vector2(SoundConstants.SPEAKER_OFFSET, 0));
+ this.addChild(this.speakerNode2);
// Listener
- const child = new Image( listenerImage );
- const listenerBounds = new Bounds2( SoundConstants.LISTENER_BOUNDS_X.min, child.height, SoundConstants.LISTENER_BOUNDS_X.max, model.getWaveAreaBounds().height - child.bottom );
- this.listener = new MovableNode( model.listenerPositionProperty, listenerBounds, model.modelViewTransform, child );
- child.setCenter( new Vector2( 0, 0 ) );
- this.addChild( this.listener );
+ const child = new Image(listenerImage);
+ const listenerBounds = new Bounds2( SoundConstants.LISTENER_BOUNDS_X.min, child.height, SoundConstants.LISTENER_BOUNDS_X.max, model.getWaveAreaBounds().height - child.bottom);
+ this.listener = new MovableNode(model.listenerPositionProperty, listenerBounds, model.modelViewTransform, child);
+ child.setCenter(new Vector2(0,0));
+ this.addChild(this.listener);
- model.speaker2PositionProperty.link( value => {
- this.canvasNode.source2PositionY = model.modelToLatticeTransform.modelToViewY( value.y );
- } );
+ model.speaker2PositionProperty.link(value => {
+ this.canvasNode.source2PositionY = model.modelToLatticeTransform.modelToViewY(value.y);
+ });
}
}
Index: js/sound/view/SoundScreenView.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/js/sound/view/SoundScreenView.js b/js/sound/view/SoundScreenView.js
--- a/js/sound/view/SoundScreenView.js (revision eb69a225ca9131538d4695288252930487bf6d1d)
+++ b/js/sound/view/SoundScreenView.js (date 1599660663000)
@@ -10,7 +10,10 @@
import ResetAllButton from '../../../../scenery-phet/js/buttons/ResetAllButton.js';
import GaugeNode from '../../../../scenery-phet/js/GaugeNode.js';
import TimeControlNode from '../../../../scenery-phet/js/TimeControlNode.js';
-import { AlignGroup, Rectangle, Text, Color } from '../../../../scenery/js/imports.js';
+import AlignGroup from '../../../../scenery/js/nodes/AlignGroup.js';
+import Rectangle from '../../../../scenery/js/nodes/Rectangle.js';
+import Text from '../../../../scenery/js/nodes/Text.js';
+import Color from '../../../../scenery/js/util/Color.js';
import soundManager from '../../../../tambo/js/soundManager.js';
import WaveAreaNode from '../../../../wave-interference/js/common/view/WaveAreaNode.js';
import SineWaveGenerator from '../../../../wave-interference/js/waves/view/SineWaveGenerator.js';
@@ -20,7 +23,7 @@
import SoundControlPanel from '../../common/view/SoundControlPanel.js';
import SpeakerNode from '../../common/view/SpeakerNode.js';
import sound from '../../sound.js';
-import SoundStrings from '../../SoundStrings.js';
+import soundStrings from '../../soundStrings.js';
import SoundModel from '../model/SoundModel.js';
// constants
@@ -33,16 +36,16 @@
/**
* @param {SoundModel} model
*/
- constructor( model ) {
+ constructor( model) {
assert && assert( model instanceof SoundModel, 'invalid model' );
super();
// @private - shows the background of the wave area for sound view and used for layout
this.waveAreaNode = new WaveAreaNode( {
- top: SoundConstants.CONTROL_PANEL_MARGIN + WAVE_MARGIN + 15,
- centerX: this.layoutBounds.centerX - 142
- } );
+ top: SoundConstants.CONTROL_PANEL_MARGIN + WAVE_MARGIN + 15,
+ centerX: this.layoutBounds.centerX - 142
+ } );
this.addChild( this.waveAreaNode );
@@ -50,64 +53,64 @@
this.canvasNode = new LatticeCanvasNode( model.lattice, {
baseColor: Color.white,
hasReflection: model.hasReflection,
- sourcePosition: new Vector2( SoundConstants.SOURCE_POSITION_X, Math.floor( model.modelToLatticeTransform.modelToViewY( model.speaker1Position.y ) ) ),
+ sourcePosition: new Vector2(SoundConstants.SOURCE_POSITION_X, Math.floor(model.modelToLatticeTransform.modelToViewY( model.speaker1Position.y ))),
hasSecondSource: model.hasSecondSource
} );
const latticeScale = this.waveAreaNode.width / this.canvasNode.width;
this.canvasNode.mutate( {
- scale: latticeScale,
- center: this.waveAreaNode.center,
- visible: true
- } );
+ scale: latticeScale,
+ center: this.waveAreaNode.center,
+ visible: true
+ } );
- this.addChild( this.canvasNode );
+ this.addChild(this.canvasNode);
// @private - alligns the control panels
- this.contolPanelAlignGroup = new AlignGroup( {
+ this.contolPanelAlignGroup = new AlignGroup({
matchVertical: false
- } );
+ });
// @public - control panel resposible for setting the frequency and amplitude
- this.controlPanel = new SoundControlPanel( model, this.contolPanelAlignGroup );
+ this.controlPanel = new SoundControlPanel(model, this.contolPanelAlignGroup);
this.controlPanel.mutate( {
right: this.layoutBounds.right - SoundConstants.CONTROL_PANEL_MARGIN,
- top: SoundConstants.CONTROL_PANEL_MARGIN + SoundConstants.CONTROL_PANEL_SPACING
+ top: SoundConstants.CONTROL_PANEL_MARGIN + SoundConstants.CONTROL_PANEL_SPACNG
} );
-
- this.addChild( this.controlPanel );
+
+ this.addChild(this.controlPanel);
- if ( model.isAudioEnabledProperty ) {
+ if(model.isAudioEnabledProperty){
// @public - control panel responsible for the audio controls
- this.audioControlPanel = new AudioControlPanel( model, this.contolPanelAlignGroup );
+ this.audioControlPanel = new AudioControlPanel(model, this.contolPanelAlignGroup);
this.audioControlPanel.mutate( {
right: this.layoutBounds.right - SoundConstants.CONTROL_PANEL_MARGIN,
top: this.controlPanel.bottom + SoundConstants.CONTROL_PANEL_SPACING
} );
-
- this.addChild( this.audioControlPanel );
+
+ this.addChild(this.audioControlPanel);
// Amplitude of the hearable tone
- const soundAmpitudeProperty = new NumberProperty( 0 );
+ const soundAmpitudeProperty = new NumberProperty(0);
// Update the final amplitude of the sine wave tone
const updateSoundAmplitude = () => {
- const amplitudeDampening = model.audioControlSettingProperty && model.audioControlSettingProperty.value === SoundModel.AudioControlOptions.LISTENER ? ( SoundConstants.LISTENER_BOUNDS_X.max - model.listenerPositionProperty.value.x ) / ( SoundConstants.LISTENER_BOUNDS_X.max - SoundConstants.LISTENER_BOUNDS_X.min ) : 1;
+ const amplitudeDampening = model.audioControlSettingProperty && model.audioControlSettingProperty.value === SoundModel.AudioControlOptions.LISTENER ? (SoundConstants.LISTENER_BOUNDS_X.max - model.listenerPositionProperty.value.x) / (SoundConstants.LISTENER_BOUNDS_X.max - SoundConstants.LISTENER_BOUNDS_X.min) : 1;
const pressureDampening = model.pressureProperty ? model.pressureProperty.value : 1;
- soundAmpitudeProperty.set( model.amplitudeProperty.value / 1.5 * amplitudeDampening * pressureDampening );
+ soundAmpitudeProperty.set(model.amplitudeProperty.value / 1.5 * amplitudeDampening * pressureDampening);
};
- model.amplitudeProperty.link( updateSoundAmplitude );
+ model.amplitudeProperty.link(updateSoundAmplitude);
- if ( model.pressureProperty ) {
- model.pressureProperty.link( updateSoundAmplitude );
+ if(model.pressureProperty){
+ model.pressureProperty.link(updateSoundAmplitude);
}
- if ( model.audioControlSettingProperty ) {
- model.audioControlSettingProperty.link( updateSoundAmplitude );
- model.listenerPositionProperty.link( updateSoundAmplitude );
+ if(model.audioControlSettingProperty){
+ model.audioControlSettingProperty.link(updateSoundAmplitude);
+ model.listenerPositionProperty.link(updateSoundAmplitude);
}
const sineWavePlayer = new SineWaveGenerator(
@@ -117,7 +120,7 @@
model.isAudioEnabledProperty,
model.isRunningProperty
]
- } );
+ });
// Suppress the tone when another screen is selected
soundManager.addSoundGenerator( sineWavePlayer, {
@@ -128,51 +131,51 @@
// Passes the bounds of the canvas to the model for use in its modelViewTranforms
model.setViewBounds( this.waveAreaNode.bounds );
- if ( model.pressureProperty ) {
- const speakerCenter = model.modelViewTransform.modelToViewPosition( model.speaker1Position );
+ if(model.pressureProperty){
+ const speakerCenter = model.modelViewTransform.modelToViewPosition(model.speaker1Position);
const boxSizeX = 150;
const boxSizeY = 200;
// Pressure box.
- const box = new Rectangle( speakerCenter.x - boxSizeX / 2, speakerCenter.y - boxSizeY / 2, boxSizeX, boxSizeY, {
+ const box = new Rectangle(speakerCenter.x - boxSizeX / 2, speakerCenter.y - boxSizeY / 2, boxSizeX, boxSizeY, {
stroke: '#f3d99b',
lineWidth: 3
- } );
+ });
// Darken the pressure box in low pressures.
model.pressureProperty.link( prop => {
- box.setFill( new Color( 0, 0, 0, 1 - prop ) );
- } );
+ box.setFill(new Color(0,0,0, 1 - prop));
+ });
- this.addChild( box );
+ this.addChild(box);
// Pressure gauge.
- const gauge = new GaugeNode( model.pressureProperty, SoundStrings.atm, model.pressureProperty.range );
+ const gauge = new GaugeNode(model.pressureProperty, soundStrings.atm, model.pressureProperty.range);
gauge.centerX = speakerCenter.x;
- gauge.scale( 0.4 );
+ gauge.scale(0.4);
gauge.bottom = speakerCenter.y - boxSizeY / 2;
- const oneText = new Text( '1.0' );
- const zeroText = new Text( '0.0' );
+ const oneText = new Text('1.0');
+ const zeroText = new Text('0.0');
oneText.centerY = gauge.centerY + GAUGE_SPACING_Y;
zeroText.centerY = gauge.centerY + GAUGE_SPACING_Y;
oneText.right = gauge.right - GAUGE_SPACING_X;
zeroText.left = gauge.left + GAUGE_SPACING_X;
- this.addChild( gauge );
+ this.addChild(gauge);
- this.addChild( oneText );
- this.addChild( zeroText );
+ this.addChild(oneText);
+ this.addChild(zeroText);
}
// First speaker
- this.speakerNode1 = new SpeakerNode( model.oscillatorProperty );
- const viewPosition = model.modelViewTransform.modelToViewPosition( model.speaker1Position );
- viewPosition.setX( viewPosition.x + SoundConstants.SPEAKER_OFFSET );
- this.speakerNode1.setRightCenter( viewPosition );
- this.addChild( this.speakerNode1 );
+ this.speakerNode1 = new SpeakerNode(model.oscillatorProperty);
+ const viewPosition = model.modelViewTransform.modelToViewPosition( model.speaker1Position);
+ viewPosition.setX(viewPosition.x + SoundConstants.SPEAKER_OFFSET);
+ this.speakerNode1.setRightCenter(viewPosition);
+ this.addChild(this.speakerNode1);
// Pause/play/step buttons.
const timeControlNode = new TimeControlNode( model.isRunningProperty, {
@@ -191,7 +194,7 @@
}
} );
- this.addChild( timeControlNode );
+ this.addChild(timeControlNode);
const resetAllButton = new ResetAllButton( {
listener: () => {
Index: js/sound/view/SingleSourceView.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/js/sound/view/SingleSourceView.js b/js/sound/view/SingleSourceView.js
--- a/js/sound/view/SingleSourceView.js (revision eb69a225ca9131538d4695288252930487bf6d1d)
+++ b/js/sound/view/SingleSourceView.js (date 1599660663000)
@@ -1,5 +1,5 @@
// Copyright 2020, University of Colorado Boulder
-/* eslint-disable default-import-match-filename */ // TODO Re-enable
+
/**
* @author Piet Goris
* View for the single source view.
@@ -7,7 +7,7 @@
import Bounds2 from '../../../../dot/js/Bounds2.js';
import Vector2 from '../../../../dot/js/Vector2.js';
-import { Image } from '../../../../scenery/js/imports.js';
+import Image from '../../../../scenery/js/nodes/Image.js';
import listenerImage from '../../../images/girl_png.js';
import SoundConstants from '../../common/SoundConstants.js';
import MovableNode from '../../common/view/MovableNode.js';
@@ -16,16 +16,16 @@
import SoundScreenView from './SoundScreenView.js';
class SingleSourceView extends SoundScreenView {
- constructor( model ) {
+ constructor(model) {
assert && assert( model instanceof SingleSourceModel, 'invalid model' );
- super( model );
+ super(model);
// Listener
const bounds = new Bounds2( SoundConstants.LISTENER_BOUNDS_X.min, model.listenerPositionProperty.value.y, SoundConstants.LISTENER_BOUNDS_X.max, 1 );
- const child = new Image( listenerImage );
- const listener = new MovableNode( model.listenerPositionProperty, bounds, model.modelViewTransform, child );
- child.setCenter( new Vector2( 0, 0 ) );
- this.addChild( listener );
+ const child = new Image(listenerImage);
+ const listener = new MovableNode(model.listenerPositionProperty, bounds, model.modelViewTransform, child);
+ child.setCenter(new Vector2(0,0));
+ this.addChild(listener);
}
}
Index: js/sound/view/ReflectionView.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/js/sound/view/ReflectionView.js b/js/sound/view/ReflectionView.js
--- a/js/sound/view/ReflectionView.js (revision eb69a225ca9131538d4695288252930487bf6d1d)
+++ b/js/sound/view/ReflectionView.js (date 1599660663000)
@@ -5,65 +5,66 @@
* View for the reflection screen.
*/
-import { Shape } from '../../../../kite/js/imports.js';
-import { Node, Rectangle } from '../../../../scenery/js/imports.js';
+import Shape from '../../../../kite/js/Shape.js';
+import Node from '../../../../scenery/js/nodes/Node.js';
+import Rectangle from '../../../../scenery/js/nodes/Rectangle.js';
import SoundConstants from '../../common/SoundConstants.js';
import ReflectionControlPanel from '../../common/view/ReflectionControlPanel.js';
import SoundModeControlPanel from '../../common/view/SoundModeControlPanel.js';
import sound from '../../sound.js';
-import SingleSourceModel from '../model/SingleSourceModel.js';
+import ReflectionModel from '../model/SingleSourceModel.js';
import SoundScreenView from './SoundScreenView.js';
class ReflectionView extends SoundScreenView {
- constructor( model ) {
- assert && assert( model instanceof SingleSourceModel, 'invalid model' );
- super( model );
+ constructor(model) {
+ assert && assert( model instanceof ReflectionModel, 'invalid model' );
+ super(model);
// @private - control panel for the angle and position of the reflection wall
- this.reflectionControlPanel = new ReflectionControlPanel( model, this.contolPanelAlignGroup );
+ this.reflectionControlPanel = new ReflectionControlPanel(model, this.contolPanelAlignGroup);
// @private - control panel for controlling wether the speaker emits waves continuously or pulses
- this.soundModeControlPanel = new SoundModeControlPanel( model, this.contolPanelAlignGroup );
+ this.soundModeControlPanel = new SoundModeControlPanel(model, this.contolPanelAlignGroup);
// @private - rectangle representing the reflection wall
- this.reflector = new Rectangle( 0, 0, SoundConstants.WAVE_AREA_WIDTH * 2, 4, {
+ this.reflector = new Rectangle(0, 0, SoundConstants.WAVE_AREA_WIDTH * 2, 4, {
fill: '#f3d99b',
stroke: 'black',
lineWidth: 1
- } );
+ });
- this.reflector.setY( model.modelViewTransform.modelToViewY( SoundConstants.WAVE_AREA_WIDTH ) );
+ this.reflector.setY(model.modelViewTransform.modelToViewY(SoundConstants.WAVE_AREA_WIDTH));
model.wallAngleProperty.link( prop => {
- this.reflector.setRotation( -prop );
- this.canvasNode.setWallAngle( prop );
- } );
+ this.reflector.setRotation(-prop);
+ this.canvasNode.setWallAngle(prop);
+ });
// @private - container for the reflector, needed for rotation
this.reflectorContainer = new Node();
- this.reflectorContainer.addChild( this.reflector );
- this.reflectorContainer.setClipArea( Shape.rect( model.modelViewTransform.modelToViewX( 0 ), model.modelViewTransform.modelToViewY( 0 ), model.modelViewTransform.modelToViewDeltaX( SoundConstants.WAVE_AREA_WIDTH ), model.modelViewTransform.modelToViewDeltaY( SoundConstants.WAVE_AREA_WIDTH ) ) );
+ this.reflectorContainer.addChild(this.reflector);
+ this.reflectorContainer.setClipArea(Shape.rect(model.modelViewTransform.modelToViewX(0), model.modelViewTransform.modelToViewY(0), model.modelViewTransform.modelToViewDeltaX(SoundConstants.WAVE_AREA_WIDTH), model.modelViewTransform.modelToViewDeltaY(SoundConstants.WAVE_AREA_WIDTH)));
model.wallPositionXProperty.link( prop => {
- this.reflector.setX( model.modelViewTransform.modelToViewX( prop ) );
- this.canvasNode.setWallPositionX( model.modelToLatticeTransform.modelToViewX( prop ) );
- } );
+ this.reflector.setX(model.modelViewTransform.modelToViewX(prop));
+ this.canvasNode.setWallPositionX(model.modelToLatticeTransform.modelToViewX(prop));
+ });
- this.addChild( this.reflectorContainer );
+ this.addChild(this.reflectorContainer);
- this.reflectionControlPanel.mutate( {
+ this.reflectionControlPanel.mutate( {
right: this.layoutBounds.right - SoundConstants.CONTROL_PANEL_MARGIN,
top: this.controlPanel.bottom + SoundConstants.CONTROL_PANEL_SPACING
} );
- this.addChild( this.reflectionControlPanel );
+ this.addChild(this.reflectionControlPanel);
this.soundModeControlPanel.mutate( {
- right: this.layoutBounds.right - SoundConstants.CONTROL_PANEL_MARGIN,
- top: this.reflectionControlPanel.bottom + SoundConstants.CONTROL_PANEL_SPACING
- } );
-
- this.addChild( this.soundModeControlPanel );
+ right: this.layoutBounds.right - SoundConstants.CONTROL_PANEL_MARGIN,
+ top: this.reflectionControlPanel.bottom + SoundConstants.CONTROL_PANEL_SPACING
+ });
+
+ this.addChild(this.soundModeControlPanel);
}
}
Index: js/sound/view/PressureView.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/js/sound/view/PressureView.js b/js/sound/view/PressureView.js
--- a/js/sound/view/PressureView.js (revision eb69a225ca9131538d4695288252930487bf6d1d)
+++ b/js/sound/view/PressureView.js (date 1599660663000)
@@ -1,11 +1,11 @@
// Copyright 2020, University of Colorado Boulder
-/* eslint-disable default-import-match-filename */ // TODO Re-enable
+
/**
* @author Piet Goris
* View for the pressure screen.
*/
-import { Image } from '../../../../scenery/js/imports.js';
+import Image from '../../../../scenery/js/nodes/Image.js';
import listenerImage from '../../../images/girl_png.js';
import SoundConstants from '../../common/SoundConstants.js';
import AirDensityControlPanel from '../../common/view/AirDensityControlPanel.js';
@@ -14,25 +14,25 @@
import SoundScreenView from './SoundScreenView.js';
class PressureView extends SoundScreenView {
- constructor( model ) {
+ constructor(model) {
assert && assert( model instanceof PressureModel, 'invalid model' );
- super( model );
+ super(model);
- const center = model.modelViewTransform.modelToViewPosition( model.listenerPositionProperty.value );
+ const center = model.modelViewTransform.modelToViewPosition(model.listenerPositionProperty.value);
// @private - listener node
- this.listener = new Image( listenerImage );
- this.listener.setCenter( center );
- this.addChild( this.listener );
-
+ this.listener = new Image(listenerImage);
+ this.listener.setCenter(center);
+ this.addChild(this.listener);
+
// @private - control panel for the air density in the box
- this.pressureControlPanel = new AirDensityControlPanel( model, this.contolPanelAlignGroup );
-
+ this.pressureControlPanel = new AirDensityControlPanel(model, this.contolPanelAlignGroup);
+
this.pressureControlPanel.mutate( {
right: this.layoutBounds.right - SoundConstants.CONTROL_PANEL_MARGIN,
top: this.audioControlPanel.bottom + SoundConstants.CONTROL_PANEL_SPACING
} );
-
- this.addChild( this.pressureControlPanel );
+
+ this.addChild(this.pressureControlPanel);
}
}
Index: js/sound/view/MeasureView.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/js/sound/view/MeasureView.js b/js/sound/view/MeasureView.js
--- a/js/sound/view/MeasureView.js (revision eb69a225ca9131538d4695288252930487bf6d1d)
+++ b/js/sound/view/MeasureView.js (date 1599660663000)
@@ -1,5 +1,5 @@
// Copyright 2020, University of Colorado Boulder
-/* eslint-disable default-import-match-filename */ // TODO Re-enable
+
/**
* @author Piet Goris
* View for the measure screen.
@@ -19,9 +19,9 @@
import SoundScreenView from './SoundScreenView.js';
class MeasureView extends SoundScreenView {
- constructor( model ) {
+ constructor(model) {
assert && assert( model instanceof MeasureModel, 'invalid model' );
- super( model );
+ super(model);
const rulerLength = model.modelViewTransform.modelToViewDeltaX( 500 );
const majorTickMarkWidth = rulerLength / ( 10 );
@@ -40,37 +40,37 @@
soundManager.addSoundGenerator( releaseSound, { categoryName: 'user-interface' } );
// Ruler
- const rulerNode = new RulerNode( rulerLength, 50, majorTickMarkWidth, majorTickLabels, 'meter', {
+ const rulerNode = new RulerNode(rulerLength, 50, majorTickMarkWidth, majorTickLabels, 'meter', {
minorTicksPerMajorTick: 4,
insetsWidth: 60,
unitsMajorTickIndex: 10,
unitsSpacing: 8
- } );
- const movableRuler = new MovableNode( model.rulerPositionProperty, this.visibleBoundsProperty.value, ModelViewTransform2.createOffsetScaleMapping( new Vector2( 0, 0 ), 1 ), rulerNode );
- this.addChild( movableRuler );
+ });
+ const movableRuler = new MovableNode(model.rulerPositionProperty, this.visibleBoundsProperty.value, ModelViewTransform2.createOffsetScaleMapping( new Vector2( 0, 0 ), 1 ), rulerNode);
+ this.addChild(movableRuler);
// Stopwatch
- const createFormatter = units => StopwatchNode.createRichTextNumberFormatter( {
+ const createFormatter = units => StopwatchNode.getRichNumberFormatter( {
showAsDecimal: true,
units: units
- } );
+ });
const stopwatchNode = new StopwatchNode( model.stopwatch, {
- visibleBoundsProperty: this.visibleBoundsProperty,
- numberDisplayOptions: {
- numberFormatter: createFormatter( 'ms' )
- },
- dragListenerOptions: {
- start: () => {
- grabSound.play();
- },
- end: () => {
- releaseSound.play();
- }
- }
- } );
+ visibleBoundsProperty: this.visibleBoundsProperty,
+ numberDisplayOptions: {
+ numberFormatter: createFormatter( 'ms' )
+ },
+ dragListenerOptions: {
+ start: () => {
+ grabSound.play();
+ },
+ end: () => {
+ releaseSound.play();
+ }
+ }
+ } );
- this.addChild( stopwatchNode );
+ this.addChild(stopwatchNode);
}
}
Index: package.json
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/package.json b/package.json
--- a/package.json (revision eb69a225ca9131538d4695288252930487bf6d1d)
+++ b/package.json (date 1599660663000)
@@ -21,6 +21,6 @@
]
},
"eslintConfig": {
- "extends": "../chipper/eslint/sim_eslintrc.js"
+ "extends": "../chipper/eslint/sim_es6_eslintrc.js"
}
}
\ No newline at end of file
Index: js/sound/SoundScreen.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/js/sound/SoundScreen.js b/js/sound/SoundScreen.js
--- a/js/sound/SoundScreen.js (revision eb69a225ca9131538d4695288252930487bf6d1d)
+++ b/js/sound/SoundScreen.js (date 1599660663000)
@@ -6,23 +6,22 @@
*/
import Dimension2 from '../../../dot/js/Dimension2.js';
-import StringProperty from '../../../axon/js/StringProperty.js';
import Screen from '../../../joist/js/Screen.js';
import ScreenIcon from '../../../joist/js/ScreenIcon.js';
import SoundColors from '../common/SoundColors.js';
import sound from '../sound.js';
class SoundScreen extends Screen {
- constructor( title, createModel, createView, iconImage ) {
+ constructor(title, createModel, createView, iconImage) {
const options = {
backgroundColorProperty: SoundColors.SCREEN_VIEW_BACKGROUND,
- name: new StringProperty( title ),
- homeScreenIcon: new ScreenIcon( iconImage, {
- size: new Dimension2( Screen.MINIMUM_HOME_SCREEN_ICON_SIZE.width, Screen.MINIMUM_HOME_SCREEN_ICON_SIZE.height ),
+ name: title,
+ homeScreenIcon: new ScreenIcon(iconImage, {
+ size: new Dimension2(Screen.MINIMUM_HOME_SCREEN_ICON_SIZE.width, Screen.MINIMUM_HOME_SCREEN_ICON_SIZE.height),
maxIconWidthProportion: 1,
maxIconHeightProportion: 1
- } ),
+ }),
showPlaySoundControl: true,
audioEnabled: true
};
Index: js/sound/model/TwoSourceModel.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/js/sound/model/TwoSourceModel.js b/js/sound/model/TwoSourceModel.js
--- a/js/sound/model/TwoSourceModel.js (revision eb69a225ca9131538d4695288252930487bf6d1d)
+++ b/js/sound/model/TwoSourceModel.js (date 1599660663000)
@@ -14,20 +14,20 @@
class TwoSourceModel extends SoundModel {
constructor() {
- super( {
- speaker1PositionY: 1 / 3 * SoundConstants.WAVE_AREA_WIDTH,
+ super({
+ speaker1PositionY: 1/3 * SoundConstants.WAVE_AREA_WIDTH,
hasSecondSource: true
- } );
+ });
// @public - whether audio is enabled
this.isAudioEnabledProperty = new BooleanProperty( false );
// @public - position of the listener
- this.listenerPositionProperty = new Vector2Property( new Vector2( 1 / 2 * SoundConstants.WAVE_AREA_WIDTH, 1 / 2 * SoundConstants.WAVE_AREA_WIDTH ) );
+ this.listenerPositionProperty = new Vector2Property(new Vector2( 1/2 * SoundConstants.WAVE_AREA_WIDTH, 1/2 * SoundConstants.WAVE_AREA_WIDTH));
// @public - position of the second speaker
- this.speaker2PositionProperty = new Vector2Property( new Vector2( this.modelToLatticeTransform.viewToModelX( SoundConstants.SOURCE_POSITION_X ), 2 / 3 * SoundConstants.WAVE_AREA_WIDTH ) );
+ this.speaker2PositionProperty = new Vector2Property(new Vector2(this.modelToLatticeTransform.viewToModelX(SoundConstants.SOURCE_POSITION_X), 2/3 * SoundConstants.WAVE_AREA_WIDTH));
}
/**
@@ -35,11 +35,11 @@
* @public
*/
reset() {
- super.reset();
+ super.reset();
- this.isAudioEnabledProperty.reset();
- this.listenerPositionProperty.reset();
- this.speaker2PositionProperty.reset();
+ this.isAudioEnabledProperty.reset();
+ this.listenerPositionProperty.reset();
+ this.speaker2PositionProperty.reset();
}
}
Index: sound_en.html
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/sound_en.html b/sound_en.html
--- a/sound_en.html (revision eb69a225ca9131538d4695288252930487bf6d1d)
+++ b/sound_en.html (date 1599660663000)
@@ -33,8 +33,8 @@
},
"phet": {
"requirejsNamespace": "SOUND",
- "supportsSound": true,
"simulation": true,
+ "supportsSound": true,
"runnable": true,
"readmeCreatedManually": true,
"supportedBrands": [
@@ -67,10 +67,6 @@
{
"repo": "tambo",
"requirejsNamespace": "TAMBO"
- },
- {
- "repo": "twixt",
- "requirejsNamespace": "TWIXT"
}
];
@@ -80,13 +76,13 @@
// Preloads, with more included for phet-io brand
let preloads = [
+ '../sherpa/lib/mdn-array-from-polyfill.js',
+ '../sherpa/lib/es6-promise-1e68dc.auto.min.js',
'../joist/js/splash.js',
'../sherpa/lib/jquery-2.1.0.js',
'../sherpa/lib/lodash-4.17.4.js',
'../sherpa/lib/FileSaver-b8054a2.js',
- '../sherpa/lib/himalaya-1.1.0.js',
- '../sherpa/lib/linebreak-1.1.0.js',
- '../sherpa/lib/flatqueue-1.2.1.js',
+ '../sherpa/lib/himalaya-0.2.7.js',
'../sherpa/lib/he-1.1.1.js',
'../assert/js/assert.js',
'../query-string-machine/js/QueryStringMachine.js',
@@ -95,14 +91,13 @@
'../sherpa/lib/base64-js-1.2.0.js',
'../sherpa/lib/TextEncoderLite-3c9f6f0.js',
'../tandem/js/PhetioIDUtils.js',
- '../perennial-alias/js/common/SimVersion.js'
+ '../chipper/js/SimVersion.js'
];
if ( brand === 'phet-io' ) {
preloads = preloads.concat( [
- '../chipper/js/phet-io/phetioCompareAPIs.js',
'../phet-io/js/phet-io-initialize-globals.js',
- '../sound/js/sound-phet-io-overrides.js'
+ '../sound/js/phet-io/sound-overrides.js'
] );
}
@@ -115,7 +110,6 @@
script.type = type;
script.src = preloadURL;
script.async = false;
- script.setAttribute( 'crossorigin', 'use-credentials' );
document.head.appendChild( script );
};
@@ -127,7 +121,7 @@
// Module loading in compilation-free (development) mode will be kicked off once strings are loaded.
// This is done in load-unbuilt-strings.js
- window.phet.chipper.loadModules = () => loadURL( '../chipper/dist/js/sound/js/sound-main.js', 'module' );
+ window.phet.chipper.loadModules = () => loadURL( 'js/sound-main.js', 'module' );
@kathy-phet said:
They have signed the CLA and I received the files via zip file.