x_ite 8.6.16 → 8.6.18

package/docs/_config.yml

@@ -20,7 +20,7 @@ timezone:
 # ↓ --------------------------
 
 title: X_ITE X3D Browser               # the main title
-version: 8.6.15                         # x_ite latest version
+version: 8.6.18                         # x_ite latest version
 size: 290                              # size in kb
 x3d_latest_version: 4.0                # x3d latest version
 

package/docs/_posts/reference/prototype-services.md

@@ -87,9 +87,9 @@ The value is one of the *_STATE* properties defined in the X3DConstants object.
 
 Creates a new default instance of the extern prototype.
 
-#### void **loadNow** ()
+#### Promise\<void\> **loadNow** ()
 
-Triggers the load of the extern prototype. If the extern prototype is already loaded or the load is already in progress, this request is silently ignored.
+Triggers the loading of the extern prototype. It returns a Promise that is resolved when the extern prototype is completely loaded and all instances are updated.
 
 #### String **toVRMLString** (\[options\])
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x_ite",
-	"version": "8.6.16",
+	"version": "8.6.18",
 	"description": "X_ITE X3D Browser, view and manipulate X3D and VRML scenes in HTML.",
 	"homepage": "https://create3000.github.io/x_ite/",
 	"author": "Holger Seelig <holger.seelig@gmail.com>",
@@ -71,7 +71,7 @@
 		"opentype.js": "^1.3.4",
 		"pako": "^2.1.0",
 		"string-replace-webpack-plugin": "^0.1.3",
-		"webpack": "^5.78.0",
+		"webpack": "^5.79.0",
 		"webpack-cli": "^5.0.1",
 		"webpack-shell-plugin-next": "^2.3.1"
 	},

package/src/x_ite/Base/X3DBaseNode.js

@@ -245,22 +245,15 @@ X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototy
    {
       return new (this .constructor) (executionContext || this [_executionContext]);
    },
-   setup: (function ()
+   setup: function ()
    {
-      const attributes = { value: Function .prototype, enumerable: false };
-
-      return function ()
-      {
-         Object .defineProperty (this, "setup", attributes);
-
-         for (const field of this [_fields])
-            field .setTainted (false);
+      for (const field of this [_fields])
+         field .setTainted (false);
 
-         this .initialize ();
+      this .initialize ();
 
-         this [_initialized] = true;
-      };
-   })(),
+      this [_initialized] = true;
+   },
    initialize: function ()
    { },
    isInitialized: function ()
@@ -313,10 +306,6 @@ X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototy
    {
       return this [_fieldDefinitions];
    },
-   getFieldsAreEnumerable: function ()
-   {
-      return false;
-   },
    addField: function (fieldDefinition)
    {
       const
@@ -336,7 +325,7 @@ X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototy
       {
          get: function () { return field; },
          set: function (value) { field .setValue (value); },
-         enumerable: this .getFieldsAreEnumerable (),
+         enumerable: false,
          configurable: true, // false : non deletable
       });
 
@@ -520,10 +509,6 @@ X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototy
    {
       return this [_fields];
    },
