sunrize 1.8.29 → 1.9.1

package/bin/sunrize.js

@@ -4,13 +4,16 @@
 const os = require ("os");
 const path = require ("path");
 const { spawn } = require ("child_process");
-const cwd = process .cwd ();
-const cmd = os .platform () === "win32" ? "npm.cmd" : "npm";
-const args = [... process .argv .slice (2), cwd];
+const dir = process .cwd ();
+const cwd = path .resolve (__dirname, "..");
+const args = process .argv .slice (2);
 
-process .chdir (path .resolve (__dirname, ".."));
+args .unshift ("start", "--silent", "--");
+args .push ("--cwd", dir);
 
-const p = spawn (cmd, ["start", "--silent", "--", btoa (JSON .stringify (args))], { shell: true });
+const p = os .platform () === "win32"
+   ? spawn ("cmd.exe", ["/c", "npm.cmd", ... args], { cwd })
+   : spawn ("npm", args, { cwd });
 
 p .stdout .pipe (process .stdout);
 p .stderr .pipe (process .stderr);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.8.29",
+  "version": "1.9.1",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -18,10 +18,10 @@
     "X3DUOM": "sh build/X3DUOM.sh",
     "download": "node build/download.js",
     "premake": "npm i -D electron",
-    "make": "env PATH=\"$(pwd)/build/wine-proxy:$PATH\" electron-forge make",
+    "make": "electron-forge make",
     "postmake": "npm i -P electron",
     "pregithub": "npm i -D electron",
-    "github": "env PATH=\"$(pwd)/build/wine-proxy:$PATH\" electron-forge publish",
+    "github": "electron-forge publish",
     "postgithub": "npm i -P electron",
     "predocs": "rm -f -r docs/_site/",
     "docs": "cd docs && bundle exec jekyll serve --ssl-key ssl/server.key --ssl-cert ssl/server.crt --incremental --host=`ipconfig getifaddr en0`",
@@ -91,7 +91,7 @@
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^37.2.0",
+    "electron": "^38.0.0",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -100,7 +100,7 @@
     "jquery-ui-dist": "^1.13.3",
     "jstree": "^3.3.17",
     "material-icons": "^1.13.14",
-    "material-symbols": "^0.34.0",
+    "material-symbols": "^0.35.0",
     "md5": "^2.3.0",
     "mime-types": "^3.0.1",
     "monaco-editor": "^0.50.0",
@@ -110,7 +110,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.1.1",
-    "x_ite": "^12.0.6",
+    "x_ite": "^12.0.7",
     "x3d-traverse": "^1.0.13"
   }
 }

package/src/Application/Application.js

