fix text texture regression; change TextureInfo default for minFilter; remove setMaterialParams methods in both Shape and ShapeGroup; etc.

Author: peteroupc

demos/picking2.html

@@ -85,9 +85,9 @@
     shape.setQuaternion(
       H3DU.Math.quatFromTaitBryan(rotation));
     if(shape === pickedShape) {
-      shape.setMaterialParams({"emission":[0.5, 0.5, 0.5]});
+      shape.getMaterial().setParams({"emission":[0.5, 0.5, 0.5]});
     } else {
-      shape.setMaterialParams({"emission":[0, 0, 0]});
+      shape.getMaterial().setParams({"emission":[0, 0, 0]});
     }
   }
   rotation[0] = 360 * H3DU.getTimePosition(timer, time, 6000);

demos/picking3.html

@@ -92,9 +92,9 @@
     shape.setQuaternion(
       H3DU.Math.quatFromTaitBryan(rotation));
     if(shape === pickedShape) {
-      shape.setMaterialParams({"emission":[0.5, 0.5, 0.5]});
+      shape.getMaterial().setParams({"emission":[0.5, 0.5, 0.5]});
     } else {
-      shape.setMaterialParams({"emission":[0, 0, 0]});
+      shape.getMaterial().setParams({"emission":[0, 0, 0]});
     }
   }
   rotation[0] = 360 * H3DU.getTimePosition(timer, time, 6000);

demos/selfpulse.html

@@ -53,7 +53,7 @@
      0
    );
     shape.setQuaternion(q);
-    shape.setMaterialParams({"emission":[emissive, emissive, emissive]});
+    shape.getMaterial().setParams({"emission":[emissive, emissive, emissive]});
    // Render the scene
     scene.render(sub);
   });

demos/specular.html

@@ -42,13 +42,14 @@
   ], scene).then(function(tex) {
     "use strict";
     var mesh = H3DU.Meshes.createBox(10, 20, 20);
-    var shape = new H3DU.Shape(mesh).setMaterialParams({
-      "diffuse":"white",
-      "specular":"white",
-      "shininess":20,
-      "texture":tex[0],
-      "specularMap":tex[1]
-    });
+    var shape = new H3DU.Shape(mesh).setMaterial(
+      new H3DU.Material({
+        "diffuse":"white",
+        "specular":"white",
+        "shininess":20,
+        "texture":tex[0],
+        "specularMap":tex[1]
+      }));
     sub.addShape(shape);
    // Create a timer
     var timer = {};

doc/H3DU.Shape.md

@@ -31,8 +31,7 @@ the <a href="H3DU.Math.md#H3DU.Math.colorTosRGB">sRGB color space</a>.
 * [primitiveCount](#H3DU.Shape_H3DU.Shape_primitiveCount)<br>Gets the number of primitives (triangles, lines,
 and points) composed by all shapes in this scene.
 * [setColor](#H3DU.Shape_H3DU.Shape_setColor)<br>Sets material parameters that give the shape a certain color.
-* [setMaterial](#H3DU.Shape_H3DU.Shape_setMaterial)<br>Sets this shape's material parameters.
-* [setMaterialParams](#H3DU.Shape_H3DU.Shape_setMaterialParams)<br>Sets parameters of this shape's material.
+* [setMaterial](#H3DU.Shape_H3DU.Shape_setMaterial)<br>Sets this shape's material parameter object.
 * [setPosition](#H3DU.Shape_H3DU.Shape_setPosition)<br>Sets the relative position of this shape from its original
 position.
 * [setQuaternion](#H3DU.Shape_H3DU.Shape_setQuaternion)<br>Sets this object's rotation in the form of a <a href="tutorial-glmath.md">quaternion</a>.
@@ -165,26 +164,12 @@ This object. (Type: <a href="H3DU.Shape.md">H3DU.Shape</a>)
  <a name='H3DU.Shape_H3DU.Shape_setMaterial'></a>
 ### H3DU.Shape#setMaterial(material)
 
-Sets this shape's material parameters.
+Sets this shape's material parameter object.
 
 #### Parameters
 
 * `material` (Type: <a href="H3DU.Material.md">H3DU.Material</a> | <a href="H3DU.PbrMaterial.md">H3DU.PbrMaterial</a>)<br>
-    The material object to use. This parameter can't be a <a href="H3DU.Texture.md">H3DU.Texture</a> object.
-
-#### Return Value
-
-This object. (Type: <a href="H3DU.Shape.md">H3DU.Shape</a>)
-
- <a name='H3DU.Shape_H3DU.Shape_setMaterialParams'></a>
-### H3DU.Shape#setMaterialParams(params)
-
-Sets parameters of this shape's material.
-
-#### Parameters
-
-* `params` (Type: Object)<br>
-    An object described in H3DU.PbrMaterial#setParams.
+    The material object to use. Throws an error if this parameter is null, is omitted, or is a <a href="H3DU.Texture.md">H3DU.Texture</a> object
 
 #### Return Value
 

doc/H3DU.ShapeGroup.md

@@ -32,7 +32,6 @@ in this shape group at the given index.
 and points) composed by all shapes in this shape group.
 * [removeShape](#H3DU.ShapeGroup_H3DU.ShapeGroup_removeShape)<br>Removes all instances of a 3D shape from this shape group
 * [setMaterial](#H3DU.ShapeGroup_H3DU.ShapeGroup_setMaterial)<br>Sets the material used by all shapes in this shape group.
-* [setMaterialParams](#H3DU.ShapeGroup_H3DU.ShapeGroup_setMaterialParams)<br>Sets material parameters for all shapes in this shape group.
 * [setPosition](#H3DU.ShapeGroup_H3DU.ShapeGroup_setPosition)<br>Sets the relative position of the shapes in this group
 from their original position.
 * [setQuaternion](#H3DU.ShapeGroup_H3DU.ShapeGroup_setQuaternion)<br>Sets this shape group's rotation in the form of a <a href="tutorial-glmath.md">quaternion</a>.
@@ -189,20 +188,6 @@ Sets the material used by all shapes in this shape group.
 
 Return value. (Type: Object)
 
- <a name='H3DU.ShapeGroup_H3DU.ShapeGroup_setMaterialParams'></a>
-### H3DU.ShapeGroup#setMaterialParams(params)
-
-Sets material parameters for all shapes in this shape group.
-
-#### Parameters
-
-* `params` (Type: Object)<br>
-    An object described in H3DU.Material#setParams.
-
-#### Return Value
-
-This object. (Type: <a href="H3DU.Shape.md">H3DU.Shape</a>)
-
  <a name='H3DU.ShapeGroup_H3DU.ShapeGroup_setPosition'></a>
 ### H3DU.ShapeGroup#setPosition(x, y, z)