From f0a7e0ed1b60ac7148466b512bdc0ba35f0310ea Mon Sep 17 00:00:00 2001 From: James H Ball Date: Sat, 29 Jun 2024 20:10:18 +0100 Subject: [PATCH] Revert "Use modified version of dood.al oscilloscope for visualiser" This reverts commit f75b6e034a9f38b32a650c20cc720ac3b0a4d0c9. --- Resources/oscilloscope/noise.jpg | Bin 9077 -> 0 bytes Resources/oscilloscope/oscilloscope.html | 662 --------------- Resources/oscilloscope/oscilloscope.js | 942 ---------------------- Source/components/VisualiserComponent.cpp | 32 +- Source/components/VisualiserComponent.h | 25 - osci-render.jucer | 6 - 6 files changed, 14 insertions(+), 1653 deletions(-) delete mode 100644 Resources/oscilloscope/noise.jpg delete mode 100644 Resources/oscilloscope/oscilloscope.html delete mode 100644 Resources/oscilloscope/oscilloscope.js diff --git a/Resources/oscilloscope/noise.jpg b/Resources/oscilloscope/noise.jpg deleted file mode 100644 index 8066386591803f16ed358f8b647e106cc51ae771..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9077 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 TE*zNQ8lE__v|~N;_wxS%t6>Ct diff --git a/Resources/oscilloscope/oscilloscope.html b/Resources/oscilloscope/oscilloscope.html deleted file mode 100644 index ffd3015..0000000 --- a/Resources/oscilloscope/oscilloscope.html +++ /dev/null @@ -1,662 +0,0 @@ - - - - - - - - - - - - - - - - -
- - - [CLICK TO START] - - - -
- - XXY OSCILLOSCOPE - -
- -
- - - - - - - - - - - - - - - -
- - - - -
Gain
+0.00
-		 - - - - -
Intensity
+0.0
-
- - - - -
Audio volume
1.00
-		 - - - -
  - Swap x / y -
  - Invert x and y -
-
- - - - -
- -

- SWEEP - - - - - - - -
- - - - -
Trigger value
+0.00
-		 - - - - -
Milliseconds/div
1
-
- - -

- -

- SIGNAL GENERATOR - -

 x = -
- - y = -
- - - - - - - - - - - - - - - - - - - - - -
Parameter a x1

 1.00
Parameter b x1
1.00
- -

- -
- -

- MICROPHONE - - - -

- -
- - - - - - -
PLAY FILE
- -

- - - -