@@ -16,11 +16,7 @@ const localStorage = new LocalStorage (path .join (electron .app .getPath ("user
 
 module .exports = class Application
 {
-   config            = new DataStorage (localStorage, "Sunrize.Application.");
-   receivedFiles     = [ ];
-   mainMenu          = [ ];
-   openLocationValue = "";
-   exportPath        = new Map ();
+   static app;
 
    static run ()
    {
@@ -41,9 +37,15 @@ module .exports = class Application
 
       electron .app .commandLine .appendSwitch ("--enable-features", "OverlayScrollbar,ConversionMeasurement,AttributionReportingCrossAppWeb");
 
-      return new Application ();
+      return this .app = new Application ();
    }
 
+   config            = new DataStorage (localStorage, "Sunrize.Application.");
+   receivedFiles     = [ ];
+   mainMenu          = [ ];
+   openLocationValue = "";
+   exportPath        = new Map ();
+
    constructor ()
    {
       if (process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT")
@@ -114,11 +116,6 @@ module .exports = class Application
       });
    }
 
-   get applicationShouldQuitAfterLastWindowClosed ()
-   {
-      return true || process .platform !== "darwin" || process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT";
-   }
-
    get title ()
    {
       return this .mainWindow .title;
@@ -288,7 +285,7 @@ module .exports = class Application
                   },
                   { type: "separator" },
                   {
-                     label: _("Enable Browser Update on Load"),
+                     label: _("Make Browser Live (Play) on Load"),
                      type: "checkbox",
                      checked: this .config .browserUpdate,
                      click: () =>
@@ -1169,9 +1166,6 @@ module .exports = class Application
 
    quit ()
    {
-      if (!this .applicationShouldQuitAfterLastWindowClosed)
-         return;
-
       Template .removeAll ();
       electron .app .quit ();
    }

package/src/Tools/Core/X3DChildNodeTool.js

@@ -1,6 +1,8 @@
 "use strict";
 
-const X3DNodeTool = require ("./X3DNodeTool");
+const
+   X3DNodeTool = require ("./X3DNodeTool"),
+   X3D         = require ("../../X3D");
 
 class X3DChildNodeTool extends X3DNodeTool
 {
@@ -13,6 +15,33 @@ class X3DChildNodeTool extends X3DNodeTool
    {
       return true;
    }
+
+   isNodeTraversable (type)
+   {
+      if (!this .node .isVisible ())
+         return false;
+
+      switch (type)
+      {
+         case X3D .TraverseType .POINTER:
+            return this .node .isPointingObject ();
+
+         case X3D .TraverseType .CAMERA:
+            return this .node .isCameraObject ();
+
+         case X3D .TraverseType .PICKING:
+            return this .node .isPickableObject ();
+
+         case X3D .TraverseType .COLLISION:
+            return this .node .isCollisionObject ();
+
+         case X3D .TraverseType .SHADOW:
+            return this .node .isShadowObject ();
+
+         case X3D .TraverseType .DISPLAY:
+            return this .node .isVisibleObject ();
+      }
+   }
 }
 
 module .exports = X3DChildNodeTool;

package/src/Tools/Core/X3DNodeTool.js

@@ -469,9 +469,15 @@ class X3DNodeTool extends X3DBaseTool
 
    toolPointingEnabled = true;
 
+   isNodeTraversable (type)
+   {
+      return true;
+   }
+
    traverse (type, renderObject = this .node)
    {
-      this .node .traverse (type, renderObject);
+      if (this .isNodeTraversable (type))
+         this .node .traverse (type, renderObject);
 
       switch (type)
       {

package/src/assets/Entitlements.plist

@@ -2,23 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <dict>
-    <key>com.apple.security.cs.allow-jit</key>
-    <true/>
     <key>com.apple.security.device.audio-input</key>
     <true/>
-    <key>com.apple.security.device.bluetooth</key>
-    <true/>
     <key>com.apple.security.device.camera</key>
     <true/>
     <key>com.apple.security.device.print</key>
     <true/>
     <key>com.apple.security.device.usb</key>
     <true/>
-    <key>com.apple.security.personal-information.location</key>
-    <true/>
-    <key>com.apple.security.personal-information.addressbook</key>
-    <true/>
-    <key>com.apple.security.personal-information.calendars</key>
-    <true/>
   </dict>
 </plist>

package/src/assets/html/window-template.html

@@ -15,11 +15,11 @@
               <div id="browser-frame">
                 <x3d-canvas
                     id="browser"
-                    debug="true"
                     cache="false"
+                    contextMenu="false"
+                    debug="true"
                     preserveDrawingBuffer="true"
                     splashScreen="false"
-                    contextMenu="false"
                     xrSessionMode="NONE"></x3d-canvas>
               </div>
               <div id="secondary-toolbar" class="toolbar vertical-toolbar large-toolbar secondary-toolbar"></div>

package/src/assets/themes/default-template.css

@@ -1,8 +1,7 @@
 @charset "utf-8";
+@import url(https://fonts.googleapis.com/css2?family=Roboto+Mono:ital,wght@0,400;0,700;1,400;1,700&family=Roboto:ital,wght@0,100;0,400;0,700;1,100;1,400;1,700&display=swap);
 @import url(../../node_modules/material-icons/iconfont/material-icons.css);
 @import url(../../node_modules/material-symbols/index.css);
-@import url(https://fonts.googleapis.com/css2?family=Roboto+Mono:ital,wght@0,400;0,700;1,400;1,700&family=Roboto:ital,wght@0,100;0,400;0,700;1,100;1,400;1,700&display=swap);
-
 @import url(../../node_modules/spectrum-colorpicker2/dist/spectrum.css);
 @import url(system-colors.css);
 

package/src/main.js

@@ -1,9 +1,6 @@
 "use strict";
 
-if (process .argv .length > 2)
-{
-   process .argv = process .argv .concat (JSON .parse (atob (process .argv .pop ())));
-   process .chdir (process .argv .pop ());
-}
+if (process .argv .at (-2) === "--cwd")
+   process .chdir (process .argv .at (-1));
 
-const app = require ("./Application/Application") .run ();
+require ("./Application/Application") .run ();

package/src/assets/html/application.html

@@ -1,77 +0,0 @@
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <!-- Theme -->
-    <link rel="stylesheet" type="text/css" href="file:///Users/holger/Desktop/X_ITE/sunrize/src/assets/themes/default.css"/>
-  </head>
-  <body>
-    <tab-group sortable="true">
-      <style>
-.etabs .nav {
-  height: var(--window-tabs-height);
-  background: var(--background-color);
-  box-shadow: none;
-  border: none;
-  overflow: auto;
-  white-space: nowrap;
-}
-
-.etabs .tab {
-  background: var(--window-tabs-background-color);
-  border-color: var(--border-color) !important;
-  padding: 4px 3px !important;
-  color: var(--window-tabs-text-color);
-  font-family: var(--sans-serif);
-  box-shadow: none;
-}
-
-.etabs .tab:first-child {
-  border-left: 0;
-}
-
-.etabs .tab.active {
-  z-index: 1100;
-  background: var(--background-color);
-  color: var(--window-tabs-highlight-color);
-}
-
-.etabs::before {
-  z-index: 1000;
-  content: "";
-  position: relative;
-  display: block;
-  height: 1px;
-  width: 100%;
-  box-shadow: var(--tabs-shadow);
-}
-
-.etabs .buttons {
-  border-color: var(--border-color);
-}
-
-.etabs .buttons:hover button,
-.etabs .tab-close button:hover {
-  background: none;
-}
-
-.etabs .buttons button:hover,
-.etabs .tab-close:hover button {
-  color: var(--system-gray0);
-}
-
-.etabs .tab-close button {
-  visibility: hidden;
-}
-
-.etabs .tab.active .tab-close button,
-.etabs .tab:hover .tab-close button {
-  visibility: visible;
-}
-
-.etabs .tab-close {
-  margin-left: 4px;
-}
-      </style>
-    </tab-group>
-  </body>
-</html>

package/src/assets/html/window.html

@@ -1,38 +0,0 @@
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <link rel="stylesheet" type="text/css" href="file:///Users/holger/Desktop/X_ITE/sunrize/node_modules/jquery-ui-dist/jquery-ui.min.css"/>
-    <link rel="stylesheet" type="text/css" href="file:///Users/holger/Desktop/X_ITE/sunrize/node_modules/qtip2/dist/jquery.qtip.min.css"/>
-    <link rel="stylesheet" type="text/css" href="file:///Users/holger/Desktop/X_ITE/sunrize/src/assets/themes/default.css"/>
-    <link rel="stylesheet" data-name="vs/editor/editor.main" href="file:///Users/holger/Desktop/X_ITE/sunrize/node_modules/monaco-editor/min/vs/editor/editor.main.css">
-  </head>
-  <body>
-    <div id="vertical-splitter" class="vertical-splitter">
-      <div class="vertical-splitter-left">
-        <div id="horizontal-splitter" class="horizontal-splitter">
-          <div class="horizontal-splitter-top">
-            <div id="browser-pane">
-              <div id="browser-frame">
-                <x3d-canvas
-                    id="browser"
-                    debug="true"
-                    cache="false"
-                    preserveDrawingBuffer="true"
-                    splashScreen="false"
-                    contextMenu="false"
-                    xrSessionMode="NONE"></x3d-canvas>
-              </div>
-              <div id="secondary-toolbar" class="toolbar vertical-toolbar large-toolbar secondary-toolbar"></div>
-            </div>
-          </div>
-          <div class="horizontal-splitter-bottom">
-            <div id="footer"></div>
-          </div>
-        </div>
-      </div>
-      <div class="vertical-splitter-right">
-        <div id="sidebar" class="sidebar"></div>
-      </div>
-    </div>
-  </body>
-</html>