x_ite 8.7.2 → 8.7.3

package/src/x_ite/Base/X3DTypedArrayField.js

@@ -50,9 +50,13 @@ import Algorithm     from "../../standard/Math/Algorithm.js";
 
 const
    _target = Symbol (),
+   _proxy  = Symbol (),
    _cache  = Symbol (),
    _tmp    = Symbol (),
-   _length = Symbol ();
+   _length = Symbol (),
+   _insert = Symbol (),
+   _erase  = Symbol (),
+   _grow   = Symbol ();
 
 const handler =
 {
@@ -87,26 +91,8 @@ const handler =
             {
                // Return reference to index.
 
-               const value = target [_cache] [index];
-
-               if (value)
-               {
-                  return value;
-               }
-               else
-               {
-                  const
-                     value         = new valueType (),
-                     internalValue = value .getValue (),
-                     i             = index * components;
-
-                  value .addEvent = addEvent .bind (target, i, components, internalValue);
-                  value .getValue = getValue .bind (target, i, components, internalValue);
-
-                  target [_cache] [index] = value;
-
-                  return value;
-               }
+               return target [_cache] [index]
+                  ?? (target [_cache] [index] = createValue (target, index, components, valueType));
             }
          }
          else
@@ -134,7 +120,9 @@ const handler =
 
       if (components === 1)
       {
-         array [index] = value;
+         const valueType = target .getValueType ();
+
+         array [index] = valueType (value);
       }
       else
       {
@@ -176,11 +164,14 @@ const handler =
    },
 };
 
-function X3DTypedArrayField (value)
+function X3DTypedArrayField (args)
 {
    X3DArrayField .call (this, new (this .getArrayType ()) (16));
 
+   const proxy = new Proxy (this, handler);
+
    this [_target] = this;
+   this [_proxy]  = proxy;
 
    if (this .getComponents () > 1)
    {
@@ -188,12 +179,9 @@ function X3DTypedArrayField (value)
       this [_tmp]   = [ ]; // Array with components size.
    }
 
-   if (value [0] instanceof Array)
-      value = value [0];
-
-   X3DTypedArrayField .prototype .push .apply (this, value);
+   X3DTypedArrayField .prototype .push .call (this, ... args);
 
-   return new Proxy (this, handler);
+   return proxy;
 }
 
 X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .prototype),
@@ -222,29 +210,13 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
       {
          // Return reference to index.
 
+         const cache = target [_cache];
+
          for (let index = 0; index < length; ++ index)
          {
-            const value = target [_cache] [index];
-
-            if (value)
-            {
-               yield value;
-            }
-            else
-            {
-               const
-                  value         = new valueType (),
-                  internalValue = value .getValue (),
-                  i             = index * components;
-
-               value .addEvent = addEvent .bind (target, i, components, internalValue);
-               value .getValue = getValue .bind (target, i, components, internalValue);
-
-               target [_cache] [index] = value;
-
-               yield value;
-            }
-          }
+            yield cache [index]
+               ?? (cache [index] = createValue (target, index, components, valueType));
+         }
       }
    },
    getTarget: function ()
