x_ite 8.7.8 → 8.8.0

package/src/x_ite/Browser/Layout/ScreenText.js

@@ -70,15 +70,14 @@ function ScreenText (text, fontStyle)
    this .textureNode .setup ();
 }
 
-ScreenText .prototype = Object .assign (Object .create (X3DTextGeometry .prototype),
+Object .assign (Object .setPrototypeOf (ScreenText .prototype, X3DTextGeometry .prototype),
 {
-   constructor: ScreenText,
    modelViewMatrix: new Matrix4 (),
-   isTransparent: function ()
+   isTransparent ()
    {
       return true;
    },
-   getMatrix: function ()
+   getMatrix ()
    {
       return this .matrix;
    },
@@ -310,7 +309,7 @@ ScreenText .prototype = Object .assign (Object .create (X3DTextGeometry .prototy
             this .textureNode .clear ();
       };
    })(),
-   drawGlyph: function (cx, font, glyph, x, y, size)
+   drawGlyph (cx, font, glyph, x, y, size)
    {
       //console .log (glyph .name, x, y);
 
@@ -365,7 +364,7 @@ ScreenText .prototype = Object .assign (Object .create (X3DTextGeometry .prototy
          cx .stroke ();
       }
    },
-   getGlyphExtents: function (font, glyph, primitiveQuality, min, max)
+   getGlyphExtents (font, glyph, primitiveQuality, min, max)
    {
       const unitsPerEm = font .unitsPerEm;
 
@@ -387,7 +386,7 @@ ScreenText .prototype = Object .assign (Object .create (X3DTextGeometry .prototy
          this .getText () .setBBox (bbox);
       };
    })(),
-   display: function (gl, renderContext)
+   display (gl, renderContext)
    {
       Matrix4 .prototype .multLeft .call (renderContext .modelViewMatrix, this .matrix);
 
@@ -403,7 +402,7 @@ ScreenText .prototype = Object .assign (Object .create (X3DTextGeometry .prototy
          return line .multLineMatrix (invMatrix .assign (this .matrix) .inverse ());
       };
    })(),
-   transformMatrix: function (matrix)
+   transformMatrix (matrix)
    {
       // Apply screen nodes transformation in place here.
       return matrix .multLeft (this .matrix);

package/src/x_ite/Browser/Layout/X3DLayoutContext.js

@@ -56,9 +56,9 @@ const
 function X3DLayoutContext ()
 { }
 
-X3DLayoutContext .prototype =
+Object .assign (X3DLayoutContext .prototype,
 {
-   getScreenTextureProperties: function ()
+   getScreenTextureProperties ()
    {
       this [_screenTextureProperties] = new TextureProperties (this .getPrivateScene ());
 
@@ -126,6 +126,6 @@ X3DLayoutContext .prototype =
          matrix .assign (modelViewMatrix) .inverse () .multLeft (screenMatrix);
       };
    })(),
-};
+});
 
 export default X3DLayoutContext;

package/src/x_ite/Browser/Legacy.js

@@ -45,20 +45,40 @@
  *
  ******************************************************************************/
 
-function legacy ()
+const Legacy =
 {
-   const element = this .getElement ();
+   elements (elements, X3DBrowser)
+   {
+      if (elements .length)
+      {
+         console .warn ("Use of <X3DCanvas> element is depreciated, please use <x3d-canvas> element instead. See https://create3000.github.io/x_ite/#embedding-x_ite-within-a-web-page.");
 
-   if (element .prop ("nodeName") .toUpperCase () !== "X3DCANVAS")
-      return;
+         $.map (elements, element => new X3DBrowser (element));
+      }
+   },
+   browser (browser)
+   {
+      const element = browser .getElement ();
 
-   if (element .attr ("src"))
-      this .attributeChangedCallback ("src", undefined, element .attr ("src"));
-   else if (element .attr ("url"))
-      this .attributeChangedCallback ("url", undefined, element .attr ("url"));
+      if (element .prop ("nodeName") .toUpperCase () !== "X3DCANVAS")
+         return;
 
-   // Make element focusable.
-   element .attr ("tabindex", element .attr ("tabindex") ?? 0);
-}
+      if (element .attr ("src"))
+         browser .attributeChangedCallback ("src", undefined, element .attr ("src"));
+      else if (element .attr ("url"))
+         browser .attributeChangedCallback ("url", undefined, element .attr ("url"));
 
-export default legacy;
+      // Make element focusable.
+      element .attr ("tabindex", element .attr ("tabindex") ?? 0);
+   },
+   error (elements, error)
+   {
+      console .error (error);
+
+      // <X3DCanvas>
+      elements .children (".x_ite-private-browser") .hide ();
+      elements .children (":not(.x_ite-private-browser)") .show ();
+   },
+};
+
+export default Legacy;

