x_ite 8.6.18 → 8.6.20

package/docs/_config.yml

@@ -20,7 +20,7 @@ timezone:
 # ↓ --------------------------
 
 title: X_ITE X3D Browser               # the main title
-version: 8.6.18                         # 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
-
-```sh
-$ 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/_posts/setup-a-localhost-server.md

@@ -29,14 +29,14 @@ If you have [Python](https://www.python.org){:target="_blank"} installed, then i
 
 Just open a Terminal and go to the directory you want to make available.
 
-```sh
+```console
 # Let's make the Desktop directory available.
 $ cd Desktop
 ```
 
 Type in the following command to start the server.
 
-```sh
+```console
 $ python3 -m http.server
 ```
 

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.18",
+	"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>",
@@ -71,13 +71,13 @@
 		"opentype.js": "^1.3.4",
 		"pako": "^2.1.0",
 		"string-replace-webpack-plugin": "^0.1.3",
-		"webpack": "^5.79.0",
-		"webpack-cli": "^5.0.1",
+		"webpack": "^5.80.0",
+		"webpack-cli": "^5.0.2",
 		"webpack-shell-plugin-next": "^2.3.1"
 	},
 	"scripts": {
 		"test": "cd ../x_ite-tests && npm test",
-		"lint": "jshint **",
+		"lint": "eslint src",
 		"build": "make",
 		"-prebuild:js": "npm run lint"
 	}

package/src/example.html

@@ -16,6 +16,6 @@ x3d-canvas {
     <x3d-canvas src="https://create3000.github.io/media/x_ite/info/info.x3d">
       <p>Your browser may not support all features required by X_ITE!</p>
     </x3d-canvas>
-    <p>If local files are not loaded <a href="https://create3000.github.io/x_ite/#using-firefox-chrome-and-opera-with-local-files">consider setup a localhost server</a>.</p>
+    <a>If local files are not loaded <a href="https://create3000.github.io/x_ite/setup-a-localhost-server">consider setup a localhost server</a> or use <a href="https://create3000.github.io/x_ite/dom-integration">DOM Integration methods</a>.</p>
   </body>
 </html>

package/src/standard/Math/Algorithm.js

@@ -231,4 +231,4 @@ export default class Algorithm
 
       return first;
    }
-};
+}

package/src/standard/Math/Algorithms/MergeSort.js

@@ -76,26 +76,28 @@ MergeSort .prototype =
    },
    merge: function (lo, m, hi)
    {
+      const { array, auxiliary, compare } = this;
+
       let i, j, k;
 
       i = 0, j = lo;
       // Copy first half of array a to auxiliary array b.
       while (j <= m)
-         this .auxiliary [i++] = this .array [j++];
+         auxiliary [i++] = array [j++];
 
       i = 0; k = lo;
       // Copy back next-greatest element at each time.
       while (k < j && j <= hi)
       {
-         if (this .compare (this .array [j], this .auxiliary [i]))
-            this .array [k++] = this .array [j++];
+         if (compare (array [j], auxiliary [i]))
+            array [k++] = array [j++];
          else
-            this .array [k++] = this .auxiliary [i++];
+            array [k++] = auxiliary [i++];
       }
 
       // Copy back remaining elements of first half (if any).
       while (k < j)
-         this .array [k++] = this .auxiliary [i++];
+         array [k++] = auxiliary [i++];
    }
 };
 

package/src/standard/Math/Algorithms/PartialSort.js

@@ -68,6 +68,8 @@ PartialSort .prototype =
    },
    partialsort: function (lo, hi)
    {
+      const { array, compare } = this;
+
       let gap = this .last, i, last;
 
       if (gap > 1)
@@ -77,7 +79,7 @@ PartialSort .prototype =
       {
          const j = i + gap;
 
-         if (this .compare (this .array [j], this .array [i]))
+         if (compare (array [j], array [i]))
          {
             const t = array [i];
             array [i] = array [j];

package/src/standard/Math/Algorithms/QuickSort.js

@@ -70,9 +70,7 @@ QuickSort .prototype =
          i = lo,
          j = hi;
 
-      const
-         array   = this .array,
-         compare = this .compare;
+      const { array, compare } = this;
 
       // Vergleichs­element x
       const x = array [(lo + hi) >>> 1];

package/src/standard/Math/Geometry/Box2.js

@@ -48,7 +48,7 @@
 import Matrix3 from "../Numbers/Matrix3.js";
 import Vector2 from "../Numbers/Vector2.js";
 
-function Box2 (size, center)
+function Box2 (/* size, center */)
 {
    this .matrix = new Matrix3 ();
 

package/src/standard/Math/Geometry/Box3.js

@@ -50,7 +50,7 @@ import Matrix4   from "../Numbers/Matrix4.js";
 import Vector3   from "../Numbers/Vector3.js";
 import SAT       from "../Algorithms/SAT.js";
 
-function Box3 (size, center)
+function Box3 (/* size, center */)
 {
    this .matrix = new Matrix4 ();
 

package/src/standard/Math/Numbers/Quaternion.js

@@ -46,6 +46,7 @@
  ******************************************************************************/
 
 import Vector3   from "./Vector3.js";
+import Matrix3   from "./Matrix3.js";
 import Algorithm from "../Algorithm.js";
 
 function Quaternion (x, y, z, w)
@@ -137,7 +138,7 @@ Quaternion .prototype =
 
       return this;
    },
-   getMatrix: function (matrix)
+   getMatrix: function (matrix = new Matrix3 ())
    {
       const { x, y, z, w } = this;
 
@@ -168,11 +169,11 @@ Quaternion .prototype =
    },
    isReal: function ()
    {
-      return ! (this .x || this .y || this .z);
+      return !(this .x || this .y || this .z);
    },
    isImag: function ()
    {
-      return ! this .w;
+      return !this .w;
    },
    equals: function (quat)
    {

package/src/standard/Math/Numbers/Rotation4.js

@@ -48,6 +48,7 @@
 import Quaternion from "./Quaternion.js";
 import Vector3    from "./Vector3.js";
 import Vector4    from "./Vector4.js";
+import Matrix3    from "./Matrix3.js";
 import Algorithm  from "../Algorithm.js";
 
 const
@@ -280,7 +281,7 @@ Rotation4 .prototype =
    {
       this .set (vector .x, vector .y, vector .z, this [_angle]);
    },
-   getAxis: function (axis)
+   getAxis: function (axis = new Vector3 (0, 0, 0))
    {
       return axis .set (this [_x], this [_y], this [_z]);
    },
@@ -290,7 +291,7 @@ Rotation4 .prototype =
       this .update ();
       return this;
    },
-   getQuaternion: function (quaternion)
+   getQuaternion: function (quaternion = new Quaternion (0, 0, 0, 1))
    {
       return quaternion .assign (this [_quaternion]);
    },
@@ -300,7 +301,7 @@ Rotation4 .prototype =
       this .update ();
       return this;
    },
-   getMatrix: function (matrix)
+   getMatrix: function (matrix = new Matrix3 ())
    {
       return this [_quaternion] .getMatrix (matrix);
    },

package/src/x_ite/Base/X3DBaseNode.js

@@ -64,7 +64,7 @@ const
    _childObjects      = Symbol (),
    _initialized       = Symbol (),
    _live              = Symbol (),
-   _set_live__        = Symbol ("X3DBaseNode.set_live__"),
+   _set_live__        = Symbol (),
    _cloneCount        = Symbol ();
 
 function X3DBaseNode (executionContext)

package/src/x_ite/Base/X3DEventObject.js

@@ -48,7 +48,7 @@
 import X3DChildObject from "./X3DChildObject.js";
 import Events         from "./Events.js";
 
-const _browser = Symbol .for ("X3DEventObject.browser");
+const _browser = Symbol .for ("X_ITE.X3DEventObject.browser");
 
 function X3DEventObject (browser)
 {
@@ -66,6 +66,7 @@ X3DEventObject .prototype = Object .assign (Object .create (X3DChildObject .prot
    },
    getExtendedEventHandling: function ()
    {
+      // Whether initializeOnly field are treated like inputOnly and inputOutput fields.
       return true;
    },
    addEvent: function (field)
@@ -91,7 +92,7 @@ X3DEventObject .prototype = Object .assign (Object .create (X3DChildObject .prot
       if (this .isTainted ())
          return;
 
-      if (field .isInput () || (this .getExtendedEventHandling () && ! field .isOutput ()))
+      if (field .isInput () || (this .getExtendedEventHandling () && field .isInitializable ()))
       {
          this .addNodeEvent ();
       }

package/src/x_ite/Base/X3DField.js

@@ -61,7 +61,7 @@ const
    _inputRoutes         = Symbol (),
    _outputRoutes        = Symbol (),
    _routeCallbacks      = Symbol (),
-   _uniformLocation     = Symbol .for ("X3DField.uniformLocation");
+   _uniformLocation     = Symbol .for ("X_ITE.X3DField.uniformLocation");
 
 function X3DField (value)
 {
@@ -76,7 +76,6 @@ X3DField .prototype = Object .assign (Object .create (X3DChildObject .prototype)
    [_value]: null,
    [_accessType]: X3DConstants .initializeOnly,
    [_unit]: null,
-   [_uniformLocation]: null,
    [_references]: new Set (),
    [_referencesCallbacks]: new Map (),
    [_fieldInterests]: new Set (),
@@ -84,6 +83,7 @@ X3DField .prototype = Object .assign (Object .create (X3DChildObject .prototype)
    [_inputRoutes]: new Set (),
    [_outputRoutes]: new Set (),
    [_routeCallbacks]: new Map (),
+   [_uniformLocation]: null,
    create: function ()
    {
       return new (this .constructor) ();

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

@@ -227,7 +227,7 @@ const Context =
                   }
                };
 
-               setTimeout (check, 0);
+               setTimeout (check);
             });
          },
          getBufferSubDataAsync: async function (target, buffer, srcByteOffset, dstBuffer, /* optional */ dstOffset, /* optional */ length)

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

@@ -449,7 +449,7 @@ ExamineViewer .prototype = Object .assign (Object .create (X3DViewer .prototype)
             {
                this .tapedTwice = true;
 
-               setTimeout (function () { this .tapedTwice = false; } .bind (this), 300);
+               setTimeout (() => this .tapedTwice = false, 300);
             }
 
             break;
@@ -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 ()
    {
@@ -102,7 +106,6 @@ X3DNetworkingContext .prototype =
 
       this [_defaultScene] .setPrivate (true);
       this [_defaultScene] .setLive (true);
-      this [_defaultScene] .setup ();
 
       this .getDefaultScene = function () { return this [_defaultScene]; };
 
@@ -110,6 +113,10 @@ X3DNetworkingContext .prototype =
 
       return this [_defaultScene];
    },
+   getBrowserLoading: function ()
+   {
+      return this [_loading];
+   },
    setBrowserLoading: function (value)
    {
       this [_loading] = value;
@@ -137,13 +144,9 @@ X3DNetworkingContext .prototype =
          }
       }
    },
-   getLoading: function ()
-   {
-      return this [_loading];
-   },
-   getDisplayLoadCount: function ()
+   getLoadingObjects: function ()
    {
-      return [... this [_loadingObjects]] .reduce ((v, o) => v + !(o .isPrivate ?.() ?? true), 0);
+      return this [_loadingObjects];
    },
    addLoadingObject: function (object)
    {
@@ -167,6 +170,10 @@ X3DNetworkingContext .prototype =
       this .setLoadCount (this [_loadingObjects] .size);
       this .setCursor (this .getCursor ());
    },
+   getDisplayLoadCount: function ()
+   {
+      return [... this [_loadingObjects]] .reduce ((v, o) => v + !(o .isPrivate ?.() ?? true), 0);
+   },
    setLoadCount: function (value)
    {
       this ._loadCount = value;

package/src/x_ite/Browser/VERSION.js

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