sunrize 1.0.66 → 1.0.67

package/docs/_config.yml

@@ -33,13 +33,13 @@ github:
   username: create3000/sunrize            # change to your github username
 
 twitter:
-  username: web3dconsortium             # change to your twitter username
+  username: web3dconsortium               # change to your twitter username
 
 social:
   # Change to your full name.
   # It will be displayed as the default author of the posts and the copyright owner in the Footer
   name: CREATE3000
-  email: holger.seelig@google.com         # change to your email address
+  email: holger.seelig@gmail.com          # change to your email address
   links:
     # The first element serves as the copyright owner"s link
     - https://twitter.com/web3dconsortium # change to your twitter homepage

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.0.66",
+  "version": "1.0.67",
   "description": "A Multi Platform X3D Editor",
   "homepage": "https://create3000.github.io/sunrize/",
   "author": "Holger Seelig",
@@ -67,7 +67,7 @@
     "qtip2": "^3.0.3",
     "spectrum-colorpicker2": "^2.0.10",
     "string-similarity": "^4.0.4",
-    "x_ite": "^8.9.3"
+    "x_ite": "^8.10.0"
   },
   "main": "src/main.js",
   "bin": {

package/src/sunrize/Application/Interface.js

@@ -23,7 +23,7 @@ module .exports = class Interface
       this .config       = { global: this .createGlobalConfig () }
       this .config .file = this .createFileConfig ()
 
-      this .browser .addBrowserCallback (this, this .setBrowserEvent .bind (this))
+      this .browser .addBrowserCallback (this, X3D .X3DConstants .INITIALIZED_EVENT, this .browserInitialized .bind (this))
       CSS .colorScheme .addEventListener ("change", event => this .colorScheme (!! event .matches))
    }
 
@@ -33,7 +33,7 @@ module .exports = class Interface
 
       // Configure
 
-      this .setBrowserEvent (X3D .X3DConstants .INITIALIZED_EVENT)
+      this .browserInitialized (X3D .X3DConstants .INITIALIZED_EVENT)
    }
 
    initialize () { }
@@ -89,11 +89,8 @@ module .exports = class Interface
     *
     * @param {string} event
     */