package/src/x_ite/Browser/Lighting/X3DLightingContext.js

@@ -65,13 +65,13 @@ function X3DLightingContext ()
    this [_shadowBuffers] = [ ]; // Shadow buffer cache
 }
 
-X3DLightingContext .prototype =
+Object .assign (X3DLightingContext .prototype,
 {
-   getMaxLights: function ()
+   getMaxLights ()
    {
       return this [_maxLights];
    },
-   popShadowBuffer: function (shadowMapSize)
+   popShadowBuffer (shadowMapSize)
    {
       try
       {
@@ -95,11 +95,11 @@ X3DLightingContext .prototype =
          return null;
       }
    },
-   pushShadowBuffer: function (buffer)
+   pushShadowBuffer (buffer)
    {
       if (buffer)
          this [_shadowBuffers] [buffer .getWidth ()] .push (buffer);
    },
-};
+});
 
 export default X3DLightingContext;

package/src/x_ite/Browser/NURBS/NURBS.js

@@ -50,7 +50,7 @@ import Vector3 from "../../../standard/Math/Numbers/Vector3.js";
 import Vector4 from "../../../standard/Math/Numbers/Vector4.js";
 
 const NURBS = {
-   getTessellation: function (tessellation, dimension)
+   getTessellation (tessellation, dimension)
    {
       if (tessellation > 0)
          return tessellation + 1;
@@ -60,7 +60,7 @@ const NURBS = {
 
       return 2 * dimension + 1;
    },
-   getClosed2D: function (order, knot, weight, controlPoint)
+   getClosed2D (order, knot, weight, controlPoint)
    {
       const
          dimension   = controlPoint .length,
@@ -195,7 +195,7 @@ const NURBS = {
          return true;
       };
    })(),
-   isPeriodic: function (order, dimension, knot)
+   isPeriodic (order, dimension, knot)
    {
       // Check if knots are periodic.
 
@@ -228,7 +228,7 @@ const NURBS = {
 
       return true;
    },
-   getKnots: function (result, closed, order, dimension, knot)
+   getKnots (result, closed, order, dimension, knot)
    {
       const knots = result || [ ];
 
@@ -277,7 +277,7 @@ const NURBS = {
 
       return knots;
    },
-   getWeights: function (result, dimension, weight)
+   getWeights (result, dimension, weight)
    {
       if (weight .length !== dimension)
          return undefined;
@@ -293,7 +293,7 @@ const NURBS = {
 
       return weights;
    },
-   getUVWeights: function (result, uDimension, vDimension, weight)
+   getUVWeights (result, uDimension, vDimension, weight)
    {
       const dimension = uDimension * vDimension;
 
@@ -314,7 +314,7 @@ const NURBS = {
 
       return weights;
    },
-   getControlPoints2D: function (result, closed, order, weights, controlPoint)
+   getControlPoints2D (result, closed, order, weights, controlPoint)
    {
       const
          controlPoints     = result || [ ],
@@ -348,7 +348,7 @@ const NURBS = {
 
       return controlPoints;
    },
-   getControlPoints: function (result, closed, order, weights, controlPointNode)
+   getControlPoints (result, closed, order, weights, controlPointNode)
    {
       const
          controlPoints = result || [ ],
@@ -380,7 +380,7 @@ const NURBS = {
 
       return controlPoints;
    },
-   getUVControlPoints: function (result, uClosed, vClosed, uOrder, vOrder, uDimension, vDimension, weights, controlPointNode)
+   getUVControlPoints (result, uClosed, vClosed, uOrder, vOrder, uDimension, vDimension, weights, controlPointNode)
    {
       const
          controlPoints = result || [ ],
@@ -429,7 +429,7 @@ const NURBS = {
 
       return controlPoints;
    },
-   getTexControlPoints: function (result, uClosed, vClosed, uOrder, vOrder, uDimension, vDimension, controlPointNode)
+   getTexControlPoints (result, uClosed, vClosed, uOrder, vOrder, uDimension, vDimension, controlPointNode)
    {
       const controlPoints = result || [ ];
 

package/src/x_ite/Browser/Navigation/ExamineViewer.js

@@ -102,13 +102,9 @@ function ExamineViewer (executionContext, navigationInfo)
    this .timeSensor = new TimeSensor (executionContext);
 }
 
-ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
+Object .assign (Object .setPrototypeOf (ExamineViewer .prototype, X3DViewer .prototype),
 {
-   constructor: ExamineViewer,
-   [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
-      new X3DFieldDefinition (X3DConstants .outputOnly, "isActive", new Fields .SFBool ()),
-   ]),
-   initialize: function ()
+   initialize ()
    {
       X3DViewer .prototype .initialize .call (this);
 
@@ -155,7 +151,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
 
       this .set_activeViewpoint__ ();
    },
-   set_activeViewpoint__: function ()
+   set_activeViewpoint__ ()
    {
       if (this .getStraightenHorizon ())
       {
@@ -167,7 +163,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
 
       this .disconnect ();
    },
-   mousedown: function (event)
+   mousedown (event)
    {
       if (this .button >= 0)
          return;
@@ -234,7 +230,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
          }
       }
    },
-   mouseup: function (event)
+   mouseup (event)
    {
       if (event .button !== this .button)
          return;
@@ -276,7 +272,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
          }
       }
    },
-   dblclick: function (event)
+   dblclick (event)
    {
       // Stop event propagation.
       event .preventDefault ();
@@ -376,7 +372,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
             this .addMove (translation, Vector3 .Zero);
       };
    })(),
-   touchstart: function (event)
+   touchstart (event)
    {
       const touches = event .originalEvent .touches;
 
@@ -425,7 +421,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
          }
       }
    },
-   touchend: function (event)
+   touchend (event)
    {
       switch (this .button)
       {
@@ -549,19 +545,19 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
          }
       };
    })(),
