Merge branch 'dev-2.0' into fix/strands-noise-range

Author: davepagurek

docs/parameterData.json

@@ -1485,11 +1485,14 @@
     "noiseDetail": {
       "overloads": [
         [
-          "Number",
+          "Number"
+        ],
+        [
+          "Number", 
           "Number"
         ]
-      ]
-    },
+  ]
+},
     "noiseSeed": {
       "overloads": [
         [
@@ -2033,13 +2036,6 @@
         ]
       ]
     },
-    "combineColors": {
-      "overloads": [
-        [
-          "Function"
-        ]
-      ]
-    },
     "getPixelInputs": {
       "overloads": [
         [
@@ -2885,6 +2881,16 @@
         ]
       ]
     },
+    "buildFilterShader": {
+      "overloads": [
+        [
+          "Function"
+        ],
+        [
+          "Object"
+        ]
+      ]
+    },
     "createFilterShader": {
       "overloads": [
         [
@@ -2913,6 +2919,25 @@
         ]
       ]
     },
+    "buildMaterialShader": {
+      "overloads": [
+        [
+          "Function"
+        ],
+        [
+          "Object"
+        ]
+      ]
+    },
+    "loadMaterialShader": {
+      "overloads": [
+        [
+          "String",
+          "Function?",
+          "Function?"
+        ]
+      ]
+    },
     "baseMaterialShader": {
       "overloads": [
         []
@@ -2923,16 +2948,73 @@
         []
       ]
     },
+    "buildNormalShader": {
+      "overloads": [
+        [
+          "Function"
+        ],
+        [
+          "Object"
+        ]
+      ]
+    },
+    "loadNormalShader": {
+      "overloads": [
+        [
+          "String",
+          "Function?",
+          "Function?"
+        ]
+      ]
+    },
     "baseNormalShader": {
       "overloads": [
         []
       ]
     },
+    "buildColorShader": {
+      "overloads": [
+        [
+          "Function"
+        ],
+        [
+          "Object"
+        ]
+      ]
+    },
+    "loadColorShader": {
+      "overloads": [
+        [
+          "String",
+          "Function?",
+          "Function?"
+        ]
+      ]
+    },
     "baseColorShader": {
       "overloads": [
         []
       ]
     },
+    "buildStrokeShader": {
+      "overloads": [
+        [
+          "Function"
+        ],
+        [
+          "Object"
+        ]
+      ]
+    },
+    "loadStrokeShader": {
+      "overloads": [
+        [
+          "String",
+          "Function?",
+          "Function?"
+        ]
+      ]
+    },
     "baseStrokeShader": {
       "overloads": [
         []

src/math/noise.js

@@ -343,7 +343,7 @@ function noise(p5, fn){
    *
    * @method noiseDetail
    * @param {Number} lod number of octaves to be used by the noise.
-   * @param {Number} falloff falloff factor for each octave.
+   * @param {Number} [falloff=0.5] falloff factor for each octave.
    *
    * @example
    * <div>
@@ -388,7 +388,7 @@ function noise(p5, fn){
    * </code>
    * </div>
    */
-  fn.noiseDetail = function(lod, falloff) {
+  fn.noiseDetail = function(lod, falloff=0.5) {
     if (lod > 0) {
       perlin_octaves = lod;
     }