-   setBrowserEvent (event)
+   browserInitialized (event)
    {
-      if (event !== X3D .X3DConstants .INITIALIZED_EVENT)
-         return
-
       this .config .file = this .createFileConfig (this .browser .getWorldURL ())
 
       this .configure ()

package/src/sunrize/Editors/OutlineEditor.js

@@ -27,11 +27,14 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
    {
       super .configure ()
 
-      this .X3DTransformMatrix3DNode = new Set ([
+      // Now are all nodes available.
+
+      this .matrixNodes = new Set ([
          X3D .X3DConstants .Billboard,
          X3D .X3DConstants .CADPart,
          X3D .X3DConstants .GeoLocation,
          X3D .X3DConstants .GeoTransform,
+         X3D .X3DConstants .HAnimHumanoid,
          X3D .X3DConstants .HAnimJoint,
          X3D .X3DConstants .HAnimSite,
          X3D .X3DConstants .LayoutGroup,
@@ -801,6 +804,31 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       await Editor .turnIntoPrototype (executionContext, externproto)
    }
 
+   toggleImportedNode (event, parent)
+   {
+      const
+         img          = $(event .target),
+         exportedNode = this .getExportedNode (img .closest (".exported-node", this .sceneGraph)),
+         inlineNode   = this .getNode (parent .closest (".node", this .sceneGraph)),
+         importedNode = this .executionContext .importedNodes .get (exportedNode .getExportedName ());
+
+      if (importedNode)
+      {
+         if (importedNode .getInlineNode () !== inlineNode)
+            return;
+
+         Editor .removeImportedNode (this .executionContext, exportedNode .getExportedName ());
+
+         img .attr ("src", `../images/OutlineEditor/Values/FALSE.svg`)
+      }
+      else
+      {
+         Editor .updateImportedNode (this .executionContext, inlineNode, exportedNode .getExportedName ());
+
+         img .attr ("src", `../images/OutlineEditor/Values/TRUE.svg`)
+      }
+   }
+
    addInstance (id, executionContextId, protoNodeId)
    {
       const
@@ -1968,8 +1996,11 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          node        = this .getNode (nodeElement),
          modelMatrix = this .getModelMatrix (nodeElement .parent () .closest (".node", this .sceneGraph))
 
-      if (self && node .getType () .some (Set .prototype .has, this .X3DTransformMatrix3DNode))
-         modelMatrix .multLeft (node .getMatrix ())
+      if (self)
+      {
+         if (node .getType () .some (Set .prototype .has, this .matrixNodes))
+            modelMatrix .multLeft (node .getMatrix ())
+      }
 
       return modelMatrix
    }

package/src/sunrize/Editors/OutlineView.js

@@ -245,6 +245,9 @@ module .exports = class OutlineView extends Interface
             .on ("dragstart", this .onDragStartNode .bind (this))
       }
 
+      child .find (".exported-node > .item .boolean-button")
+         .on ("click", event => this .toggleImportedNode (event, parent))
+
       // Expand children.
 
       const
@@ -255,6 +258,8 @@ module .exports = class OutlineView extends Interface
       this .expandSceneSubtreeComplete (specialElements, elements)
    }
 
+   toggleImportedNode (event, parent) { }
+
    expandSceneSubtreeComplete (specialElements, elements)
    {
       this .updateRouteGraph ()
@@ -480,6 +485,10 @@ module .exports = class OutlineView extends Interface
       {
          return this .naturalCompare (a .getExportedName (), b .getExportedName ())
       })
+      .sort ((a, b) =>
+      {
+         return this .naturalCompare (a .getLocalNode () .getTypeName (), b .getLocalNode () .getTypeName ())
+      })
 
       const ul = $("<ul></ul>")
          .appendTo (child)
@@ -1114,6 +1123,20 @@ module .exports = class OutlineView extends Interface
             .append ($("<span></span>") .addClass ("as-name") .text (exportedNode .getExportedName ()))
       }
 
+      const exportedExecutionContext = exportedNode .getLocalNode () .getExecutionContext ();
+
+      if (exportedExecutionContext !== this .executionContext && exportedExecutionContext .getExecutionContext () === this .executionContext)
+      {
+         const imported = this .executionContext .importedNodes
+            .some (importedNode => importedNode .getExportedNode () === exportedNode .getLocalNode () && importedNode .getImportedName () === exportedNode .getExportedName ());
+
+         $("<img></img>")
+            .addClass ("boolean-button")
+            .attr ("src", `../images/OutlineEditor/Values/${imported ? "TRUE" : "FALSE"}.svg`)
+            .attr ("title", _ ("Toggle value."))
+            .appendTo (child)
+      }
+
       // Append empty tree to enable expander.
 
       $("<ul><li></li></ul>") .appendTo (child)
@@ -2740,6 +2763,11 @@ module .exports = class OutlineView extends Interface
       return this .objects .get (parseInt (element .attr ("node-id")))
    }
 
+   getExportedNode (element)
+   {
+      return this .objects .get (parseInt (element .attr ("exported-node-id")))
+   }
+
    getField (element)
    {
       return this .objects .get (parseInt (element .attr ("field-id")))

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

@@ -44,7 +44,12 @@ class X3DBoundedObjectTool extends X3DNodeTool
    traverse (type, renderObject)
    {
       this .toolNode .traverse (type, renderObject)
+
+      renderObject .getHumanoids () .push (null)
+
       this .toolInnerNode ?.traverse (type, renderObject)
+
+      renderObject .getHumanoids () .pop ()
    }
 }
 

package/src/sunrize/Tools/Grouping/X3DTransformNodeTool.js

@@ -24,7 +24,7 @@ class X3DTransformNodeTool extends X3DNodeTool
 
       return super .removeTool ()
    }
