kopia lustrzana https://github.com/jameshball/osci-render
Remove unneccessary code and add fullscreen support
James H Ball
James H Ball
rodzic
bda414de92
commit
a6bd3bbc92
|
|
@ -99,6 +99,7 @@
|
|||
else return '+'+this.toFixed(k);
|
||||
}
|
||||
|
||||
console.log()
|
||||
var toggleVisible = function(string)
|
||||
{
|
||||
var element = document.getElementById(string);
|
||||
|
|
@ -144,14 +145,6 @@
|
|||
</td>
|
||||
<td width="360" valign="top">
|
||||
|
||||
<br>
|
||||
|
||||
<b id="title" style="font-size:26px"> XXY OSCILLOSCOPE </b> <b id="samplerate"></b>
|
||||
|
||||
<br>
|
||||
|
||||
<hr noshade>
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<td> <!--TOP LEFT CONTROL-->
|
||||
|
|
@ -200,15 +193,6 @@ oninput="controls.audioVolume=this.value; audioVolumeOutput.value=parseFloat(thi
|
|||
</tr>
|
||||
</table>
|
||||
|
||||
|
||||
<div id="displayNotes" style="display:none">
|
||||
<p><i>Version 0.96 (May 2022). Made
|
||||
by <a href="http://venuspatrol.nfshost.com">Neil Thapen</a>.<br>
|
||||
Line-drawing code adapted from
|
||||
<a href="https://github.com/m1el/woscope">woscope</a> by e1ml.<br>
|
||||
Thanks to e1ml and ompuco for inspiration.</i>
|
||||
</div>
|
||||
|
||||
<hr noshade>
|
||||
|
||||
<p><b style="font-size:18px">
|
||||
|
|
@ -236,95 +220,6 @@ oninput="controls.sweepMsDiv=Math.pow(2, this.value-2); msDivOutput.value = cont
|
|||
</tr>
|
||||
</table>
|
||||
|
||||
|
||||
<hr noshade>
|
||||
|
||||
<p><b style="font-size:18px">
|
||||
<input id="generatorCheckbox" type="checkbox" onchange="controls.signalGeneratorOn=this.checked"> SIGNAL GENERATOR</b>
|
||||
|
||||
<p> x = <input type="text" size="37" id="xInput" value = ""
|
||||
onkeydown = "if (event.keyCode == 13) {UI.compile(); xNote.value='';}"
|
||||
oninput = "if (this.value != controls.xExpression) xNote.value='X'; else xNote.value='';"/>
|
||||
<output id="xNote"> </output><br>
|
||||
|
||||
 y = <input type="text" size="37" id="yInput" value = ""
|
||||
onkeydown = "if (event.keyCode == 13) {UI.compile(); yNote.value='';}"
|
||||
oninput = "if (this.value != controls.yExpression) yNote.value='X'; else yNote.value='';"/>
|
||||
<output id="yNote"> </output><br>
|
||||
|
||||
|
||||
<table border="0">
|
||||
<tr>
|
||||
<td width="155"></td> <td width="45"></td><td width="155"></td> <td width="45"></td>
|
||||
</tr><tr>
|
||||
<td align="right">Parameter a</td> <td></td>
|
||||
<td><input id="aExponent" type="range" style="width:90%" min="0" max="3" value=0 step=1
|
||||
oninput="controls.aExponent=this.value; aExponentOutput.value=[' x1',' x10','x100','x1000'][this.value]"></td>
|
||||
<td> <output id="aExponentOutput"> x1</td>
|
||||
</tr><tr>
|
||||
<td colspan="3"><input id="aValue" type="range" style="width:95%" min="0.5" max="5.00" value=1.0 step=0.02
|
||||
oninput="controls.aValue=this.value; aValueOutput.value=parseFloat(this.value).toFixed(2)"><br></td>
|
||||
<td> <output id="aValueOutput">1.00</td>
|
||||
</tr>
|
||||
<tr><td height="5"></td></tr>
|
||||
<tr>
|
||||
<td align="right">Parameter b</td> <td></td>
|
||||
<td><input id="bExponent" type="range" style="width:90%" min="0" max="3" value=0 step=1
|
||||
oninput="controls.bExponent=this.value; bExponentOutput.value=[' x1',' x10','x100','x1000'][this.value]"></td>
|
||||
<td> <output id="bExponentOutput"> x1</td>
|
||||
</tr><tr>
|
||||
<td colspan="3"><input id="bValue" type="range" style="width:95%" min="0.5" max="5.00" value=1.0 step=0.02
|
||||
oninput="controls.bValue=this.value; bValueOutput.value=parseFloat(this.value).toFixed(2)"></td>
|
||||
<td> <output id="bValueOutput">1.00</td></tr>
|
||||
</table>
|
||||
|
||||
<div id="generatorNotes" style="display:none">
|
||||
<p><i>Use javascript expressions, e.g. 'Math.tan(t)'.<br>
|
||||
t is the time, n is the number of samples.</i>
|
||||
</div>
|
||||
|
||||
<hr noshade>
|
||||
|
||||
<p><b style="font-size:18px">
|
||||
<input type="checkbox" id="micCheckbox"
|
||||
onchange="if (this.checked) AudioSystem.tryToGetMicrophone(); else AudioSystem.disconnectMicrophone()"> MICROPHONE</b>
|
||||
<output id="microphoneOutput">
|
||||
|
||||
|
||||
<div id="micNotes" style="display:none"><i>
|
||||
Set "Audio Volume" to zero to avoid feedback.<br>
|
||||
Stereo input may not work in some browsers.<br>
|
||||
<p>To get audio from another program,
|
||||
you can either physically connect your audio output to your audio input,
|
||||
or use third party software.
|
||||
E.g. <a href="http://vb-audio.pagesperso-orange.fr/Cable/">VB-CABLE</a> on Windows,
|
||||
or <a href="https://github.com/mattingalls/Soundflower">Soundflower</a> with
|
||||
<a href="https://github.com/mLupine/SoundflowerBed">SoundflowerBed</a> on Mac.
|
||||
</i></div>
|
||||
|
||||
<hr noshade>
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<td width=200><b style="font-size:18px"> PLAY FILE<b></td>
|
||||
<td width=200><input id="audioFile" type="file" accept="audio/*" /></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<p><audio id="audioElement" controls></audio>
|
||||
|
||||
<script>
|
||||
var file;
|
||||
audioFile.onchange = function()
|
||||
{
|
||||
if (file) URL.revokeObjectURL(file)
|
||||
var files = this.files;
|
||||
file = URL.createObjectURL(files[0]);
|
||||
audioElement.src = file;
|
||||
audioElement.play();
|
||||
};
|
||||
</script>
|
||||
|
||||
<hr noshade>
|
||||
|
||||
|
||||
|
|
@ -355,19 +250,16 @@ oninput="controls.persistence=this.value; persistenceOutput.value=parseFloat(thi
|
|||
</td></tr>
|
||||
<tr><td>
|
||||
  <input id="hideGrid" type="checkbox"
|
||||
onchange="controls.grid=!controls.grid; if (Render) Render.screenTexture = Render.loadTexture('noise.jpg');"> Hide graticule
|
||||
onchange="controls.grid=!controls.grid"> Hide graticule
|
||||
</td></tr>
|
||||
</table>
|
||||
</td>
|
||||
|
||||
</tr></table>
|
||||
|
||||
|
||||
<input id="urlText" type="text" size="28" style="margin-top:5px" onclick="Controls.generateUrl()"
|
||||
value=" export current settings as a URL">
|
||||
 <a href="javascript:restoreDefaults();">[reset all]</a>
|
||||
|
||||
<script>
|
||||
|
||||
var killed = false;
|
||||
|
||||
var Controls = {
|
||||
generateUrl : function()
|
||||
|
|
@ -479,7 +371,6 @@ var Controls = {
|
|||
|
||||
</script>
|
||||
|
||||
<div id="extraNotes" style="display:none">
|
||||
</div>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -117,23 +117,10 @@ var UI =
|
|||
{
|
||||
sidebarWidth : 360,
|
||||
|
||||
init : function()
|
||||
{
|
||||
var kHzText = (AudioSystem.sampleRate/1000).toFixed(1)+"kHz";
|
||||
document.getElementById("samplerate").innerHTML=kHzText;
|
||||
init : function() {
|
||||
mainGain.oninput();
|
||||
trigger.oninput();
|
||||
this.xInput = document.getElementById("xInput");
|
||||
this.yInput = document.getElementById("yInput");
|
||||
this.xInput.value = controls.xExpression;
|
||||
this.yInput.value = controls.yExpression;
|
||||
},
|
||||
|
||||
compile : function() //doesn't compile anything anymore
|
||||
{
|
||||
controls.xExpression = this.xInput.value;
|
||||
controls.yExpression = this.yInput.value;
|
||||
}
|
||||
}
|
||||
|
||||
var Render =
|
||||
|
|
@ -696,60 +683,66 @@ var sweepPosition = -1;
|
|||
var belowTrigger = false;
|
||||
|
||||
function doScriptProcessor(event) {
|
||||
fetch(Juce.getBackendResourceAddress("audio"))
|
||||
.then((response) => response.arrayBuffer())
|
||||
.then((buffer) => {
|
||||
var dataView = new DataView(buffer);
|
||||
if (!killed) {
|
||||
fetch(Juce.getBackendResourceAddress("audio"))
|
||||
.then((response) => response.arrayBuffer())
|
||||
.then((buffer) => {
|
||||
var dataView = new DataView(buffer);
|
||||
|
||||
for (var i = 0; i < xSamples.length; i++) {
|
||||
xSamples[i] = dataView.getFloat32(i * 4 * 2, true);
|
||||
ySamples[i] = dataView.getFloat32(i * 4 * 2 + 4, true);
|
||||
}
|
||||
|
||||
if (controls.sweepOn) {
|
||||
var gain = Math.pow(2.0,controls.mainGain);
|
||||
var sweepMinTime = controls.sweepMsDiv*10/1000;
|
||||
var triggerValue = controls.sweepTriggerValue;
|
||||
for (var i=0; i<xSamples.length; i++)
|
||||
{
|
||||
xSamples[i] = sweepPosition / gain;
|
||||
sweepPosition += 2*AudioSystem.timePerSample/sweepMinTime;
|
||||
if (sweepPosition > 1.1 && belowTrigger && ySamples[i]>=triggerValue)
|
||||
sweepPosition =-1.3;
|
||||
belowTrigger = ySamples[i]<triggerValue;
|
||||
for (var i = 0; i < xSamples.length; i++) {
|
||||
xSamples[i] = dataView.getFloat32(i * 4 * 2, true);
|
||||
ySamples[i] = dataView.getFloat32(i * 4 * 2 + 4, true);
|
||||
}
|
||||
}
|
||||
|
||||
if (!controls.freezeImage)
|
||||
{
|
||||
if (!controls.disableFilter)
|
||||
{
|
||||
Filter.generateSmoothedSamples(AudioSystem.oldXSamples, xSamples, AudioSystem.smoothedXSamples);
|
||||
Filter.generateSmoothedSamples(AudioSystem.oldYSamples, ySamples, AudioSystem.smoothedYSamples);
|
||||
|
||||
if (!controls.swapXY) Render.drawLineTexture(AudioSystem.smoothedXSamples, AudioSystem.smoothedYSamples);
|
||||
else Render.drawLineTexture(AudioSystem.smoothedYSamples, AudioSystem.smoothedXSamples);
|
||||
if (controls.sweepOn) {
|
||||
var gain = Math.pow(2.0,controls.mainGain);
|
||||
var sweepMinTime = controls.sweepMsDiv*10/1000;
|
||||
var triggerValue = controls.sweepTriggerValue;
|
||||
for (var i=0; i<xSamples.length; i++)
|
||||
{
|
||||
xSamples[i] = sweepPosition / gain;
|
||||
sweepPosition += 2*AudioSystem.timePerSample/sweepMinTime;
|
||||
if (sweepPosition > 1.1 && belowTrigger && ySamples[i]>=triggerValue)
|
||||
sweepPosition =-1.3;
|
||||
belowTrigger = ySamples[i]<triggerValue;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!controls.swapXY) Render.drawLineTexture(xSamples, ySamples);
|
||||
else Render.drawLineTexture(ySamples, xSamples);
|
||||
}
|
||||
}
|
||||
|
||||
for (var i = 0; i<xSamples.length; i++) {
|
||||
AudioSystem.oldXSamples[i] = xSamples[i];
|
||||
AudioSystem.oldYSamples[i] = ySamples[i];
|
||||
}
|
||||
|
||||
requestAnimationFrame(drawCRTFrame);
|
||||
});
|
||||
if (!controls.freezeImage)
|
||||
{
|
||||
if (!controls.disableFilter)
|
||||
{
|
||||
Filter.generateSmoothedSamples(AudioSystem.oldXSamples, xSamples, AudioSystem.smoothedXSamples);
|
||||
Filter.generateSmoothedSamples(AudioSystem.oldYSamples, ySamples, AudioSystem.smoothedYSamples);
|
||||
|
||||
if (!controls.swapXY) Render.drawLineTexture(AudioSystem.smoothedXSamples, AudioSystem.smoothedYSamples);
|
||||
else Render.drawLineTexture(AudioSystem.smoothedYSamples, AudioSystem.smoothedXSamples);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!controls.swapXY) Render.drawLineTexture(xSamples, ySamples);
|
||||
else Render.drawLineTexture(ySamples, xSamples);
|
||||
}
|
||||
}
|
||||
|
||||
for (var i = 0; i<xSamples.length; i++) {
|
||||
AudioSystem.oldXSamples[i] = xSamples[i];
|
||||
AudioSystem.oldYSamples[i] = ySamples[i];
|
||||
}
|
||||
|
||||
|
||||
|
||||
requestAnimationFrame(drawCRTFrame);
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function drawCRTFrame(timeStamp) {
|
||||
Render.drawCRT();
|
||||
}
|
||||
|
||||
|
||||
var xSamples = new Float32Array(1920);
|
||||
var ySamples = new Float32Array(1920);
|
||||
UI.init();
|
||||
|
|
|
|||
|
|
@ -136,14 +136,7 @@ MainComponent::MainComponent(OscirenderAudioProcessor& p, OscirenderAudioProcess
|
|||
} else if (mode == FullScreenMode::MAIN_COMPONENT) {
|
||||
pluginEditor.visualiserFullScreen = false;
|
||||
}
|
||||
|
||||
if (pluginEditor.visualiserFullScreen) {
|
||||
removeChildComponent(&pluginEditor.visualiser);
|
||||
pluginEditor.addAndMakeVisible(pluginEditor.visualiser);
|
||||
} else {
|
||||
pluginEditor.removeChildComponent(&pluginEditor.visualiser);
|
||||
addAndMakeVisible(pluginEditor.visualiser);
|
||||
}
|
||||
|
||||
pluginEditor.visualiser.setFullScreen(pluginEditor.visualiserFullScreen);
|
||||
|
||||
pluginEditor.resized();
|
||||
|
|
@ -191,7 +184,7 @@ void MainComponent::updateFileLabel() {
|
|||
}
|
||||
|
||||
void MainComponent::resized() {
|
||||
auto bounds = getLocalBounds().withTrimmedTop(20).reduced(20);
|
||||
juce::Rectangle<int> bounds = getLocalBounds().withTrimmedTop(20).reduced(20);
|
||||
auto buttonWidth = 120;
|
||||
auto buttonHeight = 30;
|
||||
auto padding = 10;
|
||||
|
|
@ -244,6 +237,11 @@ void MainComponent::resized() {
|
|||
bounds.removeFromTop(padding);
|
||||
if (!pluginEditor.visualiserFullScreen) {
|
||||
auto minDim = juce::jmin(bounds.getWidth(), bounds.getHeight());
|
||||
pluginEditor.visualiser.setBounds(bounds.withSizeKeepingCentre(minDim, minDim));
|
||||
juce::Point<int> localTopLeft = {bounds.getX(), bounds.getY()};
|
||||
juce::Point<int> topLeft = pluginEditor.getLocalPoint(this, localTopLeft);
|
||||
auto shiftedBounds = bounds;
|
||||
shiftedBounds.setX(topLeft.getX());
|
||||
shiftedBounds.setY(topLeft.getY());
|
||||
pluginEditor.visualiser.setBounds(shiftedBounds.withSizeKeepingCentre(minDim, minDim));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -100,10 +100,7 @@ OscirenderAudioProcessorEditor::OscirenderAudioProcessorEditor(OscirenderAudioPr
|
|||
|
||||
addAndMakeVisible(lua);
|
||||
addAndMakeVisible(luaResizerBar);
|
||||
|
||||
if (visualiserFullScreen) {
|
||||
addAndMakeVisible(visualiser);
|
||||
}
|
||||
addAndMakeVisible(visualiser);
|
||||
|
||||
tooltipDropShadow.setOwner(&tooltipWindow);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -100,7 +100,6 @@ private:
|
|||
.withResourceProvider(provider)
|
||||
.withNativeFunction("toggleFullscreen", [this](auto& var, auto complete) {
|
||||
enableFullScreen();
|
||||
complete("toggleFullscreen");
|
||||
})
|
||||
);
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue