sunrize 1.0.11 → 1.0.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "A Multi Platform X3D Editor",
   "homepage": "https://create3000.github.io/sunrize/",
   "author": "Holger Seelig",
@@ -35,11 +35,11 @@
   ],
   "devDependencies": {
     "@electron-forge/cli": "^6.0.5",
-    "@electron-forge/maker-deb": "^6.0.5",
-    "@electron-forge/maker-rpm": "^6.0.5",
+    "@electron-forge/maker-deb": "^6.1.0",
+    "@electron-forge/maker-rpm": "^6.1.0",
     "@electron-forge/maker-squirrel": "^6.0.5",
     "@electron-forge/maker-zip": "^6.0.5",
-    "electron": "^23.1.2"
+    "electron": "^23.2.0"
   },
   "dependencies": {
     "capitalize": "^2.0.4",
@@ -50,14 +50,15 @@
     "jquery": "^3.6.4",
     "jquery-ui-dist": "^1.13.2",
     "jstree": "^3.3.15",
-    "material-icons": "^1.13.2",
-    "material-symbols": "^0.5.0",
+    "material-icons": "^1.13.3",
+    "material-symbols": "^0.5.3",
     "md5": "^2.3.0",
     "monaco-editor": "^0.36.1",
     "node-localstorage": "^2.2.1",
     "qtip2": "^3.0.3",
     "spectrum-colorpicker2": "^2.0.10",
-    "x_ite": "latest"
+    "string-similarity": "^4.0.4",
+    "x_ite": "^8.6.13"
   },
   "main": "src/main.js",
   "bin": {

package/src/sunrize/Application/Tabs.js

@@ -122,7 +122,14 @@ module .exports = new class Tabs
          this .openTabs (openTabs, false)
 
       if (this .tabs .getTabs () .length)
-         this .getTabByURL (activeTab)?.activate ()
+      {
+         const tab = this .getTabByURL (activeTab)
+
+         if (tab)
+            tab .activate ()
+         else
+            this .tabs .getTabByPosition (0) .activate ()
+      }
       else
          this .openTabs ()
    }

package/src/sunrize/Controls/Splitter.js