- - - - - - - - -
- - - - - - - - - -
Hue
125
Persistence
0.00
-		 - - - - -
-  Freeze image -
-  Disable upsampling -
-  Hide graticule -
-
- - - - [reset all] - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Resources/oscilloscope/oscilloscope.js b/Resources/oscilloscope/oscilloscope.js deleted file mode 100644 index 7c2343b..0000000 --- a/Resources/oscilloscope/oscilloscope.js +++ /dev/null @@ -1,942 +0,0 @@ - -var AudioSystem = -{ - microphoneActive : false, - - init : function (bufferSize) - { - window.AudioContext = window.AudioContext||window.webkitAudioContext; - this.audioContext = new window.AudioContext(); - this.sampleRate = this.audioContext.sampleRate; - this.bufferSize = bufferSize; - this.timePerSample = 1/this.sampleRate; - this.oldXSamples = new Float32Array(this.bufferSize); - this.oldYSamples = new Float32Array(this.bufferSize); - this.smoothedXSamples = new Float32Array(Filter.nSmoothedSamples); - this.smoothedYSamples = new Float32Array(Filter.nSmoothedSamples); - - if (!(navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia)) - { - microphoneOutput.value = " unavailable in this browser"; - } - }, - - startSound : function() - { - var audioElement = document.getElementById("audioElement"); - this.source = this.audioContext.createMediaElementSource(audioElement); - this.audioVolumeNode = this.audioContext.createGain(); - - this.generator = this.audioContext.createScriptProcessor(this.bufferSize, 0, 2); - this.generator.onaudioprocess = SignalGenerator.generate; - - this.scopeNode = this.audioContext.createScriptProcessor(this.bufferSize, 2, 2); - this.scopeNode.onaudioprocess = doScriptProcessor; - this.source.connect(this.scopeNode); - this.generator.connect(this.scopeNode); - - this.scopeNode.connect(this.audioVolumeNode); - this.audioVolumeNode.connect(this.audioContext.destination); - }, - - tryToGetMicrophone : function() - { - if (this.microphoneActive) - { - AudioSystem.microphone.connect(AudioSystem.scopeNode); - audioVolume.value = 0.0; - audioVolume.oninput(); - return; - } - - var constraints = {audio: { mandatory: { echoCancellation: false }}}; - //var constraints = {audio: {echoCancellation: false} }; - navigator.getUserMedia = navigator.getUserMedia || - navigator.webkitGetUserMedia || - navigator.mozGetUserMedia; - if (navigator.getUserMedia) - { - navigator.getUserMedia(constraints, onStream, function(){micCheckbox.checked = false;}); - } - else - { - micCheckbox.checked = false; - } - }, - - disconnectMicrophone : function() - { - if (this.microphone) this.microphone.disconnect(); - } -} - - - -onStream = function(stream) -{ - AudioSystem.microphoneActive = true; - AudioSystem.microphone = AudioSystem.audioContext.createMediaStreamSource(stream); - AudioSystem.microphone.connect(AudioSystem.scopeNode); - - audioVolume.value = 0.0; - audioVolume.oninput(); -}; - -var SignalGenerator = -{ - oldA : 1.0, - oldB : 1.0, - timeInSamples : 0, - - generate : function(event) - { - var xOut = event.outputBuffer.getChannelData(0); - var yOut = event.outputBuffer.getChannelData(1); - var newA = controls.aValue * Math.pow(10.0, controls.aExponent); - var newB = controls.bValue * Math.pow(10.0, controls.bExponent); - var oldA = SignalGenerator.oldA; - var oldB = SignalGenerator.oldB; - var PI = Math.PI; - var cos = Math.cos; - var sin = Math.sin; - var xFunc = eval("(function xFunc(){return "+controls.xExpression+";})"); - var yFunc = eval("(function yFunc(){return "+controls.yExpression+";})"); - var bufferSize = AudioSystem.bufferSize; - var timeInSamples = SignalGenerator.timeInSamples; - var sampleRate = AudioSystem.sampleRate; - var x = 0.0; - var y = 0.0; - if (!controls.signalGeneratorOn) - { - for (var i=0; i0) - { - var xDelta = xPoints[i]-xPoints[i-1]; - if (xDelta<0) xDelta = -xDelta; - var yDelta = yPoints[i]-yPoints[i-1]; - if (yDelta<0) yDelta = -yDelta; - this.totalLength += xDelta + yDelta; - }*/ - } - //testOutputElement.value = this.totalLength; - - gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer); - gl.bufferData(gl.ARRAY_BUFFER, scratchVertices, gl.STATIC_DRAW); - gl.bindBuffer(gl.ARRAY_BUFFER, null); - - var program = this.lineShader; - gl.useProgram(program); - gl.enableVertexAttribArray(program.aStart); - gl.enableVertexAttribArray(program.aEnd); - gl.enableVertexAttribArray(program.aIdx); - - gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer); - gl.vertexAttribPointer(program.aStart, 2, gl.FLOAT, false, 0, 0); - gl.vertexAttribPointer(program.aEnd, 2, gl.FLOAT, false, 0, 8*4); - gl.bindBuffer(gl.ARRAY_BUFFER, this.quadIndexBuffer); - gl.vertexAttribPointer(program.aIdx, 1, gl.FLOAT, false, 0, 0); - - gl.activeTexture(gl.TEXTURE0); - gl.bindTexture(gl.TEXTURE_2D, this.screenTexture); - gl.uniform1i(program.uScreen, 0); - - gl.uniform1f(program.uSize, 0.015); - gl.uniform1f(program.uGain, Math.pow(2.0,controls.mainGain)*450/512); - if (controls.invertXY) gl.uniform1f(program.uInvert, -1.0); - else gl.uniform1f(program.uInvert, 1.0); - if (controls.disableFilter) gl.uniform1f(program.uIntensity, 0.005*(Filter.steps+1.5)); - // +1.5 needed above for some reason for the brightness to match - else gl.uniform1f(program.uIntensity, 0.005); - gl.uniform1f(program.uFadeAmount, this.fadeAmount); - gl.uniform1f(program.uNEdges, this.nEdges); - - gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this.vertexIndexBuffer); - var nEdgesThisTime = (xPoints.length-1); - - /*if (this.totalLength > 300) - { - nEdgesThisTime *= 300/this.totalLength; - nEdgesThisTime = Math.floor(nEdgesThisTime); - }*/ - - gl.drawElements(gl.TRIANGLES, nEdgesThisTime * 6, gl.UNSIGNED_SHORT, 0); - - gl.disableVertexAttribArray(program.aStart); - gl.disableVertexAttribArray(program.aEnd); - gl.disableVertexAttribArray(program.aIdx); - }, - - fade : function(alpha) - { - this.setNormalBlending(); - - var program = this.simpleShader; - gl.useProgram(program); - gl.enableVertexAttribArray(program.vertexPosition); - gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer); - gl.bufferData(gl.ARRAY_BUFFER, this.fullScreenQuad, gl.STATIC_DRAW); - gl.vertexAttribPointer(program.vertexPosition, 2, gl.FLOAT, false, 0, 0); - gl.bindBuffer(gl.ARRAY_BUFFER, null); - gl.uniform4fv(program.colour, [0.0, 0.0, 0.0, this.fadeAmount]); - gl.drawArrays(gl.TRIANGLES, 0, 6); - gl.disableVertexAttribArray(program.vertexPosition); - }, - - loadTexture : function(src) - { - var texture = gl.createTexture(); - gl.bindTexture(gl.TEXTURE_2D, texture); - // Fill with grey pixel, as placeholder until loaded - gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 1, 1, 0, gl.RGBA, gl.UNSIGNED_BYTE, - new Uint8Array([128, 128, 128, 255])); - // Asynchronously load an image - var image = new Image(); - image.crossOrigin = "anonymous"; - image.src = src; - image.addEventListener('load', function() - { - // Now that the image has loaded make copy it to the texture. - gl.bindTexture(gl.TEXTURE_2D, texture); - gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, image); - gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR); - //gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR); - gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR_MIPMAP_LINEAR); - gl.generateMipmap(gl.TEXTURE_2D); - //hardcoded: - texture.width = texture.height = 512; - if (controls.grid) Render.drawGrid(texture); - }); - return texture; - }, - - drawGrid : function(texture) - { - this.activateTargetTexture(texture); - this.setNormalBlending(); - this.setShader(this.simpleShader); - gl.colorMask(true, false, false, true); - - var data = []; - - for (var i=0; i<11; i++) - { - var step = 45; - var s = i*step; - data.splice(0,0, 0, s, 10*step, s); - data.splice(0,0, s, 0, s, 10*step); - if (i!=0 && i!=10) - { - for (var j=0; j<51; j++) - { - t = j*step/5; - if (i!=5) - { - data.splice(0,0, t, s-2, t, s+1); - data.splice(0,0, s-2, t, s+1, t); - } - else - { - data.splice(0,0, t, s-5, t, s+4); - data.splice(0,0, s-5, t, s+4, t); - } - } - } - } - - for (var j=0; j<51; j++) - { - var t = j*step/5; - if (t%5 == 0) continue; - data.splice(0,0, t-2, 2.5*step, t+2, 2.5*step); - data.splice(0,0, t-2, 7.5*step, t+2, 7.5*step); - } - - - var vertices = new Float32Array(data); - for (var i=0; i 1.1 && belowTrigger && ySamples[i]>=triggerValue) - sweepPosition =-1.3; - belowTrigger = ySamples[i] 0) { -// g.setColour(waveformColour); -// paintXY(g, r.withSizeKeepingCentre(minDim, minDim)); -// } -// } -// + g.setColour(backgroundColour); + g.fillRoundedRectangle(getLocalBounds().toFloat(), OscirenderLookAndFeel::RECT_RADIUS); + + auto r = getLocalBounds().toFloat(); + auto minDim = juce::jmin(r.getWidth(), r.getHeight()); + + { + juce::CriticalSection::ScopedLockType scope(lock); + if (buffer.size() > 0) { + g.setColour(waveformColour); + paintXY(g, r.withSizeKeepingCentre(minDim, minDim)); + } + } + if (!active) { // add translucent layer g.setColour(juce::Colours::black.withAlpha(0.5f)); @@ -267,7 +264,6 @@ void VisualiserComponent::resetBuffer() { } void VisualiserComponent::resized() { - browser.setBounds(getLocalBounds()); auto area = getLocalBounds(); area.removeFromBottom(5); auto buttonRow = area.removeFromBottom(25); diff --git a/Source/components/VisualiserComponent.h b/Source/components/VisualiserComponent.h index 85e23d4..1e74bea 100644 --- a/Source/components/VisualiserComponent.h +++ b/Source/components/VisualiserComponent.h @@ -66,31 +66,6 @@ private: SvgButton popOutButton{ "popOut", BinaryData::open_in_new_svg, juce::Colours::white, juce::Colours::white }; SvgButton settingsButton{ "settings", BinaryData::cog_svg, juce::Colours::white, juce::Colours::white }; - juce::WebBrowserComponent::ResourceProvider provider = [](const juce::String& path) { - juce::String mimeType; - if (path.endsWith(".html")) { - mimeType = "text/html"; - } else if (path.endsWith(".jpg")) { - mimeType = "image/jpeg"; - } else if (path.endsWith(".js")) { - mimeType = "text/javascript"; - } - std::vector data; - int size; - const char* file = BinaryData::getNamedResource(path.substring(1).replaceCharacter('.', '_').toRawUTF8(), size); - for (int i = 0; i < size; i++) { - data.push_back((std::byte) file[i]); - } - juce::WebBrowserComponent::Resource resource = { data, mimeType }; - return resource; - }; - - juce::WebBrowserComponent browser = juce::WebBrowserComponent( - juce::WebBrowserComponent::Options() - .withNativeIntegrationEnabled() - .withResourceProvider(provider) - ); - std::vector tempBuffer; int precision = 4; diff --git a/osci-render.jucer b/osci-render.jucer index b558775..2fca074 100644 --- a/osci-render.jucer +++ b/osci-render.jucer @@ -22,12 +22,6 @@ - - - - -