x_ite 8.7.8 → 8.8.0

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

@@ -61,44 +61,55 @@ function FontStyle (executionContext)
    this ._size .setUnit ("length");
 }
 
-FontStyle .prototype = Object .assign (Object .create (X3DFontStyleNode .prototype),
+Object .assign (Object .setPrototypeOf (FontStyle .prototype, X3DFontStyleNode .prototype),
 {
-   constructor: FontStyle,
-   [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
-      new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",    new Fields .SFNode ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "language",    new Fields .SFString ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "family",      new Fields .MFString ("SERIF")),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "style",       new Fields .SFString ("PLAIN")),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "size",        new Fields .SFFloat (1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "spacing",     new Fields .SFFloat (1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "horizontal",  new Fields .SFBool (true)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "leftToRight", new Fields .SFBool (true)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "topToBottom", new Fields .SFBool (true)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "justify",     new Fields .MFString ("BEGIN")),
-   ]),
-   getTypeName: function ()
+   getTextGeometry (text)
    {
-      return "FontStyle";
+      return new PolygonText (text, this);
    },
-   getComponentName: function ()
+   getScale ()
    {
-      return "Text";
+      return this ._size .getValue ();
    },
-   getContainerField: function ()
+});
+
+Object .defineProperties (FontStyle,
+{
+   typeName:
    {
-      return "fontStyle";
+      value: "FontStyle",
+      enumerable: true,
    },
-   getSpecificationRange: function ()
+   componentName:
    {
-      return ["2.0", "Infinity"];
+      value: "Text",
+      enumerable: true,
    },
-   getTextGeometry: function (text)
+   containerField:
    {
-      return new PolygonText (text, this);
+      value: "fontStyle",
+      enumerable: true,
    },
-   getScale: function ()
+   specificationRange:
    {
-      return this ._size .getValue ();
+      value: Object .freeze (["2.0", "Infinity"]),
+      enumerable: true,
+   },
+   fieldDefinitions:
+   {
+      value: new FieldDefinitionArray ([
+         new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",    new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "language",    new Fields .SFString ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "family",      new Fields .MFString ("SERIF")),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "style",       new Fields .SFString ("PLAIN")),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "size",        new Fields .SFFloat (1)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "spacing",     new Fields .SFFloat (1)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "horizontal",  new Fields .SFBool (true)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "leftToRight", new Fields .SFBool (true)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "topToBottom", new Fields .SFBool (true)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "justify",     new Fields .MFString ("BEGIN")),
+      ]),
+      enumerable: true,
    },
 });
 

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

@@ -65,37 +65,9 @@ function Text (executionContext)
    this ._lineBounds .setUnit ("length");
 }
 