-   
+
    static box = new Box3 ()
 
    reshape ()
@@ -44,7 +44,12 @@ class X3DTransformNodeTool extends X3DNodeTool
    traverse (type, renderObject)
    {
       this .toolNode .traverse (type, renderObject)
+
+      renderObject .getHumanoids () .push (null)
+
       this .toolInnerNode ?.traverse (type, renderObject)
+
+      renderObject .getHumanoids () .pop ()
    }
 }
 

package/src/sunrize/Undo/Editor.js

@@ -457,18 +457,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) })}
 
                // Remove routes.
 
-               for (const field of node .getFields ())
-               {
-                  for (const route of field .getInputRoutes ())
-                  {
-                     this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager)
-                  }
-
-                  for (const route of field .getOutputRoutes ())
-                  {
-                     this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager)
-                  }
-               }
+               this .deleteRoutes (executionContext, node, undoManager)
 
                if (node .getType () .includes (X3D .X3DConstants .X3DBindableNode))
                {
@@ -821,7 +810,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) })}
     * @param {string} importedName
     * @param {UndoManager} undoManager
     */
-   static updateImportedNode (executionContext, inlineNode, exportedName, importedName, undoManager = UndoManager .shared)
+   static updateImportedNode (executionContext, inlineNode, exportedName, importedName = exportedName, undoManager = UndoManager .shared)
    {
       undoManager .beginUndo (_ ("Update Imported Node »%s«"), importedName)
 
@@ -852,6 +841,13 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) })}
 
       undoManager .beginUndo (_ ("Remove Imported Node »%s«"), importedName)
 
+      try
+      {
+         this .deleteRoutes (executionContext, importedNode .getExportedNode (), undoManager);
+      }
+      catch
+      { }
+
       executionContext .removeImportedNode (importedName)
 
       undoManager .registerUndo (() =>
@@ -1337,18 +1333,10 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) })}
       {
          inputRoutes  .set (field .getName (), new Set (field .getInputRoutes ()))
          outputRoutes .set (field .getName (), new Set (field .getOutputRoutes ()))
-
-         for (const route of field .getInputRoutes ())
-         {
-            this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager)
-         }
-
-         for (const route of field .getOutputRoutes ())
-         {
-            this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager)
-         }
       }
 
+      this .deleteRoutes (executionContext, instance, undoManager)
+
       // Set proto node.
 
       instance .setProtoNode (protoNode)
@@ -1529,6 +1517,33 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) })}
       undoManager .endUndo ()
    }
 
+   /**
+    *
+    * @param {X3DBaseNode} node
+    * @param {UndoManager} undoManager
+    */
+   static deleteRoutes (executionContext, node, undoManager = UndoManager .shared)
+   {
+      for (const field of node .getFields ())
+      {
+         for (const route of field .getInputRoutes ())
+         {
+            if (route .getExecutionContext () !== executionContext)
+               continue;
+
+            this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager)
+         }
+
+         for (const route of field .getOutputRoutes ())
+         {
+            if (route .getExecutionContext () !== executionContext)
+               continue;
+
+            this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager)
+         }
+      }
+   }
+
    /**
     *
     * @param {X3DExecutionContext} executionContext

package/src/themes/default.css

@@ -1213,6 +1213,10 @@ body.dark .ui-widget .library-list .component {
   color: var(--system-brown);
 }
 
+.scene-graph .exported-node > .item .boolean-button {
+  top: 2px
+}
+
 .scene-graph .field > .item .name {
   color: var(--system-orange);
 }
@@ -1233,6 +1237,7 @@ body.dark .ui-widget .library-list .component {
 }
 
 .scene-graph .boolean-button {
+  cursor: pointer;
   position: relative;
   margin-left: 10px;
   width: 28px;