From 4de3ddb8cec0c546342166337642b97b5810a5b5 Mon Sep 17 00:00:00 2001 From: ergz Date: Sat, 7 Oct 2023 23:33:28 -0700 Subject: [PATCH] starts adding tailwind to make things prettier --- basic.html | 87 -------------------- basic.js | 217 -------------------------------------------------- index.ts | 14 ---- src/basic.ts | 180 ----------------------------------------- synth.html | 27 ++++--- tsconfig.json | 109 ------------------------- 6 files changed, 14 insertions(+), 620 deletions(-) delete mode 100644 basic.html delete mode 100644 basic.js delete mode 100644 index.ts delete mode 100644 src/basic.ts delete mode 100644 tsconfig.json diff --git a/basic.html b/basic.html deleted file mode 100644 index 737693b..0000000 --- a/basic.html +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - simple-synth - - -
-
- Waveform Selection - - - - - - - - - -
-
- -
-
- Keyboard - - - - - - - - - - - - - - - - - - - - - -
-
- - -
-
- Octave Selection - - - - - - - - - - - - - - - -
-
- - -
- - - -
- - - .5 -
- - - \ No newline at end of file diff --git a/basic.js b/basic.js deleted file mode 100644 index a2f5bec..0000000 --- a/basic.js +++ /dev/null @@ -1,217 +0,0 @@ -let osc = null; -let gain = null; -let selectedWave = "square"; -let baseFreq = 440; -let currentFreq = 261.63; -let notes = ["C", "D", "E", "F", "G", "A", "B"]; -let arpInterval = null; - -function octavehz(hz, octave) { - const val = parseFloat(octave); - return hz * 2 ** val; -} - -function noteToHz(note) { - switch (note) { - case "C": - return 261.63; - case "D": - return 293.66; - case "E": - return 329.63; - case "F": - return 349.23; - case "G": - return 392; - case "A": - return 440; - case "B": - return 493.88; - default: - return 0; - } -} - -window.onload = function () { - const audioContext = new AudioContext(); - - function updateOscFrequency() { - let selectedNoteButton = document.querySelector( - "input[name='notechoice']:checked" - ); - let selectedOctaveButton = document.querySelector( - "input[name='octavechoice']:checked" - ); - - if (selectedNoteButton && selectedOctaveButton) { - let selectedNote = selectedNoteButton.value; - let selectedOctave = parseFloat(selectedOctaveButton.value); - let noteFreq = noteToHz(selectedNote); - let freqOctaveChoice = octavehz(noteFreq, selectedOctave); - if (osc) { - osc.frequency.setValueAtTime( - freqOctaveChoice, - audioContext.currentTime - ); - } - } - } - - function handleWaveformSelectionChange() { - let selectedRadioButton = document.querySelector( - "input[name='wavechoice']:checked" - ); - if (selectedRadioButton) { - selectedWave = selectedRadioButton.value; - if (osc) { - osc.type = selectedWave; - } - console.log(selectedWave); - } else { - console.log("No radio button is selected."); - } - } - - document.querySelectorAll("input[name='notechoice']").forEach((rb) => { - rb.addEventListener("change", updateOscFrequency); - }); - - document - .querySelectorAll("input[name='wavechoice']") - .forEach((radioButton) => { - radioButton.addEventListener("change", handleWaveformSelectionChange); - }); - - document.querySelectorAll("input[name='octavechoice']").forEach((rb) => { - rb.addEventListener("change", updateOscFrequency); - }); - - // handle keyboard - window.addEventListener("keydown", (event) => { - if (event.repeat) return; - switch (event.key) { - // play/stop - case "s": - { - if (osc) { - osc.stop(); - osc = null; - } - } - break; - // "piano roll" - case "1": - selectNote("C"); - break; - case "2": - selectNote("D"); - break; - case "3": - selectNote("E"); - break; - case "4": - selectNote("F"); - break; - case "5": - selectNote("G"); - break; - case "6": - selectNote("A"); - break; - case "7": - selectNote("B"); - break; - default: - // If the key is not 1-7, do nothing - break; - } - }); - - function selectNote(note) { - const radioButton = document.querySelector( - `input[name='notechoice'][value='${note}']` - ); - if (radioButton) { - radioButton.checked = true; - updateOscFrequency(); - } else { - console.error(`Radio button for note ${note} not found`); - } - } - - // gain slider - const gainSlider = document.getElementById("gain"); - const gainDisplay = document.getElementById("gainDisplay"); - gainSlider.addEventListener("input", () => { - const level = parseFloat(gainSlider.value); - console.log(level); - gain.gain.setTargetAtTime(level, audioContext.currentTime, 0.01); - gainDisplay.textContent = level; - }); - - // start button - document.getElementById("start").addEventListener("click", () => { - if (!osc) { - osc = audioContext.createOscillator(); - console.log("new osc created!"); - } - - if (!gain) { - gain = audioContext.createGain(); - } - - osc.type = selectedWave; - osc.frequency.setValueAtTime(currentFreq, audioContext.currentTime); - gain.gain.setTargetAtTime( - parseFloat(gainSlider.value), - audioContext.currentTime, - 0 - ); - osc.connect(gain); - gain.connect(audioContext.destination); - osc.start(); - audioContext.resume(); - }); - - // stop button - document.getElementById("stop").addEventListener("click", () => { - if (osc) { - osc.stop(); - osc = null; - if (arpInterval) { - clearInterval(arpInterval); - arpInterval = null; - } - } else { - console.log("no osc to stop"); - } - }); - - // arp - work in progress - function startArp() { - if (!arpInterval) { - baseNote = "C"; - let currentOctave = -2; - if (osc) { - arpInterval = setInterval(() => { - if (currentOctave > 2) { - currentOctave = -2; - } - - let noteFreq = noteToHz(baseNote); - let freqOctaveChoice = octavehz(noteFreq, currentOctave); - osc.frequency.setValueAtTime( - freqOctaveChoice, - audioContext.currentTime - ); - - currentOctave++; - }, 100); - } else { - console.log("no osc to run arp on"); - } - } - } - - document.getElementById("arp").addEventListener("click", startArp); -}; diff --git a/index.ts b/index.ts deleted file mode 100644 index df2af22..0000000 --- a/index.ts +++ /dev/null @@ -1,14 +0,0 @@ -window.onload = function () { - const audioContext: AudioContext = new AudioContext(); - const osc: OscillatorNode = audioContext.createOscillator(); - - // this gets the node for the start butten and adds to it an even listener for click, when clicked the synth will play - document.getElementById("play")!.addEventListener("click", () => { - audioContext.resume(); - }); - - osc.type = "square"; - osc.frequency.setValueAtTime(220, audioContext.currentTime); - osc.connect(audioContext.destination); - osc.start(); -}; diff --git a/src/basic.ts b/src/basic.ts deleted file mode 100644 index a10594a..0000000 --- a/src/basic.ts +++ /dev/null @@ -1,180 +0,0 @@ -let osc: OscillatorNode; -let gain: GainNode; -let selectedWave: string = "square"; -let baseFreq: number = 440; -let currentFreq: number = 261.63; - -function octavehz(hz: number, octave: string): number { - const val = parseFloat(octave); - return hz * 2 ** val; -} - -function noteToHz(note: string): number { - switch (note) { - case "C": - return 261.63; - case "D": - return 269.66; - case "E": - return 329.63; - case "F": - return 349.23; - case "G": - return 392; - case "A": - return 440; - case "B": - return 493.88; - default: - return 0; - } -} - -window.onload = function () { - const audioContext: AudioContext = new AudioContext(); - - function updateOscFrequency() { - let selectedNoteButton = document.querySelector( - "input[name='notechoice']:checked" - ); - console.log("note choice changed to: " + selectedNoteButton.value); - let selectedOctaveButton = document.querySelector( - "input[name='octavechoice']:checked" - ); - - if (selectedNoteButton && selectedOctaveButton) { - let selectedNote = selectedNoteButton.value; - let selectedOctave = parseFloat(selectedOctaveButton.value); - let noteFreq = noteToHz(selectedNote); - let freqOctaveChoice = octavehz(noteFreq, selectedOctave); - if (osc) { - osc.frequency.setValueAtTime( - freqOctaveChoice, - audioContext.currentTime - ); - } - } - } - - function handleWaveformSelectionChange() { - let selectedRadioButton = document.querySelector( - "input[name='wavechoice']:checked" - ); - if (selectedRadioButton) { - selectedWave = selectedRadioButton.value; - if (osc) { - osc.type = selectedWave; - } - console.log(selectedWave); - } else { - console.log("No radio button is selected."); - } - } - - document.querySelectorAll("input[name='notechoice']").forEach((rb) => { - rb.addEventListener("change", updateOscFrequency); - }); - - document - .querySelectorAll("input[name='wavechoice']") - .forEach((radioButton) => { - radioButton.addEventListener("change", handleWaveformSelectionChange); - }); - - document.querySelectorAll("input[name='octavechoice']").forEach((rb) => { - rb.addEventListener("change", updateOscFrequency); - }); - - window.addEventListener("keydown", (event) => { - switch (event.key) { - case "1": - selectNote("C"); - break; - case "2": - selectNote("D"); - break; - case "3": - selectNote("E"); - break; - case "4": - selectNote("F"); - break; - case "5": - selectNote("G"); - break; - case "6": - selectNote("A"); - break; - case "7": - selectNote("B"); - break; - default: - // If the key is not 1-7, do nothing - break; - } - }); - - function selectNote(note) { - const radioButton = document.querySelector( - `input[name='notechoice'][value='${note}']` - ); - if (radioButton) { - radioButton.checked = true; - updateOscFrequency(); - } else { - console.error(`Radio button for note ${note} not found`); - } - } - - const gainSlider = document.getElementById("gain"); - const gainDisplay = document.getElementById("gainDisplay"); - gainSlider.addEventListener("input", () => { - const level = parseFloat(gainSlider.value); - console.log(level); - gain.gain.setTargetAtTime(level, audioContext.currentTime, 0.01); - gainDisplay.textContent = level; - }); - - document.getElementById("start").addEventListener("click", () => { - if (!osc) { - osc = audioContext.createOscillator(); - console.log("new osc created!"); - } - - if (!gain) { - gain = audioContext.createGain(); - } - - console.log(selectedWave); - osc.type = selectedWave; - osc.frequency.setValueAtTime(currentFreq, audioContext.currentTime); - gain.gain.setTargetAtTime( - parseFloat(gainSlider.value), - audioContext.currentTime, - 0 - ); - osc.connect(gain); - gain.connect(audioContext.destination); - osc.start(); - audioContext.resume(); - }); - - document.getElementById("stop").addEventListener("click", () => { - osc.stop(); - osc = null; - }); - - document.getElementById("arp").addEventListener("click", () => { - const notes = ["C", "D", "E", "F", "G", "A", "B"]; - for (let i = 0; i < notes.length; i++) { - for (let j = 0; j < 1000; j++) { - let x = 100; - } - console.log(notes[i]); - osc.frequency.setValueAtTime( - noteToHz(notes[i]), - audioContext.currentTime - ); - } - }); -}; diff --git a/synth.html b/synth.html index bd181aa..62b8ce0 100644 --- a/synth.html +++ b/synth.html @@ -4,15 +4,16 @@ - + + simple-synth - + -
-
- Voice 1 +
+ + Voice 1 @@ -23,22 +24,22 @@ -
+
Octave Selection - - - + + +
- - - 0 + + + 0
- +
diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index 41427af..0000000 --- a/tsconfig.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "compilerOptions": { - /* Visit https://aka.ms/tsconfig to read more about this file */ - - /* Projects */ - // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ - // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ - // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ - // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ - // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ - - /* Language and Environment */ - "target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ - // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ - // "jsx": "preserve", /* Specify what JSX code is generated. */ - // "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */ - // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ - // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ - // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ - // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ - // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ - // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ - // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ - // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ - - /* Modules */ - "module": "commonjs", /* Specify what module code is generated. */ - // "rootDir": "./", /* Specify the root folder within your source files. */ - // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ - // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ - // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ - // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ - // "types": [], /* Specify type package names to be included without being referenced in a source file. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ - // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ - // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ - // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ - // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ - // "resolveJsonModule": true, /* Enable importing .json files. */ - // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ - // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ - - /* JavaScript Support */ - // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ - // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ - // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ - - /* Emit */ - // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ - // "declarationMap": true, /* Create sourcemaps for d.ts files. */ - // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ - "sourceMap": true, /* Create source map files for emitted JavaScript files. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ - "outDir": "./dist", /* Specify an output folder for all emitted files. */ - // "removeComments": true, /* Disable emitting comments. */ - // "noEmit": true, /* Disable emitting files from a compilation. */ - // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ - // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ - // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ - // "newLine": "crlf", /* Set the newline character for emitting files. */ - // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ - // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ - // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ - // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ - // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ - // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ - - /* Interop Constraints */ - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ - // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ - // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ - "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ - // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ - "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ - - /* Type Checking */ - "strict": true, /* Enable all strict type-checking options. */ - // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ - // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ - // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ - // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ - // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ - // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ - // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ - // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ - // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ - // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ - // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ - // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ - // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ - // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ - // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ - // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ - // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ - - /* Completeness */ - // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ - "skipLibCheck": true /* Skip type checking all .d.ts files. */ - } -}