From ea25f75fdfa87c885abfe15c31ecc67032943194 Mon Sep 17 00:00:00 2001 From: jbphet Date: Mon, 4 Nov 2019 13:22:50 -0700 Subject: [PATCH 01/10] removed the vibration sounds that the sound design time ruled out, see #216 (cherry picked from commit b3599fb50cc6ab2f771aa52ebe8bf2c2963c40cb) --- .../view/MoleculesAndLightScreenView.js | 16 +---- .../view/malSoundOptionsDialogContent.js | 2 +- sounds/license.json | 56 ------------------ sounds/vibrate-option-001.mp3 | Bin 6269 -> 0 bytes sounds/vibrate-option-003.mp3 | Bin 6269 -> 0 bytes sounds/vibrate-option-005.mp3 | Bin 6269 -> 0 bytes sounds/vibrate-option-006.mp3 | Bin 6269 -> 0 bytes sounds/vibrate-option-008.mp3 | Bin 12852 -> 0 bytes sounds/vibrate-option-009.mp3 | Bin 6269 -> 0 bytes sounds/vibrate-option-010.mp3 | Bin 12539 -> 0 bytes 10 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 sounds/vibrate-option-001.mp3 delete mode 100644 sounds/vibrate-option-003.mp3 delete mode 100644 sounds/vibrate-option-005.mp3 delete mode 100644 sounds/vibrate-option-006.mp3 delete mode 100644 sounds/vibrate-option-008.mp3 delete mode 100644 sounds/vibrate-option-009.mp3 delete mode 100644 sounds/vibrate-option-010.mp3 diff --git a/js/moleculesandlight/view/MoleculesAndLightScreenView.js b/js/moleculesandlight/view/MoleculesAndLightScreenView.js index 4e8bf59a..485145cd 100644 --- a/js/moleculesandlight/view/MoleculesAndLightScreenView.js +++ b/js/moleculesandlight/view/MoleculesAndLightScreenView.js @@ -58,16 +58,9 @@ define( require => { const breakApartSoundV2Info = require( 'sound!MOLECULES_AND_LIGHT/break-apart-v2.mp3' ); const moleculeEnergizedLoopInfo = require( 'sound!MOLECULES_AND_LIGHT/glow-loop-higher.mp3' ); const rotateSoundInfo = require( 'sound!MOLECULES_AND_LIGHT/rotate-loop.mp3' ); - const vibrateOption1SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-option-001.mp3' ); const vibrateOption2SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-option-002.mp3' ); - const vibrateOption3SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-option-003.mp3' ); const vibrateOption4SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-option-004.mp3' ); - const vibrateOption5SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-option-005.mp3' ); - const vibrateOption6SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-option-006.mp3' ); const vibrateOption7SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-option-007.mp3' ); - const vibrateOption8SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-option-008.mp3' ); - const vibrateOption9SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-option-009.mp3' ); - const vibrateOption10SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-option-010.mp3' ); const microwavePhotonV1SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/photon-v1-4th-interval-000.mp3' ); const infraredPhotonV1SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/photon-v1-4th-interval-001.mp3' ); const visiblePhotonV1SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/photon-v1-4th-interval-002.mp3' ); @@ -302,16 +295,9 @@ define( require => { // molecule vibration sounds const moleculeVibrationSoundClips = [ - new SoundClip( vibrateOption1SoundInfo, { initialOutputLevel: 0.2, loop: true } ), new SoundClip( vibrateOption2SoundInfo, { initialOutputLevel: 0.2, loop: true } ), - new SoundClip( vibrateOption3SoundInfo, { initialOutputLevel: 0.2, loop: true } ), new SoundClip( vibrateOption4SoundInfo, { initialOutputLevel: 0.2, loop: true } ), - new SoundClip( vibrateOption5SoundInfo, { initialOutputLevel: 0.2, loop: true } ), - new SoundClip( vibrateOption6SoundInfo, { initialOutputLevel: 0.2, loop: true } ), - new SoundClip( vibrateOption7SoundInfo, { initialOutputLevel: 0.2, loop: true } ), - new SoundClip( vibrateOption8SoundInfo, { initialOutputLevel: 0.2, loop: true } ), - new SoundClip( vibrateOption9SoundInfo, { initialOutputLevel: 0.2, loop: true } ), - new SoundClip( vibrateOption10SoundInfo, { initialOutputLevel: 0.2, loop: true } ) + new SoundClip( vibrateOption7SoundInfo, { initialOutputLevel: 0.2, loop: true } ) ]; moleculeVibrationSoundClips.forEach( soundClip => { soundManager.addSoundGenerator( soundClip ); diff --git a/js/moleculesandlight/view/malSoundOptionsDialogContent.js b/js/moleculesandlight/view/malSoundOptionsDialogContent.js index 27145534..89652e2a 100644 --- a/js/moleculesandlight/view/malSoundOptionsDialogContent.js +++ b/js/moleculesandlight/view/malSoundOptionsDialogContent.js @@ -93,7 +93,7 @@ define( require => { // sound selection for molecule vibration const vibrationSoundRadioButtonGroup = new VerticalAquaRadioButtonGroup( this.vibrationSoundProperty, - createNumberedRadioButtonDescriptorSet( 10 ) + createNumberedRadioButtonDescriptorSet( 3 ) ); const vibrationSoundSelectionPanel = new Panel( new VBox( { diff --git a/sounds/license.json b/sounds/license.json index 06cdaf78..b86ba636 100644 --- a/sounds/license.json +++ b/sounds/license.json @@ -119,14 +119,6 @@ "license": "contact phethelp@colorado.edu", "notes": "created by Ashton Morris (PhET Interactive Simulations)" }, - "vibrate-option-001.mp3": { - "text": [ - "Copyright 2018 University of Colorado Boulder" - ], - "projectURL": "http://phet.colorado.edu", - "license": "contact phethelp@colorado.edu", - "notes": "created by Ashton Morris (PhET Interactive Simulations)" - }, "vibrate-option-002.mp3": { "text": [ "Copyright 2018 University of Colorado Boulder" @@ -135,14 +127,6 @@ "license": "contact phethelp@colorado.edu", "notes": "created by Ashton Morris (PhET Interactive Simulations)" }, - "vibrate-option-003.mp3": { - "text": [ - "Copyright 2018 University of Colorado Boulder" - ], - "projectURL": "http://phet.colorado.edu", - "license": "contact phethelp@colorado.edu", - "notes": "created by Ashton Morris (PhET Interactive Simulations)" - }, "vibrate-option-004.mp3": { "text": [ "Copyright 2018 University of Colorado Boulder" @@ -151,22 +135,6 @@ "license": "contact phethelp@colorado.edu", "notes": "created by Ashton Morris (PhET Interactive Simulations)" }, - "vibrate-option-005.mp3": { - "text": [ - "Copyright 2018 University of Colorado Boulder" - ], - "projectURL": "http://phet.colorado.edu", - "license": "contact phethelp@colorado.edu", - "notes": "created by Ashton Morris (PhET Interactive Simulations)" - }, - "vibrate-option-006.mp3": { - "text": [ - "Copyright 2018 University of Colorado Boulder" - ], - "projectURL": "http://phet.colorado.edu", - "license": "contact phethelp@colorado.edu", - "notes": "created by Ashton Morris (PhET Interactive Simulations)" - }, "vibrate-option-007.mp3": { "text": [ "Copyright 2018 University of Colorado Boulder" @@ -174,29 +142,5 @@ "projectURL": "http://phet.colorado.edu", "license": "contact phethelp@colorado.edu", "notes": "created by Ashton Morris (PhET Interactive Simulations)" - }, - "vibrate-option-008.mp3": { - "text": [ - "Copyright 2018 University of Colorado Boulder" - ], - "projectURL": "http://phet.colorado.edu", - "license": "contact phethelp@colorado.edu", - "notes": "created by Ashton Morris (PhET Interactive Simulations)" - }, - "vibrate-option-009.mp3": { - "text": [ - "Copyright 2018 University of Colorado Boulder" - ], - "projectURL": "http://phet.colorado.edu", - "license": "contact phethelp@colorado.edu", - "notes": "created by Ashton Morris (PhET Interactive Simulations)" - }, - "vibrate-option-010.mp3": { - "text": [ - "Copyright 2018 University of Colorado Boulder" - ], - "projectURL": "http://phet.colorado.edu", - "license": "contact phethelp@colorado.edu", - "notes": "created by Ashton Morris (PhET Interactive Simulations)" } } diff --git a/sounds/vibrate-option-001.mp3 b/sounds/vibrate-option-001.mp3 deleted file mode 100644 index 9f38fc50a3127de7f5e097758c6eae08b5c169a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6269 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%0A6+ItCKqVKT@7A4Y;7vk{{7RO5>wmu` z;df=*sCyf$PK~B6?>k1_1>2lA4uvC=;BJBD){oh~yJh?RTqoLWc?@mIFfs`mF&M_k zY4&2HE-%Te@49MUbrzn1GyR)JWHGIlzgvy8JZeENoN;NvCEXAxRnU2{zx{>0;kGX} zcy~^f^O@vvOeZCD$gF1PcZX$=Pe*TyS&n3tG|Q9@=TKHUT0CRYhkBD|^%&FVXx$Id zb(R|;(%t3%a&@;Z?_GLmA&7N7gu6z#o7Bg&RJ;DS>7mzrk()79`Z($maW%79@t3zk9MjJ>EiBuw;Z~Cdl%K3-< zA4uw=_V!h%Ol%XKo+by%4y&31g(sgeugCX>TW3`WJ_=&F20S6;4x%l2n;52eI@pK* zAhMy1FierP-BMU!WQ9-r%i)<0R`{x5jpqqV(H~?1wNGLn(YqJ z04Q_=6cdbF8ZW^S$=7=AWU94<1!j(Sa>%jQavnlr0rbTlSQoNY`22_Fh#m5$_~;MsY8|sV4GZfsL3??1Py=I`{w+ z1jR=tDFoi*?d#(xJg%LT+a^B5gWC#}PPkB3WBsspL$||8%SCpep(iJ@G(`_tBKEb6 zv6VA=Sab*%54D(cJ$5R1p7{A%#nKu!HwS9{Ko%dKGTG;_s{0 z#Wy}pcDwS%sm~k-69Z-YJ(tU`8J+*mI_ZP?6rrOou@gLODuEG%7!-JYurTHsBP` z2%_@Pa&aW&M5tQxDiD8O9Qa#(6Pi%<-SL^xkM;vs`h1O*zO}K6qL!ATTFw9SITX%; ZsmGrexsNB|0Z=6Y!2JKr@PGd9e*n1ZIsyOy diff --git a/sounds/vibrate-option-003.mp3 b/sounds/vibrate-option-003.mp3 deleted file mode 100644 index a632862db2034a015415c8bb5295aec0d94d2a1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6269 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 diff --git a/sounds/vibrate-option-005.mp3 b/sounds/vibrate-option-005.mp3 deleted file mode 100644 index 0ecb7c65ec52bf0f2ca513a46c406b74e0e1ef10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6269 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 Q07E*zUH-fB|68U116-xXuK)l5 diff --git a/sounds/vibrate-option-008.mp3 b/sounds/vibrate-option-008.mp3 deleted file mode 100644 index b8600c41b97fdf778fdef177be6b27fe6d5b5ee6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12852 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 From 4272c9cc3caa28730b1d9c4c7a5f69e7ef302254 Mon Sep 17 00:00:00 2001 From: jbphet Date: Mon, 4 Nov 2019 13:38:33 -0700 Subject: [PATCH 02/10] added two new vibration sound options, see #216 (cherry picked from commit a5e0e5de4c8829a2095ffd8181336e4248afdeaa) --- .../view/MoleculesAndLightScreenView.js | 4 ++++ .../view/malSoundOptionsDialogContent.js | 2 +- sounds/license.json | 16 ++++++++++++++++ sounds/vibrate-option-002-higher.mp3 | Bin 0 -> 6269 bytes sounds/vibrate-option-002-saturated-eq.mp3 | Bin 0 -> 6269 bytes 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 sounds/vibrate-option-002-higher.mp3 create mode 100644 sounds/vibrate-option-002-saturated-eq.mp3 diff --git a/js/moleculesandlight/view/MoleculesAndLightScreenView.js b/js/moleculesandlight/view/MoleculesAndLightScreenView.js index 485145cd..7f6465bb 100644 --- a/js/moleculesandlight/view/MoleculesAndLightScreenView.js +++ b/js/moleculesandlight/view/MoleculesAndLightScreenView.js @@ -59,6 +59,8 @@ define( require => { const moleculeEnergizedLoopInfo = require( 'sound!MOLECULES_AND_LIGHT/glow-loop-higher.mp3' ); const rotateSoundInfo = require( 'sound!MOLECULES_AND_LIGHT/rotate-loop.mp3' ); const vibrateOption2SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-option-002.mp3' ); + const vibrateOption2HigherSoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-option-002-higher.mp3' ); + const vibrateOption2SaturatedEQSoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-option-002-saturated-eq.mp3' ); const vibrateOption4SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-option-004.mp3' ); const vibrateOption7SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-option-007.mp3' ); const microwavePhotonV1SoundInfo = require( 'sound!MOLECULES_AND_LIGHT/photon-v1-4th-interval-000.mp3' ); @@ -296,6 +298,8 @@ define( require => { // molecule vibration sounds const moleculeVibrationSoundClips = [ new SoundClip( vibrateOption2SoundInfo, { initialOutputLevel: 0.2, loop: true } ), + new SoundClip( vibrateOption2HigherSoundInfo, { initialOutputLevel: 0.2, loop: true } ), + new SoundClip( vibrateOption2SaturatedEQSoundInfo, { initialOutputLevel: 0.2, loop: true } ), new SoundClip( vibrateOption4SoundInfo, { initialOutputLevel: 0.2, loop: true } ), new SoundClip( vibrateOption7SoundInfo, { initialOutputLevel: 0.2, loop: true } ) ]; diff --git a/js/moleculesandlight/view/malSoundOptionsDialogContent.js b/js/moleculesandlight/view/malSoundOptionsDialogContent.js index 89652e2a..faa89c0a 100644 --- a/js/moleculesandlight/view/malSoundOptionsDialogContent.js +++ b/js/moleculesandlight/view/malSoundOptionsDialogContent.js @@ -93,7 +93,7 @@ define( require => { // sound selection for molecule vibration const vibrationSoundRadioButtonGroup = new VerticalAquaRadioButtonGroup( this.vibrationSoundProperty, - createNumberedRadioButtonDescriptorSet( 3 ) + createNumberedRadioButtonDescriptorSet( 5 ) ); const vibrationSoundSelectionPanel = new Panel( new VBox( { diff --git a/sounds/license.json b/sounds/license.json index b86ba636..355852b6 100644 --- a/sounds/license.json +++ b/sounds/license.json @@ -127,6 +127,22 @@ "license": "contact phethelp@colorado.edu", "notes": "created by Ashton Morris (PhET Interactive Simulations)" }, + "vibrate-option-002-higher.mp3": { + "text": [ + "Copyright 2018 University of Colorado Boulder" + ], + "projectURL": "http://phet.colorado.edu", + "license": "contact phethelp@colorado.edu", + "notes": "created by Ashton Morris (PhET Interactive Simulations)" + }, + "vibrate-option-002-saturated-eq.mp3": { + "text": [ + "Copyright 2018 University of Colorado Boulder" + ], + "projectURL": "http://phet.colorado.edu", + "license": "contact phethelp@colorado.edu", + "notes": "created by Ashton Morris (PhET Interactive Simulations)" + }, "vibrate-option-004.mp3": { "text": [ "Copyright 2018 University of Colorado Boulder" diff --git a/sounds/vibrate-option-002-higher.mp3 b/sounds/vibrate-option-002-higher.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..1f22da45ab7e8a5438ec5822ca5a982a883c1081 GIT binary patch literal 6269 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 literal 0 HcmV?d00001 diff --git a/sounds/vibrate-option-002-saturated-eq.mp3 b/sounds/vibrate-option-002-saturated-eq.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..d1be2a7e3e361debb01d8dfd50c80143db76b062 GIT binary patch literal 6269 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 literal 0 HcmV?d00001 From 367a7c1dd2ce9aa45adcd14807b321edee20e095 Mon Sep 17 00:00:00 2001 From: jbphet Date: Mon, 4 Nov 2019 13:41:30 -0700 Subject: [PATCH 03/10] selected my preferred oscillation sound as the default, see #216 (cherry picked from commit e4d63bdee51f97f103c8e59cde0a8a92ac201684) --- js/moleculesandlight/view/malSoundOptionsDialogContent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/moleculesandlight/view/malSoundOptionsDialogContent.js b/js/moleculesandlight/view/malSoundOptionsDialogContent.js index faa89c0a..cdf34243 100644 --- a/js/moleculesandlight/view/malSoundOptionsDialogContent.js +++ b/js/moleculesandlight/view/malSoundOptionsDialogContent.js @@ -42,7 +42,7 @@ define( require => { // @public (read-only) this.photonInitialEmissionSoundSetProperty = new NumberProperty( 3 ); this.photonSecondaryEmissionSoundSetProperty = new NumberProperty( 2 ); - this.vibrationSoundProperty = new NumberProperty( 1 ); + this.vibrationSoundProperty = new NumberProperty( 2 ); // @private {Node} - dialog content, created when requested, see explanation below this.dialogContent = null; From d2beca10c1c8188ff6f0699bd000078791176086 Mon Sep 17 00:00:00 2001 From: jbphet Date: Mon, 4 Nov 2019 14:09:33 -0700 Subject: [PATCH 04/10] made photon emission sound play when photon starts to become visible, see #216 (cherry picked from commit 872d8741d45894f76a2ec162363cbcdce2d49dcc) --- .../view/MoleculesAndLightScreenView.js | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/js/moleculesandlight/view/MoleculesAndLightScreenView.js b/js/moleculesandlight/view/MoleculesAndLightScreenView.js index 7f6465bb..32ff88b2 100644 --- a/js/moleculesandlight/view/MoleculesAndLightScreenView.js +++ b/js/moleculesandlight/view/MoleculesAndLightScreenView.js @@ -100,6 +100,9 @@ define( require => { // volume of photon emission sounds const PHOTON_SOUND_OUTPUT_LEVEL = 0.1; + // X position at which the lamp emission sound is played, empirically determined + const PLAY_LAMP_EMISSION_X_POSITION = -1400; + /** * Constructor for the screen view of Molecules and Light. * @@ -389,19 +392,27 @@ define( require => { } ); } ); photonAbsorptionModel.photons.addItemAddedListener( photon => { - let soundSetIndex; + const soundClipIndex = ORDERED_WAVELENGTHS.indexOf( photon.wavelength ); if ( photon.locationProperty.value.x < 0 ) { // photon was emitted from lamp, use the initial emission sound - soundSetIndex = malSoundOptionsDialogContent.photonInitialEmissionSoundSetProperty.value - 1; + // soundSetIndex = malSoundOptionsDialogContent.photonInitialEmissionSoundSetProperty.value - 1; + + const playEmitFromLampSound = position => { + if ( position.x >= PLAY_LAMP_EMISSION_X_POSITION ) { + const soundSetIndex = malSoundOptionsDialogContent.photonInitialEmissionSoundSetProperty.value - 1; + photonEmissionSoundPlayers[ soundSetIndex ][ soundClipIndex ].play(); + photon.locationProperty.unlink( playEmitFromLampSound ); + } + }; + photon.locationProperty.link( playEmitFromLampSound ); } else { // photon was emitted from lamp, use the secondary emission sound - soundSetIndex = malSoundOptionsDialogContent.photonSecondaryEmissionSoundSetProperty.value - 1; + const soundSetIndex = malSoundOptionsDialogContent.photonSecondaryEmissionSoundSetProperty.value - 1; + photonEmissionSoundPlayers[ soundSetIndex ][ soundClipIndex ].play(); } - const soundClipIndex = ORDERED_WAVELENGTHS.indexOf( photon.wavelength ); - photonEmissionSoundPlayers[ soundSetIndex ][ soundClipIndex ].play(); } ); } From f0473e013a75e20e3c4a83c0ea8bd69301cf1403 Mon Sep 17 00:00:00 2001 From: jbphet Date: Mon, 4 Nov 2019 15:40:20 -0700 Subject: [PATCH 05/10] added enable control properties to loops so that they don't play when sim is paused, see #216 (cherry picked from commit e1a996ce64cb0e599513dcd774e97bb3c373a6b0) --- .../view/MoleculesAndLightScreenView.js | 45 +++++++++++-------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/js/moleculesandlight/view/MoleculesAndLightScreenView.js b/js/moleculesandlight/view/MoleculesAndLightScreenView.js index 32ff88b2..4edc5de8 100644 --- a/js/moleculesandlight/view/MoleculesAndLightScreenView.js +++ b/js/moleculesandlight/view/MoleculesAndLightScreenView.js @@ -275,7 +275,7 @@ define( require => { initialOutputLevel: 0.1 } ); soundManager.addSoundGenerator( moleculeEnergizedLoop ); - const moleculeEnergizedSoundPlayer = moleculeEnergized => { + const updateMoleculeEnergizedSound = moleculeEnergized => { if ( moleculeEnergized ) { moleculeEnergizedLoop.play(); } @@ -292,24 +292,33 @@ define( require => { }; // molecule rotating sound - const rotateSound = new SoundClip( rotateSoundInfo, { initialOutputLevel: 0.05, loop: true } ); + const rotateSound = new SoundClip( rotateSoundInfo, { + initialOutputLevel: 0.05, + loop: true, + enableControlProperties: [ photonAbsorptionModel.runningProperty ] + } ); soundManager.addSoundGenerator( rotateSound ); - const rotateSoundPlayer = rotating => { + const updateRotationSound = rotating => { rotating ? rotateSound.play() : rotateSound.stop(); }; // molecule vibration sounds + const moleculeVibrationSoundClipOptions = { + initialOutputLevel: 0.2, + loop: true, + enableControlProperties: [ photonAbsorptionModel.runningProperty ] + }; const moleculeVibrationSoundClips = [ - new SoundClip( vibrateOption2SoundInfo, { initialOutputLevel: 0.2, loop: true } ), - new SoundClip( vibrateOption2HigherSoundInfo, { initialOutputLevel: 0.2, loop: true } ), - new SoundClip( vibrateOption2SaturatedEQSoundInfo, { initialOutputLevel: 0.2, loop: true } ), - new SoundClip( vibrateOption4SoundInfo, { initialOutputLevel: 0.2, loop: true } ), - new SoundClip( vibrateOption7SoundInfo, { initialOutputLevel: 0.2, loop: true } ) + new SoundClip( vibrateOption2SoundInfo, moleculeVibrationSoundClipOptions ), + new SoundClip( vibrateOption2HigherSoundInfo, moleculeVibrationSoundClipOptions ), + new SoundClip( vibrateOption2SaturatedEQSoundInfo, moleculeVibrationSoundClipOptions ), + new SoundClip( vibrateOption4SoundInfo, moleculeVibrationSoundClipOptions ), + new SoundClip( vibrateOption7SoundInfo, moleculeVibrationSoundClipOptions ) ]; moleculeVibrationSoundClips.forEach( soundClip => { soundManager.addSoundGenerator( soundClip ); } ); - const vibrationSoundPlayer = vibrating => { + const updateVibrationSound = vibrating => { const indexToPlay = malSoundOptionsDialogContent.vibrationSoundProperty.value - 1; if ( vibrating ) { @@ -336,10 +345,10 @@ define( require => { // function that adds all of the listeners involved in creating sound const addSoundPlayersToMolecule = molecule => { - molecule.highElectronicEnergyStateProperty.link( moleculeEnergizedSoundPlayer ); + molecule.highElectronicEnergyStateProperty.link( updateMoleculeEnergizedSound ); molecule.brokeApartEmitter.addListener( breakApartSoundPlayer ); - molecule.rotatingProperty.link( rotateSoundPlayer ); - molecule.vibratingProperty.link( vibrationSoundPlayer ); + molecule.rotatingProperty.link( updateRotationSound ); + molecule.vibratingProperty.link( updateVibrationSound ); }; // add listeners to molecules for playing the sounds @@ -348,17 +357,17 @@ define( require => { // remove listeners when the molecules go away photonAbsorptionModel.activeMolecules.addItemRemovedListener( function( removedMolecule ) { - if ( removedMolecule.highElectronicEnergyStateProperty.hasListener( moleculeEnergizedSoundPlayer ) ) { - removedMolecule.highElectronicEnergyStateProperty.unlink( moleculeEnergizedSoundPlayer ); + if ( removedMolecule.highElectronicEnergyStateProperty.hasListener( updateMoleculeEnergizedSound ) ) { + removedMolecule.highElectronicEnergyStateProperty.unlink( updateMoleculeEnergizedSound ); } if ( removedMolecule.brokeApartEmitter.hasListener( breakApartSoundPlayer ) ) { removedMolecule.brokeApartEmitter.removeListener( breakApartSoundPlayer ); } - if ( removedMolecule.rotatingProperty.hasListener( rotateSoundPlayer ) ) { - removedMolecule.rotatingProperty.unlink( rotateSoundPlayer ); + if ( removedMolecule.rotatingProperty.hasListener( updateRotationSound ) ) { + removedMolecule.rotatingProperty.unlink( updateRotationSound ); } - if ( removedMolecule.vibratingProperty.hasListener( vibrationSoundPlayer ) ) { - removedMolecule.vibratingProperty.unlink( vibrationSoundPlayer ); + if ( removedMolecule.vibratingProperty.hasListener( updateVibrationSound ) ) { + removedMolecule.vibratingProperty.unlink( updateVibrationSound ); } } ); From bb0531d19636785ac74793892cfb4ba6f948b982 Mon Sep 17 00:00:00 2001 From: jbphet Date: Mon, 4 Nov 2019 15:51:22 -0700 Subject: [PATCH 06/10] Bumping version to 1.5.0-dev.10 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9ca9e3b5..fa70c462 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "molecules-and-light", - "version": "1.5.0-dev.9", + "version": "1.5.0-dev.10", "license": "GPL-3.0", "repository": { "type": "git", From 2f1136c91907a5cb59b00776d7450062aaa28591 Mon Sep 17 00:00:00 2001 From: jbphet Date: Mon, 4 Nov 2019 15:52:16 -0700 Subject: [PATCH 07/10] updated dependencies.json for 1.5.0-dev.10 --- dependencies.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.json b/dependencies.json index a0a954a9..d778e9fc 100644 --- a/dependencies.json +++ b/dependencies.json @@ -1,5 +1,5 @@ { - "comment": "# molecules-and-light 1.5.0-dev.9 Mon Nov 04 2019 17:20:50 GMT-0500 (Eastern Standard Time)", + "comment": "# molecules-and-light 1.5.0-dev.10 Mon Nov 04 2019 15:51:44 GMT-0700 (Mountain Standard Time)", "assert": { "sha": "a99a9ce9ee0774bf3ef509bf3e31ca7383f67478", "branch": "master" @@ -13,7 +13,7 @@ "branch": "master" }, "chipper": { - "sha": "59fdc88e1a6079b108ca063367b21a1bea79b853", + "sha": "9f69f9e381778e740ced31d914f69e7664c36fd7", "branch": "master" }, "dot": { @@ -21,7 +21,7 @@ "branch": "master" }, "joist": { - "sha": "21d163d28b186bf0a7b3226ca769402a0d8a0d38", + "sha": "7fbe5dcd309a818964232b828266f503027156a7", "branch": "master" }, "kite": { @@ -29,7 +29,7 @@ "branch": "master" }, "molecules-and-light": { - "sha": "46a5d257353216bd7517316dc10603e1781bc917", + "sha": "bb0531d19636785ac74793892cfb4ba6f948b982", "branch": "master" }, "nitroglycerin": { From a12221a63772cf1fbfa8f2ea3a7a252299671be1 Mon Sep 17 00:00:00 2001 From: jbphet Date: Mon, 4 Nov 2019 15:55:36 -0700 Subject: [PATCH 08/10] added enable control properties to glow loop so it doesn't play when sim is paused, see #216 --- js/moleculesandlight/view/MoleculesAndLightScreenView.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/moleculesandlight/view/MoleculesAndLightScreenView.js b/js/moleculesandlight/view/MoleculesAndLightScreenView.js index 1d90fd15..227740e9 100644 --- a/js/moleculesandlight/view/MoleculesAndLightScreenView.js +++ b/js/moleculesandlight/view/MoleculesAndLightScreenView.js @@ -269,7 +269,8 @@ define( require => { // sound to play when molecule becomes "energized", which is depicted as glowing in the view const moleculeEnergizedLoop = new SoundClip( moleculeEnergizedLoopInfo, { loop: true, - initialOutputLevel: 0.1 + initialOutputLevel: 0.1, + enableControlProperties: [ photonAbsorptionModel.runningProperty ] } ); soundManager.addSoundGenerator( moleculeEnergizedLoop ); const updateMoleculeEnergizedSound = moleculeEnergized => { From b7870023f40bb07ab553f8f6223d92e966c41b9e Mon Sep 17 00:00:00 2001 From: jbphet Date: Mon, 4 Nov 2019 16:00:00 -0700 Subject: [PATCH 09/10] Bumping version to 1.5.0-dev.11 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fa70c462..d06b11e2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "molecules-and-light", - "version": "1.5.0-dev.10", + "version": "1.5.0-dev.11", "license": "GPL-3.0", "repository": { "type": "git", From 24dc697ebf6ea9233cfd7b5403ae8e45165426df Mon Sep 17 00:00:00 2001 From: jbphet Date: Mon, 4 Nov 2019 16:01:06 -0700 Subject: [PATCH 10/10] updated dependencies.json for 1.5.0-dev.11 --- dependencies.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.json b/dependencies.json index d778e9fc..54d91ba6 100644 --- a/dependencies.json +++ b/dependencies.json @@ -1,5 +1,5 @@ { - "comment": "# molecules-and-light 1.5.0-dev.10 Mon Nov 04 2019 15:51:44 GMT-0700 (Mountain Standard Time)", + "comment": "# molecules-and-light 1.5.0-dev.11 Mon Nov 04 2019 16:00:25 GMT-0700 (Mountain Standard Time)", "assert": { "sha": "a99a9ce9ee0774bf3ef509bf3e31ca7383f67478", "branch": "master" @@ -29,7 +29,7 @@ "branch": "master" }, "molecules-and-light": { - "sha": "bb0531d19636785ac74793892cfb4ba6f948b982", + "sha": "b7870023f40bb07ab553f8f6223d92e966c41b9e", "branch": "master" }, "nitroglycerin": {