-   getSourceText: function ()
-   {
-      return null;
-   },
    hasRoutes: function ()
    {
       ///  Returns true if there are any routes from or to fields of this node otherwise false.
@@ -605,7 +590,7 @@ X3DBaseNode .prototype = Object .assign (Object .create (X3DEventObject .prototy
       for (const field of this [_childObjects])
          field .dispose ();
 
-      for (const field of this .getFields ())
+      for (const field of this [_fields])
          field .dispose ();
 
       X3DEventObject .prototype .dispose .call (this);

package/src/x_ite/Base/X3DEventObject.js

@@ -83,8 +83,8 @@ X3DEventObject .prototype = Object .assign (Object .create (X3DChildObject .prot
 
       // Register for processEvent
 
-      browser .addBrowserEvent ();
       browser .addTaintedField (field, event);
+      browser .addBrowserEvent ();
 
       // Register for eventsProcessed
 

package/src/x_ite/Base/X3DField.js

@@ -68,8 +68,6 @@ function X3DField (value)
    X3DChildObject .call (this);
 
    this [_value] = value;
-
-   return this;
 }
 
 X3DField .prototype = Object .assign (Object .create (X3DChildObject .prototype),
@@ -367,32 +365,31 @@ X3DField .prototype = Object .assign (Object .create (X3DChildObject .prototype)
          if (field !== this)
             this .set (field .getValue (), field .length);
 
-         // Process interests
+         // Process interests.
 
          this .processInterests ();
 
-         // Process routes
+         // Process routes.
 
          let first = true;
 
-         if (this [_fieldInterests] .size)
+         for (const fieldInterest of this [_fieldInterests])
          {
-            for (const fieldInterest of this [_fieldInterests] .values ())
+            if (first)
+            {
+               first = false;
+               fieldInterest .addEventObject (this, event);
+            }
+            else
             {
-               if (first)
-               {
-                  first = false;
-                  fieldInterest .addEventObject (this, event);
-               }
-               else
-                  fieldInterest .addEventObject (this, Events .copy (event));
+               fieldInterest .addEventObject (this, Events .copy (event));
             }
          }
 
          if (first)
             Events .push (event);
 
-         // Process field callbacks
+         // Process field callbacks.
 
          if (this [_fieldCallbacks] .size)
          {
@@ -403,16 +400,18 @@ X3DField .prototype = Object .assign (Object .create (X3DChildObject .prototype)
    })(),
    addCloneCount: Function .prototype,
    removeCloneCount: Function .prototype,
-   valueOf: function ()
-   {
-      return this;
-   },
    fromString: function (string, scene)
    {
       // Function will be overridden in VRMLParser.
    },
    dispose: function ()
    {
+      this [_references]          .clear ();
+      this [_referencesCallbacks] .clear ();
+      this [_fieldInterests]      .clear ();
+      this [_fieldCallbacks]      .clear ();
+      this [_routeCallbacks]      .clear ();
+
       for (const route of new Set (this [_inputRoutes]))
          route .dispose ();
 

package/src/x_ite/Base/X3DObject.js

@@ -183,7 +183,11 @@ X3DObject .prototype =
    {
       generator .string = "[object " + this .getTypeName () + "]";
    },
-   dispose: function () { },
+   dispose: function ()
+   {
+      this [_interests] .clear ();
+      this [_userData]  .clear ();
+   },
 };
 
 for (const key of Reflect .ownKeys (X3DObject .prototype))

package/src/x_ite/Base/X3DObjectArrayField.js

@@ -188,7 +188,7 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
 
       for (let i = 0; i < length; ++ i)
       {
-         if (! a [i] .equals (b [i]))
+         if (!a [i] .equals (b [i]))
             return false;
       }
 
@@ -361,7 +361,7 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
             {
                const current = values [i];
 
-               if (! value (current .valueOf ()))
+               if (!value (current .valueOf ()))
                {
                   const tmp = values [first];
 
@@ -385,7 +385,7 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
          {
             const current = values [i];
 
-            if (! current .equals (value))
+            if (!current .equals (value))
             {
                const tmp = values [first];
 
@@ -413,25 +413,26 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
 
       return values .map (function (value) { return value .valueOf () });
    },
-   resize: function (size, value, silent)
+   resize: function (size, value, silently)
    {
       const
          target = this [_target],
-         array  = target .getValue ();
+         array  = target .getValue (),
+         length = array .length;
 
-      if (size < array .length)
+      if (size < length)
       {
-         for (let i = size, length = array .length; i < length; ++ i)
+         for (let i = size; i < length; ++ i)
             target .removeChildObject (array [i]);
 
          array .length = size;
 
-         if (! silent)
+         if (!silently)
             target .addEvent ();
       }
-      else if (size > array .length)
+      else if (size > length)
       {
-         for (let i = array .length; i < size; ++ i)
+         for (let i = length; i < size; ++ i)
          {
             const field = new (target .getSingleType ()) ();
 
@@ -442,7 +443,7 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
             array .push (field);
          }
 
-         if (! silent)
+         if (!silently)
             target .addEvent ();
       }
    },

package/src/x_ite/Base/X3DTypedArrayField.js

@@ -603,7 +603,7 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
 
       return values .slice ();
    },
-   resize: function (newLength, value, silent)
+   resize: function (newLength, value, silently)
    {
       const
          target     = this [_target],
@@ -619,7 +619,7 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
          if (components > 1)
             target [_cache] .length = newLength;
 
-         if (!silent)
+         if (!silently)
             target .addEvent ();
       }
       else if (newLength > length)
@@ -644,7 +644,7 @@ X3DTypedArrayField .prototype = Object .assign (Object .create (X3DArrayField .p
             }
          }
 
-         if (!silent)
+         if (!silently)
             target .addEvent ();
       }
 

package/src/x_ite/Browser/Networking/X3DNetworkingContext.js

@@ -114,11 +114,10 @@ X3DNetworkingContext .prototype =
    {
       this [_loading] = value;
 
-      this .setLoadCount (0);
-
       if (value)
       {
-         this .resetLoadCount ();
+         if (!this [_loadingObjects] .has (this))
+            this .resetLoadCount ();
 
          this .getShadow () .find (".x_ite-private-world-info") .remove ();
 
@@ -142,6 +141,10 @@ X3DNetworkingContext .prototype =
    {
       return this [_loading];
    },
+   getDisplayLoadCount: function ()
+   {
+      return [... this [_loadingObjects]] .reduce ((v, o) => v + !(o .isPrivate ?.() ?? true), 0);
+   },
    addLoadingObject: function (object)
    {
       if (this [_loadingObjects] .has (object))
@@ -162,6 +165,7 @@ X3DNetworkingContext .prototype =
       this [_loadingObjects] .delete (object);
 
       this .setLoadCount (this [_loadingObjects] .size);
+      this .setCursor (this .getCursor ());
    },
    setLoadCount: function (value)
    {
@@ -180,9 +184,7 @@ X3DNetworkingContext .prototype =
    },
    [_set_loadCount]: function ()
    {
-      const loadingDisplay = [... this [_loadingObjects]]
-         .filter (o => o .isPrivate)
-         .reduce ((v, o) => v + !o .isPrivate (), 0);
+      const loadingDisplay = this .getDisplayLoadCount ();
 
       if (this ._loadCount .getValue () || this [_loading])
       {

package/src/x_ite/Browser/PointingDeviceSensor/X3DPointingDeviceSensorContext.js

@@ -135,9 +135,9 @@ X3DPointingDeviceSensorContext .prototype =
             break;
          default:
          {
-            if (this ._loadCount .getValue ())
+            if (this .getDisplayLoadCount ())
                div .css ("cursor", "wait");
-            else if (this [_pointingDevice] && this [_pointingDevice] .isOver)
+            else if (this [_pointingDevice] ?.isOver)
                div .css ("cursor", "pointer");
             else
                div .css ("cursor", "default");

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.6.15";
+export default "8.6.18";

package/src/x_ite/Browser/VolumeRendering/X3DVolumeRenderingContext.js

@@ -59,9 +59,9 @@ function X3DVolumeRenderingContext () { }
 
 X3DVolumeRenderingContext .prototype =
 {
-   getDefaultVoxels: function (executionContext)
+   getDefaultVoxels: function ()
    {
-      this [_defaultVoxelsNode] = executionContext .createNode ("PixelTexture3D", { setup: false, warn: false });
+      this [_defaultVoxelsNode] = this .getPrivateScene () .createNode ("PixelTexture3D", false);
       this [_defaultVoxelsNode] ._image = [1, 1, 1, 1, 255];
       this [_defaultVoxelsNode] .repeatS = true;
       this [_defaultVoxelsNode] .repeatT = true;

package/src/x_ite/Browser/X3DBrowser.js

@@ -87,7 +87,6 @@ function X3DBrowser (element)
 
    X3DBrowserContext .call (this, element);
 
-   this [_reject]           = Function .prototype;
    this [_browserCallbacks] = new Map ();
    this [_console]          = document .getElementsByClassName ("x_ite-console");
 
@@ -244,6 +243,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
          if (argument instanceof ComponentInfo)
             return this .loadComponents ([argument .name]);
 
+         // Load array of component names.
          return loadComponents (this, [... argument], new Set ());
       };
    })(),
@@ -285,11 +285,9 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    {
       return new Promise ((resolve, reject) =>
       {
-         this [_reject] ("Replacing world aborted.");
-
-         if (this [_fileLoader])
-            this [_fileLoader] .abort ();
+         this [_fileLoader] ?.abort ();
 
+         this [_reject] ?.("Replacing world aborted.");
          this [_reject] = reject;
 
          // Remove world.
@@ -480,16 +478,15 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
          this ._loadCount       .removeInterest ("checkLoadCount",    this);
          this .prepareEvents () .removeInterest ("updateInitialized", this);
 
-         if (this [_fileLoader])
-            this [_fileLoader] .abort ();
+         this [_fileLoader] ?.abort ();
 
          // Start loading.
 
-         this .setBrowserLoading (true);
-         this .addLoadingObject (this);
-
          const fileLoader = this [_fileLoader] = new FileLoader (this .getWorld ());
 
+         this .setBrowserLoading (true);
+         this .addLoadingObject (fileLoader);
+
          fileLoader .createX3DFromURL (url, parameter, (scene) =>
          {
             if (fileLoader !== this [_fileLoader])
@@ -503,8 +500,10 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
 
             if (scene)
             {
+               this .addLoadingObject (this); // Prevent resetLoadCount.
                this .replaceWorld (scene) .then (resolve) .catch (reject);
                this .removeLoadingObject (this);
+               this .removeLoadingObject (fileLoader);
             }
             else
             {
@@ -530,7 +529,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
             }
 
             this .changeViewpoint (fragment);
-            this .removeLoadingObject (this);
+            this .removeLoadingObject (fileLoader);
             this .setBrowserLoading (false);
 
             resolve ();
@@ -548,7 +547,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
             else
                location = url;
 
-            this .removeLoadingObject (this);
+            this .removeLoadingObject (fileLoader);
             this .setBrowserLoading (false);
 
             resolve ();
@@ -648,10 +647,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    viewAll: function (layerNode)
    {
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
-
-      if (!layerNode)
-         layerNode = this .getActiveLayer ();
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode) ?? this .getActiveLayer ();
 
       if (!layerNode)
          return;
@@ -660,13 +656,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    firstViewpoint: function (layerNode)
    {
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
-
-      if (!layerNode)
-         layerNode = this .getActiveLayer ();
-
-      if (!layerNode)
-         return;
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode) ?? this .getActiveLayer ();
 
       const viewpoints = layerNode .getUserViewpoints ();
 
@@ -675,10 +665,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    previousViewpoint: function (layerNode)
    {
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
-
-      if (!layerNode)
-         layerNode = this .getActiveLayer ();
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode) ?? this .getActiveLayer ();
 
       if (!layerNode)
          return;
@@ -707,10 +694,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    nextViewpoint: function (layerNode)
    {
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
-
-      if (!layerNode)
-         layerNode = this .getActiveLayer ();
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode) ?? this .getActiveLayer ();
 
       if (!layerNode)
          return;
@@ -739,10 +723,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
    },
    lastViewpoint: function (layerNode)
    {
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
-
-      if (!layerNode)
-         layerNode = this .getActiveLayer ();
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode) ?? this .getActiveLayer ();
 
       if (!layerNode)
          return;
@@ -760,10 +741,7 @@ X3DBrowser .prototype = Object .assign (Object .create (X3DBrowserContext .proto
          layerNode = this .getActiveLayer ();
       }
 
-      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode);
-
-      if (!layerNode)
-         layerNode = this .getActiveLayer ();
+      layerNode = X3DCast (X3DConstants .X3DLayerNode, layerNode) ?? this .getActiveLayer ();
 
       if (!layerNode)
          return;

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

@@ -208,9 +208,9 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
       return false;
    },
-   getFieldsAreEnumerable: function ()
+   getSourceText: function ()
    {
-      return true;
+      return null;
    },
    traverse: function () { },
    toStream: function (generator)

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

@@ -276,11 +276,6 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
 
       protoNode ._name_changed .addFieldInterest (this ._typeName_changed);
 
-      const outerNode = this .getExecutionContext () .getOuterNode ();
-
-      if (outerNode ?.getType () .includes (X3DConstants .X3DProtoDeclaration))
-         return;
-
       if (protoNode .isExternProto)
       {
          if (this [_protoNode] .checkLoadState () === X3DConstants .COMPLETE_STATE)
@@ -290,7 +285,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
          else
          {
             protoNode ._updateInstances .addInterest ("construct", this);
-            protoNode .requestImmediateLoad ();
+            protoNode .requestImmediateLoad () .catch (Function .prototype);
          }
       }
       else
@@ -1017,11 +1012,11 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
    },
    dispose: function ()
    {
+      this [_protoNode] ._name_changed .removeFieldInterest (this ._typeName_changed);
       this [_protoNode] ._updateInstances .removeInterest ("construct", this);
       this [_protoNode] ._updateInstances .removeInterest ("update",    this);
 
-      if (this [_body])
-         this [_body] .dispose ();
+      this [_body] ?.dispose ();
 
       X3DNode .prototype .dispose .call (this);
    },

package/src/x_ite/Components/CubeMapTexturing/ImageCubeMapTexture.js

@@ -127,13 +127,13 @@ ImageCubeMapTexture .prototype = Object .assign (Object .create (X3DEnvironmentT
       this .image .on ("abort error", this .setError .bind (this));
       this .image .prop ("crossOrigin", "Anonymous");
 
-      this .requestImmediateLoad ();
+      this .requestImmediateLoad () .catch (Function .prototype);
    },
-   unLoadNow: function ()
+   unloadData: function ()
    {
       this .clearTexture ();
    },
-   loadNow: function ()
+   loadData: function ()
    {
       this .urlStack .setValue (this ._url);
       this .loadNext ();

package/src/x_ite/Components/DIS/DISEntityTypeMapping.js

@@ -99,14 +99,6 @@ DISEntityTypeMapping .prototype = Object .assign (Object .create (X3DInfoNode .p
       X3DInfoNode  .prototype .initialize .call (this);
       X3DUrlObject .prototype .initialize .call (this);
    },
-   requestImmediateLoad: function (cache = true)
-   { },
-   requestUnload: function ()
-   { },
-   set_load__: function ()
-   { },
-   set_url__: function ()
-   { },
    dispose: function ()
    {
       X3DUrlObject .prototype .dispose .call (this);