-Text .prototype = Object .assign (Object .create (X3DGeometryNode .prototype),
+Object .assign (Object .setPrototypeOf (Text .prototype, X3DGeometryNode .prototype),
 {
-   constructor: Text,
-   [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",   new Fields .SFNode ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "string",     new Fields .MFString ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "length",     new Fields .MFFloat ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "maxExtent",  new Fields .SFFloat ()),
-      new X3DFieldDefinition (X3DConstants .initializeOnly, "solid",      new Fields .SFBool ()),
-      new X3DFieldDefinition (X3DConstants .outputOnly,     "origin",     new Fields .SFVec3f ()),
-      new X3DFieldDefinition (X3DConstants .outputOnly,     "textBounds", new Fields .SFVec2f ()),
-      new X3DFieldDefinition (X3DConstants .outputOnly,     "lineBounds", new Fields .MFVec2f ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput,    "fontStyle",  new Fields .SFNode ()),
-   ]),
-   getTypeName: function ()
-   {
-      return "Text";
-   },
-   getComponentName: function ()
-   {
-      return "Text";
-   },
-   getContainerField: function ()
-   {
-      return "geometry";
-   },
-   getSpecificationRange: function ()
-   {
-      return ["2.0", "Infinity"];
-   },
-   initialize: function ()
+   initialize ()
    {
       X3DGeometryNode .prototype .initialize .call (this);
 
@@ -103,18 +75,18 @@ Text .prototype = Object .assign (Object .create (X3DGeometryNode .prototype),
 
       this .set_fontStyle__ ();
    },
-   getMatrix: function ()
+   getMatrix ()
    {
       return this .textGeometry .getMatrix ();
    },
-   getLength: function (index)
+   getLength (index)
    {
       if (index < this ._length .length)
          return Math .max (0, this ._length [index]);
 
       return 0;
    },
-   set_live__: function ()
+   set_live__ ()
    {
        X3DGeometryNode .prototype .set_live__ .call (this);
 
@@ -123,7 +95,7 @@ Text .prototype = Object .assign (Object .create (X3DGeometryNode .prototype),
       else
          this .getBrowser () .getBrowserOptions () ._PrimitiveQuality .removeInterest ("requestRebuild", this);
    },
-   set_fontStyle__: function ()
+   set_fontStyle__ ()
    {
       this .fontStyleNode ?.removeInterest ("requestRebuild", this);
 
@@ -138,20 +110,20 @@ Text .prototype = Object .assign (Object .create (X3DGeometryNode .prototype),
 
       this .setTransparent (this .textGeometry .isTransparent ());
    },
-   build: function ()
+   build ()
    {
       this .textGeometry .update ();
       this .textGeometry .build ();
 
       this .setSolid (this ._solid .getValue ());
    },
-   traverse: function (type, renderObject)
+   traverse (type, renderObject)
    {
       this .textGeometry .traverse (type, renderObject);
 
       X3DGeometryNode .prototype .traverse .call (this, type, renderObject);
    },
-   display: function (gl, renderContext)
+   display (gl, renderContext)
    {
       this .textGeometry .display (gl, renderContext);
 
@@ -159,16 +131,55 @@ Text .prototype = Object .assign (Object .create (X3DGeometryNode .prototype),
 
       renderContext .textureNode = null;
    },
-   transformLine: function (line)
+   transformLine (line)
    {
       // Apply sceen nodes transformation in place here.
       return this .textGeometry .transformLine (line);
    },
-   transformMatrix: function (matrix)
+   transformMatrix (matrix)
    {
       // Apply sceen nodes transformation in place here.
       return this .textGeometry .transformMatrix (matrix);
    },
 });
 
+Object .defineProperties (Text,
+{
+   typeName:
+   {
+      value: "Text",
+      enumerable: true,
+   },
+   componentName:
+   {
+      value: "Text",
+      enumerable: true,
+   },
+   containerField:
+   {
+      value: "geometry",
+      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,    "string",     new Fields .MFString ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "length",     new Fields .MFFloat ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "maxExtent",  new Fields .SFFloat ()),
+         new X3DFieldDefinition (X3DConstants .initializeOnly, "solid",      new Fields .SFBool ()),
+         new X3DFieldDefinition (X3DConstants .outputOnly,     "origin",     new Fields .SFVec3f ()),
+         new X3DFieldDefinition (X3DConstants .outputOnly,     "textBounds", new Fields .SFVec2f ()),
+         new X3DFieldDefinition (X3DConstants .outputOnly,     "lineBounds", new Fields .MFVec2f ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput,    "fontStyle",  new Fields .SFNode ()),
+      ]),
+      enumerable: true,
+   },
+});
+
 export default Text;

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

@@ -86,22 +86,22 @@ function X3DFontStyleNode (executionContext)
 
    this .addType (X3DConstants .X3DFontStyleNode);
 
-   this .addChildObjects ("load",                 new Fields .SFBool (true),
+   this .addChildObjects ("url",                  this ._family,
+                          "load",                 new Fields .SFBool (true),
                           "autoRefresh",          new Fields .SFTime (),
                           "autoRefreshTimeLimit", new Fields .SFTime (3600));
 
-   this .addAlias ("url", this ._family);
+   this ._family .setName ("family");
 
    this .familyStack = [ ];
    this .alignments  = [ ];
    this .loader      = new FileLoader (this);
 }
 
-X3DFontStyleNode .prototype = Object .assign (Object .create (X3DNode .prototype),
+Object .assign (Object .setPrototypeOf (X3DFontStyleNode .prototype, X3DNode .prototype),
    X3DUrlObject .prototype,
 {
-   constructor: X3DFontStyleNode,
-   initialize: function ()
+   initialize ()
    {
       X3DNode      .prototype .initialize .call (this);
       X3DUrlObject .prototype .initialize .call (this);
@@ -117,7 +117,7 @@ X3DFontStyleNode .prototype = Object .assign (Object .create (X3DNode .prototype
 
       this .requestImmediateLoad () .catch (Function .prototype);
    },
-   set_style__: function ()
+   set_style__ ()
    {
       if (!this ._load .getValue ())
          return;
@@ -126,7 +126,7 @@ X3DFontStyleNode .prototype = Object .assign (Object .create (X3DNode .prototype
 
       this .requestImmediateLoad () .catch (Function .prototype);
    },
-   set_justify__: function ()
+   set_justify__ ()
    {
       const majorNormal = this ._horizontal .getValue () ? this ._leftToRight .getValue () : this ._topToBottom .getValue ();
 
@@ -140,15 +140,15 @@ X3DFontStyleNode .prototype = Object .assign (Object .create (X3DNode .prototype
                              ? this .getAlignment (1, minorNormal)
                              : minorNormal ? TextAlignment .FIRST : TextAlignment .END;
    },
-   getMajorAlignment: function ()
+   getMajorAlignment ()
    {
       return this .alignments [0];
    },
-   getMinorAlignment: function ()
+   getMinorAlignment ()
    {
       return this .alignments [1];
    },
-   getAlignment: function (index, normal)
+   getAlignment (index, normal)
    {
       if (normal)
       {
@@ -177,7 +177,7 @@ X3DFontStyleNode .prototype = Object .assign (Object .create (X3DNode .prototype
 
       return index ? TextAlignment .FIRST : TextAlignment .BEGIN;
    },
-   getDefaultFont: function (familyName)
+   getDefaultFont (familyName)
    {
       const family = Fonts [familyName];
 
@@ -186,7 +186,7 @@ X3DFontStyleNode .prototype = Object .assign (Object .create (X3DNode .prototype
 
       return;
    },
-   loadData: function ()
+   loadData ()
    {
       // Add default font to family array.
 
@@ -203,7 +203,7 @@ X3DFontStyleNode .prototype = Object .assign (Object .create (X3DNode .prototype
 
       this .loadNext ();
    },
-   loadNext: function ()
+   loadNext ()
    {
       try
       {
@@ -232,29 +232,43 @@ X3DFontStyleNode .prototype = Object .assign (Object .create (X3DNode .prototype
          this .setError (error .message);
       }
    },
-   setError: function (error)
+   setError (error)
    {
       if (this .URL .protocol !== "data:")
-         console .warn ("Error loading font '" + decodeURI (this .URL .href) + "':", error);
+         console .warn (`Error loading font '${decodeURI (this .URL .href)}':`, error);
 
       this .loadNext ();
    },
-   setFont: function (font)
+   setFont (font)
    {
       this .font = font;
 
       this .setLoadState (X3DConstants .COMPLETE_STATE);
       this .addNodeEvent ();
    },
-   getFont: function ()
+   getFont ()
    {
       return this .font;
    },
-   dispose: function ()
+   dispose ()
    {
       X3DUrlObject .prototype .dispose .call (this);
       X3DNode      .prototype .dispose .call (this);
    },
 });
 
+Object .defineProperties (X3DFontStyleNode,
+{
+   typeName:
+   {
+      value: "X3DFontStyleNode",
+      enumerable: true,
+   },
+   componentName:
+   {
+      value: "Text",
+      enumerable: true,
+   },
+});
+
 export default X3DFontStyleNode;

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

@@ -73,17 +73,16 @@ function TextureProjectorContainer ()
    this .projectiveTextureMatrixArray    = new Float32Array (16);
 }
 
-TextureProjectorContainer .prototype =
+Object .assign (TextureProjectorContainer .prototype,
 {
-   constructor: TextureProjectorContainer,
-   set: function (textureProjectorNode, modelViewMatrix)
+   set (textureProjectorNode, modelViewMatrix)
    {
       this .browser              = textureProjectorNode .getBrowser ();
       this .textureProjectorNode = textureProjectorNode;
 
       this .modelViewMatrix .assign (modelViewMatrix);
    },
-   setGlobalVariables: function (renderObject)
+   setGlobalVariables (renderObject)
    {
       const
          textureProjectorNode  = this .textureProjectorNode,
@@ -118,7 +117,7 @@ TextureProjectorContainer .prototype =
       this .modelViewMatrix .multVecMatrix (this .location .assign (textureProjectorNode ._location .getValue ()));
       this .locationArray .set (this .location);
    },
-   setShaderUniforms: function (gl, shaderObject, renderObject)
+   setShaderUniforms (gl, shaderObject, renderObject)
    {
       const i = shaderObject .numProjectiveTextures ++;
 
@@ -136,11 +135,11 @@ TextureProjectorContainer .prototype =
       gl .uniformMatrix4fv (shaderObject .x3d_ProjectiveTextureMatrix [i], false, this .projectiveTextureMatrixArray);
       gl .uniform3fv (shaderObject .x3d_ProjectiveTextureLocation [i], this .locationArray);
    },
-   dispose: function ()
+   dispose ()
    {
       TextureProjectorCache .push (this);
    },
-};
+});
 
 function TextureProjector (executionContext)
 {
@@ -151,52 +150,63 @@ function TextureProjector (executionContext)
    this ._fieldOfView .setUnit ("angle");
 }
 
-TextureProjector .prototype = Object .assign (Object .create (X3DTextureProjectorNode .prototype),
+Object .assign (Object .setPrototypeOf (TextureProjector .prototype, X3DTextureProjectorNode .prototype),
 {
-   constructor: TextureProjector,
-   [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
-      new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",     new Fields .SFNode ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "description",  new Fields .SFString ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "on",           new Fields .SFBool (true)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "global",       new Fields .SFBool (true)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "location",     new Fields .SFVec3f (0, 0, 1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "direction",    new Fields .SFVec3f (0, 0, 1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "upVector",     new Fields .SFVec3f (0, 0, 1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "fieldOfView" , new Fields .SFFloat (0.7854)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "nearDistance", new Fields .SFFloat (1)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "farDistance",  new Fields .SFFloat (10)),
-      new X3DFieldDefinition (X3DConstants .outputOnly,  "aspectRatio",  new Fields .SFFloat ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "texture",      new Fields .SFNode ()),
-   ]),
-   getTypeName: function ()
+   initialize ()
+   {
+      X3DTextureProjectorNode .prototype .initialize .call (this);
+   },
+   getFieldOfView ()
    {
-      return "TextureProjector";
+      const fov = this ._fieldOfView .getValue ();
+
+      return fov > 0 && fov < Math .PI ? fov : Math .PI / 4;
    },
-   getComponentName: function ()
+   getTextureProjectors ()
    {
-      return "TextureProjector";
+      return TextureProjectorCache;
    },
-   getContainerField: function ()
+});
+
+Object .defineProperties (TextureProjector,
+{
+   typeName:
    {
-      return "children";
+      value: "TextureProjector",
+      enumerable: true,
    },
-   getSpecificationRange: function ()
+   componentName:
    {
-      return ["4.0", "Infinity"];
+      value: "TextureProjector",
+      enumerable: true,
    },
-   initialize: function ()
+   containerField:
    {
-      X3DTextureProjectorNode .prototype .initialize .call (this);
+      value: "children",
+      enumerable: true,
    },
-   getFieldOfView: function ()
+   specificationRange:
    {
-      const fov = this ._fieldOfView .getValue ();
-
-      return fov > 0 && fov < Math .PI ? fov : Math .PI / 4;
+      value: Object .freeze (["4.0", "Infinity"]),
+      enumerable: true,
    },
-   getTextureProjectors: function ()
+   fieldDefinitions:
    {
-      return TextureProjectorCache;
+      value: new FieldDefinitionArray ([
+         new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",     new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "description",  new Fields .SFString ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "on",           new Fields .SFBool (true)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "global",       new Fields .SFBool (true)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "location",     new Fields .SFVec3f (0, 0, 1)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "direction",    new Fields .SFVec3f (0, 0, 1)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "upVector",     new Fields .SFVec3f (0, 0, 1)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "fieldOfView" , new Fields .SFFloat (0.7854)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "nearDistance", new Fields .SFFloat (1)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "farDistance",  new Fields .SFFloat (10)),
+         new X3DFieldDefinition (X3DConstants .outputOnly,  "aspectRatio",  new Fields .SFFloat ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "texture",      new Fields .SFNode ()),
+      ]),
+      enumerable: true,
    },
 });