x_ite 8.6.12 → 8.6.14

package/src/x_ite/Fields/ArrayFields.js

@@ -136,29 +136,37 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
    },
    addCloneCount: function (count)
    {
-      this [_cloneCount] += count;
+      const target = this .getTarget ();
 
-      for (const element of this .getValue ())
+      target [_cloneCount] += count;
+
+      for (const element of target .getValue ())
          element .addCloneCount (count);
    },
    removeCloneCount: function (count)
    {
-      this [_cloneCount] -= count;
+      const target = this .getTarget ();
+
+      target [_cloneCount] -= count;
 
-      for (const element of this .getValue ())
+      for (const element of target .getValue ())
          element .removeCloneCount (count);
    },
    addChildObject: function (value)
    {
-      X3DObjectArrayField .prototype .addChildObject .call (this, value);
+      const target = this .getTarget ();
 
-      value .addCloneCount (this [_cloneCount]);
+      X3DObjectArrayField .prototype .addChildObject .call (target, value);
+
+      value .addCloneCount (target [_cloneCount]);
    },
    removeChildObject: function (value)
    {
-      X3DObjectArrayField .prototype .removeChildObject .call (this, value);
+      const target = this .getTarget ();
+
+      X3DObjectArrayField .prototype .removeChildObject .call (target, value);
 
-      value .removeCloneCount (this [_cloneCount]);
+      value .removeCloneCount (target [_cloneCount]);
    },
    toStream: function (generator)
    {
@@ -210,11 +218,13 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
    },
    toVRMLString: function ()
    {
-      this .addCloneCount (1);
+      const target = this .getTarget ();
 
-      const string = X3DObjectArrayField .prototype .toVRMLString .call (this);
+      target .addCloneCount (1);
 
-      this .removeCloneCount (1);
+      const string = X3DObjectArrayField .prototype .toVRMLString .call (target);
+
+      target .removeCloneCount (1);
 
       return string;
    },
