x_ite 8.4.3 → 8.5.3

package/src/x_ite/Components/Shape/Material.js

@@ -73,26 +73,27 @@ Material .prototype = Object .assign (Object .create (X3DOneSidedMaterialNode .p
    [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
       new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",                 new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "ambientIntensity",         new Fields .SFFloat (0.2)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "ambientTexture",           new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "ambientTextureMapping",    new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "ambientTexture",           new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "diffuseColor",             new Fields .SFColor (0.8, 0.8, 0.8)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "diffuseTexture",           new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "diffuseTextureMapping",    new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "diffuseTexture",           new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "specularColor",            new Fields .SFColor ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "specularTexture",          new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "specularTextureMapping",   new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "specularTexture",          new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveColor",            new Fields .SFColor ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveTexture",          new Fields .SFNode ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveStrength",         new Fields .SFFloat (1)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveTextureMapping",   new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveTexture",          new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "shininess",                new Fields .SFFloat (0.2)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "shininessTexture",         new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "shininessTextureMapping",  new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "shininessTexture",         new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "occlusionStrength",        new Fields .SFFloat (1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "occlusionTexture",         new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "occlusionTextureMapping",  new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "occlusionTexture",         new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "normalScale",              new Fields .SFFloat (1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "normalTexture",            new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "normalTextureMapping",     new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "normalTexture",            new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "transparency",             new Fields .SFFloat ()),
    ]),
    getTypeName: function ()
@@ -302,62 +303,72 @@ Material .prototype = Object .assign (Object .create (X3DOneSidedMaterialNode .p
 
          if (this .ambientTextureNode)
          {
-            const ambientTexture = shaderObject .x3d_AmbientTexture;
+            const
+               ambientTextureMapping = this ._ambientTextureMapping .getValue (),
+               ambientTexture        = shaderObject .x3d_AmbientTexture;
 
             this .ambientTextureNode .setShaderUniforms (gl, shaderObject, renderObject, ambientTexture);
 
-            gl .uniform1i (ambientTexture .textureTransformMapping,  textureTransformMapping  .get (this ._ambientTextureMapping .getValue ()) || 0);
-            gl .uniform1i (ambientTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._ambientTextureMapping .getValue ()) || 0);
+            gl .uniform1i (ambientTexture .textureTransformMapping,  textureTransformMapping  .get (ambientTextureMapping) || 0);
+            gl .uniform1i (ambientTexture .textureCoordinateMapping, textureCoordinateMapping .get (ambientTextureMapping) || 0);
          }
 
          // Diffuse parameters
 
          if (this .diffuseTextureNode)
          {
-            const diffuseTexture = shaderObject .x3d_DiffuseTexture;
+            const
+               diffuseTextureMapping = this ._diffuseTextureMapping .getValue (),
+               diffuseTexture        = shaderObject .x3d_DiffuseTexture;
 
             this .diffuseTextureNode .setShaderUniforms (gl, shaderObject, renderObject, diffuseTexture);
 
-            gl .uniform1i (diffuseTexture .textureTransformMapping,  textureTransformMapping  .get (this ._diffuseTextureMapping .getValue ()) || 0);
-            gl .uniform1i (diffuseTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._diffuseTextureMapping .getValue ()) || 0);
+            gl .uniform1i (diffuseTexture .textureTransformMapping,  textureTransformMapping  .get (diffuseTextureMapping) || 0);
+            gl .uniform1i (diffuseTexture .textureCoordinateMapping, textureCoordinateMapping .get (diffuseTextureMapping) || 0);
          }
 
          // Specular parameters
 
          if (this .specularTextureNode)
          {
-            const specularTexture = shaderObject .x3d_SpecularTexture;
+            const
+               specularTextureMapping = this ._specularTextureMapping .getValue (),
+               specularTexture        = shaderObject .x3d_SpecularTexture;
 
             this .specularTextureNode .setShaderUniforms (gl, shaderObject, renderObject, specularTexture);
 
-            gl .uniform1i (specularTexture .textureTransformMapping,  textureTransformMapping  .get (this ._specularTextureMapping .getValue ()) || 0);
-            gl .uniform1i (specularTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._specularTextureMapping .getValue ()) || 0);
+            gl .uniform1i (specularTexture .textureTransformMapping,  textureTransformMapping  .get (specularTextureMapping) || 0);
+            gl .uniform1i (specularTexture .textureCoordinateMapping, textureCoordinateMapping .get (specularTextureMapping) || 0);
          }
 
          // Shininess parameters
 
          if (this .shininessTextureNode)
          {
-            const shininessTexture = shaderObject .x3d_ShininessTexture;
+            const
+               shininessTextureMapping = this ._shininessTextureMapping .getValue (),
+               shininessTexture        = shaderObject .x3d_ShininessTexture;
 
             this .shininessTextureNode .setShaderUniforms (gl, shaderObject, renderObject, shininessTexture);
 
-            gl .uniform1i (shininessTexture .textureTransformMapping,  textureTransformMapping  .get (this ._shininessTextureMapping .getValue ()) || 0);
-            gl .uniform1i (shininessTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._shininessTextureMapping .getValue ()) || 0);
+            gl .uniform1i (shininessTexture .textureTransformMapping,  textureTransformMapping  .get (shininessTextureMapping) || 0);
+            gl .uniform1i (shininessTexture .textureCoordinateMapping, textureCoordinateMapping .get (shininessTextureMapping) || 0);
          }
 
          // Occlusion parameters
 
          if (this .occlusionTextureNode)
          {
-            const occlusionTexture = shaderObject .x3d_OcclusionTexture;
+            const
+               occlusionTextureMapping = this ._occlusionTextureMapping .getValue (),
+               occlusionTexture        = shaderObject .x3d_OcclusionTexture;
 
             gl .uniform1f (shaderObject .x3d_OcclusionStrength, this .occlusionStrength);
 
             this .occlusionTextureNode .setShaderUniforms (gl, shaderObject, renderObject, occlusionTexture);
 
-            gl .uniform1i (occlusionTexture .textureTransformMapping,  textureTransformMapping  .get (this ._occlusionTextureMapping .getValue ()) || 0);
-            gl .uniform1i (occlusionTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._occlusionTextureMapping .getValue ()) || 0);
+            gl .uniform1i (occlusionTexture .textureTransformMapping,  textureTransformMapping  .get (occlusionTextureMapping) || 0);
+            gl .uniform1i (occlusionTexture .textureCoordinateMapping, textureCoordinateMapping .get (occlusionTextureMapping) || 0);
          }
       }
    },

