Merge branch 'main' into dev-2.0-docs

Author: davepagurek

parametric-fhp-de.jpg

@@ -2744,6 +2744,14 @@
       "line": 10,
       "description": "Get the current volume of a sound.",
       "is_constructor": 1,
+      "params": [
+        {
+          "name": "smoothing",
+          "description": "Smooth the amplitude analysis by averaging with the last analysis frame. 0.0 is no time averaging with the last analysis frame.",
+          "type": "Number",
+          "optional": true
+        }
+      ],
       "example": [
         "\n<div>\n<code>\nlet sound, amp, cnv;\n  \nfunction preload() {\n  //replace this sound with something local with rights to distribute\n  sound = loadSound('/assets/Damscray_DancingTiger.mp3');\n}\n\nfunction setup() {\n  cnv = createCanvas(100, 100);\n  cnv.mousePressed(playSound);\n  textAlign(CENTER);\n  fill(255);\n  amp = new p5.Amplitude();\n  sound.connect(amp);\n}\n\nfunction playSound() {\n  sound.play();\n}\n\nfunction draw() {\n  let level = amp.getLevel();\n  level = map(level, 0, 0.2, 0, 255);\n  background(level, 0, 0);\n  text('tap to play', width/2, 20);\n  describe('The color of the background changes based on the amplitude of the sound.');\n}\n</code>\n</div>"
       ]
@@ -25088,7 +25096,7 @@
     },
     {
       "file": "src/Amplitude.js",
-      "line": 52,
+      "line": 53,
       "description": "Connect an audio source to the amplitude object.",
       "itemtype": "method",
       "name": "setInput",
@@ -25105,7 +25113,7 @@
     },
     {
       "file": "src/Amplitude.js",
-      "line": 62,
+      "line": 63,
       "description": "Get the current amplitude value of a sound.",
       "itemtype": "method",
       "name": "getLevel",
@@ -25117,6 +25125,23 @@
       "module": "p5.sound",
       "submodule": "p5.sound"
     },
+    {
+      "file": "src/Amplitude.js",
+      "line": 73,
+      "description": "Get the current amplitude value of a sound.",
+      "itemtype": "method",
+      "name": "smooth",
+      "params": [
+        {
+          "name": "Smooth",
+          "description": "Amplitude analysis by averaging with the last analysis frame. Off by default.",
+          "type": "Number"
+        }
+      ],
+      "class": "p5.Amplitude",
+      "module": "p5.sound",
+      "submodule": "p5.sound"
+    },
     {
       "file": "src/AudioIn.js",
       "line": 57,

parametric-fhp-en.jpg

@@ -10,11 +10,11 @@ relatedReference:
 
 This program demonstrates the use of the basic shape
 primitive functions
-<a href="https://p5js.org/reference/#/p5/square" target="_blank">square()</a>,
-<a href="https://p5js.org/reference/#/p5/rect" target="_blank">rect()</a>,
-<a href="https://p5js.org/reference/#/p5/ellipse" target="_blank">ellipse()</a>,
-<a href="https://p5js.org/reference/#/p5/circle" target="_blank">circle()</a>,
-<a href="https://p5js.org/reference/#/p5/arc" target="_blank">arc()</a>,
-<a href="https://p5js.org/reference/#/p5/line" target="_blank">line()</a>,
-<a href="https://p5js.org/reference/#/p5/triangle" target="_blank">triangle()</a>,
-and <a href="https://p5js.org/reference/#/p5/quad" target="_blank">quad()</a>.
+<a href="https://p5js.org/reference/p5/square" target="_blank">square()</a>,
+<a href="https://p5js.org/reference/p5/rect" target="_blank">rect()</a>,
+<a href="https://p5js.org/reference/p5/ellipse" target="_blank">ellipse()</a>,
+<a href="https://p5js.org/reference/p5/circle" target="_blank">circle()</a>,
+<a href="https://p5js.org/reference/p5/arc" target="_blank">arc()</a>,
+<a href="https://p5js.org/reference/p5/line" target="_blank">line()</a>,
+<a href="https://p5js.org/reference/p5/triangle" target="_blank">triangle()</a>,
+and <a href="https://p5js.org/reference/p5/quad" target="_blank">quad()</a>.

public/reference/data.json

@@ -7,14 +7,14 @@ oneLineDescription: Add color to your sketch.
 
 This expands on the Shape Primitives example by adding
 color.
-<a href="https://p5js.org/reference/#/p5/background" target="_blank">background()</a>
+<a href="https://p5js.org/reference/p5/background" target="_blank">background()</a>
 fills the canvas with one color,
-<a href="https://p5js.org/reference/#/p5/stroke" target="_blank">stroke()</a>
+<a href="https://p5js.org/reference/p5/stroke" target="_blank">stroke()</a>
 sets the color for drawing lines, and
-<a href="https://p5js.org/reference/#/p5/fill" target="_blank">fill()</a>
+<a href="https://p5js.org/reference/p5/fill" target="_blank">fill()</a>
 sets the color for the inside of shapes.
-<a href="https://p5js.org/reference/#/p5/noFill" target="_blank">noStroke()</a> and
-<a href="https://p5js.org/reference/#/p5/noFill" target="_blank">noFill()</a>
+<a href="https://p5js.org/reference/p5/noFill" target="_blank">noStroke()</a> and
+<a href="https://p5js.org/reference/p5/noFill" target="_blank">noFill()</a>
 turn off line color and inner color, respectively.
 
 Colors can be represented in many different ways. This example demonstrates several options.