x_ite 8.6.19 → 8.6.20

package/docs/_config.yml

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

package/docs/_posts/getting-started.md

@@ -542,24 +542,6 @@ There is a ZIP archive available to locally install X_ITE on your server. Compre
 
 [Download X_ITE ZIP archive](https://create3000.github.io/code/x_ite/latest/x_ite.zip)
 
-### You can also get it on NPM
-
-```console
-$ npm install x_ite
-```
-
-It can be used in [Electron](https://www.electronjs.org){:target="_blank"} apps in a preload script of the **renderer process** like this:
-
-```js
-window .addEventListener ("DOMContentLoaded", () =>
-{
-  const X3D = require ("x_ite")
-  ...
-})
-```
-
-Make sure that contextIsolation is set to **false** when creating a BrowserWindow instance.
-
 ### Using X_ITE with a CDN
 
 CDNs can offer a performance benefit by hosting X_ITE on servers spread across the globe. This also offers an advantage that if the visitor to your webpage has already downloaded a copy of X_ITE from the same CDN, it won't have to be re-downloaded. To use the X_ITE CDN, just reference the CSS and JavaScript file in the script element directly from the GitHub CDN or jsDelivr CDN domain.
@@ -596,6 +578,24 @@ If you are in production and everything is working well, then use a fixed versio
 <script src="https://cdn.jsdelivr.net/npm/x_ite@{{ site.version }}/dist/x_ite.min.js"></script>
 ```
 
+### You can also get it from NPM
+
+```console
+$ npm install x_ite
+```
+
+It can be used in [Electron](https://www.electronjs.org){:target="_blank"} apps in a preload script of the **renderer process** in a way like this:
+
+```js
+window .addEventListener ("DOMContentLoaded", () =>
+{
+  const X3D = require ("x_ite")
+  ...
+})
+```
+
+Make sure that contextIsolation is set to **false** when creating a BrowserWindow instance.
+
 ## Embedding X_ITE within a Web Page
 
 To display your X3D scene in a HTML5 page, first save your scene as X3D XML Encoded file, X3D JSON Encoded file, or as X3D Classic Encoded file, i.e. create a file with the extension .x3d, .x3dj, .x3dv, or .wrl.

package/docs/_tabs/playground.html

@@ -99,9 +99,9 @@ $(function ()
 `;
 
    require .config ({ paths: { "vs": "https://cdn.jsdelivr.net/npm/monaco-editor@latest/min/vs" }});
-   require (["vs/editor/editor.main"], () =>
+   require (["vs/editor/editor.main"], async () =>
    {
-      const darkMode = (window .matchMedia && window .matchMedia ("(prefers-color-scheme: dark)") .matches || $("html") .attr ("data-mode") === "dark") && ($("html") .attr ("data-mode") !== "light");
+      const darkMode = (window .matchMedia ?.("(prefers-color-scheme: dark)") .matches || $("html") .attr ("data-mode") === "dark") && ($("html") .attr ("data-mode") !== "light");
 
       const editor = monaco .editor .create (document .getElementById ("editor"),
       {
@@ -115,25 +115,29 @@ $(function ()
          minimap: { enabled: false },
       });
 
+      const url = new URL (document .location .href) .searchParams .get ("url");
+
+      if (url)
+      {
+         const Browser = X3D .getBrowser ();
+
+         Browser .baseURL = url;
+
+         await Browser .loadURL (new X3D .MFString (url)) .catch (Function .prototype);
+
+         const encoding = { XML: "XML", JSON: "JSON", VRML: "VRML" } [Browser .currentScene .encoding] ?? "XML";
+
+         monaco .editor .setModelLanguage (editor .getModel (), encoding .toLowerCase ());
+
+         editor .setValue (Browser .currentScene [`to${encoding}String`] ());
+      }
+
       editor .getModel () .onDidChangeContent (async (event) =>
       {
          const
             Browser = X3D .getBrowser (),
             text    = editor .getValue (),
-            url     = "data:," + text;
-
-         if (text .match (/<\w+/))
-         {
-            monaco .editor .setModelLanguage (editor .getModel (), "xml");
-         }
-         else if (text .match (/"\w+"\s*:\s*\{/))
-         {
-            monaco .editor .setModelLanguage (editor .getModel (), "json");
-         }
-         else if (text .match (/\w+\s*\{/))
-         {
-            monaco .editor .setModelLanguage (editor .getModel (), "vrml");
-         }
+            url     = "data:," + encodeURIComponent (text);
 
          if (Browser .getActiveViewpoint ())
          {
@@ -153,9 +157,12 @@ $(function ()
          {
             await Browser .loadURL (new X3D .MFString (url)) .catch (Function .prototype);
          }
+
+         monaco .editor .setModelLanguage (editor .getModel (), Browser .currentScene .encoding .toLowerCase ());
       });
 
-      editor .setValue (box .replace (/ {3}/g, "  "));
+      if (!url)
+         editor .setValue (box .replace (/ {3}/g, "  "));
    });
 })
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x_ite",
-	"version": "8.6.19",
+	"version": "8.6.20",
 	"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>",

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

@@ -533,6 +533,9 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
                      event .deltaY     = delta;
                      event .zoomFactor = Math .abs (delta) / $(window) .width ();
 
+                     event .pageX = (touches [0] .pageX + touches [1] .pageX) / 2;
+                     event .pageY = (touches [0] .pageY + touches [1] .pageY) / 2;
+
                      this .mousewheel (event);
 
                      break;

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

@@ -370,6 +370,9 @@ LookAtViewer .prototype = Object .assign (Object .create (X3DViewer .prototype),
 
                   event .deltaY     = delta;
                   event .zoomFactor = Math .abs (delta) / $(window) .width ();
+                  
+                  event .pageX  = (touches [0] .pageX + touches [1] .pageX) / 2;
+                  event .pageY  = (touches [0] .pageY + touches [1] .pageY) / 2;
 
                   this .mousewheel (event);
                }

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

@@ -54,7 +54,7 @@ const
    _loadingTotal   = Symbol (),
    _loadingObjects = Symbol (),
    _loading        = Symbol (),
-   _location       = Symbol (),
+   _baseURL        = Symbol (),
    _defaultScene   = Symbol (),
    _set_loadCount  = Symbol ();
 
@@ -77,7 +77,7 @@ function X3DNetworkingContext ()
    this [_loadingTotal]   = 0;
    this [_loadingObjects] = new Set ();
    this [_loading]        = false;
-   this [_location]       = getBaseURI (this .getElement () [0]);
+   this [_baseURL]        = getBaseURI (this .getElement () [0]);
 }
 
 X3DNetworkingContext .prototype =
@@ -90,9 +90,13 @@ X3DNetworkingContext .prototype =
    {
       return URLs .getProviderUrl ();
    },
-   getLocation: function ()
+   getBaseURL: function ()
    {
-      return this [_location];
+      return this [_baseURL];
+   },
+   setBaseURL: function (value)
+   {
+      this [_baseURL] = String (value);
    },
    getDefaultScene: function ()
    {

package/src/x_ite/Browser/VERSION.js

@@ -45,4 +45,4 @@
  *
  ******************************************************************************/
 
-export default "8.6.19";
+export default "8.6.20";

package/src/x_ite/Browser/X3DBrowser.js

@@ -826,49 +826,51 @@ for (const key of Reflect .ownKeys (X3DBrowser .prototype))
 
 Object .defineProperty (X3DBrowser .prototype, "name",
 {
-   get: function () { return this .getName (); },
+   get: X3DBrowser .prototype .getName,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "version",
 {
-   get: function () { return this .getVersion (); },
+   get: X3DBrowser .prototype .getVersion,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "providerUrl",
 {
-   get: function () { return this .getProviderUrl (); },
+   get: X3DBrowser .prototype .getProviderUrl,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "currentFrameRate",
 {
-   get: function () { return this .getCurrentFrameRate (); },
+   get: X3DBrowser .prototype .getCurrentFrameRate,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "currentSpeed",
 {
-   get: function () { return this .getCurrentSpeed (); },
+   get: X3DBrowser .prototype .getCurrentSpeed,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DBrowser .prototype, "description",
 {
-   get: function ()
-   {
-      return this .getDescription ();
-   },
-   set: function (value)
-   {
-      this .setDescription (value);
-   },
+   get: X3DBrowser .prototype .getDescription,
+   set: X3DBrowser .prototype .setDescription,
+   enumerable: true,
+   configurable: false
+});
+
+Object .defineProperty (X3DBrowser .prototype, "baseURL",
+{
+   get: X3DBrowser .prototype .getBaseURL,
+   set: X3DBrowser .prototype .setBaseURL,
    enumerable: true,
    configurable: false
 });

package/src/x_ite/Execution/X3DExecutionContext.js

@@ -942,71 +942,71 @@ for (const key of Reflect .ownKeys (X3DExecutionContext .prototype))
 
 Object .defineProperty (X3DExecutionContext .prototype, "specificationVersion",
 {
-   get: function () { return this .getSpecificationVersion (); },
+   get: X3DExecutionContext .prototype .getSpecificationVersion,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "encoding",
 {
-   get: function () { return this .getEncoding (); },
+   get: X3DExecutionContext .prototype .getEncoding,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "profile",
 {
-   get: function () { return this .getProfile (); },
+   get: X3DExecutionContext .prototype .getProfile,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "components",
 {
-   get: function () { return this .getComponents (); },
+   get: X3DExecutionContext .prototype .getComponents,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "worldURL",
 {
-   get: function () { return this .getWorldURL (); },
+   get: X3DExecutionContext .prototype .getWorldURL,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "units",
 {
-   get: function () { return this .getUnits (); },
+   get: X3DExecutionContext .prototype .getUnits,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "rootNodes",
 {
-   get: function () { return this .getRootNodes (); },
-   set: function (value) { this .setRootNodes (value); },
+   get: X3DExecutionContext .prototype .getRootNodes,
+   set: X3DExecutionContext .prototype .setRootNodes,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "protos",
 {
-   get: function () { return this .getProtoDeclarations (); },
+   get: X3DExecutionContext .prototype .getProtoDeclarations,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "externprotos",
 {
-   get: function () { return this .getExternProtoDeclarations (); },
+   get: X3DExecutionContext .prototype .getExternProtoDeclarations,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExecutionContext .prototype, "routes",
 {
-   get: function () { return this .getRoutes (); },
+   get: X3DExecutionContext .prototype .getRoutes,
    enumerable: true,
    configurable: false
 });

package/src/x_ite/InputOutput/FileLoader.js

@@ -72,11 +72,10 @@ function FileLoader (node, external)
    this .browser          = node .getBrowser ();
    this .external         = external === undefined ? this .browser .isExternal () : external;
    this .executionContext = this .external ? node .getExecutionContext () : this .browser .currentScene;
-   this .userAgent        = this .browser .getName () + "/" + this .browser .getVersion () + " (X3D Browser; +" + this .browser .getProviderUrl () + ")";
    this .target           = "";
    this .url              = [ ];
    this .URL              = new URL (this .getReferer (), this .getReferer ());
-   this .fileReader       = new FileReader ();
+   this .controller       = new AbortController ();
 }
 
 FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
@@ -84,24 +83,20 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
    constructor: FileLoader,
    abort: function ()
    {
-      this .callback      = Function .prototype;
-      this .bindViewpoint = Function .prototype;
-      this .foreign       = Function .prototype;
-   },
-   isPrivate: function ()
-   {
-      return true;
+      this .url .length = 0;
+
+      this .controller .abort ();
    },
-   getWorldURL: function ()
+   getURL: function ()
    {
       return this .URL;
    },
    getReferer: function ()
    {
-      if (this .node .getTypeName () === "X3DWorld")
+      if (this .node instanceof X3DWorld)
       {
          if (this .external)
-            return this .browser .getLocation ();
+            return this .browser .getBaseURL ();
       }
 
       return this .executionContext .getWorldURL ();
@@ -199,7 +194,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
    createX3DFromURLAsync: function (callback, data)
    {
       if (data === null)
-         callback (null, this .URL);
+         callback (null);
       else
          this .createX3DFromString (this .URL, data, callback, this .loadDocumentError .bind (this));
    },
@@ -248,7 +243,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
             if (result [3] === "base64")
                data = atob (data);
             else
-               data = unescape (data);
+               data = decodeURIComponent (data);
 
             this .callback (data);
             return;
@@ -288,7 +283,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
       // Load URL async
 
       const
-         options     = { cache: this .node .getCache () ? "default" : "reload" },
+         options     = { cache: this .node .getCache () ? "default" : "reload", signal: this .controller .signal },
          response    = this .handleErrors (await fetch (this .URL .href, options)),
          contentType = response .headers .get ("content-type") ?.replace (/;.*$/, "");
 
@@ -304,10 +299,10 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
    },
    handleErrors: function (response)
    {
-      if (!response .ok)
-         throw Error (response .statusText || response .status);
+      if (response .ok)
+         return response;
 
-      return response;
+      throw Error (response .statusText || response .status);
    },
    loadDocumentError: function (exception)
    {

package/src/x_ite/Prototype/X3DExternProtoDeclaration.js

@@ -410,21 +410,22 @@ for (const key of Reflect .ownKeys (X3DExternProtoDeclaration .prototype))
 
 Object .defineProperty (X3DExternProtoDeclaration .prototype, "name",
 {
-   get: function () { return this .getName (); },
+   get: X3DExternProtoDeclaration .prototype .getName,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExternProtoDeclaration .prototype, "fields",
 {
-   get: function () { return this .getFieldDefinitions (); },
+   get: X3DExternProtoDeclaration .prototype .getFieldDefinitions,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DExternProtoDeclaration .prototype, "isExternProto",
 {
-   get: function () { return true; },
+   value: true,
+   writable: false,
    enumerable: true,
    configurable: false
 });
@@ -438,7 +439,7 @@ Object .defineProperty (X3DExternProtoDeclaration .prototype, "urls",
 
 Object .defineProperty (X3DExternProtoDeclaration .prototype, "loadState",
 {
-   get: function () { return this .checkLoadState (); },
+   get: X3DExternProtoDeclaration .prototype .checkLoadState,
    enumerable: true,
    configurable: false
 });

package/src/x_ite/Prototype/X3DProtoDeclaration.js

@@ -544,21 +544,22 @@ for (const key of Reflect .ownKeys (X3DProtoDeclaration .prototype))
 
 Object .defineProperty (X3DProtoDeclaration .prototype, "name",
 {
-   get: function () { return this .getName (); },
+   get: X3DProtoDeclaration .prototype .getName,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DProtoDeclaration .prototype, "fields",
 {
-   get: function () { return this .getFieldDefinitions (); },
+   get: X3DProtoDeclaration .prototype .getFieldDefinitions,
    enumerable: true,
    configurable: false
 });
 
 Object .defineProperty (X3DProtoDeclaration .prototype, "isExternProto",
 {
-   get: function () { return false; },
+   value: false,
+   writable: false,
    enumerable: true,
    configurable: false
 });