package/src/x_ite/Components/Shape/PhysicalMaterial.js

@@ -68,21 +68,22 @@ PhysicalMaterial .prototype = Object .assign (Object .create (X3DOneSidedMateria
    [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
       new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",                        new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "baseColor",                       new Fields .SFColor (1, 1, 1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "baseTexture",                     new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "baseTextureMapping",              new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "baseTexture",                     new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveColor",                   new Fields .SFColor (0, 0, 0)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveTexture",                 new Fields .SFNode ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveStrength",                new Fields .SFFloat (1)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveTextureMapping",          new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveTexture",                 new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "metallic",                        new Fields .SFFloat (1)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "roughness",                       new Fields .SFFloat (1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "metallicRoughnessTexture",        new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "metallicRoughnessTextureMapping", new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "metallicRoughnessTexture",        new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "occlusionStrength",               new Fields .SFFloat (1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "occlusionTexture",                new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "occlusionTextureMapping",         new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "occlusionTexture",                new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "normalScale",                     new Fields .SFFloat (1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "normalTexture",                   new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "normalTextureMapping",            new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "normalTexture",                   new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "transparency",                    new Fields .SFFloat ()),
    ]),
    getTypeName: function ()
@@ -201,7 +202,7 @@ PhysicalMaterial .prototype = Object .assign (Object .create (X3DOneSidedMateria
 
       if (geometryContext .hasNormals)
       {
-         options .push ("X3D_PHYSICAL_MATERIAL");
+         options .push ("X3D_PHYSICAL_MATERIAL", "MANUAL_SRGB");
 
          if (+this .getTextureBits ())
          {
@@ -244,38 +245,44 @@ PhysicalMaterial .prototype = Object .assign (Object .create (X3DOneSidedMateria
 
          if (this .baseTextureNode)
          {
-            const baseTexture = shaderObject .x3d_BaseTexture;
+            const
+               baseTextureMapping = this ._baseTextureMapping .getValue (),
+               baseTexture        = shaderObject .x3d_BaseTexture;
 
             this .baseTextureNode .setShaderUniforms (gl, shaderObject, renderObject, baseTexture);
 
-            gl .uniform1i (baseTexture .textureTransformMapping,  textureTransformMapping  .get (this ._baseTextureMapping .getValue ()) || 0);
-            gl .uniform1i (baseTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._baseTextureMapping .getValue ()) || 0);
+            gl .uniform1i (baseTexture .textureTransformMapping,  textureTransformMapping  .get (baseTextureMapping) || 0);
+            gl .uniform1i (baseTexture .textureCoordinateMapping, textureCoordinateMapping .get (baseTextureMapping) || 0);
          }
 
          // Metallic roughness parameters
 
          if (this .metallicRoughnessTextureNode)
          {
-            const metallicRoughnessTexture = shaderObject .x3d_MetallicRoughnessTexture;
+            const
+               metallicRoughnessTextureMapping = this ._metallicRoughnessTextureMapping .getValue (),
+               metallicRoughnessTexture        = shaderObject .x3d_MetallicRoughnessTexture;
 
             this .metallicRoughnessTextureNode .setShaderUniforms (gl, shaderObject, renderObject, metallicRoughnessTexture);
 
-            gl .uniform1i (metallicRoughnessTexture .textureTransformMapping,  textureTransformMapping  .get (this ._metallicRoughnessTextureMapping .getValue ()) || 0);
-            gl .uniform1i (metallicRoughnessTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._metallicRoughnessTextureMapping .getValue ()) || 0);
+            gl .uniform1i (metallicRoughnessTexture .textureTransformMapping,  textureTransformMapping  .get (metallicRoughnessTextureMapping) || 0);
+            gl .uniform1i (metallicRoughnessTexture .textureCoordinateMapping, textureCoordinateMapping .get (metallicRoughnessTextureMapping) || 0);
          }
 
          // Occlusion parameters
 
          if (this .occlusionTextureNode)
          {
-            const occlusionTexture = shaderObject .x3d_OcclusionTexture;
+            const
+               occlusionTextureMapping = this ._occlusionTextureMapping .getValue (),
+               occlusionTexture        = shaderObject .x3d_OcclusionTexture;
 
             gl .uniform1f (shaderObject .x3d_OcclusionStrength, this .occlusionStrength);
 
             this .occlusionTextureNode .setShaderUniforms (gl, shaderObject, renderObject, occlusionTexture);
 
-            gl .uniform1i (occlusionTexture .textureTransformMapping,  textureTransformMapping  .get (this ._occlusionTextureMapping .getValue ()) || 0);
-            gl .uniform1i (occlusionTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._occlusionTextureMapping .getValue ()) || 0);
+            gl .uniform1i (occlusionTexture .textureTransformMapping,  textureTransformMapping  .get (occlusionTextureMapping) || 0);
+            gl .uniform1i (occlusionTexture .textureCoordinateMapping, textureCoordinateMapping .get (occlusionTextureMapping) || 0);
          }
       }
    },

package/src/x_ite/Components/Shape/PointProperties.js

@@ -88,10 +88,14 @@ PointProperties .prototype = Object .assign (Object .create (X3DAppearanceChildN
    {
       X3DAppearanceChildNode .prototype .initialize .call (this);
 
-      const gl = this .getBrowser () .getContext ();
+      const
+         browser = this .getBrowser (),
+         gl      = browser .getContext ();
 
       this .pointSizeRange = gl .getParameter (gl .ALIASED_POINT_SIZE_RANGE);
 
+      browser .getRenderingProperties () ._ContentScale .addInterest ("set_contentScale__", this);
+
       this ._pointSizeScaleFactor .addInterest ("set_pointSizeScaleFactor__", this);
       this ._pointSizeMinValue    .addInterest ("set_pointSizeMinValue__",    this);
       this ._pointSizeMaxValue    .addInterest ("set_pointSizeMaxValue__",    this);
@@ -105,8 +109,8 @@ PointProperties .prototype = Object .assign (Object .create (X3DAppearanceChildN
    getPointSize: function (point)
    {
       const
-         attenuation = this .attenuation,
-         dL          = point .magnitude ();
+         attenuation  = this .attenuation,
+         dL           = point .magnitude ();
 
       let pointSize = this .pointSizeScaleFactor;
 
@@ -115,17 +119,29 @@ PointProperties .prototype = Object .assign (Object .create (X3DAppearanceChildN
 
       return pointSize;
    },
+   set_contentScale__: function ()
+   {
+      this .set_pointSizeScaleFactor__ ();
+      this .set_pointSizeMinValue__ ();
+      this .set_pointSizeMaxValue__ ();
+   },
    set_pointSizeScaleFactor__: function ()
    {
-      this .pointSizeScaleFactor = Math .max (this ._pointSizeScaleFactor .getValue (), 0);
+      const contentScale = this .getBrowser () .getRenderingProperty ("ContentScale");
+
+      this .pointSizeScaleFactor = Math .max (this ._pointSizeScaleFactor .getValue (), 0) * contentScale;
    },
    set_pointSizeMinValue__: function ()
    {
-      this .pointSizeMinValue = Algorithm .clamp (this ._pointSizeMinValue .getValue (), 0, this .pointSizeRange [1]);
+      const contentScale = this .getBrowser () .getRenderingProperty ("ContentScale");
+
+      this .pointSizeMinValue = Algorithm .clamp (this ._pointSizeMinValue .getValue (), 0, this .pointSizeRange [1]) * contentScale;
    },
    set_pointSizeMaxValue__: function ()
    {
-      this .pointSizeMaxValue = Algorithm .clamp (this ._pointSizeMaxValue .getValue (), 0, this .pointSizeRange [1]);
+      const contentScale = this .getBrowser () .getRenderingProperty ("ContentScale");
+
+      this .pointSizeMaxValue = Algorithm .clamp (this ._pointSizeMaxValue .getValue (), 0, this .pointSizeRange [1]) * contentScale;
    },
    set_attenuation__: function ()
    {
@@ -140,7 +156,7 @@ PointProperties .prototype = Object .assign (Object .create (X3DAppearanceChildN
       gl .uniform1f  (shaderObject .x3d_PointPropertiesPointSizeScaleFactor, this .pointSizeScaleFactor);
       gl .uniform1f  (shaderObject .x3d_PointPropertiesPointSizeMinValue,    this .pointSizeMinValue);
       gl .uniform1f  (shaderObject .x3d_PointPropertiesPointSizeMaxValue,    this .pointSizeMaxValue);
-      gl .uniform3fv (shaderObject .x3d_PointPropertiesAttenuation, this .attenuation);
+      gl .uniform3fv (shaderObject .x3d_PointPropertiesAttenuation,          this .attenuation);
    },
 });
 

package/src/x_ite/Components/Shape/UnlitMaterial.js

@@ -64,11 +64,12 @@ UnlitMaterial .prototype = Object .assign (Object .create (X3DOneSidedMaterialNo
    [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
       new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",               new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveColor",          new Fields .SFColor (1, 1, 1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveTexture",        new Fields .SFNode ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveStrength",       new Fields .SFFloat (1)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveTextureMapping", new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveTexture",        new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "normalScale",            new Fields .SFFloat (1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "normalTexture",          new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "normalTextureMapping",   new Fields .SFString ()),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "normalTexture",          new Fields .SFNode ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "transparency",           new Fields .SFFloat ()),
    ]),
    getTypeName: function ()

package/src/x_ite/Components/Shape/X3DOneSidedMaterialNode.js

@@ -69,11 +69,12 @@ X3DOneSidedMaterialNode .prototype = Object .assign (Object .create (X3DMaterial
    {
       X3DMaterialNode .prototype .initialize .call (this);
 
-      this ._emissiveColor   .addInterest ("set_emissiveColor__",   this);
-      this ._emissiveTexture .addInterest ("set_emissiveTexture__", this);
-      this ._normalTexture   .addInterest ("set_normalTexture__",   this);
-      this ._transparency    .addInterest ("set_transparency__",    this);
-      this ._transparency    .addInterest ("set_transparent__",     this);
+      this ._emissiveColor    .addInterest ("set_emissiveColor__",   this);
+      this ._emissiveStrength .addInterest ("set_emissiveColor__",   this);
+      this ._emissiveTexture  .addInterest ("set_emissiveTexture__", this);
+      this ._normalTexture    .addInterest ("set_normalTexture__",   this);
+      this ._transparency     .addInterest ("set_transparency__",    this);
+      this ._transparency     .addInterest ("set_transparent__",     this);
 
       this .set_emissiveColor__ ();
       this .set_emissiveTexture__ ();
@@ -86,12 +87,13 @@ X3DOneSidedMaterialNode .prototype = Object .assign (Object .create (X3DMaterial
       //this .emissiveColor .set (this ._emissiveColor .getValue ());
 
       const
-         emissiveColor  = this .emissiveColor,
-         emissiveColor_ = this ._emissiveColor .getValue ();
+         emissiveColor    = this .emissiveColor,
+         emissiveColor_   = this ._emissiveColor .getValue (),
+         emissiveStrength = this ._emissiveStrength .getValue ();
 
-      emissiveColor [0] = emissiveColor_ .r;
-      emissiveColor [1] = emissiveColor_ .g;
-      emissiveColor [2] = emissiveColor_ .b;
+      emissiveColor [0] = emissiveColor_ .r * emissiveStrength;
+      emissiveColor [1] = emissiveColor_ .g * emissiveStrength;
+      emissiveColor [2] = emissiveColor_ .b * emissiveStrength;
    },
    set_emissiveTexture__: function ()
    {
@@ -146,7 +148,7 @@ X3DOneSidedMaterialNode .prototype = Object .assign (Object .create (X3DMaterial
       if (+this .getTextureBits ())
       {
          if (this .getEmissiveTexture ())
-            options .push ("X3D_EMISSIVE_TEXTURE", "X3D_EMISSIVE_TEXTURE", "X3D_EMISSIVE_TEXTURE_" + this .getEmissiveTexture () .getTextureTypeString ());
+            options .push ("X3D_EMISSIVE_TEXTURE", "X3D_EMISSIVE_TEXTURE_" + this .getEmissiveTexture () .getTextureTypeString ());
 
          if (this .getNormalTexture ())
             options .push ("X3D_NORMAL_TEXTURE", "X3D_NORMAL_TEXTURE_" + this .getNormalTexture () .getTextureTypeString ());
@@ -165,26 +167,30 @@ X3DOneSidedMaterialNode .prototype = Object .assign (Object .create (X3DMaterial
 
          if (this .emissiveTextureNode)
          {
-            const emissiveTexture = shaderObject .x3d_EmissiveTexture;
+            const
+               emissiveTextureMapping = this ._emissiveTextureMapping .getValue (),
+               emissiveTexture        = shaderObject .x3d_EmissiveTexture;
 
             this .emissiveTextureNode .setShaderUniforms (gl, shaderObject, renderObject, emissiveTexture);
 
-            gl .uniform1i (emissiveTexture .textureTransformMapping,  textureTransformMapping  .get (this ._emissiveTextureMapping .getValue ()) || 0);
-            gl .uniform1i (emissiveTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._emissiveTextureMapping .getValue ()) || 0);
+            gl .uniform1i (emissiveTexture .textureTransformMapping,  textureTransformMapping  .get (emissiveTextureMapping) || 0);
+            gl .uniform1i (emissiveTexture .textureCoordinateMapping, textureCoordinateMapping .get (emissiveTextureMapping) || 0);
          }
 
          // Normal parameters
 
          if (this .normalTextureNode)
          {
-            const normalTexture = shaderObject .x3d_NormalTexture;
+            const
+               normalTextureMapping = this ._normalTextureMapping .getValue (),
+               normalTexture        = shaderObject .x3d_NormalTexture;
 
-            this .normalTextureNode .setShaderUniforms (gl, shaderObject, renderObject, normalTexture);
+            gl .uniform1f (shaderObject .x3d_NormalScale, Math .max (this ._normalScale .getValue (), 0));
 
-            gl .uniform1i (normalTexture .textureTransformMapping,  textureTransformMapping  .get (this ._normalTextureMapping .getValue ()) || 0);
-            gl .uniform1i (normalTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._normalTextureMapping .getValue ()) || 0);
+            this .normalTextureNode .setShaderUniforms (gl, shaderObject, renderObject, normalTexture);
 
-            gl .uniform1f (shaderObject .x3d_NormalScale, Math .max (this ._normalScale .getValue (), 0));
+            gl .uniform1i (normalTexture .textureTransformMapping,  textureTransformMapping  .get (normalTextureMapping) || 0);
+            gl .uniform1i (normalTexture .textureCoordinateMapping, textureCoordinateMapping .get (normalTextureMapping) || 0);
          }
       }
    },

package/src/x_ite/Components/Sound/AudioClip.js

@@ -110,9 +110,9 @@ AudioClip .prototype = Object .assign (Object .create (X3DSoundSourceNode .proto
       this .audio .on ("abort error",     this .setError   .bind (this));
       this .audio .on ("suspend stalled", this .setTimeout .bind (this));
 
-      this .audio [0] .crossOrigin = "Anonymous";
-      this .audio [0] .preload     = "auto";
-      this .audio [0] .muted       = true;
+      this .audio .prop ("crossOrigin", "Anonymous");
+      this .audio .prop ("preload",     "auto");
+      this .audio .prop ("muted",       true);
 
       this .requestImmediateLoad ();
    },
@@ -152,7 +152,7 @@ AudioClip .prototype = Object .assign (Object .create (X3DSoundSourceNode .proto
 
       if (this .URL .protocol !== "data:")
       {
-         if (!this .getBrowser () .getBrowserOptions () .getCache () || !this .getCache ())
+         if (!this .getCache ())
             this .URL .searchParams .set ("_", Date .now ());
       }
 
@@ -184,7 +184,7 @@ AudioClip .prototype = Object .assign (Object .create (X3DSoundSourceNode .proto
       }
 
       this .audio .unbind ("canplaythrough");
-      this .setMedia (this .audio);
+      this .setMedia (this .audio [0]);
       this .setLoadState (X3DConstants .COMPLETE_STATE);
    },
    dispose: function ()

package/src/x_ite/Components/Sound/X3DSoundSourceNode.js

@@ -91,24 +91,20 @@ X3DSoundSourceNode .prototype = Object .assign (Object .create (X3DChildNode .pr
    {
       if (this .media)
       {
-         const media = this .media [0];
-
-         media .muted = true;
-         media .pause ();
+         this .media .muted = true;
+         this .media .pause ();
       }
 
       this .media = value;
 
       if (value)
       {
-         const media = value [0];
-
-         media .muted  = false;
-         media .volume = 0;
-         media .loop   = this ._loop .getValue ();
+         this .media .muted  = true;
+         this .media .volume = 0;
+         this .media .loop   = this ._loop .getValue ();
 
          this .setVolume (0);
-         this ._duration_changed = media .duration;
+         this ._duration_changed = this .media .duration;
 
          this .resetElapsedTime ();
 
@@ -132,10 +128,6 @@ X3DSoundSourceNode .prototype = Object .assign (Object .create (X3DChildNode .pr
          }
       }
    },
-   getMedia: function ()
-   {
-      return this .media;
-   },
    setVolume: function (volume)
    {
       this .volume = Algorithm .clamp (volume, 0, 1);
@@ -145,7 +137,7 @@ X3DSoundSourceNode .prototype = Object .assign (Object .create (X3DChildNode .pr
    set_loop: function ()
    {
       if (this .media)
-         this .media [0] .loop = this ._loop .getValue ();
+         this .media .loop = this ._loop .getValue ();
    },
    set_volume__: function ()
    {
@@ -157,7 +149,8 @@ X3DSoundSourceNode .prototype = Object .assign (Object .create (X3DChildNode .pr
          intensity = Algorithm .clamp (this .getBrowser () ._volume .getValue (), 0, 1),
          volume    = (! mute) * intensity * this .volume;
 
-      this .media [0] .volume = volume;
+      this .media .muted  = volume === 0;
+      this .media .volume = volume;
    },
    set_speed: function ()
    { },
@@ -169,48 +162,47 @@ X3DSoundSourceNode .prototype = Object .assign (Object .create (X3DChildNode .pr
       {
          if (this ._speed .getValue ())
          {
-            this .media [0] .currentTime = 0;
-            this .media [0] .play () .catch (Function .prototype);
+            this .media .currentTime = 0;
+            this .media .play () .catch (Function .prototype);
          }
       }
    },
    set_pause: function ()
    {
       if (this .media)
-         this .media [0] .pause ();
+         this .media .pause ();
    },
    set_resume: function ()
    {
       if (this .media)
       {
          if (this ._speed .getValue ())
-            this .media [0] .play () .catch (Function .prototype);
+            this .media .play () .catch (Function .prototype);
       }
    },
    set_stop: function ()
    {
       if (this .media)
-         this .media [0] .pause ();
+         this .media .pause ();
    },
-   set_ended: function ()
+   set_end: function ()
    {
-      if (this .media)
-      {
-         const media = this .media [0];
-
-         if (media .currentTime < media .duration)
-            return;
+      if (this ._loop .getValue ())
+         return;
 
-         if (!this ._loop .getValue ())
-            this .stop ();
-      }
+      this .stop ();
    },
    set_time: function ()
    {
-      if (this .media)
-         this ._elapsedTime = this .getElapsedTime ();
+      if (! this .media)
+         return;
+
+      this ._elapsedTime = this .getElapsedTime ();
+
+      if (this .media .currentTime < this .media .duration)
+         return;
 
-      this .set_ended ();
+      this .set_end ();
    },
    dispose: function ()
    {

package/src/x_ite/Components/Text/X3DFontStyleNode.js

@@ -219,7 +219,7 @@ X3DFontStyleNode .prototype = Object .assign (Object .create (X3DNode .prototype
 
          if (this .URL .protocol !== "data:")
          {
-            if (!this .getBrowser () .getBrowserOptions () .getCache () || !this .getCache ())
+            if (!this .getCache ())
                this .URL .searchParams .set ("_", Date .now ());
          }
 

package/src/x_ite/Components/TextureProjector/TextureProjector.js

@@ -56,7 +56,7 @@ import Rotation4               from "../../../standard/Math/Numbers/Rotation4.js
 import Matrix4                 from "../../../standard/Math/Numbers/Matrix4.js";
 import ObjectCache             from "../../../standard/Utility/ObjectCache.js";
 
-var TextureProjectorCache = ObjectCache (TextureProjectorContainer);
+const TextureProjectorCache = ObjectCache (TextureProjectorContainer);
 
 function TextureProjectorContainer ()
 {
@@ -83,17 +83,9 @@ TextureProjectorContainer .prototype =
 
       this .modelViewMatrix .assign (modelViewMatrix);
    },
-   setGroup: function (groupNode)
-   {
-      this .groupNode = groupNode;
-   },
-   getModelViewMatrix: function ()
-   {
-      return this .modelViewMatrix;
-   },
    setGlobalVariables: function (renderObject)
    {
-      var
+      const
          textureProjectorNode  = this .textureProjectorNode,
          cameraSpaceMatrix     = renderObject .getCameraSpaceMatrix () .get (),
          modelMatrix           = this .modelMatrix .assign (this .modelViewMatrix) .multRight (cameraSpaceMatrix),
@@ -106,7 +98,7 @@ TextureProjectorContainer .prototype =
       invTextureSpaceMatrix .rotate (this .rotation);
       invTextureSpaceMatrix .inverse ();
 
-      var
+      const
          width            = textureProjectorNode .getTexture () .getWidth (),
          height           = textureProjectorNode .getTexture () .getHeight (),
          nearDistance     = textureProjectorNode .getNearDistance (),
@@ -194,7 +186,7 @@ TextureProjector .prototype = Object .assign (Object .create (X3DTextureProjecto
    },
    getFieldOfView: function ()
    {
-      var fov = this ._fieldOfView .getValue ();
+      const fov = this ._fieldOfView .getValue ();
 
       return fov > 0 && fov < Math .PI ? fov : Math .PI / 4;
    },