sunrize 2.0.9 → 2.0.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "description": "Sunrize — A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -48,6 +48,7 @@
     "PLY",
     "STL",
     "SVG",
+    "VRM",
     "VRML",
     "Wavefront-OBJ",
     "WebGL",
@@ -92,7 +93,7 @@
     "@vscode/codicons": "^0.0.45",
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^41.0.2",
+    "electron": "^41.1.0",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -101,7 +102,7 @@
     "jquery-ui-dist": "^1.13.3",
     "jstree": "^3.3.17",
     "material-icons": "^1.13.14",
-    "material-symbols": "^0.40.2",
+    "material-symbols": "^0.42.3",
     "md5": "^2.3.0",
     "mime-types": "^3.0.2",
     "monaco-editor": "^0.55.1",
@@ -111,7 +112,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^4.0.5",
     "update-electron-app": "^3.1.2",
-    "x_ite": "^14.0.9",
+    "x_ite": "^14.1.2",
     "x3d-traverse": "^1.0.22"
   }
 }

package/src/Application/Application.js

@@ -33,8 +33,7 @@ module .exports = class Application
          return;
       }
 
-      if (process .platform === "win32")
-         require ("update-electron-app") .updateElectronApp ({ updateInterval: "1 hour" });
+      require ("update-electron-app") .updateElectronApp ({ updateInterval: "1 hour" });
 
       Registry .addWindowsFileTypes ();
 
@@ -1031,7 +1030,7 @@ module .exports = class Application
          },
          {
             name: _("3D"),
-            extensions: ["gltf", "glb", "obj", "stl", "ply", "svg"],
+            extensions: ["gltf", "glb", "vrm", "obj", "stl", "ply", "svg"],
          },
          {
             name: _("Audio"),

package/src/Editors/NodesLibrary.js

@@ -175,6 +175,7 @@ module .exports = class NodesLibrary extends LibraryPane
 
       const node = this .executionContext .createNode (typeName);
 
+      this .initializeNode (node);
       this .addNode (node);
 
       UndoManager .shared .endUndo ();
@@ -182,6 +183,27 @@ module .exports = class NodesLibrary extends LibraryPane
       await this .expandToAndSelectNode (node .getValue ());
    }
 
+   initializeNode (node)
+   {
+      for (const type of node .getNodeType () .reverse ())
+      {
+         switch (type)
+         {
+            case X3D .X3DConstants .ElevationGrid:
+            {
+               node .xDimension = 10;
+               node .zDimension = 10;
+               break;
+            }
+            case X3D .X3DConstants .X3DEnvironmentalSensorNode:
+            {
+               node .size = new X3D .SFVec3f (2, 2, 2);
+               break;
+            }
+         }
+      }
+   }
+
    async createProto (proto)
    {
       UndoManager .shared .beginUndo (_("Create Proto Instance %s"), proto .name);

package/src/Editors/OutlineEditor.js

@@ -328,7 +328,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
                      },
                      {
                         label: _("Fold InlineGeometry Back into Scene"),
-                        enabled: node .checkLoadState () === X3D .X3DConstants .COMPLETE_STATE && !!node .getGeometry (),
+                        enabled: node .checkLoadState () === X3D .X3DConstants .COMPLETE_STATE && !!$.try (() => node .getInnerNode ()),
                         args: ["foldInlineGeometryBackIntoScene", element .attr ("id"), executionContext .getId (), node .getId ()],
                      });
 
@@ -1624,7 +1624,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
       const
          rootNodes     = executionContext .rootNodes .copy (),
-         nodesToExport = [inlineGeometryNode .getGeometry ()],
+         nodesToExport = [inlineGeometryNode .getInnerNode ()],
          x3dSyntax     = await Editor .exportX3D (inlineGeometryNode .getInternalScene (), nodesToExport),
          nodes         = await Editor .importX3D (executionContext, x3dSyntax),
          geometryNode  = nodes [0];

package/src/Editors/ScriptEditor.js

