x_ite 8.0.0 → 8.3.0

package/src/x_ite.html

@@ -11,13 +11,14 @@
    <script src="../node_modules/css-element-queries/src/ResizeSensor.js"></script>
    <script src="../node_modules/pako/dist/pako_inflate.js"></script>
    <script src="../node_modules/libtess/libtess.cat.js"></script>
+   <!-- Text -->
    <script src="../node_modules/opentype.js/dist/opentype.js"></script>
    <!-- Texturing3D -->
-   <script src="../node_modules/CharLS.js/build/charLS-DynamicMemory-browser.js"></script>
+   <script src="../node_modules/CharLS.js/dist/charLS-FixedMemory-browser.js"></script>
    <script src="../node_modules/dicom-parser/dist/dicomParser.js"></script>
    <script src="../node_modules/jpeg-js/lib/decoder.js"></script>
    <script src="../node_modules/jpeg-lossless-decoder-js/release/current/lossless.js"></script>
-   <script src="../node_modules/OpenJPEG.js/build/openJPEG-DynamicMemory-browser.js"></script>
+   <script src="../node_modules/OpenJPEG.js/dist/openJPEG-FixedMemory-browser.js"></script>
    <!-- X_ITE END -->
    <!-- JQUERY -->
 
@@ -30,96 +31,98 @@
 import X3D from "./x_ite.js";
 window .X3D = X3D;
 
