x_ite 8.7.8 → 8.8.0

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

@@ -59,36 +59,9 @@ function Shape (executionContext)
    this .addType (X3DConstants .Shape);
 }
 
-Shape .prototype = Object .assign (Object .create (X3DShapeNode .prototype),
+Object .assign (Object .setPrototypeOf (Shape .prototype, X3DShapeNode .prototype),
 {
-   constructor: Shape,
-   [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",    new Fields .SFNode ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "visible",     new Fields .SFBool (true)),
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "castShadow",  new Fields .SFBool (true)),
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "bboxDisplay", new Fields .SFBool ()),
-      new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxSize",    new Fields .SFVec3f (-1, -1, -1)),
-      new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxCenter",  new Fields .SFVec3f ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "appearance",  new Fields .SFNode ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "geometry",    new Fields .SFNode ()),
-   ]),
-   getTypeName: function ()
-   {
-      return "Shape";
-   },
-   getComponentName: function ()
-   {
-      return "Shape";
-   },
-   getContainerField: function ()
-   {
-      return "children";
-   },
-   getSpecificationRange: function ()
-   {
-      return ["2.0", "Infinity"];
-   },
-   initialize: function ()
+   initialize ()
    {
       X3DShapeNode .prototype .initialize .call (this);
 
@@ -96,12 +69,12 @@ Shape .prototype = Object .assign (Object .create (X3DShapeNode .prototype),
 
       this .set_transformSensors__ ();
    },
-   getShapeKey: function ()
+   getShapeKey ()
    {
       return 0;
    },
    getGeometryContext: X3DShapeNode .prototype .getGeometry,
-   set_geometry__: function ()
+   set_geometry__ ()
    {
       X3DShapeNode .prototype .set_geometry__ .call (this);
 
@@ -110,15 +83,15 @@ Shape .prototype = Object .assign (Object .create (X3DShapeNode .prototype),
       else
          this .traverse = Function .prototype;
    },
-   set_transformSensors__: function ()
+   set_transformSensors__ ()
    {
       this .setPickableObject (this .getTransformSensors () .size);
    },
-   intersectsBox: function (box, clipPlanes, modelViewMatrix)
+   intersectsBox (box, clipPlanes, modelViewMatrix)
    {
       return this .getGeometry () .intersectsBox (box, clipPlanes, modelViewMatrix);
    },
-   traverse: function (type, renderObject)
+   traverse (type, renderObject)
    {
       // Always look at ParticleSystem if you do modify something here and there.
 
@@ -157,7 +130,7 @@ Shape .prototype = Object .assign (Object .create (X3DShapeNode .prototype),
 
       this .getGeometry () .traverse (type, renderObject); // Currently used for ScreenText.
    },
-   picking: function (renderObject)
+   picking (renderObject)
    {
       const modelMatrix = renderObject .getModelViewMatrix () .get ();
 
@@ -181,14 +154,52 @@ Shape .prototype = Object .assign (Object .create (X3DShapeNode .prototype),
 
       pickingHierarchy .pop ();
    },
-   displaySimple: function (gl, renderContext, shaderNode)
+   displaySimple (gl, renderContext, shaderNode)
    {
       this .getGeometry () .displaySimple (gl, renderContext, shaderNode);
    },
-   display: function (gl, renderContext)
+   display (gl, renderContext)
    {
       this .getGeometry () .display (gl, renderContext);
    },
 });
 
+Object .defineProperties (Shape,
+{
+   typeName:
+   {
+      value: "Shape",
+      enumerable: true,
+   },
+   componentName:
+   {
+      value: "Shape",
+      enumerable: true,
+   },
+   containerField:
+   {
+      value: "children",
+      enumerable: true,
+   },
+   specificationRange:
+   {
+      value: Object .freeze (["2.0", "Infinity"]),
+      enumerable: true,
+   },
+   fieldDefinitions:
+   {
+      value: new FieldDefinitionArray ([
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",    new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "visible",     new Fields .SFBool (true)),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "castShadow",  new Fields .SFBool (true)),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "bboxDisplay", new Fields .SFBool ()),
+         new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxSize",    new Fields .SFVec3f (-1, -1, -1)),
+         new X3DFieldDefinition (X3DConstants .initializeOnly, "bboxCenter",  new Fields .SFVec3f ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "appearance",  new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "geometry",    new Fields .SFNode ()),
+      ]),
+      enumerable: true,
+   },
+});
+
 export default Shape;

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

@@ -70,42 +70,9 @@ function TwoSidedMaterial (executionContext)
    this .backEmissiveColor = new Float32Array (3);
 }
 
-TwoSidedMaterial .prototype = Object .assign (Object .create (X3DMaterialNode .prototype),
+Object .assign (Object .setPrototypeOf (TwoSidedMaterial .prototype, X3DMaterialNode .prototype),
 {
-   constructor: TwoSidedMaterial,
-   [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
-      new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",             new Fields .SFNode ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "separateBackColor",    new Fields .SFBool ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "ambientIntensity",     new Fields .SFFloat (0.2)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "diffuseColor",         new Fields .SFColor (0.8, 0.8, 0.8)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "specularColor",        new Fields .SFColor ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveColor",        new Fields .SFColor ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "shininess",            new Fields .SFFloat (0.2)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "transparency",         new Fields .SFFloat ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "backAmbientIntensity", new Fields .SFFloat (0.2)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "backDiffuseColor",     new Fields .SFColor (0.8, 0.8, 0.8)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "backSpecularColor",    new Fields .SFColor ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "backEmissiveColor",    new Fields .SFColor ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "backShininess",        new Fields .SFFloat (0.2)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "backTransparency",     new Fields .SFFloat ()),
-   ]),
-   getTypeName: function ()
-   {
-      return "TwoSidedMaterial";
-   },
-   getComponentName: function ()
-   {
-      return "Shape";
-   },
-   getContainerField: function ()
-   {
-      return "material";
-   },
-   getSpecificationRange: function ()
-   {
-      return ["3.2", "Infinity"];
-   },
-   initialize: function ()
+   initialize ()
    {
       X3DMaterialNode . prototype .initialize .call (this);
 
@@ -143,11 +110,11 @@ TwoSidedMaterial .prototype = Object .assign (Object .create (X3DMaterialNode .p
 
       this .set_transparent__ ();
    },
-   set_ambientIntensity__: function ()
+   set_ambientIntensity__ ()
    {
       this .ambientIntensity = Math .max (this ._ambientIntensity .getValue (), 0);
    },
-   set_diffuseColor__: function ()
+   set_diffuseColor__ ()
    {
       //We cannot use this in Windows Edge:
       //this .diffuseColor .set (this ._diffuseColor .getValue ());
@@ -160,7 +127,7 @@ TwoSidedMaterial .prototype = Object .assign (Object .create (X3DMaterialNode .p
       diffuseColor [1] = diffuseColor_ .g;
       diffuseColor [2] = diffuseColor_ .b;
    },
-   set_specularColor__: function ()
+   set_specularColor__ ()
    {
       //We cannot use this in Windows Edge:
       //this .specularColor .set (this ._specularColor .getValue ());
@@ -173,7 +140,7 @@ TwoSidedMaterial .prototype = Object .assign (Object .create (X3DMaterialNode .p
       specularColor [1] = specularColor_ .g;
       specularColor [2] = specularColor_ .b;
    },
-   set_emissiveColor__: function ()
+   set_emissiveColor__ ()
    {
       //We cannot use this in Windows Edge:
       //this .emissiveColor .set (this ._emissiveColor .getValue ());
@@ -186,22 +153,22 @@ TwoSidedMaterial .prototype = Object .assign (Object .create (X3DMaterialNode .p
       emissiveColor [1] = emissiveColor_ .g;
       emissiveColor [2] = emissiveColor_ .b;
    },
-   set_shininess__: function ()
+   set_shininess__ ()
    {
       this .shininess = Algorithm .clamp (this ._shininess .getValue (), 0, 1);
    },
-   set_transparency__: function ()
+   set_transparency__ ()
    {
       this .transparency = Algorithm .clamp (this ._transparency .getValue (), 0, 1);
    },
    /*
     * Back Material
     */
-   set_backAmbientIntensity__: function ()
+   set_backAmbientIntensity__ ()
    {
       this .backAmbientIntensity = Math .max (this ._backAmbientIntensity .getValue (), 0);
    },
-   set_backDiffuseColor__: function ()
+   set_backDiffuseColor__ ()
    {
       //We cannot use this in Windows Edge:
       //this .backDiffuseColor .set (this ._backDiffuseColor .getValue ());
@@ -214,7 +181,7 @@ TwoSidedMaterial .prototype = Object .assign (Object .create (X3DMaterialNode .p
       backDiffuseColor [1] = backDiffuseColor_ .g;
       backDiffuseColor [2] = backDiffuseColor_ .b;
    },
-   set_backSpecularColor__: function ()
+   set_backSpecularColor__ ()
    {
       //We cannot use this in Windows Edge:
       //this .backSpecularColor .set (this ._backSpecularColor .getValue ());
@@ -227,7 +194,7 @@ TwoSidedMaterial .prototype = Object .assign (Object .create (X3DMaterialNode .p
       backSpecularColor [1] = backSpecularColor_ .g;
       backSpecularColor [2] = backSpecularColor_ .b;
    },
-   set_backEmissiveColor__: function ()
+   set_backEmissiveColor__ ()
    {
       //We cannot use this in Windows Edge:
       //this .backEmissiveColor .set (this ._backEmissiveColor .getValue ());
@@ -240,22 +207,22 @@ TwoSidedMaterial .prototype = Object .assign (Object .create (X3DMaterialNode .p
       backEmissiveColor [1] = backEmissiveColor_ .g;
       backEmissiveColor [2] = backEmissiveColor_ .b;
    },
-   set_backShininess__: function ()
+   set_backShininess__ ()
    {
       this .backShininess = Algorithm .clamp (this ._backShininess .getValue (), 0, 1);
    },
-   set_backTransparency__: function ()
+   set_backTransparency__ ()
    {
       this .backTransparency = Algorithm .clamp (this ._backTransparency .getValue (), 0, 1);
    },
-   set_transparent__: function ()
+   set_transparent__ ()
    {
       this .setTransparent (!!(this ._transparency .getValue () || (this ._separateBackColor .getValue () && this ._backTransparency .getValue ())));
    },
    getBaseTexture: Material .prototype .getBaseTexture,
    getMaterialKey: Material .prototype .getMaterialKey,
    createShader: Material .prototype .createShader,
-   setShaderUniforms: function (gl, shaderObject, renderObject, textureTransformMapping, textureCoordinateMapping, front)
+   setShaderUniforms (gl, shaderObject, renderObject, textureTransformMapping, textureCoordinateMapping, front)
    {
       if (! front && this ._separateBackColor .getValue ())
       {
@@ -278,4 +245,48 @@ TwoSidedMaterial .prototype = Object .assign (Object .create (X3DMaterialNode .p
    },
 });
 
+Object .defineProperties (TwoSidedMaterial,
+{
+   typeName:
+   {
+      value: "TwoSidedMaterial",
+      enumerable: true,
+   },
+   componentName:
+   {
+      value: "Shape",
+      enumerable: true,
+   },
+   containerField:
+   {
+      value: "material",
+      enumerable: true,
+   },
+   specificationRange:
+   {
+      value: Object .freeze (["3.2", "Infinity"]),
+      enumerable: true,
+   },
+   fieldDefinitions:
+   {
+      value: new FieldDefinitionArray ([
+         new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",             new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "separateBackColor",    new Fields .SFBool ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "ambientIntensity",     new Fields .SFFloat (0.2)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "diffuseColor",         new Fields .SFColor (0.8, 0.8, 0.8)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "specularColor",        new Fields .SFColor ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "emissiveColor",        new Fields .SFColor ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "shininess",            new Fields .SFFloat (0.2)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "transparency",         new Fields .SFFloat ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "backAmbientIntensity", new Fields .SFFloat (0.2)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "backDiffuseColor",     new Fields .SFColor (0.8, 0.8, 0.8)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "backSpecularColor",    new Fields .SFColor ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "backEmissiveColor",    new Fields .SFColor ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "backShininess",        new Fields .SFFloat (0.2)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "backTransparency",     new Fields .SFFloat ()),
+      ]),
+      enumerable: true,
+   },
+});
+
 export default TwoSidedMaterial;

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

@@ -58,42 +58,15 @@ function UnlitMaterial (executionContext)
    this .addType (X3DConstants .UnlitMaterial);
 }
 
-UnlitMaterial .prototype = Object .assign (Object .create (X3DOneSidedMaterialNode .prototype),
+Object .assign (Object .setPrototypeOf (UnlitMaterial .prototype, X3DOneSidedMaterialNode .prototype),
 {
-   constructor: UnlitMaterial,
-   [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, "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, "normalTextureMapping",   new Fields .SFString ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "normalTexture",          new Fields .SFNode ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "transparency",           new Fields .SFFloat ()),
-   ]),
-   getTypeName: function ()
-   {
-      return "UnlitMaterial";
-   },
-   getComponentName: function ()
-   {
-      return "Shape";
-   },
-   getContainerField: function ()
-   {
-      return "material";
-   },
-   getSpecificationRange: function ()
-   {
-      return ["4.0", "Infinity"];
-   },
-   initialize: function ()
+   initialize ()
    {
       X3DOneSidedMaterialNode .prototype .initialize .call (this);
 
       this .set_transparent__ ();
    },
-   set_emissiveTexture__: function ()
+   set_emissiveTexture__ ()
    {
       if (this .getEmissiveTexture ())
          this .getEmissiveTexture () ._transparent .removeInterest ("set_transparent__", this);
@@ -103,16 +76,16 @@ UnlitMaterial .prototype = Object .assign (Object .create (X3DOneSidedMaterialNo
       if (this .getEmissiveTexture ())
          this .getEmissiveTexture () ._transparent .addInterest ("set_transparent__", this);
    },
-   set_transparent__: function ()
+   set_transparent__ ()
    {
       this .setTransparent (!!(this .getTransparency () ||
                                this .getEmissiveTexture () ?.isTransparent ()));
    },
-   getMaterialKey: function ()
+   getMaterialKey ()
    {
       return "0";
    },
-   createShader: function (key, geometryContext, renderContext)
+   createShader (key, geometryContext, renderContext)
    {
       const
          browser = this .getBrowser (),
@@ -128,4 +101,42 @@ UnlitMaterial .prototype = Object .assign (Object .create (X3DOneSidedMaterialNo
    },
 });
 
+Object .defineProperties (UnlitMaterial,
+{
+   typeName:
+   {
+      value: "UnlitMaterial",
+      enumerable: true,
+   },
+   componentName:
+   {
+      value: "Shape",
+      enumerable: true,
+   },
+   containerField:
+   {
+      value: "material",
+      enumerable: true,
+   },
+   specificationRange:
+   {
+      value: Object .freeze (["4.0", "Infinity"]),
+      enumerable: true,
+   },
+   fieldDefinitions:
+   {
+      value: 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, "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, "normalTextureMapping",   new Fields .SFString ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "normalTexture",          new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "transparency",           new Fields .SFFloat ()),
+      ]),
+      enumerable: true,
+   },
+});
+
 export default UnlitMaterial;

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

@@ -55,9 +55,20 @@ function X3DAppearanceChildNode (executionContext)
    this .addType (X3DConstants .X3DAppearanceChildNode);
 }
 
-X3DAppearanceChildNode .prototype = Object .assign (Object .create (X3DNode .prototype),
+Object .setPrototypeOf (X3DAppearanceChildNode .prototype, X3DNode .prototype);
+
+Object .defineProperties (X3DAppearanceChildNode,
 {
-   constructor: X3DAppearanceChildNode,
+   typeName:
+   {
+      value: "X3DAppearanceChildNode",
+      enumerable: true,
+   },
+   componentName:
+   {
+      value: "Shape",
+      enumerable: true,
+   },
 });
 
 export default X3DAppearanceChildNode;

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

@@ -60,18 +60,31 @@ function X3DAppearanceNode (executionContext)
    this ._transparent .setAccessType (X3DConstants .outputOnly);
 }
 
-X3DAppearanceNode .prototype = Object .assign (Object .create (X3DNode .prototype),
+Object .assign (Object .setPrototypeOf (X3DAppearanceNode .prototype, X3DNode .prototype),
 {
-   constructor: X3DAppearanceNode,
-   setTransparent: function (value)
+   setTransparent (value)
    {
       if (value !== this ._transparent .getValue ())
          this ._transparent = value;
    },
-   isTransparent: function ()
+   isTransparent ()
    {
       return this ._transparent .getValue ();
    },
 });
 
+Object .defineProperties (X3DAppearanceNode,
+{
+   typeName:
+   {
+      value: "X3DAppearanceNode",
+      enumerable: true,
+   },
+   componentName:
+   {
+      value: "Shape",
+      enumerable: true,
+   },
+});
+
 export default X3DAppearanceNode;

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

@@ -65,10 +65,9 @@ function X3DMaterialNode (executionContext)
    this .shaderNodes = this .getBrowser () .getShaders ();
 }
 
-X3DMaterialNode .prototype = Object .assign (Object .create (X3DAppearanceChildNode .prototype),
+Object .assign (Object .setPrototypeOf (X3DMaterialNode .prototype, X3DAppearanceChildNode .prototype),
 {
-   constructor: X3DMaterialNode,
-   initialize: function ()
+   initialize ()
    {
       X3DAppearanceChildNode .prototype .initialize .call (this);
 
@@ -76,35 +75,35 @@ X3DMaterialNode .prototype = Object .assign (Object .create (X3DAppearanceChildN
 
       this .set_logarithmicDepthBuffer__ ();
    },
-   set_logarithmicDepthBuffer__: function ()
+   set_logarithmicDepthBuffer__ ()
    {
       this .logarithmicDepthBuffer = this .getBrowser () .getRenderingProperty ("LogarithmicDepthBuffer");
    },
-   setTransparent: function (value)
+   setTransparent (value)
    {
       if (value !== this ._transparent .getValue ())
          this ._transparent = value;
    },
-   isTransparent: function ()
+   isTransparent ()
    {
       return this ._transparent .getValue ();
    },
-   getBaseTexture: function ()
+   getBaseTexture ()
    {
       return null;
    },
-   setTexture: function (index, textureNode)
+   setTexture (index, textureNode)
    {
       const textureType = textureNode ? textureNode .getTextureType () - 1 : 0;
 
       this .textureBits .set (index * 2 + 0, textureType & 0b01);
       this .textureBits .set (index * 2 + 1, textureType & 0b10);
    },
-   getTextureBits: function ()
+   getTextureBits ()
    {
       return this .textureBits;
    },
-   getShader: function (geometryContext, renderContext)
+   getShader (geometryContext, renderContext)
    {
       let key = "";
 
@@ -154,7 +153,7 @@ X3DMaterialNode .prototype = Object .assign (Object .create (X3DAppearanceChildN
 
       return this .shaderNodes .get (key) ?? this .createShader (key, geometryContext, renderContext);
    },
-   getShaderOptions: function (geometryContext, renderContext)
+   getShaderOptions (geometryContext, renderContext)
    {
       const
          browser = this .getBrowser (),
@@ -173,7 +172,7 @@ X3DMaterialNode .prototype = Object .assign (Object .create (X3DAppearanceChildN
 
       if (renderContext)
       {
-         const { renderObject, shapeNode, appearanceNode, objectsCount } = renderContext;
+         const { renderObject, fogNode, shapeNode, appearanceNode, objectsCount } = renderContext;
 
          if (this .logarithmicDepthBuffer || renderObject .getViewpoint () .getLogarithmicDepthBuffer ())
             options .push ("X3D_LOGARITHMIC_DEPTH_BUFFER");
@@ -194,37 +193,32 @@ X3DMaterialNode .prototype = Object .assign (Object .create (X3DAppearanceChildN
          if (renderContext .shadows)
             options .push ("X3D_SHADOWS", "X3D_PCF_FILTERING");
 
-         if (renderContext .fogNode)
+         switch (fogNode ?.getFogType ())
          {
-            options .push ("X3D_FOG");
-
-            switch (renderContext .fogNode .getFogType ())
-            {
-               case 1:
-                  options .push ("X3D_FOG_LINEAR");
-                  break;
-               case 2:
-                  options .push ("X3D_FOG_EXPONENTIAL");
-                  break;
-            }
+            case 1:
+               options .push ("X3D_FOG", "X3D_FOG_LINEAR");
+               break;
+            case 2:
+               options .push ("X3D_FOG", "X3D_FOG_EXPONENTIAL");
+               break;
          }
 
          if (objectsCount [0])
          {
             options .push ("X3D_CLIP_PLANES")
-            options .push ("X3D_NUM_CLIP_PLANES " + Math .min (objectsCount [0], browser .getMaxClipPlanes ()));
+            options .push (`X3D_NUM_CLIP_PLANES ${Math .min (objectsCount [0], browser .getMaxClipPlanes ())}`);
          }
 
          if (objectsCount [1])
          {
             options .push ("X3D_LIGHTING")
-            options .push ("X3D_NUM_LIGHTS " + Math .min (objectsCount [1], browser .getMaxLights ()));
+            options .push (`X3D_NUM_LIGHTS ${Math .min (objectsCount [1], browser .getMaxLights ())}`);
          }
 
          if (objectsCount [2])
          {
             options .push ("X3D_PROJECTIVE_TEXTURE_MAPPING")
-            options .push ("X3D_NUM_TEXTURE_PROJECTORS " + Math .min (objectsCount [2], browser .getMaxTextures ()));
+            options .push (`X3D_NUM_TEXTURE_PROJECTORS ${Math .min (objectsCount [2], browser .getMaxTextures ())}`);
          }
 
          if (appearanceNode .getStyleProperties (geometryContext .geometryType))
@@ -250,7 +244,7 @@ X3DMaterialNode .prototype = Object .assign (Object .create (X3DAppearanceChildN
                const textureNode = appearanceNode .getTexture ();
 
                options .push ("X3D_TEXTURE");
-               options .push ("X3D_NUM_TEXTURES " + textureNode .getCount ());
+               options .push (`X3D_NUM_TEXTURES ${textureNode .getCount ()}`);
 
                if (textureNode .getType () .includes (X3DConstants .MultiTexture))
                   options .push ("X3D_MULTI_TEXTURING");
@@ -258,8 +252,8 @@ X3DMaterialNode .prototype = Object .assign (Object .create (X3DAppearanceChildN
                textureNode .getShaderOptions (options);
             }
 
-            options .push ("X3D_NUM_TEXTURE_TRANSFORMS " + (appearanceNode .getTextureTransformMapping () .size || 1));
-            options .push ("X3D_NUM_TEXTURE_COORDINATES " + (geometryContext .textureCoordinateMapping .size || 1));
+            options .push (`X3D_NUM_TEXTURE_TRANSFORMS ${appearanceNode .getTextureTransformMapping () .size || 1}`);
+            options .push (`X3D_NUM_TEXTURE_COORDINATES ${geometryContext .textureCoordinateMapping .size || 1}`);
          }
 
          switch (shapeNode .getShapeKey ())
@@ -282,19 +276,19 @@ X3DMaterialNode .prototype = Object .assign (Object .create (X3DAppearanceChildN
          if (objectsCount [0])
          {
             options .push ("X3D_CLIP_PLANES")
-            options .push ("X3D_NUM_CLIP_PLANES " + Math .min (objectsCount [0], browser .getMaxClipPlanes ()));
+            options .push (`X3D_NUM_CLIP_PLANES ${Math .min (objectsCount [0], browser .getMaxClipPlanes ())}`);
          }
 
          if (objectsCount [1])
          {
             options .push ("X3D_LIGHTING")
-            options .push ("X3D_NUM_LIGHTS " + Math .min (objectsCount [1], browser .getMaxLights ()));
+            options .push (`X3D_NUM_LIGHTS ${Math .min (objectsCount [1], browser .getMaxLights ())}`);
          }
 
          if (objectsCount [2])
          {
             options .push ("X3D_PROJECTIVE_TEXTURE_MAPPING")
-            options .push ("X3D_NUM_TEXTURE_PROJECTORS " + Math .min (objectsCount [2], browser .getMaxTextures ()));
+            options .push (`X3D_NUM_TEXTURE_PROJECTORS ${Math .min (objectsCount [2], browser .getMaxTextures ())}`);
          }
 
          if (textureNode)
@@ -313,4 +307,18 @@ X3DMaterialNode .prototype = Object .assign (Object .create (X3DAppearanceChildN
    },
 });
 
+Object .defineProperties (X3DMaterialNode,
+{
+   typeName:
+   {
+      value: "X3DMaterialNode",
+      enumerable: true,
+   },
+   componentName:
+   {
+      value: "Shape",
+      enumerable: true,
+   },
+});
+
 export default X3DMaterialNode;