@@ -576,13 +576,15 @@ module .exports = class ScriptEditor extends Interface
 
       const editor = monaco .editor .create (element .get (0),
       {
-         language: this .languages [node .getTypeName ()],
-         contextmenu: false,
          automaticLayout: true,
+         bracketPairColorization: { enabled: true },
+         contextmenu: false,
+         detectIndentation: true,
+         language: this .languages [node .getTypeName ()],
+         minimap: { enabled: false },
+         tabSize: 3,
          wordWrap: "on",
          wrappingIndent: "indent",
-         minimap: { enabled: false },
-         bracketPairColorization: { enabled: true },
       });
 
       editor .viewState = editor .saveViewState ();

package/src/Undo/Editor.js

@@ -303,8 +303,8 @@ module .exports = class Editor
 
       const
          nodes               = [... executionContext .rootNodes] .slice (rootNodes .length) .map (n => n ?.getValue ()),
-         newExternProtos     = [... executionContext .externprotos] .slice (externprotos .size),
-         newProtos           = [... executionContext .protos] .slice (protos .size),
+         newExternProtos     = [... executionContext .externprotos] .slice (externprotos .length),
+         newProtos           = [... executionContext .protos] .slice (protos .length),
          updatedExternProtos = new Map (),
          updatedProtos       = new Map (),
          removedProtoNodes   = new Set ();
@@ -2129,6 +2129,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
       node = node .valueOf ();
 
       const
+         fieldName     = field .getName (),
          oldAccessType = field .getAccessType (),
          fields        = Array .from (node .getUserDefinedFields ());
 
@@ -2182,7 +2183,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
             if (node .getProtoNode () !== proto)
                continue;
 
-            const field = node .getField (oldName);
+            const field = node .getField (fieldName);
 
             if (!updatedField .isInput ())
             {

package/src/assets/Info.plist

@@ -257,6 +257,24 @@
       <key>LSIsAppleDefaultForType</key>
       <true/>
     </dict>
+    <dict>
+      <key>CFBundleTypeExtensions</key>
+      <array>
+        <string>vrm</string>
+      </array>
+      <key>CFBundleTypeMIMETypes</key>
+      <array>
+        <string>model/vrm</string>
+      </array>
+      <key>CFBundleTypeName</key>
+      <string>VRM Model</string>
+      <key>CFBundleTypeRole</key>
+      <string>Editor</string>
+      <key>LSHandlerRank</key>
+      <string>Alternate</string>
+      <key>LSIsAppleDefaultForType</key>
+      <true/>
+    </dict>
     <dict>
       <key>CFBundleTypeExtensions</key>
       <array>

package/src/assets/X3D.reg

@@ -30,6 +30,9 @@ Windows Registry Editor Version 5.00
 [HKEY_CURRENT_USER\Software\Classes\.glb\OpenWithProgids]
 "Sunrize.glb"=""
 
+[HKEY_CURRENT_USER\Software\Classes\.vrm\OpenWithProgids]
+"Sunrize.vrm"=""
+
 [HKEY_CURRENT_USER\Software\Classes\.obj\OpenWithProgids]
 "Sunrize.obj"=""
 
@@ -112,6 +115,13 @@ Windows Registry Editor Version 5.00
 [HKEY_CURRENT_USER\Software\Classes\Sunrize.glb\shell\open\command]
 @="\"SUNRIZE_EXE\" \"%1\""
 
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.vrm]
+@="VRM Model"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.vrm\DefaultIcon]
+@="\"SUNRIZE_EXE\",0"
+[HKEY_CURRENT_USER\Software\Classes\Sunrize.vrm\shell\open\command]
+@="\"SUNRIZE_EXE\" \"%1\""
+
 [HKEY_CURRENT_USER\Software\Classes\Sunrize.obj]
 @="Wavefront OBJ Model"
 [HKEY_CURRENT_USER\Software\Classes\Sunrize.obj\DefaultIcon]