samreid
commented
5 years ago Here's a patch from feasibilty prototype from today's discussion:
```diff
Index: wave-interference/js/common/view/WaveAreaGraphNode.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wave-interference/js/common/view/WaveAreaGraphNode.js (revision e0ddf9308b01444989aef2c543915f038a982f51)
+++ wave-interference/js/common/view/WaveAreaGraphNode.js (date 1571779449268)
@@ -9,19 +9,48 @@
'use strict';
// modules
+ const BooleanProperty = require( 'AXON/BooleanProperty' );
const Bounds2 = require( 'DOT/Bounds2' );
+ const ContinuousPropertySoundGenerator = require( 'TAMBO/sound-generators/ContinuousPropertySoundGenerator' );
const DashedLineNode = require( 'WAVE_INTERFERENCE/common/view/DashedLineNode' );
const Line = require( 'SCENERY/nodes/Line' );
const Node = require( 'SCENERY/nodes/Node' );
const Path = require( 'SCENERY/nodes/Path' );
+ const Property = require( 'AXON/Property' );
+ const Range = require( 'DOT/Range' );
const SceneToggleNode = require( 'WAVE_INTERFERENCE/common/view/SceneToggleNode' );
const Shape = require( 'KITE/Shape' );
+ const soundManager = require( 'TAMBO/soundManager' );
const Util = require( 'DOT/Util' );
+ const Vector2 = require( 'DOT/Vector2' );
const waveInterference = require( 'WAVE_INTERFERENCE/waveInterference' );
const WaveInterferenceConstants = require( 'WAVE_INTERFERENCE/common/WaveInterferenceConstants' );
const WaveInterferenceText = require( 'WAVE_INTERFERENCE/common/view/WaveInterferenceText' );
const WaveInterferenceUtils = require( 'WAVE_INTERFERENCE/common/WaveInterferenceUtils' );
+ // sounds
+ // const sineSound = require( 'sound!TAMBO/ethereal-flute-for-meter-loop.mp3' );
+
+ // sounds
+ const etherealFluteSound = require( 'sound!WAVE_INTERFERENCE/ethereal-flute-for-meter-loop.mp3' );
+ // const organ2Sound = require( 'sound!WAVE_INTERFERENCE/organ-v2-for-meter-loop.mp3' );
+ // const organSound = require( 'sound!WAVE_INTERFERENCE/organ-for-meter-loop.mp3' );
+ // const sineSound = require( 'sound!TAMBO/220hz-saturated-sine-loop.mp3' );
+ // const sineSound2 = require( 'sound!WAVE_INTERFERENCE/220hz-saturated-sine-playback-rate-75.mp3' );
+ // const stringSound1 = require( 'sound!TAMBO/strings-loop-middle-c-oscilloscope.mp3' );
+ // const windSound1 = require( 'sound!TAMBO/winds-loop-middle-c-oscilloscope.mp3' );
+ // const windSound2 = require( 'sound!TAMBO/winds-loop-c3-oscilloscope.mp3' );
+ // const windyTone4 = require( 'sound!WAVE_INTERFERENCE/windy-tone-for-meter-loop-rate-75-pitch-matched-fixed.mp3' );
+ // const windyToneSound = require( 'sound!WAVE_INTERFERENCE/windy-tone-for-meter-loop.mp3' );
+
+ // const sounds = [ sineSound2, windyTone4, stringSound1, sineSound, windSound1, windSound2, etherealFluteSound, organ2Sound, organSound, windyToneSound ];
+ // const selectedSound=windyTone4;
+ // const selectedSound=stringSound1;
+ // const selectedSound=windSound1;
+ // const selectedSound=etherealFluteSound;// several votes! :) EM says it is a bit harsh,
+ // const selectedSound=organSound;
+ const selectedSound = etherealFluteSound;
+
// constants
const TEXT_MARGIN_X = 8;
const TEXT_MARGIN_Y = 6;
@@ -200,16 +229,76 @@
} );
this.addChild( path );
+ const derivativePath = new Path( new Shape(), {
+ stroke: 'red',
+ lineWidth: 2,
+ lineJoin: WaveInterferenceConstants.CHART_LINE_JOIN, // Prevents artifacts at the wave source
+
+ // prevent the shape from going outside of the chart area
+ clipArea: pathClipArea,
+
+ // prevent bounds computations during main loop
+ boundsMethod: 'none',
+ localBounds: pathClipArea.bounds
+ } );
+ this.addChild( derivativePath );
+
// Created once and reused to avoid allocations
const sampleArray = [];
+ const soundPropertyGenerators = [];
+ for ( let i = 0; i < 20; i++ ) {
+ const p = new Property( 0 );
+ const continuousPropertySoundGenerator = new ContinuousPropertySoundGenerator( p, selectedSound, new Range( 100, 500 ), new BooleanProperty( false ) );
+ soundManager.addSoundGenerator( continuousPropertySoundGenerator );
+ soundPropertyGenerators.push( continuousPropertySoundGenerator );
+ }
+
// Manually tuned to center the line in the graph, dy must be synchronized with graphHeight
const dx = -options.x;
const dy = -options.centerY / 2 + 7.5;
const updateShape = () => {
const shape = getWaterSideShape( sampleArray, model.sceneProperty.value.lattice, waveAreaBounds, dx, dy );
- return path.setShape( shape );
+
+ let selectedIndex = 0;
+ const makeDerivative = s => {
+ const points = s.subpaths[ 0 ].points;
+ const derivative = new Shape();
+ for ( let i = 0; i < points.length - 2; i++ ) {
+ const a = points[ i ];
+ const b = points[ i + 1 ];
+ const c = points[ i + 2 ];
+
+ let y = 100;
+ const x = ( a.x + b.x + c.x ) / 3;
+ if ( b.y < a.y && b.y < c.y && x > 50 ) {
+ y = 200;
+ assert && assert( !isNaN( x ) );
+ const soundPropertyGenerator = soundPropertyGenerators[ selectedIndex ];
+
+ // console.log( x );
+ soundPropertyGenerator.setOutputLevel( Util.linear( 1000, 100, 0, 1, x ), 0 );
+ soundPropertyGenerator.property.value = x;
+ selectedIndex++;
+ }
+
+ const p = new Vector2( x, y );
+ derivative.lineToPoint( p );
+ // console.log( x );
+
+ }
+ return derivative;
+ };
+
+ const derivative = makeDerivative( shape );
+
+ path.setShape( shape );
+ derivativePath.setShape( derivative );
+
+ for ( let i = selectedIndex; i < soundPropertyGenerators.length; i++ ) {
+ soundPropertyGenerators[ i ].setOutputLevel( 0, 0 );
+ }
};
model.scenes.forEach( scene => scene.lattice.changedEmitter.addListener( updateShape ) );
Index: tambo/js/sound-generators/ContinuousPropertySoundGenerator.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- tambo/js/sound-generators/ContinuousPropertySoundGenerator.js (revision 340d72cec98a94e6959c96a7911193738bffc00a)
+++ tambo/js/sound-generators/ContinuousPropertySoundGenerator.js (date 1571766568917)
@@ -33,7 +33,7 @@
initialOutputLevel: 0.7,
loop: true,
trimSilence: false,
- pitchRangeInSemitones: 36,
+ pitchRangeInSemitones: 18,
pitchCenterOffset: 2,
fadeStartDelay: 0.2, // in seconds, time to wait before starting fade
fadeTime: 0.15, // in seconds, duration of fade out
@@ -48,6 +48,8 @@
super( sound, options );
+ this.property = property;
+
// @private {number} - see docs at options declaration
this.fadeTime = options.fadeTime;
@@ -61,21 +63,26 @@
this.remainingFadeTime = 0;
// start with the output level at zero so that the initial sound generation has a bit of fade in
- this.setOutputLevel( 0, 0 );
+ // this.setOutputLevel( 0, 0 );
// function for starting the sound or adjusting the volume
const listener = value => {
if ( !resetInProgressProperty.value ) {
+ const r = { min: range.max, max: range.min };
// calculate the playback rate based on the value
- const normalizedValue = Math.log( value / range.min ) / Math.log( range.max / range.min );
+ const normalizedValue = Math.log( value / r.min ) / Math.log( r.max / r.min );
const centerValue = normalizedValue - 0.5;
const midiNote = options.pitchRangeInSemitones / 2 * centerValue + options.pitchCenterOffset;
const playbackRate = Math.pow( 2, midiNote / 12 );
- this.setPlaybackRate( playbackRate );
- this.setOutputLevel( this.nonFadedOutputLevel );
+ // if ( playbackRate < 4 ) {
+ this.setPlaybackRate( playbackRate * 0.75, 1E-4 );
+ // }
+ // this.setOutputLevel( this.nonFadedOutputLevel );
+
+ // console.log(playbackRate,this.nonFadedOutputLevel);
if ( !this.playing ) {
this.play();
}
@@ -112,7 +119,7 @@
// the sound is fading out, adjust the output level
const outputLevel = Math.max( ( this.remainingFadeTime - this.delayBeforeStop ) / this.fadeTime, 0 );
- this.setOutputLevel( outputLevel * this.nonFadedOutputLevel );
+ // this.setOutputLevel( outputLevel * this.nonFadedOutputLevel );
}
// fade out complete, stop playback
```
Ashton-Morris
We would like to depict the sound from the position-based chart. Many notes are in the design doc.