@@ -63,7 +63,7 @@ module .exports = class Splitter extends Interface
 
    get position ()
    {
-      this .config .file .position
+      return this .config .file .position
    }
 
    /**

package/src/sunrize/Editors/Library.js

@@ -1,13 +1,14 @@
 "use strict"
 
 const
-   $           = require ("jquery"),
-   X3D         = require ("../X3D"),
-   Dialog      = require ("../Controls/Dialog"),
-   Editor      = require ("../Undo/Editor"),
-   UndoManager = require ("../Undo/UndoManager"),
-   Primitives  = require ("./Primitives"),
-   _           = require ("../Application/GetText")
+   $                = require ("jquery"),
+   X3D              = require ("../X3D"),
+   Dialog           = require ("../Controls/Dialog"),
+   Editor           = require ("../Undo/Editor"),
+   UndoManager      = require ("../Undo/UndoManager"),
+   Primitives       = require ("./Primitives"),
+   StringSimilarity = require ("string-similarity"),
+   _                = require ("../Application/GetText")
 
 module .exports = new class Library extends Dialog
 {
@@ -141,9 +142,7 @@ module .exports = new class Library extends Dialog
 
    updateNodes ()
    {
-      const
-         SupportedNodes = X3D .require ("x_ite/Configuration/SupportedNodes"),
-         cmp            = (a, b) => (a > b) - (a < b)
+      const cmp = (a, b) => (a > b) - (a < b)
 
       // Clear list.
 
@@ -154,7 +153,7 @@ module .exports = new class Library extends Dialog
       const input = this .input .val () .toLowerCase () .trim ()
 
       if (input)
-         var filter = (Type) => Type .prototype .getTypeName () .toLowerCase () .includes (input)
+         var filter = (Type) => StringSimilarity .compareTwoStrings (Type .prototype .getTypeName () .toLowerCase (), input) > 0.4
       else
          var filter = () => true
 
@@ -214,7 +213,7 @@ module .exports = new class Library extends Dialog
       const input = this .input .val () .toLowerCase () .trim ()
 
       if (input)
-         var filter = (object) => object .typeName .toLowerCase () .includes (input)
+         var filter = (object) => StringSimilarity .compareTwoStrings (object .typeName .toLowerCase (), input) > 0.4
       else
          var filter = () => true
 

package/src/sunrize/Editors/OutlineView.js

@@ -2556,15 +2556,16 @@ module .exports = class OutlineView extends Interface
          return
 
       const
-         selection = require ("../Application/Selection"),
-         selected  = element .hasClass ("selected"),
-         nodes     = this .sceneGraph .find (".primary, .selected"),
-         node      = this .getNode (element)
+         selection        = require ("../Application/Selection"),
+         selected         = element .hasClass ("selected"),
+         selectedElements = this .sceneGraph .find (".primary, .selected"),
+         node             = this .getNode (element),
+         elements         = $(`.node[node-id=${node .getId ()}]`)
 
-      for (const element of nodes)
+      for (const element of selectedElements)
          this .getNode ($(element)) .setUserData (_primary, false)
 
-      nodes .removeClass ("primary")
+      selectedElements .removeClass ("primary")
 
       if (add)
       {
@@ -2572,9 +2573,14 @@ module .exports = class OutlineView extends Interface
          node .setUserData (_selected, !selected)
 
          if (selected)
+         {
             element .removeClass ("selected") .addClass ("primary")
+         }
          else
+         {
             element .addClass (["primary", "selected"])
+            elements .addClass ("selected")
+         }
 
          if (selected)
             selection .remove (node)
@@ -2583,14 +2589,15 @@ module .exports = class OutlineView extends Interface
       }
       else
       {
-         for (const element of nodes)
+         for (const element of selectedElements)
             this .getNode ($(element)) .setUserData (_selected, false)
 
          node .setUserData (_primary,  true)
          node .setUserData (_selected, true)
 
-         nodes .removeClass ("selected")
+         selectedElements .removeClass ("selected")
          element .addClass (["primary", "selected"])
+         elements .addClass ("selected")
          selection .set (node)
       }
    }

package/src/sunrize/Editors/ScriptEditor.js

@@ -39,6 +39,8 @@ module .exports = class ScriptEditor extends Interface
 
       this .vSplitter = new Splitter (this .verticalSplitter, "vertical")
 
+      this .vSplitter .splitter .on ("dblclick", () => this .closeLeftBar ())
+
       this .toolbar = $("<div></div>")
          .addClass (["toolbar", "vertical-toolbar", "script-editor-toolbar"])
          .appendTo (this .scriptEditor)
@@ -140,6 +142,8 @@ module .exports = class ScriptEditor extends Interface
                break
             }
          }
+
+         this .monaco .viewState = this .monaco .saveViewState ()
       }
 
       this .node = node
@@ -157,6 +161,8 @@ module .exports = class ScriptEditor extends Interface
          this .editor = editor .element .appendTo (this .verticalSplitterRight)
          this .monaco = editor .monaco
 
+         this .monaco .restoreViewState (this .monaco .viewState)
+
          this .node ._url .addFieldCallback (this, this .set_url .bind (this))
 
          switch (this .node .getTypeName ())
@@ -242,13 +248,15 @@ module .exports = class ScriptEditor extends Interface
                   automaticLayout: true,
                   wordWrap: "on",
                   wrappingIndent: "indent",
+                  minimap: { enabled: false },
                })
 
+               editor .viewState = editor .saveViewState ()
+
                element .on ("contextmenu", (event) => this .showContextMenu ())
                element .detach ()
 
                //this .debugFindActions (editor)
-
                this .editors .set (node, { element: element, monaco: editor })
 
                resolve (this .editors .get (node))
@@ -591,4 +599,18 @@ main ()
          }
       }
    }
+
+   closeLeftBar ()
+   {
+      if (this .config .file .vSplitterPosition !== undefined)
+      {
+         this .vSplitter .position = this .config .file .vSplitterPosition
+         this .config .file .vSplitterPosition = undefined
+      }
+      else
+      {
+         this .config .file .vSplitterPosition = this .vSplitter .position
+         this .vSplitter .position = 0
+      }
+   }
 }

package/src/sunrize/Tools/Grouping/TransformTool.x3d

@@ -5,9 +5,9 @@
     <meta name='created' content='Sat, 11 Mar 2023 10:55:09 GMT'/>
     <meta name='comment' content='Rise and Shine'/>
     <meta name='creator' content='Holger Seelig'/>
-    <meta name='generator' content='Sunrize X3D Editor V1.0.11, https://create3000.github.io/sunrize/'/>
+    <meta name='generator' content='Sunrize X3D Editor V1.0.12, https://create3000.github.io/sunrize/'/>
     <meta name='identifier' content='file:///Users/holger/Desktop/X_ITE/sunrize/src/sunrize/Tools/Grouping/TransformTool.x3d'/>
-    <meta name='modified' content='Sat, 11 Mar 2023 15:53:51 GMT'/>
+    <meta name='modified' content='Sat, 25 Mar 2023 22:06:22 GMT'/>
   </head>
   <Scene>
     <ProtoDeclare name='Tool'>

package/src/sunrize/Tools/Grouping/X3DBoundedObjectTool.x3d

@@ -7,9 +7,9 @@
     <meta name='comment' content='Rise and Shine'/>
     <meta name='created' content='Fri, 29 Aug 2014 13:13:27 GMT'/>
     <meta name='creator' content='Holger Seelig'/>
-    <meta name='generator' content='Sunrize X3D Editor V1.0.11, https://create3000.github.io/sunrize/'/>
+    <meta name='generator' content='Sunrize X3D Editor V1.0.12, https://create3000.github.io/sunrize/'/>
     <meta name='identifier' content='file:///Users/holger/Desktop/X_ITE/sunrize/src/sunrize/Tools/Grouping/X3DBoundedObjectTool.x3d'/>
-    <meta name='modified' content='Sun, 19 Mar 2023 16:33:08 GMT'/>
+    <meta name='modified' content='Sat, 25 Mar 2023 22:06:07 GMT'/>
   </head>
   <Scene>
     <ExternProtoDeclare name='ToolShader' url='"../Shaders/ToolShader.x3d"'>
@@ -23,7 +23,7 @@
         <field accessType='inputOutput' type='SFVec3f' name='rectangleSize' value='1 1 1'/>
         <field accessType='inputOutput' type='SFVec3f' name='rectangleCenter'/>
         <field accessType='inputOutput' type='SFInt32' name='bboxStyle' value='1'/>
-        <field accessType='inputOutput' type='SFColor' name='bboxColor' value='0.35 1 0.7'/>
+        <field accessType='inputOutput' type='SFColor' name='bboxColor' value='1 1 1'/>
         <field accessType='inputOutput' type='SFVec3f' name='bboxSize' value='1 1 1'/>
         <field accessType='inputOutput' type='SFVec3f' name='bboxCenter'/>
       </ProtoInterface>

package/src/themes/dark.css

@@ -510,6 +510,11 @@ tr.disabled ~ tr > td > div {
   left: -3px;
 }
 
+.small .material-symbols-outlined {
+  font-size: calc(var(--icon-size) + 3px);
+  left: -1px;
+}
+
 .vertical-toolbar .separator {
   display: block;
   margin: 10px auto;