Skip to content

Commit

Permalink
integrated new molecule glow sound, see #216
Browse files Browse the repository at this point in the history
  • Loading branch information
jbphet committed Oct 21, 2019
1 parent 5236485 commit 82f49ef
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 17 deletions.
10 changes: 2 additions & 8 deletions js/moleculesandlight/view/MoleculesAndLightScreenView.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ define( require => {

// sounds
const brokeApartSoundInfo = require( 'sound!MOLECULES_AND_LIGHT/break-apart.mp3' );
const moleculeEnergizedLoopInfo = require( 'sound!MOLECULES_AND_LIGHT/glow-loop.mp3' );
const moleculeEnergizedStartSoundInfo = require( 'sound!MOLECULES_AND_LIGHT/glow-start-one-shot.mp3' );
const moleculeEnergizedLoopInfo = require( 'sound!MOLECULES_AND_LIGHT/glow-loop-higher.mp3' );
const rotateSoundInfo = require( 'sound!MOLECULES_AND_LIGHT/rotate-loop.mp3' );
const vibrateLoopSoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-loop-v2.mp3' );
const vibrateStartSoundInfo = require( 'sound!MOLECULES_AND_LIGHT/vibrate-one-shot-v2.mp3' );
Expand Down Expand Up @@ -267,16 +266,11 @@ 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.3
initialOutputLevel: 0.1
} );
soundManager.addSoundGenerator( moleculeEnergizedLoop );
const moleculeEnergizedStartSound = new SoundClip( moleculeEnergizedStartSoundInfo, {
initialOutputLevel: 0.5
} );
soundManager.addSoundGenerator( moleculeEnergizedStartSound );
const moleculeEnergizedSoundPlayer = moleculeEnergized => {
if ( moleculeEnergized ) {
moleculeEnergizedStartSound.play();
moleculeEnergizedLoop.play();
}
else {
Expand Down
Binary file added sounds/glow-loop-higher.mp3
Binary file not shown.
Binary file removed sounds/glow-loop.mp3
Binary file not shown.
10 changes: 1 addition & 9 deletions sounds/license.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
{
"glow-loop.mp3": {
"text": [
"Copyright 2018 University of Colorado Boulder"
],
"projectURL": "http://phet.colorado.edu",
"license": "contact [email protected]",
"notes": "created by Ashton Morris (PhET Interactive Simulations)"
},
"glow-start-one-shot.mp3": {
"glow-loop-higher.mp3": {
"text": [
"Copyright 2018 University of Colorado Boulder"
],
Expand Down

0 comments on commit 82f49ef

Please sign in to comment.