Merge pull request #5298 from JetStarBlues/groupDefaultMaterialTypeFunctions

Group materials on reference page

Author: stalgiag

src/webgl/material.js

@@ -280,44 +280,6 @@ p5.prototype.resetShader = function() {
   return this;
 };
 
-/**
- * Normal material for geometry is a material that is not affected by light.
- * It is not reflective and is a placeholder material often used for debugging.
- * Surfaces facing the X-axis, become red, those facing the Y-axis, become green and those facing the Z-axis, become blue.
- * You can view all possible materials in this
- * <a href="https://p5js.org/examples/3d-materials.html">example</a>.
- * @method normalMaterial
- * @chainable
- * @example
- * <div>
- * <code>
- * function setup() {
- *   createCanvas(100, 100, WEBGL);
- * }
- *
- * function draw() {
- *   background(200);
- *   normalMaterial();
- *   sphere(40);
- * }
- * </code>
- * </div>
- * @alt
- * Red, green and blue gradient.
- */
-p5.prototype.normalMaterial = function(...args) {
-  this._assert3d('normalMaterial');
-  p5._validateParameters('normalMaterial', args);
-  this._renderer.drawMode = constants.FILL;
-  this._renderer._useSpecularMaterial = false;
-  this._renderer._useEmissiveMaterial = false;
-  this._renderer._useNormalMaterial = true;
-  this._renderer.curFillColor = [1, 1, 1, 1];
-  this._renderer._setProperty('_doFill', true);
-  this.noStroke();
-  return this;
-};
-
 /**
  * Texture for geometry.  You can view other possible materials in this
  * <a href="https://p5js.org/examples/3d-materials.html">example</a>.
@@ -568,6 +530,44 @@ p5.prototype.textureWrap = function(wrapX, wrapY = wrapX) {
   }
 };
 
+/**
+ * Normal material for geometry is a material that is not affected by light.
+ * It is not reflective and is a placeholder material often used for debugging.
+ * Surfaces facing the X-axis, become red, those facing the Y-axis, become green and those facing the Z-axis, become blue.
+ * You can view all possible materials in this
+ * <a href="https://p5js.org/examples/3d-materials.html">example</a>.
+ * @method normalMaterial
+ * @chainable
+ * @example
+ * <div>
+ * <code>
+ * function setup() {
+ *   createCanvas(100, 100, WEBGL);
+ * }
+ *
+ * function draw() {
+ *   background(200);
+ *   normalMaterial();
+ *   sphere(40);
+ * }
+ * </code>
+ * </div>
+ * @alt
+ * Red, green and blue gradient.
+ */
+p5.prototype.normalMaterial = function(...args) {
+  this._assert3d('normalMaterial');
+  p5._validateParameters('normalMaterial', args);
+  this._renderer.drawMode = constants.FILL;
+  this._renderer._useSpecularMaterial = false;
+  this._renderer._useEmissiveMaterial = false;
+  this._renderer._useNormalMaterial = true;
+  this._renderer.curFillColor = [1, 1, 1, 1];
+  this._renderer._setProperty('_doFill', true);
+  this.noStroke();
+  return this;
+};
+
 /**
  * Ambient material for geometry with a given color. Ambient material defines the color the object reflects under any lighting.
  * For example, if the ambient material of an object is pure red, but the ambient lighting only contains green, the object will not reflect any light.