-   set_positionOffset__: function (value)
+   set_positionOffset__ (value)
    {
       const viewpoint = this .getActiveViewpoint ();
 
       viewpoint ._positionOffset = value;
    },
-   set_centerOfRotationOffset__: function (value)
+   set_centerOfRotationOffset__ (value)
    {
       const viewpoint = this .getActiveViewpoint ();
 
       viewpoint ._centerOfRotationOffset = value;
    },
-   set_rotation__: function (value)
+   set_rotation__ (value)
    {
       const viewpoint = this .getActiveViewpoint ();
 
@@ -588,7 +584,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
 
                this .rotationChaser ._set_destination = destination;
             }
-            catch (error)
+            catch
             {
                // Slide along critical angle.
 
@@ -613,7 +609,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
                this .rotationChaser ._set_value       = Rotation4 .Identity;
                this .rotationChaser ._set_destination = rotationChange;
             }
-            catch (error)
+            catch
             {
                // Slide along critical angle.
 
@@ -626,7 +622,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
          this .rotationChaser ._value_changed .addInterest ("set_rotation__", this);
       };
    })(),
-   addSpinning: function (rotationChange)
+   addSpinning (rotationChange)
    {
       this .disconnect ();
 
@@ -829,7 +825,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
          return r;
       };
    })(),
