sunrize 2.0.3 → 2.0.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -91,7 +91,7 @@
     "@vscode/codicons": "^0.0.44",
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^40.4.1",
+    "electron": "^40.6.0",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -110,7 +110,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.1.2",
-    "x_ite": "^14.0.3",
+    "x_ite": "^14.0.4",
     "x3d-traverse": "^1.0.22"
   }
 }

package/src/Undo/Editor.js

@@ -616,6 +616,9 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
             }
          }
 
+         if (node ._url .equals (newURL))
+            return;
+
          const uniqueURL = new X3D .MFString (... new Set (newURL));
 
          this .setFieldValue (executionContext, node, node ._url, uniqueURL, undoManager);
@@ -675,16 +678,19 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     */
    static getUsedComponents (scene)
    {
-      const components = new Set ();
+      const components = new Map ();
 
       for (const object of scene .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES | Traverse .PROTOTYPE_INSTANCES))
       {
          if (!(object instanceof X3D .SFNode))
             continue;
 
-         const node = object .getValue ();
+         const
+            node          = object .getValue (),
+            componentInfo = node .getComponentInfo ();
 
-         components .add (node .getComponentInfo () .name);
+         if (components .get (componentInfo .name) ?? 0 < componentInfo .level)
+            components .set (componentInfo .name, componentInfo .level);
       }
 
       return components;
@@ -692,31 +698,46 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
 
    static getProfileAndComponentsFromUsedComponents (browser, usedComponents)
    {
-      const profiles = ["Interactive", "Interchange", "Immersive", "Full"] .map (name =>
+      const profiles = ["Interchange", "Interactive", "Immersive", "Full"] .map (name =>
       {
-         return { profile: browser .getProfile (name), components: new Set (usedComponents) };
+         return { profile: browser .getProfile (name), components: new Map (usedComponents) };
       });
 
-      profiles .forEach (object =>
+      profiles .forEach (({ profile, components }) =>
       {
-         for (const component of object .profile .components)
-            object .components .delete (component .name);
+         for (const component of profile .components)
+         {
+            const level = components .get (component .name);
+
+            if (level === undefined)
+               continue;
+
+            if (level > component .level)
+               continue;
+
+            components .delete (component .name);
+         }
       });
 
       const min = profiles .reduce ((min, object) =>
       {
-         const count = object .profile .components .length + object .components .size;
+         const count = new Set ([
+            ... [... object .profile .components] .map (component => component .name),
+            ... object .components .keys ()
+         ]) .size;
 
          return min .count < count ? min : {
-            count: count,
-            object: object,
+            count,
+            object,
          };
       },
       { count: Number .POSITIVE_INFINITY });
 
       return {
          profile: min .object .profile,
-         components: Array .from (min .object .components) .sort () .map (name => browser .getSupportedComponents () .get (name)),
+         components: Array .from (min .object .components .keys ())
+            .sort ()
+            .map (name => browser .getComponent (name)),
       };
    }