@@ -268,23 +278,27 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
    },
    toXMLString: function ()
    {
-      this .addCloneCount (1);
+      const target = this .getTarget ();
+
+      target .addCloneCount (1);
 
-      const string = X3DObjectArrayField .prototype .toXMLString .call (this);
+      const string = X3DObjectArrayField .prototype .toXMLString .call (target);
 
-      this .removeCloneCount (1);
+      target .removeCloneCount (1);
 
       return string;
    },
    toXMLStream: function (generator)
    {
-      const length = this .length;
+      const
+         target = this .getTarget (),
+         length = target .length;
 
       if (length)
       {
          generator .EnterScope ();
 
-         const array = this .getValue ();
+         const array = target .getValue ();
 
          for (let i = 0, n = length - 1; i < n; ++ i)
          {
@@ -343,11 +357,13 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
    },
    toJSONStream: function (generator)
    {
-      const length = this .length;
+      const
+         target = this .getTarget (),
+         length = target .length;
 
       if (length)
       {
-         const array = this .getValue ();
+         const array = target .getValue ();
 
          generator .EnterScope ();
 
@@ -391,9 +407,11 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
    },
    dispose: function ()
    {
-      this .resize (0);
+      const target = this .getTarget ();
 
-      X3DObjectArrayField .prototype .dispose .call (this);
+      target .resize (0);
+
+      X3DObjectArrayField .prototype .dispose .call (target);
    },
 });
 
@@ -434,11 +452,13 @@ MFString .prototype = Object .assign (Object .create (X3DObjectArrayField .proto
    },
    toXMLStream: function (generator)
    {
-      const length = this .length;
+      const
+         target = this .getTarget (),
+         length = target .length;
 
       if (length)
       {
-         const value = this .getValue ();
+         const value = target .getValue ();
 
          for (let i = 0, n = length - 1; i < n; ++ i)
          {

package/src/x_ite/Fields/SFNode.js

@@ -51,7 +51,7 @@ import Generator    from "../InputOutput/Generator.js";
 import SFNodeCache  from "./SFNodeCache.js";
 
 const
-   _target     = Symbol (),
+   _target     = Symbol .for ("X_ITE.SFNode.target"),
    _proxy      = Symbol (),
    _cloneCount = Symbol ();
 
@@ -469,12 +469,9 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
    },
    dispose: function ()
    {
-      const
-         target = this [_target],
-         value  = target .getValue ();
+      const target = this [_target];
 
-      if (value)
-         value .dispose ();
+      target .setValue (null);
 
       X3DField .prototype .dispose .call (target);
    },

package/src/x_ite/Fields/SFNodeCache.js

@@ -45,32 +45,47 @@
  *
  ******************************************************************************/
 
-import SFNode from "./SFNode.js";
+import SFNode   from "./SFNode.js";
+import X3DField from "../Base/X3DField.js";
 
-const SFNodeCache =
+const cache = new WeakMap ();
+
+class SFNodeCache
 {
-   get: (function ()
+   static get (baseNode)
    {
-      const cache = new WeakMap ();
+      const node = cache .get (baseNode);
 
-      return function (baseNode)
+      if (node)
+      {
+         return node;
+      }
+      else
       {
-         const node = cache .get (baseNode);
+         const node = new SFNode (baseNode);
+
+         node .dispose = dispose;
+
+         cache .set (baseNode, node);
+
+         return node;
+      }
+   }
+}
+
+const _target = Symbol .for ("X_ITE.SFNode.target");
+
+function dispose ()
+{
+   const
+      target = this [_target],
+      value  = target .getValue ();
 
-         if (node)
-         {
-            return node;
-         }
-         else
-         {
-            const node = new SFNode (baseNode);
+   cache .delete (value);
 
-            cache .set (baseNode, node);
+   value ?.dispose ();
 
-            return node;
-         }
-      };
-   })(),
-};
+   X3DField .prototype .dispose .call (target);
+}
 
 export default SFNodeCache;

package/src/x_ite/InputOutput/FileLoader.js

@@ -156,6 +156,8 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
    },
    set_initLoadCount__: function (scene, success, error, field)
    {
+      // Wait for extern protos to be loaded.
+
       if (field .getValue ())
          return;
 
@@ -163,22 +165,28 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
 
       delete scene .loader;
 
-      try
-      {
-         success (scene);
-      }
-      catch (exception)
+      // Wait for instances to be created.
+
+      setTimeout (function ()
       {
-         if (error)
-            error (exception);
-         else
-            throw exception;
-      }
+         try
+         {
+            success (scene);
+         }
+         catch (exception)
+         {
+            if (error)
+               error (exception);
+            else
+               throw exception;
+         }
+      },
+      0);
 
       if (DEBUG)
       {
          if (this .URL .protocol !== "data:")
-            console .info ("Done loading scene " + decodeURI (this .URL .href));
+            console .info (`Done loading scene '${decodeURI (this .URL .href)}'`);
       }
    },
    createX3DFromURL: function (url, parameter, callback, bindViewpoint, foreign)
@@ -283,7 +291,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
       const
          options     = { cache: this .node .getCache () ? "default" : "reload" },
          response    = this .handleErrors (await fetch (this .URL .href, options)),
-         contentType = response .headers .get ("content-type") .replace (/;.*$/, "");
+         contentType = response .headers .get ("content-type") ?.replace (/;.*$/, "");
 
       if (this .foreign)
       {
@@ -323,9 +331,9 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
    error: function (exception)
    {
       if (this .URL .protocol === "data:")
-         console .warn ("Couldn't load URL 'data':", exception .message);
+         console .warn (`Couldn't load data URL: ${exception .message}`);
       else
-         console .warn ("Couldn't load URL '" + decodeURI (this .URL .href) + "':", exception .message);
+         console .warn (`Couldn't load URL '${decodeURI (this .URL .href)}': ${exception .message}`);
 
       if (DEBUG)
          console .error (exception);