-   disconnect: function ()
+   disconnect ()
    {
       const browser = this .getBrowser ();
 
@@ -840,7 +836,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
       this .timeSensor ._stopTime = browser .getCurrentTime ();
       browser .prepareEvents () .removeInterest ("spin", this);
    },
-   dispose: function ()
+   dispose ()
    {
       const browser = this .getBrowser ();
 
@@ -855,4 +851,20 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
    },
 });
 
+Object .defineProperties (ExamineViewer,
+{
+   typeName:
+   {
+      value: "ExamineViewer",
+      enumerable: true,
+   },
+   fieldDefinitions:
+   {
+      value: new FieldDefinitionArray ([
+         new X3DFieldDefinition (X3DConstants .outputOnly, "isActive", new Fields .SFBool ()),
+      ]),
+      enumerable: true,
+   },
+});
+
 export default ExamineViewer;

package/src/x_ite/Browser/Navigation/FlyViewer.js

@@ -56,32 +56,44 @@ function FlyViewer (executionContext, navigationInfo)
    X3DFlyViewer .call (this, executionContext, navigationInfo);
 }
 
-FlyViewer .prototype = Object .assign (Object .create (X3DFlyViewer .prototype),
+Object .assign (Object .setPrototypeOf (FlyViewer .prototype, X3DFlyViewer .prototype),
 {
-   constructor: FlyViewer,
-   [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
-      new X3DFieldDefinition (X3DConstants .outputOnly, "isActive", new Fields .SFBool ()),
-   ]),
-   addCollision: function ()
+   addCollision ()
    {
       this .getBrowser () .addCollision (this);
    },
-   removeCollision: function ()
+   removeCollision ()
    {
       this .getBrowser () .removeCollision (this);
    },
-   getFlyDirection: function (fromVector, toVector, direction)
+   getFlyDirection (fromVector, toVector, direction)
    {
       return direction .assign (toVector) .subtract (fromVector);
    },
-   getTranslationOffset: function (velocity)
+   getTranslationOffset (velocity)
    {
       return this .getActiveViewpoint () .getUserOrientation () .multVecRot (velocity);
    },
-   constrainPanDirection: function (direction)
+   constrainPanDirection (direction)
    {
       return direction;
    },
 });
 
+Object .defineProperties (FlyViewer,
+{
+   typeName:
+   {
+      value: "FlyViewer",
+      enumerable: true,
+   },
+   fieldDefinitions:
+   {
+      value: new FieldDefinitionArray ([
+         new X3DFieldDefinition (X3DConstants .outputOnly, "isActive", new Fields .SFBool ()),
+      ]),
+      enumerable: true,
+   },
+});
+
 export default FlyViewer;

package/src/x_ite/Browser/Navigation/LookAtViewer.js

@@ -83,13 +83,9 @@ function LookAtViewer (executionContext, navigationInfo)
    this .orientationChaser      = new OrientationChaser (executionContext);
 }
 
-LookAtViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
+Object .assign (Object .setPrototypeOf (LookAtViewer .prototype, X3DViewer .prototype),
 {
-   constructor: LookAtViewer,
-   [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
-      new X3DFieldDefinition (X3DConstants .outputOnly, "isActive", new Fields .SFBool ()),
-   ]),
-   initialize: function ()
+   initialize ()
    {
       X3DViewer .prototype .initialize .call (this);
 
@@ -121,7 +117,7 @@ LookAtViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
       this .orientationChaser .setPrivate (true);
       this .orientationChaser .setup ();
    },
-   mousedown: function (event)
+   mousedown (event)
    {
       if (this .button >= 0)
          return;
@@ -158,7 +154,7 @@ LookAtViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
          }
       }
    },