-await X3D ();
-
-const
-   Browser      = X3D .getBrowser (),
-   localStorage = Browser .getLocalStorage ();
+X3D (function ()
+{
+   const
+      Browser      = X3D .getBrowser (),
+      localStorage = Browser .getLocalStorage ();
 
-Browser .getContextMenu () .setUserMenu (createTestMenu);
+   Browser .getContextMenu () .setUserMenu (createTestMenu);
 
-localStorage .addDefaultValues ({
-   "Bookmarks.history": ["http://www.web3d.org/x3d/content/examples/Basic/ChemicalMarkupLanguage/ButanedioicAcid.x3d"],
-});
+   localStorage .addDefaultValues ({
+      "Bookmarks.history": ["https://www.web3d.org/x3d/content/examples/Basic/ChemicalMarkupLanguage/ButanedioicAcid.x3d"],
+   });
 
-let
-   loadTime = 0,
-   index    = localStorage ["Bookmarks.history"] .length - 1;
+   let
+      loadTime = 0,
+      index    = localStorage ["Bookmarks.history"] .length - 1;
 
-function loadURL (url)
-{
-   const history = localStorage ["Bookmarks.history"];
+   function loadURL (url)
+   {
+      const history = localStorage ["Bookmarks.history"];
 
-   localStorage ["Bookmarks.url"] = url;
+      localStorage ["Bookmarks.url"] = url;
 
-   if (url !== history .at (-1))
-   {
-      history .push (url);
-      history .splice (0, history .length - 100);
-      localStorage ["Bookmarks.history"] = history;
-      index = history .length - 1;
-   }
+      if (url !== history .at (-1))
+      {
+         history .push (url);
+         history .splice (0, history .length - 100);
+         localStorage ["Bookmarks.history"] = history;
+         index = history .length - 1;
+      }
 
-   if (location .href .includes (".min.html") && url .startsWith ("tests/"))
-      url = "src/" + url;
+      if (location .href .includes (".min.html") && url .startsWith ("tests/"))
+         url = "src/" + url;
 
-   $(".file") .removeClass ("loaded");
+      $(".file") .removeClass ("loaded");
 
-   loadTime = performance .now ();
+      loadTime = performance .now ();
 
-   bookmarks .loadURL (url);
+      bookmarks .loadURL (url);
 
-   return false;
-}
+      return false;
+   }
 
-function toVRMLString ()
-{
-   console .log (Browser .toVRMLString ());
-}
+   function toVRMLString ()
+   {
+      console .log (Browser .toVRMLString ());
+   }
 
-function toXMLString ()
-{
-   console .log (Browser .toXMLString ());
-}
+   function toXMLString ()
+   {
+      console .log (Browser .toXMLString ());
+   }
 
-function toJSONString ()
-{
-   console .log (Browser .toJSONString ());
-}
+   function toJSONString ()
+   {
+      console .log (Browser .toJSONString ());
+   }
 
-const bookmarks = new Bookmarks (Browser, $(".examples-box"));
+   const bookmarks = new Bookmarks (Browser, $(".examples-box"));
 
-bookmarks .setup ([X_ITE_EXAMPLES, X_ITE_TESTS]);
-loadURL (localStorage ["Bookmarks.url"] || "https://create3000.github.io/media/x_ite/info/info.x3d");
+   bookmarks .setup ([X_ITE_EXAMPLES, X_ITE_TESTS]);
+   loadURL (localStorage ["Bookmarks.url"] || "https://create3000.github.io/media/x_ite/info/info.x3d");
 
-$(".version") .text (Browser .name + " v" + Browser .version);
-$(".browser") .on ("initialized", () => Browser .println ("Scene loaded in " + ((performance .now () - loadTime) / 1000) .toFixed (3) + " s."));
-$(".browser") .on ("initialized", () => localStorage ["Bookmarks.url"] = $(".browser") .attr ("src"));
-$(".browser") .on ("shutdown", () => Browser .println ("Shutdown at " + new Date () .toUTCString () + "."));
-$(".location-entry") .val (localStorage ["Bookmarks.history"] [index])
-$(".location-go") .on ("click", () => loadURL ($(".location-entry") .val ()));
-$(".print-vrml") .on ("click", toVRMLString);
-$(".print-xml") .on ("click", toXMLString);
-$(".print-json") .on ("click", toJSONString);
+   $(".version") .text (Browser .name + " v" + Browser .version);
+   $(".browser") .on ("initialized", () => $(".console") .empty ());
+   $(".browser") .on ("initialized", () => Browser .println ("Scene loaded in " + ((performance .now () - loadTime) / 1000) .toFixed (3) + " s."));
+   $(".browser") .on ("initialized", () => localStorage ["Bookmarks.url"] = Browser .getWorldURL ());
+   $(".browser") .on ("shutdown", () => Browser .println ("Shutdown at " + new Date () .toUTCString () + "."));
+   $(".location-entry") .val (localStorage ["Bookmarks.history"] [index])
+   $(".location-go") .on ("click", () => loadURL ($(".location-entry") .val ()));
+   $(".print-vrml") .on ("click", toVRMLString);
+   $(".print-xml") .on ("click", toXMLString);
+   $(".print-json") .on ("click", toJSONString);
 
-$(".location-entry") .keydown (event =>
-{
-   switch (event .key)
+   $(".location-entry") .keydown (event =>
    {
-      case "Enter":
-         return loadURL ($(".location-entry") .val ())
-      case "ArrowUp":
-         if (index > 0)
-            $(".location-entry") .val (localStorage ["Bookmarks.history"] [--index])
-         return
-      case "ArrowDown":
-         if (index < localStorage ["Bookmarks.history"] .length - 1)
-            $(".location-entry") .val (localStorage ["Bookmarks.history"] [++index])
-         return
-   }
+      switch (event .key)
+      {
+         case "Enter":
+            return loadURL ($(".location-entry") .val ())
+         case "ArrowUp":
+            if (index > 0)
+               $(".location-entry") .val (localStorage ["Bookmarks.history"] [--index])
+            return
+         case "ArrowDown":
+            if (index < localStorage ["Bookmarks.history"] .length - 1)
+               $(".location-entry") .val (localStorage ["Bookmarks.history"] [++index])
+            return
+      }
+   });
 });
-   </script>
-   <style>
+      </script>
+      <style>
 @import url("https://fonts.googleapis.com/css?family=PT+Sans:400,400italic,700,700italic");
 
 html, body {
@@ -351,7 +354,7 @@ main.color-management .browser {
    display: none;
 }
 
-.x_ite-console {
+.console {
    font-family: monospace;
    white-space: pre;
 }
@@ -380,20 +383,20 @@ main.color-management .browser {
                </x3d-canvas>
             </form>
             <div class="location-bar">
-               <input class="location-entry" value="http://www.web3d.org/x3d/content/examples/Basic/ChemicalMarkupLanguage/ButanedioicAcid.x3d"/>
+               <input class="location-entry" value="https://www.web3d.org/x3d/content/examples/Basic/ChemicalMarkupLanguage/ButanedioicAcid.x3d"/>
                <button class="location-go" type="button">Load URL</button>
             </div>
             <div class="buttons">
-               <a class="print-xml" href="#">XML</a><a class="print-vrml" href="#">VRML</a><a class="print-json" href="#">JSON</a><a href="../dist/example.html">Example Page</a><a href="tests/d3-x3d/AreaChartExample.html">d3-x3d</a><a href="tests/dom-integration/">dom-integration</a>
+               <a class="print-xml" href="#">XML</a><a class="print-vrml" href="#">VRML</a><a class="print-json" href="#">JSON</a><a href="../dist/example.html">Example Page</a><a href="tests/d3-x3d/AreaChartExample.html">d3-x3d</a><a href="tests/dom-integration/">dom-integration</a><a href="tests/legacy/">legacy</a>
             </div>
             <div class="links">
-               <a href="../x_ite.min.html">x_ite.min.html</a><a href="http://rawgit.com/create3000/x_ite/main/x_ite.min.html">github</a>
+               <a href="../x_ite.min.html">x_ite.min.html</a><a href="https://rawgit.com/create3000/x_ite/main/x_ite.min.html">github</a>
             </div>
             <div class="examples-box">
             </div>
          </div>
       </main>
-      <footer><div class="console x_ite-console"></div></footer>
+      <footer><div class="console"></div></footer>
    </div>
 </body>
 </html>

package/src/x_ite.js

@@ -38,7 +38,7 @@
  * details (a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version 3
- * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
  * copy of the GPLv3 License.
  *
  * For Silvio, Joy and Adi.

package/webpack.config.js

@@ -6,7 +6,8 @@ const
 
 const
    TerserPlugin           = require ("terser-webpack-plugin"),
-   WebpackShellPluginNext = require ("webpack-shell-plugin-next")
+   WebpackShellPluginNext = require ("webpack-shell-plugin-next"),
+   StringReplacePlugin    = require ("string-replace-webpack-plugin")
 
 module .exports = async () =>
 {
@@ -19,16 +20,47 @@ module .exports = async () =>
       for (const files of Object .values (graph .obj ()))
       {
          for (const file of files)
-            deps .add (path .resolve (__dirname, "src", file))
+            deps .add (path .resolve (path .dirname (filename), file))
       }
 
       return deps
    }
 
    const
-      x_ite_deps = await deps ("./src/x_ite.js"),
+      x_ite_deps = await deps (path .resolve (__dirname, "src/x_ite.js")),
       targets    = [ ]
 
+   x_ite_deps .add (path .resolve (__dirname, "src/x_ite/Namespace.js"))
+
+   const namespace =
+   {
+      test: /\.js$/,
+      exclude: /Namespace\.js$/,
+      use: [
+         {
+            loader: StringReplacePlugin .replace ({
+               replacements: [
+                  {
+                     pattern: /export\s+default\s+(.+)$/sg,
+                     replacement: function (match, m, offset, string)
+                     {
+                        const
+                           ns  = path .resolve (__dirname, "src/x_ite/Namespace.js"),
+                           rel = path .relative (path .dirname (this .resourcePath), ns),
+                           key = path .relative (path .resolve (__dirname, "src"), this .resourcePath) .replace (/\.js$/, "")
+
+                        return `const __default__ = ${m};
+import Namespace from "./${rel}";
+Namespace .set ("${key}", __default__);
+export default __default__;`;
+                     },
+                  },
+               ],
+            }),
+         },
+      ],
+   }
+
    targets .push ({
       entry: {
          "x_ite": "./src/x_ite.js",
@@ -44,6 +76,9 @@ module .exports = async () =>
          },
       },
       mode: "production",
+      module: {
+         rules: [namespace],
+      },
       optimization: {
          minimize: true,
          minimizer: [
@@ -68,7 +103,6 @@ module .exports = async () =>
             jquery_fullscreen: "jquery-fullscreen-plugin/jquery.fullscreen.js",
             jquery_mousewheel: "jquery-mousewheel/jquery.mousewheel.js",
             libtess: "libtess/libtess.cat.js",
-            opentype: "opentype.js/dist/opentype.js",
             pako: "pako/dist/pako_inflate.js",
             ResizeSensor: "css-element-queries/src/ResizeSensor.js",
          }),
@@ -77,6 +111,7 @@ module .exports = async () =>
             onBuildStart: {
                scripts: [
                   `echo 'Bundling x_ite ...'`,
+                  `npm rebuild node-sass`,
                   `perl -p0e 's|\\/\\*.*?\\*\\/||sg' src/x_ite.css | npx node-sass --output-style compressed > dist/x_ite.css`,
                   `perl -p0i -e 's|^|/* X_ITE v'$npm_package_version' */|sg' dist/x_ite.css`,
                   `perl -p0i -e 's|".*?"|'\`npm pkg get version\`'|sg' src/x_ite/Browser/VERSION.js`,
@@ -109,6 +144,11 @@ module .exports = async () =>
       node: {
          __filename: false,
       },
+      resolve: {
+         fallback: {
+            process: false,
+         },
+      },
       stats: "errors-warnings",
       performance: {
          hints: "warning",
@@ -117,9 +157,30 @@ module .exports = async () =>
       },
    })
 
+   const dependencies = {
+      "Layout": ["Text"],
+      "Picking": ["RigidBodyPhysics"],
+      "VolumeRendering": ["CADGeometry", "Texturing3D"],
+   }
+
+   function resolveDeps (name)
+   {
+      let deps = [ ]
+
+      for (const d of dependencies [name] || [ ])
+         deps = [... deps, ... resolveDeps (d), d]
+
+      return deps
+   }
+
    for (const filename of fs .readdirSync ("./src/assets/components/"))
    {
-      const name = path .parse (filename) .name
+      const
+         name           = path .parse (filename) .name,
+         component_deps = [x_ite_deps]
+
+      for (const dependency of resolveDeps (name))
+         component_deps .push (await deps (path .resolve (__dirname, `src/assets/components/${dependency}.js`)))
 
       targets .push ({
          entry: {
@@ -131,6 +192,9 @@ module .exports = async () =>
             filename: "[name].js",
          },
          mode: "production",
+         module: {
+            rules: [namespace],
+         },
          optimization: {
             minimize: true,
             minimizer: [
@@ -149,16 +213,20 @@ module .exports = async () =>
             ],
          },
          plugins: [
+            new StringReplacePlugin (),
             new webpack .ProvidePlugin ({
                $: path .resolve (__dirname, "src/lib/jquery.js"),
                jQuery: path .resolve (__dirname, "src/lib/jquery.js"),
                // Per component
                ... {
+                  Text: {
+                     opentype: "opentype.js/dist/opentype.js",
+                  },
                   Texturing3D: {
-                     CharLS: "CharLS.js/build/charLS-DynamicMemory-browser.js",
+                     CharLS: "CharLS.js/dist/charLS-FixedMemory-browser.js",
                      dicomParser: "dicom-parser/dist/dicomParser.js",
                      jpeg: "jpeg-lossless-decoder-js/release/current/lossless.js",
-                     OpenJPEG: "OpenJPEG.js/build/openJPEG-DynamicMemory-browser.js",
+                     OpenJPEG: "OpenJPEG.js/dist/openJPEG-FixedMemory-browser.js",
                      JpegImage: "jpeg-js/lib/decoder.js",
                   },
                }
@@ -199,8 +267,11 @@ module .exports = async () =>
             {
                const filename = path .resolve (context, request)
 
-               if (x_ite_deps .has (filename))
+               for (const deps of component_deps)
                {
+                  if (! deps .has (filename))
+                     continue
+
                   const module = path .relative (path .resolve (__dirname, "src"), filename) .replace (/\.js$/, "")
 
                   return callback (null, `var window [Symbol .for ("X_ITE.X3D")] .require ("${module}")`)

package/x_ite.min.html

@@ -12,97 +12,99 @@
    <script src="src/tests.js"></script>
    <script src="src/tests/menu.js"></script>
 
-   <script type="module">
-await X3D ();
-
-const
-   Browser      = X3D .getBrowser (),
-   localStorage = Browser .getLocalStorage ();
+   <script>
+X3D (function ()
+{
+   const
+      Browser      = X3D .getBrowser (),
+      localStorage = Browser .getLocalStorage ();
 
-Browser .getContextMenu () .setUserMenu (createTestMenu);
+   Browser .getContextMenu () .setUserMenu (createTestMenu);
 
-localStorage .addDefaultValues ({
-   "Bookmarks.history": ["http://www.web3d.org/x3d/content/examples/Basic/ChemicalMarkupLanguage/ButanedioicAcid.x3d"],
-});
+   localStorage .addDefaultValues ({
+      "Bookmarks.history": ["https://www.web3d.org/x3d/content/examples/Basic/ChemicalMarkupLanguage/ButanedioicAcid.x3d"],
+   });
 
-let
-   loadTime = 0,
-   index    = localStorage ["Bookmarks.history"] .length - 1;
+   let
+      loadTime = 0,
+      index    = localStorage ["Bookmarks.history"] .length - 1;
 
-function loadURL (url)
-{
-   const history = localStorage ["Bookmarks.history"];
+   function loadURL (url)
+   {
+      const history = localStorage ["Bookmarks.history"];
 
-   localStorage ["Bookmarks.url"] = url;
+      localStorage ["Bookmarks.url"] = url;
 
-   if (url !== history .at (-1))
-   {
-      history .push (url);
-      history .splice (0, history .length - 100);
-      localStorage ["Bookmarks.history"] = history;
-      index = history .length - 1;
-   }
+      if (url !== history .at (-1))
+      {
+         history .push (url);
+         history .splice (0, history .length - 100);
+         localStorage ["Bookmarks.history"] = history;
+         index = history .length - 1;
+      }
 
-   if (location .href .includes (".min.html") && url .startsWith ("src/tests/"))
-      url = "src/" + url;
+      if (location .href .includes (".min.html") && url .startsWith ("src/tests/"))
+         url = "src/" + url;
 
-   $(".file") .removeClass ("loaded");
+      $(".file") .removeClass ("loaded");
 
-   loadTime = performance .now ();
+      loadTime = performance .now ();
 
-   bookmarks .loadURL (url);
+      bookmarks .loadURL (url);
 
-   return false;
-}
+      return false;
+   }
 
-function toVRMLString ()
-{
-   console .log (Browser .toVRMLString ());
-}
+   function toVRMLString ()
+   {
+      console .log (Browser .toVRMLString ());
+   }
 
-function toXMLString ()
-{
-   console .log (Browser .toXMLString ());
-}
+   function toXMLString ()
+   {
+      console .log (Browser .toXMLString ());
+   }
 
-function toJSONString ()
-{
-   console .log (Browser .toJSONString ());
-}
+   function toJSONString ()
+   {
+      console .log (Browser .toJSONString ());
+   }
 
-const bookmarks = new Bookmarks (Browser, $(".examples-box"));
+   const bookmarks = new Bookmarks (Browser, $(".examples-box"));
 
-bookmarks .setup ([X_ITE_EXAMPLES, X_ITE_TESTS]);
-loadURL (localStorage ["Bookmarks.url"] || "https://create3000.github.io/media/x_ite/info/info.x3d");
+   bookmarks .setup ([X_ITE_EXAMPLES, X_ITE_TESTS]);
+   loadURL (localStorage ["Bookmarks.url"] || "https://create3000.github.io/media/x_ite/info/info.x3d");
 
-$(".version") .text (Browser .name + " v" + Browser .version);
-$(".browser") .on ("initialized", () => Browser .println ("Scene loaded in " + ((performance .now () - loadTime) / 1000) .toFixed (3) + " s."));
-$(".browser") .on ("initialized", () => localStorage ["Bookmarks.url"] = $(".browser") .attr ("src"));
-$(".browser") .on ("shutdown", () => Browser .println ("Shutdown at " + new Date () .toUTCString () + "."));
-$(".location-entry") .val (localStorage ["Bookmarks.history"] [index])
-$(".location-go") .on ("click", () => loadURL ($(".location-entry") .val ()));
-$(".print-vrml") .on ("click", toVRMLString);
-$(".print-xml") .on ("click", toXMLString);
-$(".print-json") .on ("click", toJSONString);
+   $(".version") .text (Browser .name + " v" + Browser .version);
+   $(".browser") .on ("initialized", () => $(".console") .empty ());
+   $(".browser") .on ("initialized", () => Browser .println ("Scene loaded in " + ((performance .now () - loadTime) / 1000) .toFixed (3) + " s."));
+   $(".browser") .on ("initialized", () => localStorage ["Bookmarks.url"] = Browser .getWorldURL ());
+   $(".browser") .on ("shutdown", () => Browser .println ("Shutdown at " + new Date () .toUTCString () + "."));
+   $(".location-entry") .val (localStorage ["Bookmarks.history"] [index])
+   $(".location-go") .on ("click", () => loadURL ($(".location-entry") .val ()));
+   $(".print-vrml") .on ("click", toVRMLString);
+   $(".print-xml") .on ("click", toXMLString);
+   $(".print-json") .on ("click", toJSONString);
 
-$(".location-entry") .keydown (event =>
-{
-   switch (event .key)
+   $(".location-entry") .keydown (event =>
    {
-      case "Enter":
-         return loadURL ($(".location-entry") .val ())
-      case "ArrowUp":
-         if (index > 0)
-            $(".location-entry") .val (localStorage ["Bookmarks.history"] [--index])
-         return
-      case "ArrowDown":
-         if (index < localStorage ["Bookmarks.history"] .length - 1)
-            $(".location-entry") .val (localStorage ["Bookmarks.history"] [++index])
-         return
-   }
+      switch (event .key)
+      {
+         case "Enter":
+            return loadURL ($(".location-entry") .val ())
+         case "ArrowUp":
+            if (index > 0)
+               $(".location-entry") .val (localStorage ["Bookmarks.history"] [--index])
+            return
+         case "ArrowDown":
+            if (index < localStorage ["Bookmarks.history"] .length - 1)
+               $(".location-entry") .val (localStorage ["Bookmarks.history"] [++index])
+            return
+      }
+   });
 });
-   </script>
-   <style>
+      </script>
+      <style>
 @import url("https://fonts.googleapis.com/css?family=PT+Sans:400,400italic,700,700italic");
 
 html, body {
@@ -334,7 +336,7 @@ main.color-management .browser {
    display: none;
 }
 
-.x_ite-console {
+.console {
    font-family: monospace;
    white-space: pre;
 }
@@ -363,20 +365,20 @@ main.color-management .browser {
                </x3d-canvas>
             </form>
             <div class="location-bar">
-               <input class="location-entry" value="http://www.web3d.org/x3d/content/examples/Basic/ChemicalMarkupLanguage/ButanedioicAcid.x3d"/>
+               <input class="location-entry" value="https://www.web3d.org/x3d/content/examples/Basic/ChemicalMarkupLanguage/ButanedioicAcid.x3d"/>
                <button class="location-go" type="button">Load URL</button>
             </div>
             <div class="buttons">
-               <a class="print-xml" href="#">XML</a><a class="print-vrml" href="#">VRML</a><a class="print-json" href="#">JSON</a><a href="dist/example.html">Example Page</a><a href="src/tests/d3-x3d/AreaChartExample.html">d3-x3d</a><a href="src/tests/dom-integration/">dom-integration</a>
+               <a class="print-xml" href="#">XML</a><a class="print-vrml" href="#">VRML</a><a class="print-json" href="#">JSON</a><a href="dist/example.html">Example Page</a><a href="src/tests/d3-x3d/AreaChartExample.html">d3-x3d</a><a href="src/tests/dom-integration/">dom-integration</a><a href="src/tests/legacy/">legacy</a>
             </div>
             <div class="links min-links">
-               <a href="src/x_ite.html">src/x_ite.html</a><a href="http://rawgit.com/create3000/x_ite/main/x_ite.min.html">github</a>
+               <a href="src/x_ite.html">src/x_ite.html</a><a href="https://rawgit.com/create3000/x_ite/main/x_ite.min.html">github</a>
             </div>
             <div class="examples-box">
             </div>
          </div>
       </main>
-      <footer><div class="console x_ite-console"></div></footer>
+      <footer><div class="console"></div></footer>
    </div>
 </body>
 </html>