@@ -269,19 +241,20 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
    },
    equals: function (other)
    {
-      if (this === other)
-         return true;
-
       const
-         target = this [_target],
-         length = target [_length];
+         target      = this [_target],
+         otherTarget = other [_target],
+         length      = target [_length];
+
+      if (target === otherTarget)
+         return true;
 
-      if (length !== other [_length])
+      if (length !== otherTarget [_length])
          return false;
 
       const
          a = target .getValue (),
-         b = other .getValue ();
+         b = otherTarget .getValue ();
 
       for (let i = 0, l = length * target .getComponents (); i < l; ++ i)
       {
@@ -323,7 +296,7 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
 
       if (array .length < otherArray .length)
       {
-         array = target .grow (otherArray .length);
+         array = target [_grow] (otherArray .length);
 
          array .set (otherArray);
 
@@ -365,13 +338,16 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
          components      = target .getComponents (),
          length          = target [_length],
          argumentsLength = arguments .length,
-         array           = target .grow ((length + argumentsLength) * components);
+         array           = target [_grow] ((length + argumentsLength) * components);
 
       array .copyWithin (argumentsLength * components, 0, length * components);
 
       if (components === 1)
       {
-         array .set (arguments, 0);
+         const valueType = target .getValueType ();
+
+         for (let a = 0; a < argumentsLength; ++ a)
+            array [a] = valueType (arguments [a]);
       }
       else
       {
@@ -390,7 +366,7 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
 
       target .addEvent ();
 
-      return array .length;
+      return target [_length];
    },
    shift: function ()
    {
@@ -436,11 +412,14 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
          components      = target .getComponents (),
          length          = target [_length],
          argumentsLength = arguments .length,
-         array           = target .grow ((length + argumentsLength) * components);
+         array           = target [_grow] ((length + argumentsLength) * components);
 
       if (components === 1)
       {
-         array .set (arguments, length);
+         const valueType = target .getValueType ();
+
+         for (let a = 0, i = length; a < argumentsLength; ++ a, ++ i)
+            array [i] = valueType (arguments [a]);
       }
       else
       {
@@ -498,7 +477,7 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
          return value;
       }
    },
-   splice: function (index, deleteCount)
+   splice: function (index, deleteCount, ... insertValues)
    {
       const
          target = this [_target],
@@ -510,23 +489,23 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
       if (index + deleteCount > length)
          deleteCount = length - index;
 
-      const result = target .erase (index, index + deleteCount);
+      const result = target [_erase] (index, index + deleteCount);
 
-      if (arguments .length > 2)
-         target .spliceInsert (index, Array .prototype .splice .call (arguments, 2));
+      if (insertValues .length)
+         target [_insert] (index, insertValues);
 
       target .addEvent ();
 
       return result;
    },
-   spliceInsert: function (index, other)
+   [_insert]: function (index, other)
    {
       const
          target      = this [_target],
          components  = target .getComponents (),
          length      = target [_length],
          otherLength = other .length,
-         array       = target .grow ((length + otherLength) * components);
+         array       = target [_grow] ((length + otherLength) * components);
 
       index *= components;
 
@@ -534,7 +513,10 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
 
       if (components === 1)
       {
-         array .set (other, index);
+         const valueType = target .getValueType ();
+
+         for (let a = 0, i = index; a < otherLength; ++ a, ++ i)
+            array [i] = valueType (other [a]);
       }
       else
       {
@@ -549,59 +531,31 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
 
       target [_length] += otherLength;
    },
-   insert: function (index, other, first, last)
+   [_erase]: function (first, last)
    {
       const
          target     = this [_target],
-         length     = target [_length],
-         otherArray = other .getValue (),
+         array      = target .getValue (),
          components = target .getComponents (),
          difference = last - first,
-         array      = target .grow ((length + difference) * components);
-
-      index *= components;
-      first *= components;
-      last  *= components;
-
-      array .copyWithin (index + difference * components, index, length * components);
-
-      for (; first < last; ++ index, ++ first)
-         array [index] = otherArray [first];
-
-      target [_length] += difference;
-
-      target .addEvent ();
-   },
-   erase: function (first, last)
-   {
-      const
-         target      = this [_target],
-         array       = target .getValue (),
-         components  = target .getComponents (),
-         difference  = last - first,
-         length      = target [_length],
-         newLength   = length - difference,
-         values      = target .create (),
-         valuesArray = values .grow (difference * components);
+         length     = target [_length],
+         newLength  = length - difference,
+         values     = target [_proxy] .slice (first, last);
 
       first *= components;
       last  *= components;
 
-      for (let v = 0, f = first; f < last; ++ v, ++ f)
-         valuesArray [v] = array [f];
-
       array .copyWithin (first, last, length * components);
       array .fill (0, newLength * components, length * components);
 
       target [_length] = newLength;
-      values [_length] = difference;
 
       if (components > 1)
          target [_cache] .length = newLength;
 
       target .addEvent ();
 
-      return values .slice ();
+      return values;
    },
    resize: function (newLength, value, silently)
    {
@@ -624,7 +578,7 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
       }
       else if (newLength > length)
       {
-         array = target .grow (newLength * components);
+         array = target [_grow] (newLength * components);
 
          if (value !== undefined)
          {
@@ -652,7 +606,7 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
 
       return array;
    },
-   grow: function (length)
+   [_grow]: function (length)
    {
       const
          target = this [_target],
@@ -687,72 +641,6 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
 
       return newArray;
    },
-   includes: function (searchElement, fromIndex)
-   {
-      const
-         target     = this [_target],
-         components = target .getComponents (),
-         length     = target [_length];
-
-      if (components === 1)
-      {
-         return Array .prototype .includes .call (this, searchElement, fromIndex);
-      }
-      else
-      {
-         for (let i = fromIndex === undefined ? 0 : fromIndex; i < length; ++ i)
-         {
-            if (this [i] .equals (searchElement))
-               return true;
-         }
-
-         return false;
-      }
-   },
-   indexOf: function (searchElement, fromIndex)
-   {
-      const
-         target     = this [_target],
-         components = target .getComponents (),
-         length     = target [_length];
-
-      if (components === 1)
-      {
-         return Array .prototype .indexOf .call (this, searchElement, fromIndex);
-      }
-      else
-      {
-         for (let i = fromIndex === undefined ? 0 : fromIndex; i < length; ++ i)
-         {
-            if (this [i] .equals (searchElement))
-               return i;
-         }
-
-         return -1;
-      }
-   },
-   lastIndexOf: function (searchElement, fromIndex)
-   {
-      const
-         target     = this [_target],
-         components = target .getComponents (),
-         length     = target [_length];
-
-      if (components === 1)
-      {
-         return Array .prototype .lastIndexOf .call (this, searchElement, fromIndex);
-      }
-      else
-      {
-         for (let i = fromIndex === undefined ? length - 1 : fromIndex; i >= 0; -- i)
-         {
-            if (this [i] .equals (searchElement))
-               return i;
-         }
-
-         return -1;
-      }
-   },
    reverse: function ()
    {
       const
@@ -782,7 +670,7 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
             {
                const
                   i1 = i + c,
-                  i2 = length - (components - i - c - 1) - 1,
+                  i2 = length - i - 1 - (components - c - 1),
                   t  = array [i1];
 
                array [i1] = array [i2];
@@ -793,9 +681,9 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
 
       target .addEvent ();
 
-      return this;
+      return target [_proxy];
    },
-   sort: function (compareFunction)
+   sort: function (compareFn)
    {
       const
          target     = this [_target],
@@ -805,11 +693,18 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
 
       if (components === 1)
       {
-         target .set (array .subarray (0, length) .sort (compareFunction));
+         const valueType = target .getValueType ();
+
+         const cmp = compareFn
+            ? (a, b) => compareFn (valueType (a), valueType (b))
+            : Algorithm .cmp;
+
+         target .set (array .subarray (0, length) .sort (cmp));
       }
       else
       {
-         const result = this .map (value => value .copy ()) .sort (compareFunction !== undefined ? compareFunction : function (a, b)
+         const result = Array .prototype .map .call (target [_proxy], value => value .copy ())
+            .sort (compareFn ?? ((a, b) =>
          {
             for (let c = 0; c < components; ++ c)
             {
@@ -821,7 +716,7 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
             }
 
             return 0;
-         });
+         }));
 
          for (let i = 0; i < length; ++ i)
          {
@@ -834,7 +729,7 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
 
       target .addEvent ();
 
-      return this;
+      return target [_proxy];
    },
    toStream: function (generator)
    {
@@ -1080,6 +975,19 @@ Object .defineProperty (X3DTypedArrayField .prototype, "length",
 
 // Getter/Setter functions to reference a value for a given index.
 
+function createValue (target, index, components, valueType)
+{
+   const
+      value         = new valueType (),
+      internalValue = value .getValue (),
+      i             = index * components;
+
+   value .addEvent = addEvent .bind (target, i, components, internalValue);
+   value .getValue = getValue .bind (target, i, components, internalValue);
+
+   return value;
+}
+
 function getValue (index, components, value)
 {
    const array = this .getValue ();

package/src/x_ite/Browser/Core/BrowserOptions.js

@@ -84,10 +84,10 @@ BrowserOptions .prototype = Object .assign (Object .create (X3DBaseNode .prototy
       new X3DFieldDefinition (X3DConstants .inputOutput, "Shading",                new Fields .SFString ("GOURAUD")),
       new X3DFieldDefinition (X3DConstants .inputOutput, "MotionBlur",             new Fields .SFBool ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "Cache",                  new Fields .SFBool (true)),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "ContentScale",           new Fields .SFFloat (1)),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "ContentScale",           new Fields .SFDouble (1)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "ContextMenu",            new Fields .SFBool (true)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "Debug",                  new Fields .SFBool ()),
-      new X3DFieldDefinition (X3DConstants .inputOutput, "Gravity",                new Fields .SFFloat (9.80665)),
+      new X3DFieldDefinition (X3DConstants .inputOutput, "Gravity",                new Fields .SFDouble (9.80665)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "LogarithmicDepthBuffer", new Fields .SFBool ()),
       new X3DFieldDefinition (X3DConstants .inputOutput, "Notifications",          new Fields .SFBool (true)),
       new X3DFieldDefinition (X3DConstants .inputOutput, "Multisampling",          new Fields .SFInt32 (4)),

package/src/x_ite/Browser/Core/RenderingProperties.js

@@ -69,7 +69,7 @@ RenderingProperties .prototype = Object .assign (Object .create (X3DBaseNode .pr
       new X3DFieldDefinition (X3DConstants .outputOnly, "Antialiased",            new Fields .SFBool (true)),
       new X3DFieldDefinition (X3DConstants .outputOnly, "ColorDepth",             new Fields .SFInt32 ()),
       new X3DFieldDefinition (X3DConstants .outputOnly, "TextureMemory",          new Fields .SFDouble ()),
-      new X3DFieldDefinition (X3DConstants .outputOnly, "ContentScale",           new Fields .SFFloat (1)),
+      new X3DFieldDefinition (X3DConstants .outputOnly, "ContentScale",           new Fields .SFDouble (1)),
       new X3DFieldDefinition (X3DConstants .outputOnly, "LogarithmicDepthBuffer", new Fields .SFBool ()),
       new X3DFieldDefinition (X3DConstants .outputOnly, "MaxSamples",             new Fields .SFInt32 ()),
       new X3DFieldDefinition (X3DConstants .outputOnly, "Multisampling",          new Fields .SFInt32 (4)),

package/src/x_ite/Browser/Core/X3DCoreContext.js

@@ -53,6 +53,7 @@ import BrowserProperties   from "./BrowserProperties.js";
 import RenderingProperties from "./RenderingProperties.js";
 import Notification        from "./Notification.js";
 import ContextMenu         from "./ContextMenu.js";
+import URLs                from "../Networking/URLs.js";
 import Scene               from "../../Execution/Scene.js";
 import DataStorage         from "../../../standard/Utility/DataStorage.js";
 import Vector3             from "../../../standard/Math/Numbers/Vector3.js";
@@ -88,28 +89,44 @@ function X3DCoreContext (element)
    // Get canvas & context.
 
    const
-      shadow       = element .data ("shadow"),
       browser      = $("<div></div>") .addClass ("x_ite-private-browser") .attr ("tabindex", 0),
       surface      = $("<div></div>") .addClass ("x_ite-private-surface") .appendTo (browser),
       splashScreen = $("<div></div>") .hide () .addClass ("x_ite-private-splash-screen") .appendTo (browser),
       spinner      = $("<div></div>") .addClass ("x_ite-private-spinner") .appendTo (splashScreen),
       progress     = $("<div></div>") .addClass ("x_ite-private-progress") .appendTo (splashScreen);
 
+   if (element .prop ("nodeName") .toLowerCase () === "x3d-canvas")
+   {
+      const
+         shadow = $(element [0] .attachShadow ({ mode: "open", delegatesFocus: true })),
+         link   = $("<link/>");
+
+      link
+         .on ("load", () => browser .show ())
+         .attr ("rel", "stylesheet")
+         .attr ("type", "text/css")
+         .attr ("href", new URL ("x_ite.css", URLs .getScriptUrl ()) .href);
+
+      this [_shadow] = shadow
+         .append (link)
+         .append (browser .hide ());
+   }
+   else
+   {
+      this [_shadow] = element .prepend (browser);
+   }
+
    $("<div></div>") .addClass ("x_ite-private-x_ite") .html (this .getName () + "<span class='x_ite-private-x3d'>X3D</span>") .appendTo (progress);
    $("<div></div>") .addClass ("x_ite-private-progressbar")  .appendTo (progress) .append ($("<div></div>"));
    $("<div></div>") .addClass ("x_ite-private-spinner-text") .appendTo (progress);
 
    this [_instanceId]   = ++ instanceId;
    this [_element]      = element;
-   this [_shadow]       = shadow ? shadow .append (browser .hide ()) : this [_element] .prepend (browser);
    this [_surface]      = surface;
    this [_canvas]       = $("<canvas></canvas>") .addClass ("x_ite-private-canvas") .prependTo (surface);
    this [_context]      = Context .create (this [_canvas] [0], WEBGL_LATEST_VERSION, element .attr ("preserveDrawingBuffer") === "true");
    this [_splashScreen] = splashScreen;
 
-   if (shadow)
-      element .data ("loaded") .then (function () { browser .show (); });
-
    this [_localStorage] = new DataStorage (localStorage, "X_ITE.X3DBrowser(" + this [_instanceId] + ").");
    this [_mobile]       = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i .test (navigator .userAgent);
 
@@ -318,7 +335,6 @@ X3DCoreContext .prototype =
             this .setBrowserOption ("Notifications", this .parseBooleanAttribute (newValue, true));
             break;
          }
-         case "onerror":
          case "oninitialized":
          case "onshutdown":
          {

package/src/x_ite/Browser/DOMIntegration.js

@@ -228,7 +228,7 @@ class DOMIntegration
 
 		const node = $.data (element, "node");
 
-		if (! node)
+		if (!node)
 			return;
 
 		node .dispose ();
@@ -249,7 +249,7 @@ class DOMIntegration
 	{
 		const node = $.data (element, "node");
 
-		if (! node)
+		if (!node)
 			return;
 
 		node ._loadState .addInterest ("appendInlineChildElement", this, element);
@@ -338,7 +338,7 @@ class DOMIntegration
 
 		const node = $.data (element, "node");
 
-		if (! node)
+		if (!node)
 			return;
 
 		for (const field of node .getFields ())
@@ -347,7 +347,7 @@ class DOMIntegration
 
 	bindFieldCallback (field, element)
 	{
-		if (! field .isOutput ())
+		if (!field .isOutput ())
 			return;
 
 		field .addInterest ("fieldCallback", this, element);
@@ -360,7 +360,7 @@ class DOMIntegration
 	{
 		const node = $.data (element, "node");
 
-		if (! node)
+		if (!node)
 			return;
 
 		const event = new CustomEvent (field .getName (),

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.7.2";
+export default "8.7.3";

package/src/x_ite/Browser/X3DBrowser.js

@@ -81,11 +81,9 @@ function X3DBrowser (element)
 {
    element = $(element);
 
-   if (element .data ("browser"))
+   if (element .prop ("browser"))
       throw new Error ("Couldn't create browser, element has already a browser.");
 
-   element .data ("browser", this);
-
    X3DBrowserContext .call (this, element);
 
    this [_browserCallbacks] = new Map ();
@@ -205,8 +203,8 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
             level: Algorithm .clamp (level || component .level, 1, component .level),
             title: component .title,
             providerUrl: component .providerUrl,
-            external: $.data (component, "external"),
-            dependencies: $.data (component, "dependencies"),
+            external: component .external,
+            dependencies: component .dependencies,
          });
       }
 
@@ -229,9 +227,9 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
 
          const component = browser .getSupportedComponents () .get (name);
 
-         await loadComponents (browser, $.data (component, "dependencies"), seen);
+         await loadComponents (browser, component .dependencies, seen);
 
-         if (!$.data (component, "external"))
+         if (!component .external)
             return;
 
          if (Features .NODE_ENV)

package/src/x_ite/Components/Core/X3DNode.js

@@ -799,8 +799,6 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
    },
    toJSONStream: function (generator)
    {
-      try
-      {
       const sharedNode = generator .IsSharedNode (this);
 
       generator .EnterScope ();
@@ -900,9 +898,6 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
       {
          if (sourceText .length !== 1)
             sourceText = null;
-
-         if (sourceText && ! sourceText [0] .match (/^\s*(?:ecmascript|javascript|vrmlscript)\:/s))
-            sourceText = null;
       }
 
 
@@ -1277,11 +1272,6 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
       generator .string += '}';
 
       generator .LeaveScope ();
-      }
-      catch (error)
-      {
-         console .log (error)
-      }
    },
    dispose: function ()
    {