-   mouseup: function (event)
+   mouseup (event)
    {
       if (event .button !== this .button)
          return;
@@ -181,7 +177,7 @@ LookAtViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
          }
       }
    },
-   dblclick: function (event)
+   dblclick (event)
    {
       // Stop event propagation.
       event .preventDefault ();
@@ -192,7 +188,7 @@ LookAtViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
       this .disconnect ();
       this .lookAtPoint (x, y, this .getStraightenHorizon ());
    },
-   mousemove: function (event)
+   mousemove (event)
    {
       this .getBrowser () .addBrowserEvent ();
 
@@ -252,7 +248,7 @@ LookAtViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
             this .addMove (translation, Vector3 .Zero);
       };
    })(),
-   touchstart: function (event)
+   touchstart (event)
    {
       const touches = event .originalEvent .touches;
 
@@ -292,7 +288,7 @@ LookAtViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
          }
       }
    },
-   touchend: function (event)
+   touchend (event)
    {
       switch (this .button)
       {
@@ -384,19 +380,19 @@ LookAtViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
          }
       };
    })(),
-   set_positionOffset__: function (value)
+   set_positionOffset__ (value)
    {
       const viewpoint = this .getActiveViewpoint ();
 
       viewpoint ._positionOffset = value;
    },
-   set_centerOfRotationOffset__: function (value)
+   set_centerOfRotationOffset__ (value)
    {
       const viewpoint = this .getActiveViewpoint ();
 
       viewpoint ._centerOfRotationOffset = value;
    },
-   set_orientationOffset__: function (value)
+   set_orientationOffset__ (value)
    {
       const viewpoint = this .getActiveViewpoint ();
 
@@ -494,17 +490,33 @@ LookAtViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
          this .orientationChaser ._value_changed .addInterest ("set_orientationOffset__", this);
       };
    })(),
-   disconnect: function ()
+   disconnect ()
    {
       this .orientationChaser      ._value_changed .removeInterest ("set_orientationOffset__", this);
       this .positionChaser         ._value_changed .removeInterest ("set_positionOffset__",         this)
       this .centerOfRotationChaser ._value_changed .removeInterest ("set_centerOfRotationOffset__", this)
    },
-   dispose: function ()
+   dispose ()
    {
       this .getBrowser () .getSurface () .off (".LookAtViewer");
       $(document) .off (".LookAtViewer" + this .getId ());
    },
 });
 
+Object .defineProperties (LookAtViewer,
+{
+   typeName:
+   {
+      value: "LookAtViewer",
+      enumerable: true,
+   },
+   fieldDefinitions:
+   {
+      value: new FieldDefinitionArray ([
+         new X3DFieldDefinition (X3DConstants .outputOnly, "isActive", new Fields .SFBool ()),
+      ]),
+      enumerable: true,
+   },
+});
+
 export default LookAtViewer;

package/src/x_ite/Browser/Navigation/NoneViewer.js

@@ -56,12 +56,22 @@ function NoneViewer (executionContext, navigationInfo)
    X3DViewer .call (this, executionContext, navigationInfo);
 }
 
-NoneViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
+Object .setPrototypeOf (NoneViewer .prototype, X3DViewer .prototype);
+
+Object .defineProperties (NoneViewer,
 {
-   constructor: NoneViewer,
-   [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
-      new X3DFieldDefinition (X3DConstants .outputOnly, "isActive", new Fields .SFBool ()),
-   ]),
+   typeName:
+   {
+      value: "NoneViewer",
+      enumerable: true,
+   },
+   fieldDefinitions:
+   {
+      value: new FieldDefinitionArray ([
+         new X3DFieldDefinition (X3DConstants .outputOnly, "isActive", new Fields .SFBool ()),
+      ]),
+      enumerable: true,
+   },
 });
 
 export default NoneViewer;