Merge branch 'main' into daslyfe/defaultgain

packages/core/controls.mjs

@@ -396,6 +396,18 @@ export const { velocity } = registerControl('velocity');
  *
  */
 export const { gain } = registerControl('gain');
+
+/**
+ * Applies a linear gain adjustment
+ *
+ * @name gainlinear
+ * @synonyms gainlin
+ * @param {number | Pattern} amount gainlin
+ * @example
+ * s("hh*8").gainlin(".4!2 1 .4!2 1 .4 1").fast(2)
+ *
+ */
+export const { gainlinear, gainlin } = registerControl('gainlinear', 'gainlin');
 /**
  * Gain applied after all effects have been processed.
  *

packages/superdough/superdough.mjs

@@ -37,7 +37,7 @@ export function registerSound(key, onTrigger, data = {}) {
   soundMap.setKey(key, { onTrigger, data });
 }
 
-let gainCurveFunc = (val) => val;
+let gainCurveFunc = (val) => Math.pow(val, 2);
 
 export function applyGainCurve(val) {
   return gainCurveFunc(val);
@@ -141,9 +141,9 @@ export const getAudioDevices = async () => {
   return devicesMap;
 };
 
-let defaultDefaultValues = {
+const defaultDefaultValues = {
   s: 'triangle',
-  gain: 0.8,
+  gain: 1,
   postgain: 1,
   density: '.03',
   ftype: '12db',
@@ -166,17 +166,6 @@ let defaultDefaultValues = {
   fft: 8,
 };
 
-const defaultDefaultDefaultValues = Object.freeze({ ...defaultDefaultValues });
-
-export function setDefault(control, value) {
-  // const main = getControlName(control); // we cant do this because superdough is independent of strudel/core
-  defaultDefaultValues[control] = value;
-}
-
-export function resetDefaults() {
-  defaultDefaultValues = { ...defaultDefaultDefaultValues };
-}
-
 let defaultControls = new Map(Object.entries(defaultDefaultValues));
 
 export function setDefaultValue(key, value) {
@@ -195,9 +184,17 @@ export function resetDefaultValues() {
 }
 export function setVersionDefaults(version) {
   resetDefaultValues();
-  if (version === '1.0') {
+  const v = Number(version);
+  if (v <= 1.0) {
     setDefaultValue('fanchor', 0.5);
   }
+  if (v <= 1.2) {
+    setDefaultValue('gain', 0.8);
+    setGainCurve((v) => v);
+  } else {
+    setDefaultValue('gain', 1);
+    setGainCurve((v) => Math.pow(v, 2));
+  }
 }
 
 export const resetLoadedSounds = () => soundMap.set({});
@@ -406,6 +403,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     bank,
     source,
     gain = getDefaultValue('gain'),
+    gainlinear,
     postgain = getDefaultValue('postgain'),
     density = getDefaultValue('density'),
     duckorbit,
@@ -503,6 +501,9 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   velocity = applyGainCurve(velocity);
   tremolodepth = applyGainCurve(tremolodepth);
   gain *= velocity; // velocity currently only multiplies with gain. it might do other things in the future
+  if (gainlinear != null) {
+    gain *= gainlinear;
+  }
 
   const end = t + hapDuration;
   const endWithRelease = end + release;

test/__snapshots__/examples.test.mjs.snap

@@ -4527,6 +4527,75 @@ exports[`runs examples > example "gain" example index 0 1`] = `
 ]
 `;
 
+exports[`runs examples > example "gainlinear" example index 0 1`] = `
+[
+  "[ 0/1 → 1/16 | s:hh gainlinear:0.4 ]",
+  "[ 1/16 → 1/8 | s:hh gainlinear:0.4 ]",
+  "[ 1/8 → 3/16 | s:hh gainlinear:1 ]",
+  "[ 3/16 → 1/4 | s:hh gainlinear:0.4 ]",
+  "[ 1/4 → 5/16 | s:hh gainlinear:0.4 ]",
+  "[ 5/16 → 3/8 | s:hh gainlinear:1 ]",
+  "[ 3/8 → 7/16 | s:hh gainlinear:0.4 ]",
+  "[ 7/16 → 1/2 | s:hh gainlinear:1 ]",
+  "[ 1/2 → 9/16 | s:hh gainlinear:0.4 ]",
+  "[ 9/16 → 5/8 | s:hh gainlinear:0.4 ]",
+  "[ 5/8 → 11/16 | s:hh gainlinear:1 ]",
+  "[ 11/16 → 3/4 | s:hh gainlinear:0.4 ]",
+  "[ 3/4 → 13/16 | s:hh gainlinear:0.4 ]",
+  "[ 13/16 → 7/8 | s:hh gainlinear:1 ]",
+  "[ 7/8 → 15/16 | s:hh gainlinear:0.4 ]",
+  "[ 15/16 → 1/1 | s:hh gainlinear:1 ]",
+  "[ 1/1 → 17/16 | s:hh gainlinear:0.4 ]",
+  "[ 17/16 → 9/8 | s:hh gainlinear:0.4 ]",
+  "[ 9/8 → 19/16 | s:hh gainlinear:1 ]",
+  "[ 19/16 → 5/4 | s:hh gainlinear:0.4 ]",
+  "[ 5/4 → 21/16 | s:hh gainlinear:0.4 ]",
+  "[ 21/16 → 11/8 | s:hh gainlinear:1 ]",
+  "[ 11/8 → 23/16 | s:hh gainlinear:0.4 ]",
+  "[ 23/16 → 3/2 | s:hh gainlinear:1 ]",
+  "[ 3/2 → 25/16 | s:hh gainlinear:0.4 ]",
+  "[ 25/16 → 13/8 | s:hh gainlinear:0.4 ]",
+  "[ 13/8 → 27/16 | s:hh gainlinear:1 ]",
+  "[ 27/16 → 7/4 | s:hh gainlinear:0.4 ]",
+  "[ 7/4 → 29/16 | s:hh gainlinear:0.4 ]",
+  "[ 29/16 → 15/8 | s:hh gainlinear:1 ]",
+  "[ 15/8 → 31/16 | s:hh gainlinear:0.4 ]",
+  "[ 31/16 → 2/1 | s:hh gainlinear:1 ]",
+  "[ 2/1 → 33/16 | s:hh gainlinear:0.4 ]",
+  "[ 33/16 → 17/8 | s:hh gainlinear:0.4 ]",
+  "[ 17/8 → 35/16 | s:hh gainlinear:1 ]",
+  "[ 35/16 → 9/4 | s:hh gainlinear:0.4 ]",
+  "[ 9/4 → 37/16 | s:hh gainlinear:0.4 ]",
+  "[ 37/16 → 19/8 | s:hh gainlinear:1 ]",
+  "[ 19/8 → 39/16 | s:hh gainlinear:0.4 ]",
+  "[ 39/16 → 5/2 | s:hh gainlinear:1 ]",
+  "[ 5/2 → 41/16 | s:hh gainlinear:0.4 ]",
+  "[ 41/16 → 21/8 | s:hh gainlinear:0.4 ]",
+  "[ 21/8 → 43/16 | s:hh gainlinear:1 ]",
+  "[ 43/16 → 11/4 | s:hh gainlinear:0.4 ]",
+  "[ 11/4 → 45/16 | s:hh gainlinear:0.4 ]",
+  "[ 45/16 → 23/8 | s:hh gainlinear:1 ]",
+  "[ 23/8 → 47/16 | s:hh gainlinear:0.4 ]",
+  "[ 47/16 → 3/1 | s:hh gainlinear:1 ]",
+  "[ 3/1 → 49/16 | s:hh gainlinear:0.4 ]",
+  "[ 49/16 → 25/8 | s:hh gainlinear:0.4 ]",
+  "[ 25/8 → 51/16 | s:hh gainlinear:1 ]",
+  "[ 51/16 → 13/4 | s:hh gainlinear:0.4 ]",
+  "[ 13/4 → 53/16 | s:hh gainlinear:0.4 ]",
+  "[ 53/16 → 27/8 | s:hh gainlinear:1 ]",
+  "[ 27/8 → 55/16 | s:hh gainlinear:0.4 ]",
+  "[ 55/16 → 7/2 | s:hh gainlinear:1 ]",
+  "[ 7/2 → 57/16 | s:hh gainlinear:0.4 ]",
+  "[ 57/16 → 29/8 | s:hh gainlinear:0.4 ]",
+  "[ 29/8 → 59/16 | s:hh gainlinear:1 ]",
+  "[ 59/16 → 15/4 | s:hh gainlinear:0.4 ]",
+  "[ 15/4 → 61/16 | s:hh gainlinear:0.4 ]",
+  "[ 61/16 → 31/8 | s:hh gainlinear:1 ]",
+  "[ 31/8 → 63/16 | s:hh gainlinear:0.4 ]",
+  "[ 63/16 → 4/1 | s:hh gainlinear:1 ]",
+]
+`;
+
 exports[`runs examples > example "gap" example index 0 1`] = `[]`;
 
 exports[`runs examples > example "grow" example index 0 1`] = `

website/src/repl/useReplContext.jsx

@@ -13,7 +13,6 @@ import {
   resetGlobalEffects,
   resetLoadedSounds,
   initAudioOnFirstClick,
-  resetDefaults,
 } from '@strudel/webaudio';
 import { setVersionDefaultsFrom } from './util.mjs';
 import { StrudelMirror, defaultSettings } from '@strudel/codemirror';
@@ -182,7 +181,6 @@ export function useReplContext() {
 
   const resetEditor = async () => {
     (await getModule('@strudel/tonal'))?.resetVoicings();
-    resetDefaults();
     resetGlobalEffects();
     clearCanvas();
     clearHydra();