diff options
Diffstat (limited to 'python/examples/futureHouse')
| -rw-r--r-- | python/examples/futureHouse/waveViz.html | 13 | ||||
| -rw-r--r-- | python/examples/futureHouse/waveViz.js | 12 |
2 files changed, 19 insertions, 6 deletions
diff --git a/python/examples/futureHouse/waveViz.html b/python/examples/futureHouse/waveViz.html index d85a47d..273f3b8 100644 --- a/python/examples/futureHouse/waveViz.html +++ b/python/examples/futureHouse/waveViz.html @@ -9,16 +9,19 @@ </div> +<label>minPulseLength (0-4096)</label> +<input id="minPulseLength"> <label>maxPulseLength (0-4096)</label> -<input type="text" name="maxPulseLength"> -<label>minPulseLength (0-4096)</label> -<input name="minPulseLength"> +<input type="text" id="maxPulseLength"> + <br/> + <label>waitFloor (0-2, should be less than waitCeiling</label> -<input name="waitFloor"> +<input id="waitFloor"> + <label>waitCeiling (0-2, should be more than waitFloor)</label> -<input name="waitCeiling"> +<input id="waitCeiling"> </body> </html> diff --git a/python/examples/futureHouse/waveViz.js b/python/examples/futureHouse/waveViz.js index 5e59a18..a0cb53f 100644 --- a/python/examples/futureHouse/waveViz.js +++ b/python/examples/futureHouse/waveViz.js @@ -34,6 +34,16 @@ $(function () { ctx.strokeStyle = '#ffffff'; ctx.fillStyle = 'rgb(50, 50, 80)'; + $("#minPulseLength").on('keydown', function (e) { + + if (e.keyCode == 13) { + var v = $("#minPulseLength").val(); + osc1.min = v; + console.log("minP: " + v); + } + + }); + function loop() { var i; @@ -99,7 +109,7 @@ $(function () { //return max * Math.sin(a * Math.PI); var waveVal = a < 1 ? this.min : this.max; - console.log(waveVal); + // console.log(waveVal); return waveVal; } |
